diff options
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | krebs/4lib/default.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/cd.nix | 15 |
3 files changed, 3 insertions, 16 deletions
diff --git a/default.nix b/default.nix index ac748c286..c001b8c13 100644 --- a/default.nix +++ b/default.nix @@ -32,7 +32,7 @@ let stockholm = { upath = lib.nspath current-user-name; base-module = { config, ... }: { - imports = builtins.filter builtins.pathExists (lib.concatLists [ + imports = builtins.filter lib.dir.has-default-nix (lib.concatLists [ (map (f: f "2configs") [ upath ]) (map (f: f "3modules") [ kpath upath ]) ]); diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix index 396307c22..f907fe871 100644 --- a/krebs/4lib/default.nix +++ b/krebs/4lib/default.nix @@ -14,6 +14,8 @@ rec { types = import ./types.nix { inherit lib; }; + dir.has-default-nix = path: pathExists (path + "/default.nix"); + dns = import ./dns.nix { inherit lib; }; listset = import ./listset.nix { inherit lib; }; shell = import ./shell.nix { inherit lib; }; diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 10c87b2c6..8c2a9ae43 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -4,23 +4,8 @@ with lib; { krebs.build.host = config.krebs.hosts.cd; - krebs.build.user = config.krebs.users.tv; - krebs.build.target = "root@cd.internet"; - krebs.build.source = { - git.nixpkgs = { - url = https://github.com/NixOS/nixpkgs; - rev = "c44a593aa43bba6a0708f6f36065a514a5110613"; - }; - dir.secrets = { - path = "/home/tv/secrets/cd"; - }; - dir.stockholm = { - path = "/home/tv/stockholm"; - }; - }; - imports = [ ../2configs/hw/CAC-Developer-2.nix ../2configs/fs/CAC-CentOS-7-64bit.nix |