Large restructuring

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;
-          }
         ];
       };
     };

hosts/common/boot.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   boot = {

hosts/common/locale.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   time.timeZone = "America/Bahia";

hosts/common/networking.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   networking = {

hosts/common/nix.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   nix = {

hosts/common/packages.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   nixpkgs.config.allowUnfree = true;

hosts/common/services.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   services = {

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;
+  };
 }

hosts/desktops/common/boot.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   boot = {

hosts/desktops/common/hardware.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   hardware = {

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;

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
   ];

hosts/desktops/common/services.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   services = {

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;
 }

hosts/desktops/common/virtualisation.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   virtualisation = {

hosts/desktops/io.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   imports = [ 

hosts/servers/common/boot.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   boot.kernelPackages = pkgs.linuxPackages_hardened;

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;

hosts/servers/common/users.nix

@@ -0,0 +1,5 @@
+{ specialArgs, inputs, config, pkgs, lib, ... }:
+
+{
+  home-manager.users.user = import ../../../users/servers/user.nix";
+}

users/common/home.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   home = {

users/common/programs.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   programs = {

users/desktops/common/home.nix

@@ -1,4 +1,4 @@
-{ inputs, config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   home = {

users/desktops/common/programs.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   fonts.fontconfig.enable = true;

users/desktops/common/services.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   services = {

users/desktops/user.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   imports = [

users/servers/user.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
   imports = [