diff --git a/flake.nix b/flake.nix
index fc80332..5f28b37 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,18 +33,7 @@
           kmonad.nixosModules.default
           agenix.nixosModule
           home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.user = import ./users/desktops/user.nix;
-          }
-          {
-            nixpkgs.overlays = [
-              nur.overlay
-              agenix.overlay
-              deploy-rs.overlay
-            ];
-          }
+          { nixpkgs.overlays = [ nur.overlay agenix.overlay ]; }
         ];
       };
 
@@ -53,13 +42,7 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./hosts/servers/alexandria.nix
-          agenix.nixosModule
           home-manager-stable.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.user = import ./users/servers/user.nix;
-          }
         ];
       };
     };
diff --git a/hosts/common/boot.nix b/hosts/common/boot.nix
index 235a3ac..8d13f1b 100644
--- a/hosts/common/boot.nix
+++ b/hosts/common/boot.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   boot = {
diff --git a/hosts/common/locale.nix b/hosts/common/locale.nix
index 3a513ff..2b32328 100644
--- a/hosts/common/locale.nix
+++ b/hosts/common/locale.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   time.timeZone = "America/Bahia";
diff --git a/hosts/common/networking.nix b/hosts/common/networking.nix
index 81c27ca..7183bba 100644
--- a/hosts/common/networking.nix
+++ b/hosts/common/networking.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   networking = {
diff --git a/hosts/common/nix.nix b/hosts/common/nix.nix
index ca7454f..b26b03c 100644
--- a/hosts/common/nix.nix
+++ b/hosts/common/nix.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   nix = {
diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index 64cb07a..7d0b957 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   nixpkgs.config.allowUnfree = true;
diff --git a/hosts/common/services.nix b/hosts/common/services.nix
index 5885175..bfdb0db 100644
--- a/hosts/common/services.nix
+++ b/hosts/common/services.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   services = {
diff --git a/hosts/common/users.nix b/hosts/common/users.nix
index 0c9e78c..8961b5d 100644
--- a/hosts/common/users.nix
+++ b/hosts/common/users.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   users.users = {
@@ -18,4 +18,10 @@
       hashedPassword = "!";
     };
   };
+  
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = specialArgs;
+  };
 }
diff --git a/hosts/desktops/common/boot.nix b/hosts/desktops/common/boot.nix
index 36e21ee..5604c56 100644
--- a/hosts/desktops/common/boot.nix
+++ b/hosts/desktops/common/boot.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   boot = {
diff --git a/hosts/desktops/common/hardware.nix b/hosts/desktops/common/hardware.nix
index 0f5ec9e..668aa32 100644
--- a/hosts/desktops/common/hardware.nix
+++ b/hosts/desktops/common/hardware.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   hardware = {
diff --git a/hosts/desktops/common/nix.nix b/hosts/desktops/common/nix.nix
index b228cd2..3b2c239 100644
--- a/hosts/desktops/common/nix.nix
+++ b/hosts/desktops/common/nix.nix
@@ -1,4 +1,4 @@
-{ inputs, config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix
index 1110c71..d36a449 100644
--- a/hosts/desktops/common/packages.nix
+++ b/hosts/desktops/common/packages.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   environment.systemPackages = with pkgs; [
@@ -12,6 +12,7 @@
     bat
     bitwarden
     chatterino2
+    deploy-rs
     fd
     filelight
     firefox-wayland # Until firefox moves to using wayland by default
@@ -58,7 +59,6 @@
     })
     # Packages from 3rd party overlays
     agenix
-    deploy-rs
     nur.repos.baduhai.koi
     nur.repos.baduhai.emulationstation-de
   ];
diff --git a/hosts/desktops/common/services.nix b/hosts/desktops/common/services.nix
index a04ff04..9a6ad62 100644
--- a/hosts/desktops/common/services.nix
+++ b/hosts/desktops/common/services.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   services = {
diff --git a/hosts/desktops/common/users.nix b/hosts/desktops/common/users.nix
index 1f62489..416c355 100644
--- a/hosts/desktops/common/users.nix
+++ b/hosts/desktops/common/users.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   environment.sessionVariables = rec {
@@ -14,4 +14,6 @@
       "adbusers"
     ];
   };
+  
+  home-manager.users.user = import ../../../users/desktops/user.nix;
 }
diff --git a/hosts/desktops/common/virtualisation.nix b/hosts/desktops/common/virtualisation.nix
index ecb743c..59fa6ec 100644
--- a/hosts/desktops/common/virtualisation.nix
+++ b/hosts/desktops/common/virtualisation.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   virtualisation = {
diff --git a/hosts/desktops/io.nix b/hosts/desktops/io.nix
index 3dea7b1..84d3a23 100644
--- a/hosts/desktops/io.nix
+++ b/hosts/desktops/io.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   imports = [ 
diff --git a/hosts/servers/common/boot.nix b/hosts/servers/common/boot.nix
index 43970ba..5a4e53a 100644
--- a/hosts/servers/common/boot.nix
+++ b/hosts/servers/common/boot.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   boot.kernelPackages = pkgs.linuxPackages_hardened;
diff --git a/hosts/servers/common/nix.nix b/hosts/servers/common/nix.nix
index 1c4acdd..96943b4 100644
--- a/hosts/servers/common/nix.nix
+++ b/hosts/servers/common/nix.nix
@@ -1,4 +1,4 @@
-{ inputs, config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   environment.etc."channels/nixpkgs".source = inputs.nixpkgs-stable.outPath;
diff --git a/hosts/servers/common/users.nix b/hosts/servers/common/users.nix
new file mode 100644
index 0000000..faf993d
--- /dev/null
+++ b/hosts/servers/common/users.nix
@@ -0,0 +1,5 @@
+{ specialArgs, inputs, config, pkgs, lib, ... }:
+
+{
+  home-manager.users.user = import ../../../users/servers/user.nix";
+}
diff --git a/users/common/home.nix b/users/common/home.nix
index af9fa88..bbda32d 100644
--- a/users/common/home.nix
+++ b/users/common/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   home = {
diff --git a/users/common/programs.nix b/users/common/programs.nix
index cc72756..0994885 100644
--- a/users/common/programs.nix
+++ b/users/common/programs.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   programs = {
diff --git a/users/desktops/common/home.nix b/users/desktops/common/home.nix
index 6b2faa5..1e05a4a 100644
--- a/users/desktops/common/home.nix
+++ b/users/desktops/common/home.nix
@@ -1,4 +1,4 @@
-{ inputs, config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   home = {
diff --git a/users/desktops/common/programs.nix b/users/desktops/common/programs.nix
index 9c59785..4b10008 100644
--- a/users/desktops/common/programs.nix
+++ b/users/desktops/common/programs.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   fonts.fontconfig.enable = true;
diff --git a/users/desktops/common/services.nix b/users/desktops/common/services.nix
index ff22730..ee3ad03 100644
--- a/users/desktops/common/services.nix
+++ b/users/desktops/common/services.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   services = {
diff --git a/users/desktops/user.nix b/users/desktops/user.nix
index e79e317..0e97d53 100644
--- a/users/desktops/user.nix
+++ b/users/desktops/user.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   imports = [
diff --git a/users/servers/user.nix b/users/servers/user.nix
index 0b27563..749122b 100644
--- a/users/servers/user.nix
+++ b/users/servers/user.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   imports = [