home

commit 09d221242ad505e00c2070bda97d9fb98a1ea8e1
parent 375207cb568f9fc2726e3155a131d14f70afb02f
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 24 Jun 2022 11:02:42 +0200

systems/aomi: trying to fix boot…

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/hardware/lenovo-p1.nix
 | 
2
+-
M
systems/hosts/aomi.nix
 | 
14
+++++++-------

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/systems/hardware/lenovo-p1.nix b/systems/hardware/lenovo-p1.nix
@@ -9,7 +9,7 @@
     ./thinkpad.nix
   ];
   boot = {
-    initrd.availableKernelModules = [ "nvme" "rtsx_pci_sdmmc" ];
+    initrd.availableKernelModules = [ "nvme" "rtsx_pci_sdmmc" "thunderbolt" "dm-mod" ];
   };
   hardware = {
     enableAllFirmware = true;
diff --git a/systems/hosts/aomi.nix b/systems/hosts/aomi.nix
@@ -26,13 +26,6 @@ in
     (import ../../users).root
   ];
 
-  fileSystems."/" = {
-    # device = "/dev/disk/by-uuid/6bedd234-3179-46f7-9a3f-feeffd880791";
-    device = "/dev/vg/root";
-    fsType = "ext4";
-    options = [ "noatime" "discard" ];
-  };
-
   boot.initrd.luks.devices = {
     root = {
       device = "/dev/disk/by-uuid/91b05f64-b97d-4405-8405-8785699ada8f";
@@ -44,6 +37,13 @@ in
     };
   };
 
+  fileSystems."/" = {
+    # device = "/dev/disk/by-uuid/6bedd234-3179-46f7-9a3f-feeffd880791";
+    device = "/dev/mapper/root";
+    fsType = "ext4";
+    options = [ "noatime" "discard" ];
+  };
+
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/32B9-94CC";
     fsType = "vfat";