From 74429f245d366e783ecbcfb0ebd83a7f57e78e6a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 10:01:16 +0200
Subject: tv: add htop to default systemPackages

---
 tv/2configs/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 4a1247ef..d248bf57 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -158,9 +158,10 @@ with import <stockholm/lib>;
     {
       environment.systemPackages = [
         pkgs.get
+        pkgs.htop
         pkgs.krebspaste
-        pkgs.ovh-zone
         pkgs.nix-prefetch-scripts
+        pkgs.ovh-zone
         pkgs.push
       ];
     }
-- 
cgit v1.2.3


From 954996f78fbd65f89d2e768d09e2bcc41c080d17 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 22:57:34 +0200
Subject: tv: configure stockholm for buildbot

---
 tv/2configs/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index d248bf57..5d61cb94 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -1,20 +1,24 @@
-{ 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";
+      stockholm.file = getAttr builder {
+        buildbot = getEnv "PWD";
+        tv = "/home/tv/stockholm";
+      };
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
         ref = "412b0a17aa2975e092c7ab95a38561c5f82908d4"; # nixos-17.03
-- 
cgit v1.2.3


From ee08824427c0a8dbc92aa2858300f7aae5d70df0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 23:40:38 +0200
Subject: tv: stockholm is really just <stockholm>

---
 tv/2configs/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 5d61cb94..aae7c5a1 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -15,10 +15,7 @@ in {
         tv = "/home/tv/secrets/${host.name}";
       };
       secrets-common.file = "/home/tv/secrets/common";
-      stockholm.file = getAttr builder {
-        buildbot = getEnv "PWD";
-        tv = "/home/tv/stockholm";
-      };
+      stockholm.file = toString <stockholm>;
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
         ref = "412b0a17aa2975e092c7ab95a38561c5f82908d4"; # nixos-17.03
-- 
cgit v1.2.3


From 62e50105badbe23a3e448d8ca9f5770f7698b22b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 23:48:05 +0200
Subject: krebs.build.source: stockholm default is <stockholm>

---
 tv/2configs/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index aae7c5a1..bab1c72b 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -15,7 +15,6 @@ in {
         tv = "/home/tv/secrets/${host.name}";
       };
       secrets-common.file = "/home/tv/secrets/common";
-      stockholm.file = toString <stockholm>;
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
         ref = "412b0a17aa2975e092c7ab95a38561c5f82908d4"; # nixos-17.03
-- 
cgit v1.2.3