From 4d7bb2475f13730f238e854783b81b7609cfdcba Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 16 Oct 2015 22:58:54 +0200 Subject: m 2 fs/sda-crypto-root-home: resolve TODO, import crypto-root, add device --- makefu/2configs/fs/sda-crypto-root-home.nix | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'makefu/2configs') 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"; - }; }; } -- cgit v1.2.3