From 8ec6804f80f255ba185e91453dd105478d6c38dc Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Thu, 30 Jun 2022 00:49:23 +0100
Subject: [PATCH] Slight installer improvements

---
 devshell/install.nix     | 8 +++++++-
 nixos/modules/common.nix | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/devshell/install.nix b/devshell/install.nix
index e39538c..a8c6a78 100644
--- a/devshell/install.nix
+++ b/devshell/install.nix
@@ -126,6 +126,8 @@ in
         help = "Install a system configuration into a prepared installer that can be reached at $INSTALLER";
         script =
           ''
+            usage="usage: $0 [--no-bootloader] [--no-substitute] <system>"
+
             noBootloader=
             noSubstitute=
             ${parseArgs
@@ -138,9 +140,13 @@ in
                 noSubstitute=true
                 shift
                 ;;
+              --help)
+                log "$usage"
+                exit 0
+                ;;
             ''}
             system="''${1:-}"
-            [ -z "$system" ] && die "usage: $0 [--no-bootloader] [--no-substitute] <system>"
+            [ -z "$system" ] && die "$usage"
 
             : "''${INSTALLER_BUILD_OPTS:=}"
             IFS=" " read -ra BUILD_OPTS <<< "$INSTALLER_BUILD_OPTS"
diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix
index bbf9868..affb77b 100644
--- a/nixos/modules/common.nix
+++ b/nixos/modules/common.nix
@@ -93,6 +93,7 @@ in
         loader = {
           efi = {
             efiSysMountPoint = mkDefault "/boot";
+            # Should generally be enough with just /EFI/BOOT/BOOTX64.EFI in place
             canTouchEfiVariables = mkDefault false;
           };
           grub = {