From 64aa355a5882a4c088e8de455edb6cd2eec2213c Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 24 May 2024 13:55:24 +0200 Subject: refactor(hosts/apzu): Use new modules --- hosts/apzu/hardware/cpu.nix | 3 --- hosts/apzu/hardware/default.nix | 31 ------------------------------- hosts/apzu/hardware/gpu.nix | 20 -------------------- 3 files changed, 54 deletions(-) delete mode 100644 hosts/apzu/hardware/cpu.nix delete mode 100644 hosts/apzu/hardware/default.nix delete mode 100644 hosts/apzu/hardware/gpu.nix (limited to 'hosts/apzu/hardware') diff --git a/hosts/apzu/hardware/cpu.nix b/hosts/apzu/hardware/cpu.nix deleted file mode 100644 index 3bc6184f..00000000 --- a/hosts/apzu/hardware/cpu.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - hardware.cpu.intel.updateMicrocode = true; # Why not? -} diff --git a/hosts/apzu/hardware/default.nix b/hosts/apzu/hardware/default.nix deleted file mode 100644 index 2cbf3254..00000000 --- a/hosts/apzu/hardware/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{modulesPath, ...}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary? - ./cpu.nix - ./gpu.nix - ]; - - nixpkgs.hostPlatform = "x86_64-linux"; - - hardware.bluetooth = { - enable = true; - # Avoid some battery drain, requires a `power on` in bluetoothctl - powerOnBoot = false; - }; - - soispha.disks = { - enable = true; - disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKNU512GZH_PHKA1481032A512A_1"; - ssd = true; - swap = { - uuid = "c94cd20a-dd3c-436f-9841-6fe92e5c8719"; - resumeOffset = "533760"; - }; - }; - - boot = { - kernelModules = ["kvm-intel" "rtw89"]; - - initrd.availableKernelModules = ["xhci_pci" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; - }; -} diff --git a/hosts/apzu/hardware/gpu.nix b/hosts/apzu/hardware/gpu.nix deleted file mode 100644 index 74e146e2..00000000 --- a/hosts/apzu/hardware/gpu.nix +++ /dev/null @@ -1,20 +0,0 @@ -{pkgs, ...}: { - # 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"; - - hardware.opengl = { - enable = true; - extraPackages = with pkgs; [ - vaapiVdpau - libvdpau-va-gl - - #amdvlk # or directly through mesa - ]; - }; -} -- cgit 1.4.1