diff --git a/hosts/nixos/aramis/hardware.nix b/hosts/nixos/aramis/hardware.nix index 99bc77e..c66b426 100644 --- a/hosts/nixos/aramis/hardware.nix +++ b/hosts/nixos/aramis/hardware.nix @@ -26,12 +26,6 @@ firmware = { cpuFlavor = "intel"; }; - - graphics = { - enable = true; - - gpuFlavor = "intel"; - }; }; hardware = { diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix index 95e6a22..2a686f7 100644 --- a/modules/nixos/hardware/default.nix +++ b/modules/nixos/hardware/default.nix @@ -6,7 +6,6 @@ ./bluetooth ./ergodox ./firmware - ./graphics ./mx-ergo ./networking ./sound diff --git a/modules/nixos/hardware/graphics/default.nix b/modules/nixos/hardware/graphics/default.nix deleted file mode 100644 index 3baac02..0000000 --- a/modules/nixos/hardware/graphics/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.my.hardware.graphics; -in -{ - options.my.hardware.graphics = with lib; { - enable = mkEnableOption "graphics configuration"; - - gpuFlavor = mkOption { - type = with types; nullOr (enum [ "amd" "intel" ]); - default = null; - example = "intel"; - description = "Which kind of GPU to install driver for"; - }; - - amd = { - enableKernelModule = lib.my.mkDisableOption "Kernel driver module"; - - amdvlk = lib.mkEnableOption "Use AMDVLK instead of Mesa RADV driver"; - }; - - intel = { - enableKernelModule = lib.my.mkDisableOption "Kernel driver module"; - }; - }; - - config = lib.mkIf cfg.enable (lib.mkMerge [ - { - hardware.opengl = { - enable = true; - }; - } - - # AMD GPU - (lib.mkIf (cfg.gpuFlavor == "amd") { - boot.initrd.kernelModules = lib.mkIf cfg.amd.enableKernelModule [ "amdgpu" ]; - - hardware.opengl = { - extraPackages = with pkgs; [ - # OpenCL - rocmPackages.clr - rocmPackages.clr.icd - ] - ++ lib.optional cfg.amd.amdvlk amdvlk - ; - - extraPackages32 = with pkgs; [ - ] - ++ lib.optional cfg.amd.amdvlk driversi686Linux.amdvlk - ; - }; - }) - - # Intel GPU - (lib.mkIf (cfg.gpuFlavor == "intel") { - boot.initrd.kernelModules = lib.mkIf cfg.intel.enableKernelModule [ "i915" ]; - - environment.variables = { - VDPAU_DRIVER = "va_gl"; - }; - - hardware.opengl = { - extraPackages = with pkgs; [ - # Open CL - intel-compute-runtime - - # VA API - intel-media-driver - intel-vaapi-driver - libvdpau-va-gl - ]; - }; - }) - ]); -}