about summary refs log tree commit diff
path: root/machines/aszlig
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2021-06-02 11:43:56 +0200
committeraszlig <aszlig@nix.build>2021-06-02 11:45:50 +0200
commita4cdae01efb7cac9b0fbf12a1dcc38b047fa503a (patch)
tree0a3a1116cfa0d04b28e2e37a9f0ea40803ca8e7a /machines/aszlig
parentdc2ef245d76f900f174e87961a3d17e6aecbd6e2 (diff)
profiles/base: Remove GRUB from base profile
After all the goal was to move all hardware specific stuff to the actual
machine definition, which includes the boot loader.

Since GRUB is enabled by default but with a higher priority value, we
now no longer need to mkForce-disable the option for machines using
systemd-boot.

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'machines/aszlig')
-rw-r--r--machines/aszlig/dnyarri.nix2
-rw-r--r--machines/aszlig/slylandro.nix2
-rw-r--r--machines/aszlig/tishtushi.nix1
3 files changed, 3 insertions, 2 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;
   };