maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(users/multi): refactor home manager configuration on whitby.

Browse source 
Previously this used git checkouts of home-manager.git and nixpkgs.git on
whitby, which is self-evidently non-reproducible, so instead use pinned
tarballs of those repositories as data sources.

Change-Id: I3bd01e44d746c62e6bfbeab2e7698ae9954c8a94
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1993
Tested-by: BuildkiteCI
Reviewed-by: multi <depot@in-addr.xyz>
This commit is contained in:
multi 2020-09-20 21:17:58 +01:00
parent 991bf53270
commit f43dfd4b8e
2 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
users/multi/whitby/depot.nix Normal file
View file

@ -0,0 +1,6 @@
{ config ? throw "not a readTree target", ... }:
let
depotPath = "/home/multi/depot";
in
depotPath

24
users/multi/whitby/home-manager.nix
View file

@ -1,13 +1,20 @@
{ config ? throw "not a readTree target", pkgs, depot, ... }: { config ? throw "not a readTree target", ... }:
let let
hmPath = "$HOME/nix/home-manager"; homeManagerSrc = (fetchTarball {
url = "https://github.com/nix-community/home-manager/archive/9b1b55ba0264a55add4b7b4e022bdc2832b531f6.tar.gz";
sha256 = "1lvnprvqfsjhi811ldagvfy4ilysxdj4arzi0f0gskll6czwjdr7";
});
depot = import <depot> {};
pkgs = import <nixpkgs> {};
depotPath = depot.users.multi.whitby.depot {};
in in
{ {
programs = { programs = {
home-manager = { enable = true; path = hmPath; }; home-manager = { enable = true; path = homeManagerSrc; };
bash = { bash = {
enable = true; enable = true;
@ -40,11 +47,9 @@ in
home.sessionVariables = { home.sessionVariables = {
NIX_PATH = NIX_PATH =
"nixpkgs=$HOME/nix/nixpkgs:" + "nixpkgs=${depot.third_party.nixpkgsSrc}:" +
"home-manager=${hmPath}:" + "depot=${depotPath}";
"depot=$HOME/nix/depot:" + HOME_MANAGER_CONFIG = "${depotPath}/users/multi/whitby/home-manager.nix";
"/nix/var/nix/profiles/per-user/root/channels";
HOME_MANAGER_CONFIG = <depot/users/multi/whitby/home-manager.nix>;
EDITOR = "vim"; EDITOR = "vim";
}; };
@ -57,11 +62,10 @@ in
home.file = { home.file = {
z = { z = {
source = builtins.fetchurl "https://raw.githubusercontent.com/rupa/z/master/z.sh"; source = builtins.fetchurl "https://raw.githubusercontent.com/rupa/z/9f76454b32c0007f20b0eae46d55d7a1488c9df9/z.sh";
target = ".z.sh"; target = ".z.sh";
}; };
}; };
home.stateVersion = "20.03"; home.stateVersion = "20.03";
} }