move win10hotplug out of top level

ifd3f · Dec 13, 2024 · f7f65d2 · f7f65d2
1 parent db7b623
commit f7f65d2
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 4 deletions.
diff --git a/machines/chungus/configuration.nix b/machines/chungus/configuration.nix
@@ -85,7 +85,7 @@ in with lib; {
 
   # RGB stuff
   hardware.i2c.enable = true;
-  environment.systemPackages = with pkgs; [ openrgb win10hotplug ];
+  environment.systemPackages = with pkgs; [ openrgb ];
 
   hardware.nvidia.open = true;
 

diff --git a/nix/nixos-modules/astral/vfio.nix b/nix/nixos-modules/astral/vfio.nix
@@ -40,6 +40,10 @@
         "vfio_iommu_type1"
       ];
     };
+
+    environment.systemPackages = [
+      (pkgs.callPackage ./vfio/win10hotplug { })
+    ];
   };
 }
 
diff --git a/nix/pkgs/win10hotplug/default.nix → ...ules/astral/vfio/win10hotplug/default.nix b/nix/pkgs/win10hotplug/default.nix → ...ules/astral/vfio/win10hotplug/default.nix
diff --git a/nix/pkgs/win10hotplug/ergodox.xml → ...ules/astral/vfio/win10hotplug/ergodox.xml b/nix/pkgs/win10hotplug/ergodox.xml → ...ules/astral/vfio/win10hotplug/ergodox.xml
diff --git a/nix/pkgs/win10hotplug/gpu-audio.xml → ...es/astral/vfio/win10hotplug/gpu-audio.xml b/nix/pkgs/win10hotplug/gpu-audio.xml → ...es/astral/vfio/win10hotplug/gpu-audio.xml
diff --git a/nix/pkgs/win10hotplug/gpu-pcie.xml → ...les/astral/vfio/win10hotplug/gpu-pcie.xml b/nix/pkgs/win10hotplug/gpu-pcie.xml → ...les/astral/vfio/win10hotplug/gpu-pcie.xml
diff --git a/nix/pkgs/win10hotplug/gpu-vga.xml → ...ules/astral/vfio/win10hotplug/gpu-vga.xml b/nix/pkgs/win10hotplug/gpu-vga.xml → ...ules/astral/vfio/win10hotplug/gpu-vga.xml
diff --git a/nix/pkgs/win10hotplug/mouse.xml → ...odules/astral/vfio/win10hotplug/mouse.xml b/nix/pkgs/win10hotplug/mouse.xml → ...odules/astral/vfio/win10hotplug/mouse.xml
diff --git a/nix/pkgs/win10hotplug/usbctl.xml → ...dules/astral/vfio/win10hotplug/usbctl.xml b/nix/pkgs/win10hotplug/usbctl.xml → ...dules/astral/vfio/win10hotplug/usbctl.xml
diff --git a/nix/pkgs/win10hotplug/win10hotplug.sh → .../astral/vfio/win10hotplug/win10hotplug.sh b/nix/pkgs/win10hotplug/win10hotplug.sh → .../astral/vfio/win10hotplug/win10hotplug.sh
diff --git a/nix/outputs.nix b/nix/outputs.nix
@@ -32,7 +32,7 @@ in {
       #inherit (nixpkgs-lxdvms.legacyPackages.${prev.system}) lxd;
 
       inherit (self.packages.${prev.system})
-        authelia-bin win10hotplug ifd3f-infra-scripts;
+        authelia-bin ifd3f-infra-scripts;
 
       # gmic is currently broken, use an older version of darktable
       # https://github.co.O.pkgs/pull/211600

diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix
@@ -23,8 +23,6 @@ in vendored-images // rec {
     path = vendored-images.vendored-centos-8-cloud;
   }];
 
-  win10hotplug = pkgs.callPackage ./win10hotplug { };
-
   surface-screen-rotate = pkgs.runCommand "surface-screen-rotate" { } ''
     mkdir -p $out/bin
     ln -s ${./surface-screen-rotate.py} $out/bin/surface-screen-rotate