summaryrefslogtreecommitdiffstats
path: root/tv/1systems/mu/config.nix
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/1systems/mu/config.nix
parentb199a386d331ab7ff16cae6e0393379ce18a17af (diff)
parent0b57526d4fabfd40cd1f0bd5ba7bca301c7288d3 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/1systems/mu/config.nix')
-rw-r--r--tv/1systems/mu/config.nix8
1 files changed, 3 insertions, 5 deletions
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";
};
};