diff options
| author | lassulus <lass@aidsballs.de> | 2016-07-18 12:15:50 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-07-18 12:15:50 +0200 |
| commit | af1959e3bdaabc004663c2dc2120148c18aa6b7c (patch) | |
| tree | e9f5237e90903a3a1fede41dc2300cffd405e817 /tv/2configs | |
| parent | a71a9ed33a92ba901f7c605506bb2c3ee506e6c7 (diff) | |
| parent | 33c96a89c5c72218a1c9f16bcea5909cd5135768 (diff) | |
Merge remote-tracking branch 'gum/master' into new-populate
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/default.nix | 20 | ||||
| -rw-r--r-- | tv/2configs/git.nix | 1 |
2 files changed, 11 insertions, 10 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index a9ba1eadd..04009f54d 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -7,18 +7,18 @@ with config.krebs.lib; krebs.build = { user = config.krebs.users.tv; - source = mapAttrs (_: mkDefault) ({ - nixos-config = "symlink:stockholm/tv/1systems/${config.krebs.build.host.name}.nix"; - secrets = "/home/tv/secrets/${config.krebs.build.host.name}"; - secrets-common = "/home/tv/secrets/common"; - stockholm = "/home/tv/stockholm"; - nixpkgs = { + source = let inherit (config.krebs.build) host; in { + nixos-config.symlink = "stockholm/tv/1systems/${host.name}.nix"; + secrets.file = "/home/tv/secrets/${host.name}"; + secrets-common.file = "/home/tv/secrets/common"; + stockholm.file = "/home/tv/stockholm"; + nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - rev = "8bf31d7d27cae435d7c1e9e0ccb0a320b424066f"; + ref = "8bf31d7d27cae435d7c1e9e0ccb0a320b424066f"; }; - } // optionalAttrs config.krebs.build.host.secure { - secrets-master = "/home/tv/secrets/master"; - }); + } // optionalAttrs host.secure { + secrets-master.file = "/home/tv/secrets/master"; + }; }; networking.hostName = config.krebs.build.host.name; diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 9bcf8f31f..4bc971370 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -36,6 +36,7 @@ let much = {}; newsbot-js = {}; nixpkgs = {}; + populate.desc = "source code installer"; push = {}; regfish = {}; soundcloud = { |