rewrite all the outputs

flake.nix

@@ -41,7 +41,7 @@
           overlay-unstable
         ];
       };
-      mkComputer = configurationNix: homeManagerRole: nixpkgs.lib.nixosSystem {
+      mkComputer = configurationNix: nixpkgs.lib.nixosSystem {
         inherit system pkgs;
         specialArgs = { inherit custom inputs; };
         modules = (
@@ -57,7 +57,7 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.${custom.username}.imports = [
-                (import homeManagerRole { inherit custom pkgs inputs; })
+                (import ./home-manager/desktop.nix { inherit custom pkgs inputs; })
               ];
             }
           ]);
@@ -86,54 +86,23 @@
     in
     {
       nixosConfigurations = {
-        gwyn = mkComputer
+        gwyn = mkComputer ./systems/gwyn;
-          ./systems/gwyn
+        staubfinger = mkComputer ./systems/staubfinger;
-          ./home-manager/desktop.nix;
+        nixos-vm = mkComputer ./systems/desktop-vm;
-        staubfinger = mkComputer
-          ./systems/staubfinger
-          ./home-manager/desktop.nix;
-        nixos-vm = mkComputer
-          ./systems/desktop-vm
-          ./home-manager/desktop.nix;
         # Servers
-        proxy = mkComputer
+        proxy = mkVM ./systems/proxy;
-          ./systems/proxy
+        nixos-management = mkVM ./systems/nixos-management;
-          ./home-manager/headless.nix;
+        heimdall = mkVM ./systems/heimdall;
-        nixos-management = mkVM
+        grav = mkVM ./systems/grav;
-          ./systems/nixos-management;
+        ttrss = mkVM ./systems/ttrss;
-        heimdall = mkComputer
+        rss-bridge = mkVM ./systems/rss-bridge;
-          ./systems/heimdall
+        git = mkVM ./systems/git;
-          ./home-manager/headless.nix;
+        plex = mkVM ./systems/plex;
-        grav = mkComputer
+        nextcloud = mkVM ./systems/nextcloud;
-          ./systems/grav
+        mail = mkVM ./systems/mail;
-          ./home-manager/headless.nix;
+        pihole = mkVM ./systems/pihole;
-        ttrss = mkComputer
+        restic-server = mkVM ./systems/restic-server;
-          ./systems/ttrss
+        jdownloader = mkVM ./systems/jdownloader;
-          ./home-manager/headless.nix;
-        rss-bridge = mkComputer
-          ./systems/rss-bridge
-          ./home-manager/headless.nix;
-        git = mkComputer
-          ./systems/git
-          ./home-manager/headless.nix;
-        plex = mkComputer
-          ./systems/plex
-          ./home-manager/headless.nix;
-        nextcloud = mkComputer
-          ./systems/nextcloud
-          ./home-manager/headless.nix;
-        mail = mkComputer
-          ./systems/mail
-          ./home-manager/headless.nix;
-        pihole = mkComputer
-          ./systems/pihole
-          ./home-manager/headless.nix;
-        restic-server = mkComputer
-          ./systems/restic-server
-          ./home-manager/headless.nix;
-        jdownloader = mkComputer
-          ./systems/jdownloader
-          ./home-manager/headless.nix;
       };
       homeConfigurations = {
         "${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {