change

apps/installer.nix

@@ -34,14 +34,16 @@
           --default=false
 
       ${pkgs.parted}/bin/parted /dev/''${DISK} -- mklabel gpt
-      ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart primary 512MiB 100%
+      ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart primary 512MiB -8GiB
+      ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart primary linux-swap -8GiB 100%
       ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart ESP fat32 1MiB 512MiB
       ${pkgs.parted}/bin/parted /dev/''${DISK} -- set 3 esp on
       mkfs.ext4 -L nixos /dev/''${DISK}''${PARTITION_PREFIX}1
+      mkswap -L swap /dev/''${DISK}''${PARTITION_PREFIX}2
       mkfs.fat -F 32 -n boot /dev/''${DISK}''${PARTITION_PREFIX}3
 
       mount /dev/disk/by-label/nixos /mnt
-      mkdir --parents /mnt/boot
+      mkdir -p /mnt/boot
       mount /dev/disk/by-label/boot /mnt/boot
 
       ${pkgs.nixos-install-tools}/bin/nixos-install --flake github:chrishrb/nix-dots#''${FLAKE}

modules/nixos/hardware/boot.nix

@@ -10,35 +10,19 @@
       # Check for other OSes and make them available
       useOSProber = true;
 
-      # Attempt to display GRUB on widescreen monitor
-      #gfxmodeEfi = "1920x1080";
-
       # Limit the total number of configurations to rollback
       configurationLimit = 25;
 
       # Install GRUB onto the boot disk
       device = config.fileSystems."/boot".device;
-
-      # Don't install GRUB, required for UEFI?
-      #device = "nodev";
-
-      # Display menu indefinitely if holding shift key
-      extraConfig = ''
-        if keystatus --shift ; then
-            set timeout=-1
-        else
-            set timeout=3
-        fi
-      '';
     };
 
-    # Always display menu indefinitely; default is 5 seconds
-    # timeout = null;
-
-    # Allows GRUB to interact with the UEFI/BIOS I guess
-    efi.canTouchEfiVariables = true;
+    systemd-boot.enable = true;
   };
 
+  # Allows GRUB to interact with the UEFI/BIOS I guess
+  efi.canTouchEfiVariables = true;
+
   # Allow reading from Windows drives
   boot.supportedFilesystems = [ "ntfs" ];