diff options
| author | jeschli <jeschli@gmail.com> | 2018-12-28 14:48:30 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-12-28 14:48:30 +0100 |
| commit | 06b6454af78e8236a67d69cab94f62c32054be47 (patch) | |
| tree | 749fd6025d2e799314cf46d51027dc23fb19c7b8 /tv/1systems/mu/config.nix | |
| parent | 8605ac91ae3a3859ab906a5fa2e9b0e3dfcd6e1e (diff) | |
| parent | fb254e60949f029cc7cb48764093b49932d0acde (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'tv/1systems/mu/config.nix')
| -rw-r--r-- | tv/1systems/mu/config.nix | 8 |
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"; }; }; |