Skip to content

Commit

Permalink
Revert "Now that NixOS/nixpkgs#282022 has landed, switch to gpt-auto …
Browse files Browse the repository at this point in the history
…for the forseeable."

This reverts commit 4b2c89e.

Testing to see if it's what's causing my activation woes.
  • Loading branch information
philiptaron committed Mar 22, 2024
1 parent 0f6e1c7 commit d3bb46c
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions boot.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ in

boot.initrd.availableKernelModules = [
"ahci"
"efivarfs"
"nvme"
"sd_mod"
"usb_storage"
Expand All @@ -48,13 +49,17 @@ in
# No software RAID in this system.
boot.swraid.enable = false;

# Use `systemd-gpt-auto-root` to detect the root filesystem partition.
boot.initrd.supportedFilesystems = [ "ext4" ];
boot.initrd.systemd.root = "gpt-auto";
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/d5a0f038-5839-44e1-ad49-5edd00d7f81e";
fsType = "ext4";
};

# Mount the boot partition specifically. I'd like to move this to a mount unit.
fileSystems."/boot".device = "/dev/disk/by-uuid/0D2C-FF36";
fileSystems."/boot".fsType = "vfat";
"/boot" = {
device = "/dev/disk/by-uuid/0D2C-FF36";
fsType = "vfat";
};
};

# No swap devices in this system (maybe a bad call.)
swapDevices = [ ];
Expand Down

0 comments on commit d3bb46c

Please sign in to comment.