diff options
| author | lassulus <lass@lassul.us> | 2017-01-21 18:29:49 +0100 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-01-21 18:29:49 +0100 |
| commit | bd9dddd97fe5b881ac07d52f047e775bbdaf406b (patch) | |
| tree | aca0039e486ea99289c05a97542663cb7a80fb97 /lass | |
| parent | c80d283a55443154d1244f83828d49e61f425c2f (diff) | |
l 1 icarus: now installed with init
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/icarus.nix | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lass/1systems/icarus.nix b/lass/1systems/icarus.nix index 8402613d..7f632e9b 100644 --- a/lass/1systems/icarus.nix +++ b/lass/1systems/icarus.nix @@ -14,15 +14,6 @@ with import <stockholm/lib>; ../2configs/fetchWallpaper.nix ../2configs/backups.nix ../2configs/games.nix - #{ - # users.extraUsers = { - # root = { - # openssh.authorizedKeys.keys = map readFile [ - # ../../krebs/Zpubkeys/uriel.ssh.pub - # ]; - # }; - # }; - #} ]; krebs.build.host = config.krebs.hosts.icarus; @@ -32,19 +23,28 @@ with import <stockholm/lib>; loader.grub.version = 2; loader.grub.device = "/dev/sda"; - initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ]; + initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda3"; } ]; initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; - #kernelModules = [ "kvm-intel" "msr" ]; }; fileSystems = { "/" = { - device = "/dev/pool/nix"; + device = "/dev/mapper/pool-root"; fsType = "btrfs"; + options = ["defaults" "noatime" "ssd" "compress=lzo"]; + }; + "/bku" = { + device = "/dev/mapper/pool-bku"; + fsType = "btrfs"; + options = ["defaults" "noatime" "ssd" "compress=lzo"]; + }; + "/home" = { + device = "/dev/mapper/pool-home"; + fsType = "btrfs"; + options = ["defaults" "noatime" "ssd" "compress=lzo"]; }; - "/boot" = { - device = "/dev/sda1"; + device = "/dev/sda2"; }; "/tmp" = { device = "tmpfs"; |