diff options
| author | lassulus <lass@lassul.us> | 2017-06-27 23:57:26 +0200 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-06-27 23:57:26 +0200 |
| commit | 4986344d6e2674914caa31cb4a4bd198dd3d50a0 (patch) | |
| tree | 6be70528d3c254a3a00b2c8b12df6feb5541ccdf /tv | |
| parent | c89cb97a723ee2f93476803ff2de34f872388652 (diff) | |
| parent | 62e50105badbe23a3e448d8ca9f5770f7698b22b (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/1systems/mu.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix index 8e527b021..3f3b2c2f4 100644 --- a/tv/1systems/mu.nix +++ b/tv/1systems/mu.nix @@ -79,7 +79,7 @@ with import <stockholm/lib>; gimp xsane firefoxWrapper - chromiumDev + chromium skype libreoffice pidgin-with-plugins diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index d248bf578..bab1c72b6 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -1,20 +1,20 @@ -{ config, lib, pkgs, ... }: - with import <stockholm/lib>; - -{ +{ config, lib, pkgs, ... }: let + builder = if getEnv "dummy_secrets" == "true" + then "buildbot" + else "tv"; +in { krebs.enable = true; krebs.build = { user = config.krebs.users.tv; source = let inherit (config.krebs.build) host; in { nixos-config.symlink = "stockholm/tv/1systems/${host.name}.nix"; - secrets.file = - if getEnv "dummy_secrets" == "true" - then toString <stockholm/tv/dummy_secrets> - else "/home/tv/secrets/${host.name}"; + secrets.file = getAttr builder { + buildbot = toString <stockholm/tv/dummy_secrets>; + tv = "/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; ref = "412b0a17aa2975e092c7ab95a38561c5f82908d4"; # nixos-17.03 |