diff options
author | makefu <github@syntax-fehler.de> | 2016-02-15 17:07:48 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-02-15 17:07:48 +0100 |
commit | 3ceff0ec29a36119ea83f02c8943752d91b250e9 (patch) | |
tree | 7b179bc972ea01c9305ea64697e14237346885d8 /lass/2configs/base.nix | |
parent | 9a4071b66ff45e99a30e9a314eb43c6efc7e921f (diff) | |
parent | 372f2d77f301719e396a6f943657325e2f8b2cf4 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'lass/2configs/base.nix')
-rw-r--r-- | lass/2configs/base.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 4c73fc0ce..d2c96fdaa 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; { imports = [ ../2configs/vim.nix @@ -50,12 +50,10 @@ with lib; user = config.krebs.users.lass; source = mapAttrs (_: mkDefault) ({ nixos-config = "symlink:stockholm/lass/1systems/${config.krebs.build.host.name}.nix"; - nixpkgs = symlink:stockholm/nixpkgs; secrets = "/home/lass/secrets/${config.krebs.build.host.name}"; #secrets-common = "/home/lass/secrets/common"; stockholm = "/home/lass/stockholm"; - stockholm-user = "symlink:stockholm/lass"; - upstream-nixpkgs = { + nixpkgs = { url = https://github.com/Lassulus/nixpkgs; rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce"; dev = "/home/lass/src/nixpkgs"; |