Test out NixOS/nixpkgs#282022 again

philiptaron · Mar 3, 2024 · 81f6853 · 81f6853
1 parent 40ea4e3
commit 81f6853
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/boot.nix b/boot.nix
@@ -23,11 +23,14 @@ in
     managerEnvironment = {
       SYSTEMD_LOG_LEVEL = "debug";
     };
+
+    # Test out nixos/nixpkgs#282022
+    root = "gpt-auto";
   };
 
+  boot.initrd.supportedFilesystems = ["ext4"];
   boot.initrd.availableKernelModules = [
     "ahci"
-    "efivarfs"
     "nvme"
     "sd_mod"
     "usb_storage"
@@ -49,16 +52,9 @@ in
   # No software RAID in this system.
   boot.swraid.enable = false;
 
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/d5a0f038-5839-44e1-ad49-5edd00d7f81e";
-      fsType = "ext4";
-    };
-
-    "/boot" = {
-      device = "/dev/disk/by-uuid/0D2C-FF36";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/0D2C-FF36";
+    fsType = "vfat";
   };
 
   # No swap devices in this system (maybe a bad call.)

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
   nixConfig.commit-lockfile-summary = "flake.nix: update the lockfile";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs";
+    nixpkgs.url = "github:elvishjerricco/nixpkgs/gpt-auto-root";
 
     # Empty flake for making complex flake dependencies stop dead.
     empty.url = "path:./empty.nix";