diff options
| author | aszlig <aszlig@nix.build> | 2021-06-02 11:43:56 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2021-06-02 11:45:50 +0200 |
| commit | a4cdae01efb7cac9b0fbf12a1dcc38b047fa503a (patch) | |
| tree | 0a3a1116cfa0d04b28e2e37a9f0ea40803ca8e7a | |
| parent | dc2ef245d76f900f174e87961a3d17e6aecbd6e2 (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>
| -rw-r--r-- | machines/aszlig/dnyarri.nix | 2 | ||||
| -rw-r--r-- | machines/aszlig/slylandro.nix | 2 | ||||
| -rw-r--r-- | machines/aszlig/tishtushi.nix | 1 | ||||
| -rw-r--r-- | modules/user/aszlig/profiles/base.nix | 5 |
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; |