diff options
| -rw-r--r-- | hosts/arrakis/default.nix | 1 | ||||
| -rw-r--r-- | hosts/arrakis/hardware-configuration.nix | 14 |
2 files changed, 11 insertions, 4 deletions
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 93c23c4..a34b647 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -16,7 +16,6 @@ timeout = 3; }; supportedFilesystems = [ "zfs" ]; - zfs.devNodes = "/dev/disk/by-label"; }; environment.systemPackages = with pkgs; [ diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index 2f81803..4583468 100644 --- a/hosts/arrakis/hardware-configuration.nix +++ b/hosts/arrakis/hardware-configuration.nix @@ -18,9 +18,16 @@ fsType = "zfs"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-label/boot"; + fileSystems."/efiboot/efi1" = + { device = "/dev/disk/by-label/ESP1"; fsType = "vfat"; + options = [ "X-mount.mkdir" "iocharset=iso8859-1" ]; + }; + + fileSystems."/efiboot/efi2" = + { device = "/dev/disk/by-label/ESP2"; + fsType = "vfat"; + options = [ "X-mount.mkdir" "iocharset=iso8859-1" ]; }; fileSystems."/nix" = @@ -39,7 +46,8 @@ }; swapDevices = - [ { device = "/dev/disk/by-label/swap"; } + [ { device = "/dev/disk/by-label/swap1"; } + { device = "/dev/disk/by-label/swap2"; } ]; hardware = { |