diff options
| author | lassulus <lassulus@lassul.us> | 2018-11-28 21:30:46 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-11-28 22:18:54 +0100 |
| commit | 84c79ff43b2b65bba969aef7460f4a9d2915c112 (patch) | |
| tree | 82fe461bcdf384f3241bcaa7092b5540bddd3a90 | |
| parent | 35ac49f0bb4c49cd6365c12207e38e91f4a74db6 (diff) | |
* krops: merge krebs-nixpkgs into krebs-source
| -rw-r--r-- | jeschli/krops.nix | 4 | ||||
| -rw-r--r-- | tv/krops.nix | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/jeschli/krops.nix b/jeschli/krops.nix index fff0143..989abcd 100644 --- a/jeschli/krops.nix +++ b/jeschli/krops.nix @@ -1,14 +1,12 @@ { name }: let inherit (import ../krebs/krops.nix { inherit name; }) - krebs-nixpkgs krebs-source lib pkgs ; source = { test }: lib.evalSource [ - (krebs-nixpkgs { test = test; }) - krebs-source + (krebs-source { test = test; }) { nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix"; secrets = if test then { diff --git a/tv/krops.nix b/tv/krops.nix index 3b60d32..af0e861 100644 --- a/tv/krops.nix +++ b/tv/krops.nix @@ -1,15 +1,13 @@ { name }: rec { inherit (import ../krebs/krops.nix { inherit name; }) - krebs-nixpkgs krebs-source lib pkgs ; source = lib.evalSource [ - (krebs-nixpkgs { test = true; }) - krebs-source + (krebs-source { test = true; }) { nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix"; secrets.file = toString ./dummy_secrets; |