diff --git a/modules/hosts/hades/configuration.nix b/modules/hosts/hades/configuration.nix index 69e78d1..3762e71 100644 --- a/modules/hosts/hades/configuration.nix +++ b/modules/hosts/hades/configuration.nix @@ -34,10 +34,12 @@ # fstrim for ssd services.fstrim.enable = true; - # other packages to include + # corsair mouse software + hardware.ckb-next.enable = true; + + # other packages for hades peripherals environment.systemPackages = with pkgs; [ - # packages for hades peripherals #input-remapper #razergenie #openrazer-daemon @@ -45,26 +47,5 @@ ]; - # peripherals for hades - hardware.ckb-next.enable = true; - - # amd radeon gpu drivers and software - # https://nixos.wiki/wiki/AMD_GPU - boot = { - # load amdgpu driver pre boot - initrd.kernelModules = [ "amdgpu" ]; - #exposes gpu driver - kernelModules = [ - "amdgpu" - "kvm-amd" - ]; - }; - hardware = { - # discrete graphics support - graphics.enable = true; - # fixes early video issues - amdgpu.initrd.enable = true; - }; - }; } diff --git a/modules/hosts/hades/hardware.nix b/modules/hosts/hades/hardware.nix index ac43e70..92188b6 100644 --- a/modules/hosts/hades/hardware.nix +++ b/modules/hosts/hades/hardware.nix @@ -19,9 +19,6 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - # bootloader - boot.loader.systemd-boot.enable = true; - # kernel modules to include boot.initrd.availableKernelModules = [ "ehci_pci" @@ -33,8 +30,23 @@ "sd_mod" ]; - # enable amdgpu at boot - boot.initrd.kernelModules = [ "amdgpu" ]; + # enable amd radeon gpu drivers + # https://nixos.wiki/wiki/AMD_GPU + boot = { + # exposes gpu drivers + kernelModules = [ + "amdgpu" + "kvm-amd" + ]; + # gpu drivers during boot and pre boot + initrd.kernelModules = [ "amdgpu" ]; + }; + hardware = { + # discrete graphics support + graphics.enable = true; + # fixes early video issues + amdgpu.initrd.enable = true; + }; # luks device mapping boot.initrd.luks.devices."luks-35440a88-293e-455b-a018-ee1086b07321".device =