Refactor flakes

linux/blitzar/gui.nix

@@ -12,31 +12,26 @@ in {
   }: let
     xdgCfg = config.xdg;
   in {
-    home.packages = with pkgs;
-      [
-        feishin
-        hunspell
-        hunspellDicts.en-us-large
-        jellyfin-mpv-shim
-        joplin-desktop
-        libreoffice-qt6-fresh
-        lutris
-        nvtopPackages.amd
-        picard
-        qbittorrent
-        razergenie
-        ryujinx
-        telegram-desktop
-        thunderbird
-        via
-        winetricks
-        wineWowPackages.stagingFull
-      ]
-      ++ (with kdePackages; [
-        k3b
-        kdepim-addons
-        merkuro
-      ]);
+    home.packages = with pkgs; [
+      feishin
+      hunspell
+      hunspellDicts.en-us-large
+      jellyfin-mpv-shim
+      joplin-desktop
+      libreoffice-qt6-fresh
+      lutris
+      nheko
+      nvtopPackages.amd
+      picard
+      qbittorrent
+      razergenie
+      ryujinx
+      telegram-desktop
+      thunderbird
+      via
+      winetricks
+      wineWowPackages.stagingFull
+    ];
     programs = {
       git.signing = {
         key = "0x6A815D4CB1637AAC";
@@ -135,6 +130,11 @@ in {
 
   programs = {
     dconf.enable = true;
+    k3b.enable = true;
+    kde-pim = {
+      enable = true;
+      merkuro = true;
+    };
     partition-manager.enable = true;
     steam.enable = true;
   };

linux/singularity/caddy.nix

@@ -55,7 +55,13 @@
       "matrix.${dn}".extraConfig = ''
         reverse_proxy /_matrix/* ${homeSrv "conduit"}
         file_server {
-          root ${pkgs.cinny}
+          root ${pkgs.cinny.override {
+          conf = {
+            defaultHomeserver = 0;
+            hashRouter.enabled = true;
+            homeserverList = [dn];
+          };
+        }}
         }
       '';
       "vault.${dn}".extraConfig = ''