From 705bf2c5e3f5a903a705cad70e9f8df5e904580d Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sun, 22 Jan 2017 23:40:38 +0100
Subject: l 1 icarus: use grubs crytpodisk & remove /boot

---
 lass/1systems/icarus.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/icarus.nix b/lass/1systems/icarus.nix
index 7f632e9b..b869a67a 100644
--- a/lass/1systems/icarus.nix
+++ b/lass/1systems/icarus.nix
@@ -22,8 +22,9 @@ with import <stockholm/lib>;
     loader.grub.enable = true;
     loader.grub.version = 2;
     loader.grub.device = "/dev/sda";
+    loader.grub.enableCryptodisk = true;
 
-    initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda3"; } ];
+    initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ];
     initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
     initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
   };
@@ -43,9 +44,6 @@ with import <stockholm/lib>;
       fsType = "btrfs";
       options = ["defaults" "noatime" "ssd" "compress=lzo"];
     };
-    "/boot" = {
-      device = "/dev/sda2";
-    };
     "/tmp" = {
       device = "tmpfs";
       fsType = "tmpfs";
-- 
cgit v1.2.3