further refactor work

systems/koishi.nix

@@ -10,10 +10,14 @@ _: let
         kde
       ]);
 
-    home-manager.users.kat.imports = with tree.home.profiles; [
-      graphical
-      devops
-    ];
+    home-manager.users.kat.imports =
+      (with tree.home.profiles; [
+        graphical
+        devops
+      ])
+      ++ (with tree.home.environments; [
+        kde
+      ]);
 
     fileSystems = {
       "/" = {

systems/yukari.nix

@@ -13,14 +13,16 @@ _: let
       ]
       ++ (with tree.nixos.roles; [
         server
-        web-server
-        postgres-server
-        matrix-homeserver
-        vaultwarden-server
-        minecraft-server
-        monitoring-server
+      ])
+      ++ (with tree.nixos.servers; [
+        web
+        postgres
+        matrix
+        vaultwarden
+        minecraft
+        grafana-stack
         public-directory
-        irc-client
+        web-irc-client
       ]);
 
     boot = {