summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-12-18 22:12:08 +0100
committerlassulus <lassulus@lassul.us>2018-12-18 22:12:08 +0100
commitadcb9ff179c296b683c80e5219d38659b4b36eb8 (patch)
treeff7d23876ddf440f07431aac03b9169d496f7cdb /tv
parentb199a386d331ab7ff16cae6e0393379ce18a17af (diff)
parent0b57526d4fabfd40cd1f0bd5ba7bca301c7288d3 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/alnus/config.nix4
-rw-r--r--tv/1systems/mu/config.nix8
-rw-r--r--tv/1systems/nomic/config.nix2
-rw-r--r--tv/1systems/wu/config.nix2
-rw-r--r--tv/1systems/xu/config.nix2
-rw-r--r--tv/1systems/zu/config.nix2
-rw-r--r--tv/2configs/hw/AO753.nix2
-rw-r--r--tv/2configs/hw/x220.nix2
8 files changed, 11 insertions, 13 deletions
diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index 001ad0bc4..949a98b2a 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 a653ce40d..f1cd7d673 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -5,6 +5,7 @@ with import <stockholm/lib>;
<stockholm/tv>
<stockholm/tv/2configs/br.nix>
<stockholm/tv/2configs/exim-retiolum.nix>
+ <stockholm/tv/2configs/hw/x220.nix>
<stockholm/tv/2configs/retiolum.nix>
];
@@ -13,10 +14,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 +32,7 @@ with import <stockholm/lib>;
options = [ "defaults" "discard" ];
};
"/boot" = {
- device = "/dev/disk/by-uuid/CEB1-9743";
+ device = "/dev/sda1";
fsType = "vfat";
};
};
diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix
index 996a5e7ec..a89f07e8a 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 17eeff5da..4c491d65b 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 5421cab92..b9c76cf49 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 414d2f226..bbfcfafc1 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 8625078da..4df5e097a 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 38a89cfc3..35e7d8941 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;