From 1c4db9168e1cbc48e38c829498c0aeb0a77b337e Mon Sep 17 00:00:00 2001
From: Benson Chu <bensonchu457@gmail.com>
Date: Wed, 13 Mar 2024 19:30:58 -0500
Subject: [PATCH] Bootloader should be host-specific

---
 common/configuration.nix             |  5 +----
 hosts/NixAdvantage/configuration.nix | 17 ++++++++++-------
 hosts/NixDawn/configuration.nix      | 22 +++++++++++++---------
 hosts/NixFrame/configuration.nix     | 26 +++++++++++++++-----------
 hosts/NixGate/configuration.nix      | 13 ++++++-------
 5 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/common/configuration.nix b/common/configuration.nix
index 343b25d..e928657 100644
--- a/common/configuration.nix
+++ b/common/configuration.nix
@@ -8,11 +8,8 @@
   imports = [
     ../modules/default.nix
   ];
-  nix.settings.experimental-features = "nix-command flakes";
 
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  nix.settings.experimental-features = "nix-command flakes";
 
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
diff --git a/hosts/NixAdvantage/configuration.nix b/hosts/NixAdvantage/configuration.nix
index cad0039..7dba9fa 100644
--- a/hosts/NixAdvantage/configuration.nix
+++ b/hosts/NixAdvantage/configuration.nix
@@ -4,13 +4,16 @@
 
 { config, pkgs, ... }:
 {
-  imports =
-    [
-      ../../common/configuration.nix
-      ../../common/moms-house
-      # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  imports = [
+    ../../common/configuration.nix
+    ../../common/moms-house
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   boot.loader.grub.useOSProber = true;
 
diff --git a/hosts/NixDawn/configuration.nix b/hosts/NixDawn/configuration.nix
index f8bf65d..7ff1cb9 100644
--- a/hosts/NixDawn/configuration.nix
+++ b/hosts/NixDawn/configuration.nix
@@ -4,15 +4,19 @@
 
 { config, pkgs, ... }:
 {
-  imports =
-    [
-      ../../common/configuration.nix
-      ../../common/lxd-setup.nix
-      ../../common/moms-house
-      ../../common/exwm.nix
-      # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  imports = [
+    ../../common/configuration.nix
+    ../../common/lxd-setup.nix
+    ../../common/moms-house
+    ../../common/exwm.nix
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
   networking.hostName = "NixDawn"; # Define your hostname.
 
   fileSystems."/home/benson/workspace" = {
diff --git a/hosts/NixFrame/configuration.nix b/hosts/NixFrame/configuration.nix
index e51673a..59159ef 100644
--- a/hosts/NixFrame/configuration.nix
+++ b/hosts/NixFrame/configuration.nix
@@ -1,16 +1,20 @@
 { config, pkgs, ... }:
 {
-  imports =
-    [
-      # ./home-git-repos.nix
-      ../../common/configuration.nix
-      ../../common/user-facing.nix
-      ../../common/development-machine.nix
-      ../../common/laptop-things.nix
-      ../../common/exwm.nix
-      # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  imports = [
+    # ./home-git-repos.nix
+    ../../common/configuration.nix
+    ../../common/user-facing.nix
+    ../../common/development-machine.nix
+    ../../common/laptop-things.nix
+    ../../common/exwm.nix
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
   networking.hostName = "NixFrame"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
diff --git a/hosts/NixGate/configuration.nix b/hosts/NixGate/configuration.nix
index 87d1a80..acde7dd 100644
--- a/hosts/NixGate/configuration.nix
+++ b/hosts/NixGate/configuration.nix
@@ -5,13 +5,12 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      ../../common/moms-house
-      ../../common/configuration.nix
-      # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  imports = [
+    ../../common/moms-house
+    ../../common/configuration.nix
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
 
   # Bootloader.
   boot.loader.grub.enable = true;