From cd8406cf34122776f93720347638fbed4435dd8f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 17 Dec 2018 17:10:24 +0100
Subject: tv mu: use /dev/sda for devices, not UUIDs^_^

---
 tv/1systems/mu/config.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index a653ce4..7820b1a 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -13,10 +13,7 @@ with import <stockholm/lib>;
 
   tv.x0vncserver.enable = true;
 
-  # hardware configuration
-  boot.initrd.luks.devices.muca = {
-    device = "/dev/disk/by-uuid/7b24a931-40b6-44a6-ba22-c805cf164e91";
-  };
+  boot.initrd.luks.devices.muca.device = "/dev/sda2";
   boot.initrd.luks.cryptoModules = [ "aes" "sha512" "xts" ];
   boot.initrd.availableKernelModules = [ "ahci" ];
   boot.kernelModules = [ "fbcon" "kvm-intel" ];
@@ -34,7 +31,7 @@ with import <stockholm/lib>;
       options = [ "defaults" "discard" ];
     };
     "/boot" = {
-      device = "/dev/disk/by-uuid/CEB1-9743";
+      device = "/dev/sda1";
       fsType = "vfat";
     };
   };
-- 
cgit v1.2.3


From 6368559ee1ef10dfb7df802743813b219ffbf7ba Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 17 Dec 2018 17:11:31 +0100
Subject: tv mu: import x220 config

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

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 7820b1a..be8d909 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -5,6 +5,11 @@ with import <stockholm/lib>;
     <stockholm/tv>
     <stockholm/tv/2configs/br.nix>
     <stockholm/tv/2configs/exim-retiolum.nix>
+    <stockholm/tv/2configs/hw/x220.nix>
+    {
+      # Override x220.nix as we're using networkmanager here.
+      networking.wireless.enable = mkForce false;
+    }
     <stockholm/tv/2configs/retiolum.nix>
   ];
 
-- 
cgit v1.2.3


From d05a98eba35954e3fc3c384a98c679297feb8f80 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 18 Dec 2018 20:39:36 +0100
Subject: tv: enable networking.wireless in systems

---
 tv/1systems/alnus/config.nix | 4 ----
 tv/1systems/mu/config.nix    | 4 ----
 tv/1systems/nomic/config.nix | 2 ++
 tv/1systems/wu/config.nix    | 2 ++
 tv/1systems/xu/config.nix    | 2 ++
 tv/1systems/zu/config.nix    | 2 ++
 tv/2configs/hw/AO753.nix     | 2 --
 tv/2configs/hw/x220.nix      | 2 --
 8 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index 001ad0b..949a98b 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -8,10 +8,6 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/retiolum.nix>
   ];
 
-  # TODO remove non-hardware stuff from ../2configs/hw/x220.nix
-  # networking.wireless.enable collides with networkmanager
-  networking.wireless.enable = mkForce false;
-
   boot = {
     initrd = {
       availableKernelModules = [ "ahci" ];
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index be8d909..f1cd7d6 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -6,10 +6,6 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/br.nix>
     <stockholm/tv/2configs/exim-retiolum.nix>
     <stockholm/tv/2configs/hw/x220.nix>
-    {
-      # Override x220.nix as we're using networkmanager here.
-      networking.wireless.enable = mkForce false;
-    }
     <stockholm/tv/2configs/retiolum.nix>
   ];
 
diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix
index 996a5e7..a89f07e 100644
--- a/tv/1systems/nomic/config.nix
+++ b/tv/1systems/nomic/config.nix
@@ -64,4 +64,6 @@ with import <stockholm/lib>;
     gnupg
     tmux
   ];
+
+  networking.wireless.enable = true;
 }
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index 17eeff5..4c491d6 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -41,6 +41,8 @@ with import <stockholm/lib>;
     };
   };
 
+  networking.wireless.enable = true;
+
   services.printing.enable = true;
 
   services.udev.extraRules = ''
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 5421cab..b9c76cf 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -147,6 +147,8 @@ with import <stockholm/lib>;
     gptfdisk
   ];
 
+  networking.wireless.enable = true;
+
   #services.bitlbee.enable = true;
   #services.tor.client.enable = true;
   #services.tor.enable = true;
diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index 414d2f2..bbfcfaf 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -44,6 +44,8 @@ with import <stockholm/lib>;
     };
   };
 
+  networking.wireless.enable = true;
+
   services.printing.enable = true;
 
   #services.bitlbee.enable = true;
diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix
index 8625078..4df5e09 100644
--- a/tv/2configs/hw/AO753.nix
+++ b/tv/2configs/hw/AO753.nix
@@ -25,8 +25,6 @@ with import <stockholm/lib>;
     config.boot.kernelPackages.broadcom_sta
   ];
 
-  networking.wireless.enable = true;
-
   nix = {
     buildCores = 2;
     maxJobs = 2;
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index 38a89cf..35e7d89 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -26,8 +26,6 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.wireless.enable = true;
-
   # Required for Centrino.
   hardware.enableRedistributableFirmware = true;
 
-- 
cgit v1.2.3