summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tv/1systems/mu/config.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index a653ce40d..be8d90940 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>
];
@@ -13,10 +18,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 +36,7 @@ with import <stockholm/lib>;
options = [ "defaults" "discard" ];
};
"/boot" = {
- device = "/dev/disk/by-uuid/CEB1-9743";
+ device = "/dev/sda1";
fsType = "vfat";
};
};