aboutsummaryrefslogtreecommitdiffstats
path: root/hosts
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2024-05-07 19:19:45 -0700
committerMark Nipper <nipsy@bitgnome.net>2024-05-07 19:19:45 -0700
commitac9bfd3fd7dbd9ca90afefd20e3c51750ef61a57 (patch)
treeaf9d019b8bbe9bb912d73bd909c53dadd01692d8 /hosts
parentb9262b04e8626dc68db2d65945bd3df4872ffd8d (diff)
downloadnix-ac9bfd3fd7dbd9ca90afefd20e3c51750ef61a57.tar
nix-ac9bfd3fd7dbd9ca90afefd20e3c51750ef61a57.tar.gz
nix-ac9bfd3fd7dbd9ca90afefd20e3c51750ef61a57.tar.bz2
nix-ac9bfd3fd7dbd9ca90afefd20e3c51750ef61a57.tar.lz
nix-ac9bfd3fd7dbd9ca90afefd20e3c51750ef61a57.tar.xz
nix-ac9bfd3fd7dbd9ca90afefd20e3c51750ef61a57.tar.zst
nix-ac9bfd3fd7dbd9ca90afefd20e3c51750ef61a57.zip
Fix ESP mounts
Diffstat (limited to '')
-rw-r--r--hosts/darkstar/default.nix2
-rw-r--r--hosts/darkstar/hardware-configuration.nix6
2 files changed, 6 insertions, 2 deletions
diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix
index 556c7c5..4d9dbff 100644
--- a/hosts/darkstar/default.nix
+++ b/hosts/darkstar/default.nix
@@ -10,8 +10,6 @@
systemd-boot = {
enable = true;
extraInstallCommands = ''
- ${pkgs.util-linux}/bin/mount -t vfat -o iocharset=iso8859-1 /dev/disk/by-label/ESP1 /efiboot/efi1
- ${pkgs.util-linux}/bin/mount -t vfat -o iocharset=iso8859-1 /dev/disk/by-label/ESP2 /efiboot/efi2
${pkgs.coreutils}/bin/cp -r /efiboot/efi1/* /efiboot/efi2
'';
};
diff --git a/hosts/darkstar/hardware-configuration.nix b/hosts/darkstar/hardware-configuration.nix
index 3acea79..49cc244 100644
--- a/hosts/darkstar/hardware-configuration.nix
+++ b/hosts/darkstar/hardware-configuration.nix
@@ -18,6 +18,12 @@
fsType = "zfs";
};
+ 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";