about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--machines/aszlig/dnyarri.nix2
-rw-r--r--machines/aszlig/slylandro.nix2
-rw-r--r--machines/aszlig/tishtushi.nix1
-rw-r--r--modules/user/aszlig/profiles/base.nix5
4 files changed, 3 insertions, 7 deletions
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index ebf83efa..0de6f6a6 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -44,7 +44,7 @@ in {
 
   boot = {
     loader.systemd-boot.enable = true;
-    loader.grub.enable = lib.mkForce false;
+    loader.grub.enable = false;
     loader.efi.canTouchEfiVariables = true;
 
     kernelPackages = pkgs.linuxPackages_latest;
diff --git a/machines/aszlig/slylandro.nix b/machines/aszlig/slylandro.nix
index 0bb65740..b071aeb0 100644
--- a/machines/aszlig/slylandro.nix
+++ b/machines/aszlig/slylandro.nix
@@ -7,7 +7,7 @@
 
   boot = {
     loader.systemd-boot.enable = true;
-    loader.grub.enable = lib.mkForce false;
+    loader.grub.enable = false;
     loader.efi.canTouchEfiVariables = true;
     kernelPackages = pkgs.linuxPackages_latest;
 
diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix
index 78f807dd..ff37927d 100644
--- a/machines/aszlig/tishtushi.nix
+++ b/machines/aszlig/tishtushi.nix
@@ -8,6 +8,7 @@
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.loader = {
+    grub.enable = true;
     grub.device = "/dev/disk/by-id/ata-Hitachi_HTS543232A7A384_E2P31243FGB6PJ";
     timeout = 1;
   };
diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix
index 2e860809..79f7899b 100644
--- a/modules/user/aszlig/profiles/base.nix
+++ b/modules/user/aszlig/profiles/base.nix
@@ -19,11 +19,6 @@ in {
       '';
     };
 
-    boot.loader.grub = {
-      enable = true;
-      version = 2;
-    };
-
     users.defaultUserShell = "/var/run/current-system/sw/bin/zsh";
 
     networking.wireless.enable = false;