From 16d45d2bc2c81cc1f43606e2ac597f3a15ff2a4b Mon Sep 17 00:00:00 2001 From: Riley Apeldoorn Date: Mon, 23 May 2022 20:58:06 +0200 Subject: [PATCH] Remove bootloader settings from modules/default.nix and moved to machine-specific configs --- machines/loki/configuration.nix | 12 ++++++++++++ machines/thor/configuration.nix | 12 ++++++++++++ modules/default.nix | 12 ------------ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix index 278c004..cdd789b 100644 --- a/machines/loki/configuration.nix +++ b/machines/loki/configuration.nix @@ -16,6 +16,18 @@ interfaces.wlp6s0.useDHCP = true; }; + boot = { + loader.systemd-boot = { + enable = true; + editor = false; + configurationLimit = 10; + }; + + loader.efi = { + canTouchEfiVariables = true; + }; + }; + devices = { audio = { diff --git a/machines/thor/configuration.nix b/machines/thor/configuration.nix index 809b4aa..696b5d6 100644 --- a/machines/thor/configuration.nix +++ b/machines/thor/configuration.nix @@ -26,6 +26,18 @@ interfaces.enp9s0.useDHCP = true; }; + boot = { + loader.systemd-boot = { + enable = true; + editor = false; + configurationLimit = 10; + }; + + loader.efi = { + canTouchEfiVariables = true; + }; + }; + users.users."riley".packages = with pkgs; [ minecraft cockatrice diff --git a/modules/default.nix b/modules/default.nix index d8008e1..9b16c3d 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -177,18 +177,6 @@ in { ''; - boot = { - loader.systemd-boot = { - enable = true; - editor = false; - configurationLimit = 10; - }; - - loader.efi = { - canTouchEfiVariables = true; - }; - }; - networking = { firewall.enable = false; useDHCP = false;