Large restructuring

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 = [