refactoring for isServer and isWorkstation: part 4

hosts/alexandria/services.nix

@@ -3,7 +3,9 @@
 {
   services.postgresql.enable = true;
 
-  # TODO: remove when bug fux 
+  # TODO: remove when bug fix
+  # serokell/deploy-rs/issues/57
+  # NixOS/nixpkgs/issues/180175
   # Workaround for upstream bug in NetworkManager-wait-online.service
   systemd.services.NetworkManager-wait-online.enable = false;
 }

hosts/modules/programs.nix

@@ -32,6 +32,7 @@
         ls = "${pkgs.eza}/bin/eza --icons --group-directories-first";
         neofetch = "fastfetch";
         tree = "ls --tree";
+        tsh = "ssh -o RequestTTY=yes $argv tmux -u -CC new -A -s tmux-main";
         syscleanup = "sudo nix-collect-garbage -d; sudo /run/current-system/bin/switch-to-configuration boot";
       };
     }

hosts/modules/users.nix

@@ -38,12 +38,18 @@
         useGlobalPkgs = true;
         useUserPackages = true;
         backupFileExtension = "bkp";
+        users = {
+          user = import ../../users/user.nix;
+          root = import ../../users/root.nix;
+        };
+        extraSpecialArgs = {
+          inherit hostType;
+        };
       };
     }
 
     # Server specific configuration
     (lib.mkIf hostType.isServer {
-      home-manager.users.user = import ../../users/servers/user.nix;
     })
 
     # Workstation specific configuration
@@ -73,8 +79,6 @@
           hashedPassword = "$y$j9T$yHLUDvj6bDIP19dchU.aA/$OY4qeFNtx/GvI.VUYx4LapHiiVwi0MEvs8AT0HN7j58";
         };
       };
-
-      home-manager.users.user = import ../../users/desktops/user.nix;
     })
   ];
 }