4 files changed, 13 insertions, 10 deletions
diff --git a/users/default.nix b/users/default.nix
index c654583..8aaa0bb 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  withSystem,
   inputs,
   self,
   ...
@@ -22,7 +23,11 @@
           ]
           ++ (args.modules or []);
 
-        extraSpecialArgs = {inherit inputs self;};
+        extraSpecialArgs = {
+          inherit inputs self;
+          inputs' = withSystem (args.system or "x86_64-linux") ({inputs', ...}: inputs');
+        };
+
         pkgs = args.pkgs or inputs.nixpkgs.legacyPackages."x86_64-linux";
       });
 
diff --git a/users/seth/home.nix b/users/seth/home.nix
index 1f89641..2312169 100644
--- a/users/seth/home.nix
+++ b/users/seth/home.nix
@@ -14,5 +14,5 @@
       else "/home/${config.home.username}";
   };
 
-  nixpkgs.overlays = with inputs; [nur.overlay getchoo.overlays.default self.overlays.default];
+  nixpkgs.overlays = with inputs; [getchoo.overlays.default self.overlays.default];
 }
diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
index 6ae66d9..93249d2 100644
--- a/users/seth/programs/default.nix
+++ b/users/seth/programs/default.nix
@@ -1,6 +1,6 @@
 {
   pkgs,
-  inputs,
+  inputs',
   ...
 }: {
   imports = [
@@ -13,18 +13,16 @@
     ./vim.nix
   ];
 
-  home.packages = with pkgs; let
-    inherit (stdenv.hostPlatform) system;
-  in [
+  home.packages = with pkgs; [
     fd
     nurl
     rclone
     restic
 
-    inputs.attic.packages.${system}.attic
+    inputs'.attic.packages.attic
 
     (let
-      getchvim = inputs.getchvim.packages.${system}.default;
+      getchvim = inputs'.getchvim.packages.default;
     in
       # remove desktop file
       symlinkJoin {
diff --git a/users/seth/programs/firefox/default.nix b/users/seth/programs/firefox/default.nix
index cb27bf7..e2e3165 100644
--- a/users/seth/programs/firefox/default.nix
+++ b/users/seth/programs/firefox/default.nix
@@ -1,6 +1,6 @@
 {
   config,
-  pkgs,
+  inputs',
   ...
 }: {
   imports = [
@@ -14,7 +14,7 @@
   programs.firefox = {
     inherit (config.desktop) enable;
     profiles.arkenfox = {
-      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+      extensions = with inputs'.firefox-addons.packages; [
         bitwarden
         floccus
         private-relay