diff options
| author | lassulus <lassulus@lassul.us> | 2017-07-11 11:26:24 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-07-12 19:09:36 +0200 |
| commit | 3363a8746c9152709abcd5adbbcdc00c2df0ff39 (patch) | |
| tree | a10665f6ddf735eb1ac3970f2cdb24f4cf6e4ed7 /lass/2configs | |
| parent | 9215b5b6880c833721caa7572b7480c7912d7fd6 (diff) | |
move source config from module system to 1systems/*/source.nix
Diffstat (limited to 'lass/2configs')
| -rw-r--r-- | lass/2configs/default.nix | 12 | ||||
| -rw-r--r-- | lass/2configs/nixpkgs.nix | 8 |
2 files changed, 1 insertions, 19 deletions
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 27b74a30b..c643fa130 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -6,7 +6,6 @@ with import <stockholm/lib>; ../2configs/binary-cache/client.nix ../2configs/gc.nix ../2configs/mc.nix - ../2configs/nixpkgs.nix ../2configs/vim.nix ../2configs/monitoring/client.nix ./htop.nix @@ -71,16 +70,7 @@ with import <stockholm/lib>; krebs = { enable = true; search-domain = "r"; - build = { - user = config.krebs.users.lass; - source = let inherit (config.krebs.build) host; in { - nixos-config.symlink = "stockholm/lass/1systems/${host.name}.nix"; - secrets.file = - if getEnv "dummy_secrets" == "true" - then toString <stockholm/lass/2configs/tests/dummy-secrets> - else "/home/lass/secrets/${host.name}"; - }; - }; + build.user = config.krebs.users.lass; }; nix.useSandbox = true; diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix deleted file mode 100644 index f5a3bbf88..000000000 --- a/lass/2configs/nixpkgs.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - krebs.build.source.nixpkgs.git = { - url = https://cgit.lassul.us/nixpkgs; - ref = "d72efac"; - }; -} |