m 2 fs/sda-crypto-root-home: resolve TODO, import crypto-root, add device

1 files changed, 4 insertions, 19 deletions

diff --git a/makefu/2configs/fs/sda-crypto-root-home.nix b/makefu/2configs/fs/sda-crypto-root-home.nix
index 3821c7504..c2075a665 100644
--- a/makefu/2configs/fs/sda-crypto-root-home.nix
+++ b/makefu/2configs/fs/sda-crypto-root-home.nix
@@ -9,31 +9,16 @@
 
 with lib;
 {
-  boot = {
-    loader.grub.enable =true;
-    loader.grub.version =2;
-    loader.grub.device = "/dev/sda";
 
-    initrd.luks.devices = [ { name = "main"; device = "/dev/sda2"; allowDiscards=true; }];
-    initrd.luks.cryptoModules = ["aes" "sha512" "sha1" "xts" ];
-    initrd.availableKernelModules = ["xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
-  };
+  imports = [
+    ./sda-crypto-root.nix
+  ];
+
   fileSystems = {
-    "/" = {
-      device = "/dev/mapper/main-root";
-      fsType = "ext4";
-      options="defaults,discard";
-    };
-    # TODO: just import sda-crypto-root, add this device
     "/home" = {
       device = "/dev/mapper/main-home";
       fsType = "ext4";
       options="defaults,discard";
     };
-    "/boot" = {
-      device = "/dev/disk/by-label/nixboot";
-      fsType = "ext4";
-      options="defaults,discard";
-    };
   };
 }