From 32c59103f5315fb6160b1dd38df2c27647aaffdd Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 1 Dec 2016 21:58:43 +0100
Subject: tv nixpkgs: 728a957 -> e360c72

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

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 8852100e2..bd3633b11 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
-        ref = "728a9578e31a0f78f6ad07a3a2ec706ec5290f10";
+        ref = "e360c7205f84be180d80b97f3980fb809a951486";
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";
-- 
cgit v1.2.3


From 2c7f303c9779b397085855e41623ba262a15f36b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 3 Dec 2016 02:39:04 +0100
Subject: nomic: AO753 -> x220

---
 tv/1systems/nomic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 7d6a1d682..fe1e1d68a 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -7,7 +7,7 @@ with import <stockholm/lib>;
 
   imports = [
     ../.
-    ../2configs/hw/AO753.nix
+    ../2configs/hw/x220.nix
     ../2configs/exim-retiolum.nix
     ../2configs/git.nix
     ../2configs/im.nix
-- 
cgit v1.2.3


From e62dca94080a3475011c18cc2c4323eac2d56aea Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 3 Dec 2016 03:32:44 +0100
Subject: zu: define gg23

---
 krebs/3modules/tv/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 3315dd157..d44c322aa 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -391,11 +391,13 @@ with import <stockholm/lib>;
     zu = {
       cores = 4;
       nets = {
-        #gg23 = {
-        #  ip4.addr = "";
-        #  aliases = ["zu.gg23"];
-        #  ssh.port = 11423;
-        #};
+        gg23 = {
+          ip4.addr = "10.23.1.39";
+          aliases = [
+            "zu.gg23"
+          ];
+          ssh.port = 11423;
+        };
         retiolum = {
           ip4.addr = "10.243.13.40";
           ip6.addr = "42:0:0:0:0:0:0:1340";
-- 
cgit v1.2.3


From 8d18b86a014b06e3dd2b5d9dbea6dd78cbe056c4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 3 Dec 2016 04:05:17 +0100
Subject: nomic: keep using grub

---
 tv/1systems/nomic.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index fe1e1d68a..5469fffd5 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -25,6 +25,16 @@ with import <stockholm/lib>;
     ];
   };
 
+  # Don't use UEFI because current disk was partitioned/formatted for AO753.
+  # TODO remove following bool.loader section after repartitioning/reformatting
+  boot.loader = {
+    grub = {
+      device = "/dev/sda";
+      splashImage = null;
+    };
+    systemd-boot.enable = mkForce false;
+  };
+
   fileSystems."/" =
     { device = "/dev/mapper/nomic1-root";
       fsType = "btrfs";
-- 
cgit v1.2.3


From 8661ad89a6ebbee0b3aac34db0aca6fe9d173f2e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 16 Dec 2016 17:09:37 +0100
Subject: tv nixpkgs: e360c72 -> 81428dd

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

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index bd3633b11..ea97b1957 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
-        ref = "e360c7205f84be180d80b97f3980fb809a951486";
+        ref = "81428dd022c26764e9066d381ece90b1e88bd0d2";
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";
-- 
cgit v1.2.3