9 files changed, 19 insertions, 25 deletions
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index aeed06a..5ef140c 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -4,7 +4,6 @@
     ./networking
     ./software
     ./virtualisation
-    ./variables.nix
   ];
 
   sops.defaultSopsFile = "${self}/secrets/${config.networking.hostName}.yaml";
diff --git a/modules/desktop/software/default.nix b/modules/desktop/software/default.nix
index 322dbb7..6af408f 100644
--- a/modules/desktop/software/default.nix
+++ b/modules/desktop/software/default.nix
@@ -1,9 +1,9 @@
 {
   imports = [
     ./services
-    ./video
     ./aagl.nix
     ./gaming.nix
+    ./nvidia.nix
     ./programs.nix
     ./systemd.nix
   ];
diff --git a/modules/desktop/software/video/nvidia.nix b/modules/desktop/software/nvidia.nix
index c133bc2..8ebc58a 100644
--- a/modules/desktop/software/video/nvidia.nix
+++ b/modules/desktop/software/nvidia.nix
@@ -1,12 +1,22 @@
 { pkgs, config, ... }:
 {
   environment = {
+    shellAliases.nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";
+
     systemPackages = with pkgs; [
       nvidia-container-toolkit
       nvidia-docker
     ];
 
-    shellAliases.nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";
+    variables = {
+      LIBVA_DRIVER_NAME = "nvidia";
+      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+      GBM_BACKEND = "nvidia-drm";
+      __VK_LAYER_NV_optimus = "NVIDIA_only";
+      __NV_PRIME_RENDER_OFFLOAD = "1";
+      NVD_BACKEND = "direct";
+      CUDA_PATH = "${pkgs.cudatoolkit}";
+    };
   };
 
   boot = {
@@ -22,6 +32,11 @@
   hardware = {
     nvidia-container-toolkit.enable = true;
 
+    graphics = {
+      extraPackages = [ pkgs.nvidia-vaapi-driver ];
+      extraPackages32 = [ pkgs.nvidia-vaapi-driver ];
+    };
+
     nvidia = {
       modesetting.enable = true;
       open = false;
diff --git a/modules/desktop/software/services/libinput.nix b/modules/desktop/software/services/libinput.nix
index e010873..c95b993 100644
--- a/modules/desktop/software/services/libinput.nix
+++ b/modules/desktop/software/services/libinput.nix
@@ -1,6 +1,5 @@
 {
   services.libinput = {
-    enable = true;
     mouse.accelProfile = "flat";
     touchpad.accelProfile = "flat";
   };
diff --git a/modules/desktop/software/video/default.nix b/modules/desktop/software/video/default.nix
deleted file mode 100644
index 280a7d9..0000000
--- a/modules/desktop/software/video/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./graphics.nix
-    ./libva.nix
-    ./nvidia.nix
-  ];
-}
diff --git a/modules/desktop/variables.nix b/modules/desktop/variables.nix
deleted file mode 100644
index 3d50fdf..0000000
--- a/modules/desktop/variables.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.variables = {
-    LIBVA_DRIVER_NAME = "nvidia";
-    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-    GBM_BACKEND = "nvidia-drm";
-    __VK_LAYER_NV_optimus = "NVIDIA_only";
-    __NV_PRIME_RENDER_OFFLOAD = "1";
-    NVD_BACKEND = "direct";
-    CUDA_PATH = "${pkgs.cudatoolkit}";
-  };
-}
diff --git a/modules/pc/software/multimedia/video/default.nix b/modules/pc/software/multimedia/video/default.nix
index 94aa42d..2a8ea07 100644
--- a/modules/pc/software/multimedia/video/default.nix
+++ b/modules/pc/software/multimedia/video/default.nix
@@ -1,6 +1,8 @@
 { pkgs, ... }:
 {
   imports = [
+    ./graphics.nix
+    ./libva.nix
     ./vulkan.nix
     ./xserver.nix
   ];
diff --git a/modules/desktop/software/video/graphics.nix b/modules/pc/software/multimedia/video/graphics.nix
index 13da295..b54b9bc 100644
--- a/modules/desktop/software/video/graphics.nix
+++ b/modules/pc/software/multimedia/video/graphics.nix
@@ -5,13 +5,11 @@
     enable32Bit = true;
 
     extraPackages = with pkgs; [
-      nvidia-vaapi-driver
       vaapiVdpau
       libvdpau-va-gl
     ];
 
     extraPackages32 = with pkgs; [
-      nvidia-vaapi-driver
       vaapiVdpau
       libvdpau-va-gl
     ];
diff --git a/modules/desktop/software/video/libva.nix b/modules/pc/software/multimedia/video/libva.nix
index d420495..d420495 100644
--- a/modules/desktop/software/video/libva.nix
+++ b/modules/pc/software/multimedia/video/libva.nix