[flake,autoconfig] Reworked how package inputs are handled

4 files changed, 15 insertions, 23 deletions

diff --git a/autoconfig.nix b/autoconfig.nix
index 95ffcc1..ee8b108 100644
--- a/autoconfig.nix
+++ b/autoconfig.nix
@@ -16,14 +16,25 @@ in {
             (name: _:
               (lib.hasInfix "_" name) -> (lib.hasPrefix (sysidentity.type + "_") name))
             (import ./packages));
+
+        inputs-overlays =
+          lib.mapAttrs
+          (_: nixpkgs:
+            nixpkgs.legacyPackages.${sysidentity.arch})
+          (lib.filterAttrs
+            (name: _:
+              lib.hasPrefix "nixpkgs-" name)
+            inputs);
       in
       lib.nixosSystem {
         system = sysidentity.arch;
         modules = [
           ./machines/${dir}/hardware-configuration.nix
           ./configuration.nix
-          ({ ... }: { networking.hostName = sysidentity.name; })
-          # ({ ... }: { environment.systemPackages = [ inputs.nixpkgs-firefox119.legacyPackages.x86_64-linux.firefox ]; })
+          ({ ... }: {
+            networking.hostName = sysidentity.name;
+            nixpkgs.overlays = [ (_: _: inputs-overlays) ];
+          })
         ]
         ++ (if lib.pathIsRegularFile ./machines/${dir}/configuration.nix
             then [ ./machines/${dir}/configuration.nix ]
diff --git a/flake.lock b/flake.lock
index 5ce18b3..1a5dc09 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,26 +16,9 @@
         "type": "github"
       }
     },
-    "nixpkgs-firefox119": {
-      "locked": {
-        "lastModified": 1696748673,
-        "narHash": "sha256-UbPHrH4dKN/66EpfFpoG4St4XZYDX9YcMVRQGWzAUNA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9957cd48326fe8dbd52fdc50dd2502307f188b0d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9957cd48326fe8dbd52fdc50dd2502307f188b0d",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-firefox119": "nixpkgs-firefox119"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index a5fcf71..03e820a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,10 +3,9 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
-    nixpkgs-firefox119.url = "github:nixos/nixpkgs/9957cd48326fe8dbd52fdc50dd2502307f188b0d";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-firefox119, ... }@inputs:
+  outputs = inputs:
   let
     autoconfig = import ./autoconfig.nix { inherit inputs; };
   in {
diff --git a/packages/default.nix b/packages/default.nix
index 060ac9e..cdd1407 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -61,7 +61,6 @@
       peek gparted
       # Virtualization
       virt-manager libvirt qemu_kvm kvmtool qemu_full
-      firefox
     ];
 
     programs.firefox.enable = true;