From 08d4be5b51bb595e55555cc93c47f7adc77ed1c3 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sun, 22 Sep 2024 15:15:46 -0700 Subject: core: move harware and software to desktop --- modules/core/software/multimedia/video/default.nix | 11 ------- .../core/software/multimedia/video/graphics.nix | 21 ------------ modules/core/software/multimedia/video/libva.nix | 7 ---- modules/core/software/multimedia/video/nvidia.nix | 38 ---------------------- modules/core/software/multimedia/video/vulkan.nix | 9 ----- 5 files changed, 86 deletions(-) delete mode 100644 modules/core/software/multimedia/video/default.nix delete mode 100644 modules/core/software/multimedia/video/graphics.nix delete mode 100644 modules/core/software/multimedia/video/libva.nix delete mode 100644 modules/core/software/multimedia/video/nvidia.nix delete mode 100644 modules/core/software/multimedia/video/vulkan.nix (limited to 'modules/core/software/multimedia/video') diff --git a/modules/core/software/multimedia/video/default.nix b/modules/core/software/multimedia/video/default.nix deleted file mode 100644 index 31cdfd5..0000000 --- a/modules/core/software/multimedia/video/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./graphics.nix - ./libva.nix - ./nvidia.nix - ./vulkan.nix - ]; - - environment.systemPackages = [ pkgs.mediastreamer-openh264 ]; -} diff --git a/modules/core/software/multimedia/video/graphics.nix b/modules/core/software/multimedia/video/graphics.nix deleted file mode 100644 index 13da295..0000000 --- a/modules/core/software/multimedia/video/graphics.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, ... }: -{ - hardware.graphics = { - enable = true; - enable32Bit = true; - - extraPackages = with pkgs; [ - nvidia-vaapi-driver - vaapiVdpau - libvdpau-va-gl - ]; - - extraPackages32 = with pkgs; [ - nvidia-vaapi-driver - vaapiVdpau - libvdpau-va-gl - ]; - }; - - environment.systemPackages = [ pkgs.mesa ]; -} diff --git a/modules/core/software/multimedia/video/libva.nix b/modules/core/software/multimedia/video/libva.nix deleted file mode 100644 index d420495..0000000 --- a/modules/core/software/multimedia/video/libva.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - libva - libva-utils - ]; -} diff --git a/modules/core/software/multimedia/video/nvidia.nix b/modules/core/software/multimedia/video/nvidia.nix deleted file mode 100644 index c133bc2..0000000 --- a/modules/core/software/multimedia/video/nvidia.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ pkgs, config, ... }: -{ - environment = { - systemPackages = with pkgs; [ - nvidia-container-toolkit - nvidia-docker - ]; - - shellAliases.nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings"; - }; - - boot = { - blacklistedKernelModules = [ "nouveau" ]; - - kernelParams = [ - "nvidia-drm.fbdev=1" - "nvidia-drm.modeset=1" - "nvidia.NVreg_PreserveVideoMemoryAllocations=1" - ]; - }; - - hardware = { - nvidia-container-toolkit.enable = true; - - nvidia = { - modesetting.enable = true; - open = false; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.production; - forceFullCompositionPipeline = true; - - powerManagement = { - enable = true; - finegrained = false; - }; - }; - }; -} diff --git a/modules/core/software/multimedia/video/vulkan.nix b/modules/core/software/multimedia/video/vulkan.nix deleted file mode 100644 index be37e0e..0000000 --- a/modules/core/software/multimedia/video/vulkan.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - vulkan-loader - vulkan-validation-layers - vulkan-tools - vulkan-extension-layer - ]; -} -- cgit v1.2.3