diff --git a/hosts/slab/configuration.nix b/hosts/slab/configuration.nix index 1cf9353..ee620d7 100644 --- a/hosts/slab/configuration.nix +++ b/hosts/slab/configuration.nix @@ -88,7 +88,7 @@ boot.loader = { efi = { canTouchEfiVariables = true; - efiSysMountPoint = "/boot"; + efiSysMountPoint = "/efi"; }; # grub = { # enable = true; @@ -97,10 +97,9 @@ # }; systemd-boot = { enable = true; + xbootldrMountPoint = "/boot"; netbootxyz.enable = true; memtest86.enable = true; - # grr oem efi partitions - configurationLimit = 4; }; }; diff --git a/hosts/slab/hardware-configuration.nix b/hosts/slab/hardware-configuration.nix index 48ddb10..7f56f71 100644 --- a/hosts/slab/hardware-configuration.nix +++ b/hosts/slab/hardware-configuration.nix @@ -19,22 +19,12 @@ options = [ "subvol=nixos/@root" ]; }; - # fileSystems."/boot" = - # { device = "/dev/disk/by-uuid/b9813c1d-5b6c-4026-9ee3-53ba80b90dc4"; - # fsType = "ext4"; - # }; - fileSystems."/nix" = { device = "/dev/disk/by-uuid/5723dafa-81df-4bb4-a039-7f52b61cbb02"; fsType = "btrfs"; options = [ "subvol=nixos/@nix" ]; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4E1B-8BEE"; - fsType = "vfat"; - }; - fileSystems."/.btrfsroot" = { device = "/dev/disk/by-uuid/5723dafa-81df-4bb4-a039-7f52b61cbb02"; fsType = "btrfs"; @@ -47,6 +37,18 @@ options = [ "subvol=@home" ]; }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/50D3-45F0"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/efi" = + { device = "/dev/disk/by-uuid/4E1B-8BEE"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + swapDevices = [ { device = "/dev/disk/by-uuid/9360890a-4050-4326-bf5f-8fa2bdc6744a"; } ];