feat: Overlay packages of inputs not starting with nixpkgs-

3 files changed, 6 insertions, 5 deletions

diff --git a/autoconfig.nix b/autoconfig.nix
index 1660397..6df931f 100644
--- a/autoconfig.nix
+++ b/autoconfig.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, modules ? [], ... }:
 let
   inherit (inputs) nixpkgs;
   inherit (nixpkgs) lib;
@@ -18,7 +18,7 @@ let
       nixpkgs-special.legacyPackages.${system} or nixpkgs-special.packages.${system})
     (lib.filterAttrs
       (name: _:
-        lib.hasPrefix "nixpkgs-" name)
+        name != "nixpkgs")
       inputs);
 
   package-overlays =
@@ -81,7 +81,8 @@ in {
         ++ (if lib.pathIsRegularFile ./machines/${dir}/configuration.nix
             then [ ./machines/${dir}/configuration.nix ]
             else [])
-        ++ package-modules;
+        ++ package-modules
+        ++ modules;
       })
     (lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./machines));
   packages = let
diff --git a/flake.nix b/flake.nix
index 4098978..c8a7269 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
 
     nixpkgs-mint.url = "github:nixos/nixpkgs/9217c8084d8bc067d48c8edf5768e9dc54962970"; # 10 Aug 2022
 
-    nixpkgs-hytale.url = "github:JPyke3/hytale-launcher-nix";
+    hytale.url = "github:JPyke3/hytale-launcher-nix";
   };
 
   outputs = inputs:
diff --git a/machines/ceres/configuration.nix b/machines/ceres/configuration.nix
index 94ee8d6..581ff6b 100644
--- a/machines/ceres/configuration.nix
+++ b/machines/ceres/configuration.nix
@@ -4,7 +4,7 @@
     unigine-heaven unigine-superposition
     prismlauncher gnuradio
 
-    nixpkgs-hytale.hytale-launcher
+    hytale.hytale-launcher
   ];
 
   services.xserver.xautolock.enable = lib.mkForce false;