diff options
| author | Seth Flynn <[email protected]> | 2025-02-10 14:24:36 -0500 |
|---|---|---|
| committer | Seth Flynn <[email protected]> | 2025-02-10 20:26:23 -0500 |
| commit | 73046857ef20f99983aaa95c04e0061615478583 (patch) | |
| tree | 3da59e3014fdb1ed8934c6138a8179403a8ae3e8 /systems/glados | |
| parent | 79ada858cfdb056480c38d087c4600c39e3c05fe (diff) | |
glados: don't have dedicated boot file
Diffstat (limited to 'systems/glados')
| -rw-r--r-- | systems/glados/boot.nix | 21 | ||||
| -rw-r--r-- | systems/glados/default.nix | 15 |
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; |