Large restructuring

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