From 956e4d7cff8398fa52e655f47df53198f19fb673 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 13 Oct 2016 21:53:20 +0200
Subject: tv q: print TODOs first

---
 tv/5pkgs/q/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tv/5pkgs/q/default.nix b/tv/5pkgs/q/default.nix
index b19402f..f923950 100644
--- a/tv/5pkgs/q/default.nix
+++ b/tv/5pkgs/q/default.nix
@@ -178,6 +178,11 @@ in
 pkgs.writeBashBin "q" ''
   set -eu
   export PATH=/var/empty
+  (${q-todo}) || :
+  if [ "$PWD" != "$HOME" ]; then
+    (HOME=$PWD; ${q-todo}) || :
+  fi
+  echo
   ${q-cal}
   echo
   ${q-isodate}
@@ -189,8 +194,4 @@ pkgs.writeBashBin "q" ''
   (${q-online}) &
   (${q-thermal_zone}) &
   wait
-  ${q-todo}
-  if [ "$PWD" != "$HOME" ]; then
-    (HOME=$PWD; ${q-todo})
-  fi
 ''
-- 
cgit v1.2.3


From 645dfc7c5fab3077307e53d33f0c16b31c91a897 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 13 Oct 2016 21:57:08 +0200
Subject: xu: mount /bku

---
 tv/1systems/xu.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 119399a..85ac23e 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -138,6 +138,11 @@ with config.krebs.lib;
       fsType = "btrfs";
       options = ["defaults" "noatime" "ssd" "compress=lzo"];
     };
+    "/bku" = {
+      device = "/dev/mapper/xuvga-bku";
+      fsType = "btrfs";
+      options = ["defaults" "noatime" "ssd" "compress=lzo"];
+    };
     "/home" = {
       device = "/dev/mapper/xuvga-home";
       fsType = "btrfs";
-- 
cgit v1.2.3


From 2c331bc91233628a3a4f683f0fc6a03928cd149a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 19 Oct 2016 18:33:42 +0200
Subject: s 2: fix obsolete option

---
 shared/2configs/default.nix  | 4 ++--
 shared/2configs/graphite.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared/2configs/default.nix b/shared/2configs/default.nix
index 31f786d..f5377db 100644
--- a/shared/2configs/default.nix
+++ b/shared/2configs/default.nix
@@ -11,7 +11,7 @@ with config.krebs.lib;
     nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix";
     nixpkgs.git = {
       url = https://github.com/NixOS/nixpkgs;
-      ref = "9cb194cfa449c43f63185a25c8d10307aea3b358"; # nixos-16.03 @ 2016-08-05
+      ref = "b8ede35d2efa96490857c22c751e75d600bea44f"; # nixos-16.09 @ 2016-10-19
     };
     secrets.file =
       if getEnv "dummy_secrets" == "true"
@@ -28,7 +28,7 @@ with config.krebs.lib;
     "http://cache.nixos.org"
     "http://hydra.nixos.org"
   ];
-  nix.useChroot = true;
+  nix.useSandbox = true;
 
   nixpkgs.config.packageOverrides = pkgs: {
     nano = pkgs.vim;
diff --git a/shared/2configs/graphite.nix b/shared/2configs/graphite.nix
index 37c6b09..bfa2b29 100644
--- a/shared/2configs/graphite.nix
+++ b/shared/2configs/graphite.nix
@@ -12,7 +12,7 @@ with config.krebs.lib;
   services.graphite = {
     web = {
       enable = true;
-      host = "0.0.0.0";
+      listenAddress = "0.0.0.0";
     };
     carbon = {
       enableCache = true;
-- 
cgit v1.2.3