diff options
author | makefu <github@syntax-fehler.de> | 2015-10-16 22:58:54 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-10-16 22:58:54 +0200 |
commit | 4d7bb2475f13730f238e854783b81b7609cfdcba (patch) | |
tree | 3d40e80e0f566549b6debc8377b27f9262bd96a7 | |
parent | 5d10eff1817b0d320d5ba83cdcdfe8cc99b87b19 (diff) |
m 2 fs/sda-crypto-root-home: resolve TODO, import crypto-root, add device
-rw-r--r-- | makefu/2configs/fs/sda-crypto-root-home.nix | 23 |
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"; - }; }; } |