further refactor work

home/environments/kde/konawall.nix

@@ -12,6 +12,24 @@
     Terminal=False
     Type=Application
   '';
+  konawallConfig = {
+    interval = 300;
+    rotate = true;
+    source = "konachan";
+    tags = [
+      "rating:s"
+      "touhou"
+      "score:>=50"
+      "width:>=1500"
+    ];
+    logging = {
+      file = "INFO";
+      console = "DEBUG";
+    };
+  };
 in {
-  xdg.configFile."autostart/konawall.desktop".text = desktop_entry;
+  xdg.configFile = {
+    "konawall/config.toml".source = (pkgs.formats.toml {}).generate "konawall-config" konawallConfig;
+    "autostart/konawall.desktop".text = desktop_entry;
+  };
 }

modules/nixos/machine.nix

@@ -1,5 +1,5 @@
 {lib, ...}: let
-  inherit (lib.modules) mkOption;
+  inherit (lib.options) mkOption;
   inherit (lib.types) enum;
 in {
   options.machine = {

nixos/profiles/graphical/fonts.nix

@@ -4,6 +4,7 @@
       font-awesome
       twitter-color-emoji
       iosevka-bin
+      monaspace
     ];
     enableDefaultPackages = true;
     fontDir.enable = true;

nixos/profiles/wireless/firewall.nix

@@ -1,5 +1,5 @@
 _: {
-  firewall = {
+  networking.firewall = {
     allowedUDPPorts = [5353]; # MDNS
     allowedUDPPortRanges = [
       {

systems/koishi.nix

@@ -10,10 +10,14 @@ _: let
         kde
       ]);
 
-    home-manager.users.kat.imports = with tree.home.profiles; [
+    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
+      ++ (with tree.nixos.servers; [
-        matrix-homeserver
+        web
-        vaultwarden-server
+        postgres
-        minecraft-server
+        matrix
-        monitoring-server
+        vaultwarden
+        minecraft
+        grafana-stack
         public-directory
-        irc-client
+        web-irc-client
       ]);
 
     boot = {