diff options
author | makefu <github@syntax-fehler.de> | 2016-02-04 11:16:17 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-02-04 11:16:17 +0100 |
commit | 7117996d72a2d65ea324361d9cb711451a6ea398 (patch) | |
tree | fc9dbd824643e0ed80889d85b5667bfdb4c5a8b0 /2configs/default.nix | |
parent | f1b96fc2292d7b3950b6fa62faa4f729d2522774 (diff) |
Merge 'cd/master' - update krebs.build.source
Diffstat (limited to '2configs/default.nix')
-rw-r--r-- | 2configs/default.nix | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/2configs/default.nix b/2configs/default.nix index ec1100582..a98393e2b 100644 --- a/2configs/default.nix +++ b/2configs/default.nix @@ -20,24 +20,18 @@ with lib; build = { target = mkDefault "root@${config.krebs.build.host.name}"; user = config.krebs.users.makefu; - source = { - git.nixpkgs = { - #url = https://github.com/NixOS/nixpkgs; + source = { + upstream-nixpkgs = { url = mkDefault https://github.com/nixos/nixpkgs; rev = mkDefault "93d8671e2c6d1d25f126ed30e5e6f16764330119"; # unstable @ 2015-01-03, tested on filepimp - target-path = "/var/src/nixpkgs"; }; + secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/"; + stockholm = "/home/makefu/stockholm"; - dir.secrets = { - host = config.krebs.hosts.pornocauster; - path = "/home/makefu/secrets/${config.krebs.build.host.name}/"; - }; - - dir.stockholm = { - host = config.krebs.hosts.pornocauster; - path = "/home/makefu/stockholm" ; - target-path = "/var/src/stockholm"; - }; + # Defaults for all stockholm users? + nixos-config = "symlink:stockholm/${config.krebs.build.user.name}/1systems/${config.krebs.build.host.name}.nix"; + nixpkgs = symlink:stockholm/nixpkgs; + stockholm-user = "symlink:stockholm/${config.krebs.build.user.name}"; }; }; }; |