diff options
| author | ene <ene@sils.li> | 2023-02-25 19:10:28 +0100 |
|---|---|---|
| committer | ene <ene@sils.li> | 2023-02-25 19:10:28 +0100 |
| commit | 47d4e3aafac110564f06ef9440ee4849fbfdd595 (patch) | |
| tree | 7c9da2e344874c56592e0098f5d8ab6cdccefbfe /hosts | |
| parent | Fix(lf): Unmap ' and " (diff) | |
| download | nixos-config-47d4e3aafac110564f06ef9440ee4849fbfdd595.tar.gz nixos-config-47d4e3aafac110564f06ef9440ee4849fbfdd595.zip | |
Fix(hosts/mammun): Update to generated hardware config
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/mammun/hardware/default.nix | 8 | ||||
| -rw-r--r-- | hosts/mammun/hardware/gpu.nix | 15 |
2 files changed, 3 insertions, 20 deletions
diff --git a/hosts/mammun/hardware/default.nix b/hosts/mammun/hardware/default.nix index e8da6ccc..116d2c22 100644 --- a/hosts/mammun/hardware/default.nix +++ b/hosts/mammun/hardware/default.nix @@ -6,12 +6,11 @@ ... }: { imports = [ - (modulesPath + "/installer/scan/not-detected.nix") # TODO is this necessary? + (modulesPath + "/installer/scan/not-detected.nix") ./cpu.nix - ./gpu.nix ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + nixpkgs.hostPlatform = "x86_64-linux"; system.fileSystemLayouts = { enable = true; @@ -22,7 +21,6 @@ boot = { kernelModules = ["kvm-amd"]; - # TODO check this: - initrd.availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; + initrd.availableKernelModules = ["xhci_pci" "ahci" "ehci_pci" "sd_mod" "sr_mod" "sdhci_pci"]; }; } diff --git a/hosts/mammun/hardware/gpu.nix b/hosts/mammun/hardware/gpu.nix deleted file mode 100644 index c3df51ae..00000000 --- a/hosts/mammun/hardware/gpu.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: { - hardware.opengl.extraPackages = with pkgs; [ - rocm-opencl-icd # open-cl - amdvlk # or directly through mesa - amd-media-driver # libva - ]; - - # Force radv, TODO is this logical? - environment.variables.AMD_VULKAN_ICD = "RADV"; -} |