summaryrefslogtreecommitdiff
path: root/systems
diff options
context:
space:
mode:
Diffstat (limited to 'systems')
-rw-r--r--systems/glados/boot.nix21
-rw-r--r--systems/glados/default.nix15
2 files changed, 14 insertions, 22 deletions
diff --git a/systems/glados/boot.nix b/systems/glados/boot.nix
deleted file mode 100644
index 1a1d29e..0000000
--- a/systems/glados/boot.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- config,
- lib,
- ...
-}:
-
-{
- boot = {
- kernelParams =
- [
- "amd_pstate=active"
- ]
- # Don't use GSP Firmware on proprietary driver
- # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/693
- ++ lib.optional (!config.hardware.nvidia.open) "nvidia.NVreg_EnableGpuFirmware=0";
-
- lanzaboote = {
- enable = true;
- };
- };
-}
diff --git a/systems/glados/default.nix b/systems/glados/default.nix
index 85c2d85..831c90f 100644
--- a/systems/glados/default.nix
+++ b/systems/glados/default.nix
@@ -6,7 +6,6 @@
}:
{
imports = [
- ./boot.nix
./hardware-configuration.nix
inputs.self.nixosModules.default
@@ -19,6 +18,20 @@
gnome.enable = true;
};
+ boot = {
+ kernelParams =
+ [
+ "amd_pstate=active"
+ ]
+ # Don't use GSP Firmware on proprietary driver
+ # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/693
+ ++ lib.optional (!config.hardware.nvidia.open) "nvidia.NVreg_EnableGpuFirmware=0";
+
+ lanzaboote = {
+ enable = true;
+ };
+ };
+
hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.latest;