From 0d77b0d6a52d27fb386468d6e57e4e0e0d502fba Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Thu, 29 Feb 2024 00:44:30 +0100 Subject: [PATCH] move systemd-boot to options --- hosts/del/configuration.nix | 7 ------- hosts/del/profile.nix | 1 + hosts/niks/configuration.nix | 7 ------- hosts/niks/profile.nix | 1 + options/boot/systemd-boot.nix | 10 ++++++++++ 5 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 options/boot/systemd-boot.nix diff --git a/hosts/del/configuration.nix b/hosts/del/configuration.nix index e70c4868..41489d1e 100644 --- a/hosts/del/configuration.nix +++ b/hosts/del/configuration.nix @@ -16,13 +16,6 @@ }; boot = { - loader = { - systemd-boot = { - enable = true; - memtest86.enable = true; - }; - efi.canTouchEfiVariables = true; - }; kernelPackages = pkgs.linuxPackages_xanmod_latest; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; kernelModules = [ "v4l2loopback" ]; diff --git a/hosts/del/profile.nix b/hosts/del/profile.nix index 57e60b7f..0af38580 100644 --- a/hosts/del/profile.nix +++ b/hosts/del/profile.nix @@ -1,5 +1,6 @@ _: { imports = [ + ../../options/boot/systemd-boot.nix ../../options/common/docs.nix ../../options/common/oomd.nix ../../options/common/pin-registry.nix diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index ca3b374e..481950ec 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -21,13 +21,6 @@ }; boot = { - loader = { - systemd-boot = { - enable = true; - memtest86.enable = true; - }; - efi.canTouchEfiVariables = true; - }; kernelPackages = pkgs.linuxPackages_xanmod_latest; extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver ]; kernelModules = [ "ddcci" ]; diff --git a/hosts/niks/profile.nix b/hosts/niks/profile.nix index a81f0143..d305bbbc 100644 --- a/hosts/niks/profile.nix +++ b/hosts/niks/profile.nix @@ -1,5 +1,6 @@ _: { imports = [ + ../../options/boot/systemd-boot.nix ../../options/common/cpu/amd.nix ../../options/common/docs.nix ../../options/common/gpu/amd.nix diff --git a/options/boot/systemd-boot.nix b/options/boot/systemd-boot.nix new file mode 100644 index 00000000..06d3e9f0 --- /dev/null +++ b/options/boot/systemd-boot.nix @@ -0,0 +1,10 @@ +_: { + boot.loader = { + systemd-boot = { + enable = true; + memtest86.enable = true; + editor = false; + }; + efi.canTouchEfiVariables = true; + }; +}