chore(server): drop grafana

.lazy.lua

@@ -17,24 +17,4 @@ vim.lsp.config("nixd", {
   },
 })
 
-return {
+return {}
-  {
-    "folke/lazydev.nvim",
-    ft = "lua",
-    opts = {
-      library = {
-        { path = "${3rd}/luv/library", words = { "vim%.uv" } },
-      },
-    },
-  },
-  {
-    "hrsh7th/nvim-cmp",
-    opts = function(_, opts)
-      opts.sources = opts.sources or {}
-      table.insert(opts.sources, {
-        name = "lazydev",
-        group_index = 0,
-      })
-    end,
-  },
-}

flake.lock

@@ -11,11 +11,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1768580572,
+        "lastModified": 1771000778,
-        "narHash": "sha256-8j7ifTZnVDOs0VxsbUjIym9e8oiv1F+I38PtkJZL7w0=",
+        "narHash": "sha256-Co3VdFeXl7abbNGEHEkjS9raX6P3yhigu162Mg6DV14=",
         "owner": "linyinfeng",
         "repo": "angrr",
-        "rev": "422b6156d54cc668f74321b2ea83fac4acef6996",
+        "rev": "6bea47aa18c2fb33aa9a363e452c037228893453",
         "type": "github"
       },
       "original": {
@@ -130,11 +130,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768575137,
+        "lastModified": 1771508520,
-        "narHash": "sha256-e0SsKnkSnq+UwZNS9ZyPJjTjabzq9TRc1hqeDnvOF1Q=",
+        "narHash": "sha256-srt94sUlkaGEJHQg7k6gVrBF1QZcHUY/VBESjCgZmKI=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "48e67b4ad22072f1ae30b0ed8e1cb020cf06c611",
+        "rev": "ec35c21e843e4748e60822cd5543983eb61dc87a",
         "type": "github"
       },
       "original": {
@@ -150,11 +150,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768777038,
+        "lastModified": 1771363276,
-        "narHash": "sha256-q/6/bN3FW/iHO18MQxEJaZEmFQVgzeCcLH21Qevy+QQ=",
+        "narHash": "sha256-bW0untIUe6QMygBPABCMyrnaZCo8E4pKRQGZgLO9aGI=",
         "owner": "Bali10050",
         "repo": "Darkly",
-        "rev": "8f51dab9e3deb98e4f809aa5592d244bc825c68e",
+        "rev": "b37438a974e39dea0c04a6d64633eab2125b9370",
         "type": "github"
       },
       "original": {
@@ -193,11 +193,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1769064677,
+        "lastModified": 1771571526,
-        "narHash": "sha256-Upa108vGOlaOBGQTmmLEKuWekBm519u42A/oYSjTs+4=",
+        "narHash": "sha256-JvL7TMheC4pih3VbxVlPSgqhGxLiaFUppcsJoDnOg9Y=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "439e81e0b40781e16c444ca1c7fcd1cf8c5c406c",
+        "rev": "f677bc93ec72abced2828e2c7720df0f9c25f825",
         "type": "github"
       },
       "original": {
@@ -278,11 +278,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768135262,
+        "lastModified": 1769996383,
-        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -298,11 +298,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768135262,
+        "lastModified": 1769996383,
-        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -544,11 +544,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769132734,
+        "lastModified": 1771531206,
-        "narHash": "sha256-gmU9cRplrQWqoback9PgQX7Dlsdx8JlhlVZwf0q1F7E=",
+        "narHash": "sha256-1R3Wx6KUkMb4x4E5UOhW9p6rqiexzSGGWxZqSHqW5n0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d055b309a6277343cb1033a11d7500f0a0f669fc",
+        "rev": "91be7cce763fa4022c7cf025a71b0c366d1b6e77",
         "type": "github"
       },
       "original": {
@@ -587,11 +587,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768434960,
+        "lastModified": 1771102945,
-        "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=",
+        "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b",
+        "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399",
         "type": "github"
       },
       "original": {
@@ -606,11 +606,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1768941735,
+        "lastModified": 1769548169,
-        "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=",
+        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54",
+        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
         "type": "github"
       },
       "original": {
@@ -706,11 +706,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1769095293,
+        "lastModified": 1771514840,
-        "narHash": "sha256-GPlRdJ7LVLyabpJ2tDA9Bj5em9wi3mKXeedIDl7+LWs=",
+        "narHash": "sha256-t3WbZvwoDj/75YDX/nwkZuxanZLZaWr9meSfKswaN6g=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "180bdbbc91c89f540a52d2b31c8c08116c53b91f",
+        "rev": "4f69ab280e9bb34e2c0b67fdfa6f0978a170ef56",
         "type": "github"
       },
       "original": {
@@ -739,11 +739,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1768678265,
+        "lastModified": 1771305475,
-        "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=",
+        "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "d7184a04b904e07113f4623610775ae78d32394c",
+        "rev": "a2a52911757cb3b497db9407592f9b4c439571ea",
         "type": "github"
       },
       "original": {
@@ -797,11 +797,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768561867,
+        "lastModified": 1770922915,
-        "narHash": "sha256-prGOZ+w3pZfGTRxworKcJliCNsewF0L4HUPjgU/6eaw=",
+        "narHash": "sha256-6J/JoK9iL7sHvKJcGW2KId2agaKv1OGypsa7kN+ZBD4=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "8b720b9662d4dd19048664b7e4216ce530591adc",
+        "rev": "6c5a56295d2a24e43bcd8af838def1b9a95746b2",
         "type": "github"
       },
       "original": {
@@ -840,11 +840,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768840529,
+        "lastModified": 1771563879,
-        "narHash": "sha256-e22ou8nikeThx9x9/y29VdMEW4Fm7DBzlhp9ndDJUGE=",
+        "narHash": "sha256-vA5hocvdGhr+jfBN7A7ogeZqIz2qx01EixXwdVsQcnE=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "b8e9a758fa2e08d8ac5c3be5d4b1fcc92fd3ce84",
+        "rev": "379d20c55f552e91fb9f3f0382e4a97d3f452943",
         "type": "github"
       },
       "original": {
@@ -883,11 +883,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1769160766,
+        "lastModified": 1771575107,
-        "narHash": "sha256-XqxuTeiXBmN7bj/JkGnB4htuVFVOw4y9Wc3oGiXn8qI=",
+        "narHash": "sha256-RMiV8PRAuFFtJ0l6EZcADdBW1JP+DUIPpDXnMJp0w/k=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "13575c754596a1f1c4233bea5664f8646c5eb761",
+        "rev": "6b0f198fe0363867d9f8cea387a3b9212b468839",
         "type": "github"
       },
       "original": {
@@ -899,11 +899,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1768940263,
+        "lastModified": 1771419570,
-        "narHash": "sha256-sJERJIYTKPFXkoz/gBaBtRKke82h4DkX3BBSsKbfbvI=",
+        "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3ceaaa8bc963ced4d830e06ea2d0863b6490ff03",
+        "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47",
         "type": "github"
       },
       "original": {
@@ -915,11 +915,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1769160721,
+        "lastModified": 1771574726,
-        "narHash": "sha256-Tzsu2ByvbS+p+spJQcjXNctMn1gQF5Hu7NiYklFKjD4=",
+        "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec52769d18b62740ba9d5213def35abbb85ae95b",
+        "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d",
         "type": "github"
       },
       "original": {
@@ -931,11 +931,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1769018530,
+        "lastModified": 1771369470,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
         "type": "github"
       },
       "original": {
@@ -995,11 +995,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1769018530,
+        "lastModified": 1771369470,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
         "type": "github"
       },
       "original": {
@@ -1016,16 +1016,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1768687399,
+        "lastModified": 1771375091,
-        "narHash": "sha256-/7yEiXC2Z/Yk/p7aNgChkAa7BgPRlV5/0z8+jZXH8e8=",
+        "narHash": "sha256-Y5P0RYO9NKxa4UZBoGmmxtz3mEwJrBOfvdLJRGjV2Os=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "d01378f73b0c07d486519600a7808b072d088609",
+        "rev": "dbfe3634df0c57faf9772cecae1f2e92bd04de66",
         "type": "github"
       },
       "original": {
         "owner": "noctalia-dev",
-        "ref": "v4.1.1",
+        "ref": "v4.5.0",
         "repo": "noctalia-shell",
         "type": "github"
       }
@@ -1105,11 +1105,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1768996281,
+        "lastModified": 1771505899,
-        "narHash": "sha256-s+TolkG0f98fR6RtBEmymBb8RHmZ04U3SL8cjoqog2k=",
+        "narHash": "sha256-MdRGkz3huAAhsHGnRv0XZV4RG/yO9HOrmhCbOclqcIk=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "2d124215693f13dcf6ad097a02acdd473c80e447",
+        "rev": "d8e0e96766968bfebca2360ae4cb8f08d7bbab18",
         "type": "github"
       },
       "original": {
@@ -1126,11 +1126,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768893558,
+        "lastModified": 1771575468,
-        "narHash": "sha256-ntZKV5rLdZHtXKYpwDdFkkD8y/ycL0s229l0Zb/vfmw=",
+        "narHash": "sha256-4FMXl7wWiGesb7Udh5CBZ6LtisHoDszwPn9dpUiUhS0=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "0a97486171f077a37991456e7de5ffa85e88a217",
+        "rev": "6f54775bc534535d6a206135bca7455dc5c1a7d9",
         "type": "github"
       },
       "original": {
@@ -1161,11 +1161,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1768744881,
+        "lastModified": 1771541829,
-        "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=",
+        "narHash": "sha256-jtrIUcFoZuS6R4P18907H0pPyHaGoF5Tomez7j3KIHs=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "06684f00cfbee14da96fd4307b966884de272d3a",
+        "rev": "cb73f89d3ecef7e790c42f828e2228ff82975de5",
         "type": "github"
       },
       "original": {
@@ -1181,11 +1181,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768260017,
+        "lastModified": 1769878625,
-        "narHash": "sha256-r1Y+TQLEC4dNxktRaDpP8vnWOha0MFrYsfrqPhV85BA=",
+        "narHash": "sha256-cOLzS70XjXcxPi4vkTjbvSBOZ5o+CmzkLXX/AgtJMRQ=",
         "owner": "Kirottu",
         "repo": "system76-scheduler-niri",
-        "rev": "0ccb6c4d696c8db7c73153d1dcc2b2a2b2a37a84",
+        "rev": "9fe30d78748bd8f655c3f8ec8b3ce8cd25577182",
         "type": "github"
       },
       "original": {
@@ -1312,11 +1312,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768158989,
+        "lastModified": 1770228511,
-        "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
+        "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
+        "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
         "type": "github"
       },
       "original": {
@@ -1333,11 +1333,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768158989,
+        "lastModified": 1770228511,
-        "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
+        "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
+        "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
         "type": "github"
       },
       "original": {
@@ -1366,11 +1366,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1768765571,
+        "lastModified": 1771195969,
-        "narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=",
+        "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "ed1cef792b4def3321ff9ab5479df09609f17a69",
+        "rev": "536bd32efc935bf876d6de385ec18a1b715c9358",
         "type": "github"
       },
       "original": {
@@ -1387,11 +1387,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769059766,
+        "lastModified": 1771562861,
-        "narHash": "sha256-u95Qe60mF3eoEqrd0tIej4A8TDWoc/N4ZjZ60npplgw=",
+        "narHash": "sha256-6oT3rF68W8HERLXvFfEkpz8xpAVLKZsY1ZuR/BbDTO8=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "dc0483a6e3ff1ffb04ad77d26c1a4458f4cf82d6",
+        "rev": "7783a3adf3d5a9599a82c75a44c7482e70398ac2",
         "type": "github"
       },
       "original": {

flake.nix

@@ -81,7 +81,7 @@
     };
     niri.url = "github:sodiboo/niri-flake";
     noctalia = {
-      url = "github:noctalia-dev/noctalia-shell/v4.1.1";
+      url = "github:noctalia-dev/noctalia-shell/v4.5.0";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     zen.inputs.nixpkgs.follows = "nixpkgs";

hosts/imxyy-nix-server/efl.nix

@@ -7,12 +7,13 @@
   };
   virtualisation.oci-containers.containers = {
     tuwunel = {
-      image = "jevolk/tuwunel:latest";
+      image = "ghcr.io/matrix-construct/tuwunel:latest";
       volumes = [
         "tuwunel_db:/var/lib/tuwunel"
       ];
       ports = [ "6167:6167" ];
       networks = [ "podman" ];
+      extraOptions = [ "--pids-limit=-1" ];
       environment = {
         TUWUNEL_SERVER_NAME = "mtx.eflx.top";
         TUWUNEL_PORT = "6167";

hosts/imxyy-nix-server/grafana.nix

@@ -1,43 +0,0 @@
-{
-  services.grafana = {
-    enable = true;
-    settings = {
-      server = {
-        http_addr = "0.0.0.0";
-        http_port = 8090;
-        domain = "grafana.imxyy.top";
-      };
-    };
-  };
-  services.prometheus = {
-    enable = true;
-    port = 8091;
-    exporters = {
-      node = {
-        enable = true;
-        port = 8092;
-        enabledCollectors = [
-          "systemd"
-          "zfs"
-        ];
-      };
-    };
-    scrapeConfigs = [
-      {
-        job_name = "node";
-        static_configs = [
-          {
-            targets = [ "127.0.0.1:8092" ];
-          }
-        ];
-      }
-    ];
-  };
-  services.caddy.virtualHosts."grafana.imxyy.top" = {
-    extraConfig = ''
-      reverse_proxy :8090 {
-        header_up X-Real-IP {remote_host}
-      }
-    '';
-  };
-}

hosts/imxyy-nix-server/net.nix

@@ -290,21 +290,6 @@
             customDomains = [ "coder.imxyy.top" ];
           }
 
-          {
-            name = "grafana-http";
-            type = "http";
-            localIP = "127.0.0.1";
-            localPort = 80;
-            customDomains = [ "grafana.imxyy.top" ];
-          }
-          {
-            name = "grafana-https";
-            type = "https";
-            localIP = "127.0.0.1";
-            localPort = 443;
-            customDomains = [ "grafana.imxyy.top" ];
-          }
-
           {
             name = "siyuan-http";
             type = "http";
@@ -499,7 +484,6 @@
         "git"
         "vault"
         "coder"
-        "grafana"
         "matrix"
         "note"
         "oidc"

hosts/imxyy-nix-x16/home.nix

@@ -17,10 +17,10 @@
       anki
 
       ayugram-desktop
-      signal-desktop
+      signal-desktop-wayland
       element-desktop
       fractal
-      qq
+      qq-wayland
       wechat
 
       gnome-clocks
@@ -64,8 +64,8 @@
       defaultApplications =
         let
           browser = [ config.my.desktop.browser.default.desktop ];
-          editor = [ "codium.desktop" ];
+          editor = [ "nvim.desktop" ];
-          imageviewer = [ "org.gnome.Shotwell-Viewer.desktop" ];
+          imageviewer = [ "org.gnome.Loupe.desktop" ];
         in
         {
           "inode/directory" = [ "org.gnome.Nautilus.desktop" ];
@@ -74,7 +74,6 @@
 
           "text/*" = editor;
           "application/json" = editor;
-          "text/html" = editor;
           "text/xml" = editor;
           "application/xml" = editor;
           "application/xhtml+xml" = editor;
@@ -87,6 +86,7 @@
           "application/x-extension-xht" = editor;
           "application/x-extension-xhtml" = editor;
 
+          "text/html" = browser;
           "x-scheme-handler/about" = browser;
           "x-scheme-handler/ftp" = browser;
           "x-scheme-handler/http" = browser;

hosts/imxyy-nix/home.nix

@@ -17,10 +17,10 @@
       anki
 
       ayugram-desktop
-      signal-desktop
+      signal-desktop-wayland
       element-desktop
       fractal
-      qq
+      qq-wayland
       wechat
 
       gnome-clocks
@@ -96,8 +96,8 @@
       defaultApplications =
         let
           browser = [ config.my.desktop.browser.default.desktop ];
-          editor = [ "codium.desktop" ];
+          editor = [ "nvim.desktop" ];
-          imageviewer = [ "org.gnome.Shotwell-Viewer.desktop" ];
+          imageviewer = [ "org.gnome.Loupe.desktop" ];
         in
         {
           "inode/directory" = [ "org.gnome.Nautilus.desktop" ];
@@ -106,7 +106,6 @@
 
           "text/*" = editor;
           "application/json" = editor;
-          "text/html" = editor;
           "text/xml" = editor;
           "application/xml" = editor;
           "application/xhtml+xml" = editor;
@@ -119,6 +118,7 @@
           "application/x-extension-xht" = editor;
           "application/x-extension-xhtml" = editor;
 
+          "text/html" = browser;
           "x-scheme-handler/about" = browser;
           "x-scheme-handler/ftp" = browser;
           "x-scheme-handler/http" = browser;

modules/cli/all.nix

@@ -14,6 +14,9 @@ in
       monitor.all.enable = true;
       shell.all.enable = true;
       vcs.all.enable = true;
+
+      shpool.enable = true;
+      tmux.enable = true;
     };
   };
 }

modules/cli/misc.nix

@@ -30,10 +30,14 @@ in
       xz
       p7zip
       unrar-free
+      ouch
 
       pciutils
       usbutils
 
+      dust
+      dysk
+
       lsof
 
       nmap
@@ -51,6 +55,13 @@ in
       ".config/television/cable"
     ];
     my.hm = {
+      programs.fish.shellAliases = {
+        x = "ouch d";
+      };
+      programs.zsh.shellAliases = {
+        x = "ouch d";
+      };
+
       home.packages = with pkgs; [
         # keep-sorted start
         aria2
@@ -59,6 +70,7 @@ in
         fastfetch
         fd
         fzf
+        jq
         keep-sorted
         lsd
         neofetch
@@ -67,26 +79,6 @@ in
         typos
         # keep-sorted end
       ];
-      programs.tmux = {
-        enable = true;
-        extraConfig = ''
-          set-option -g mouse on
-          set-option -a terminal-features ",xterm-256color:RGB,focus,clipboard,usstyle"
-        '';
-        plugins = [
-          (pkgs.tmuxPlugins.mkTmuxPlugin {
-            pluginName = "tokyo-night-tmux";
-            rtpFilePath = "tokyo-night.tmux";
-            version = "legacy";
-            src = pkgs.fetchFromGitHub {
-              owner = "janoamaral";
-              repo = "tokyo-night-tmux";
-              rev = "16469dfad86846138f594ceec780db27039c06cd";
-              hash = "sha256-EKCgYan0WayXnkSb2fDJxookdBLW0XBKi2hf/YISwJE=";
-            };
-          })
-        ];
-      };
       programs.tealdeer = {
         enable = true;
         enableAutoUpdates = true;

modules/cli/shell/fish.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 let
@@ -30,17 +29,6 @@ in
       programs.starship.enableFishIntegration = false;
       programs.fish = {
         enable = true;
-        plugins = [
-          {
-            name = "extract";
-            src = pkgs.fetchFromGitHub {
-              owner = "hexclover";
-              repo = "fish-extract-ng";
-              tag = "v0.1";
-              hash = "sha256-yef5NX4HdZ3ab/2AzNrvvhi0CbeTvXYKZmyH76gIpyk=";
-            };
-          }
-        ];
         shellAliases = {
           la = "lsd -lah";
           ls = "lsd";

modules/cli/shell/starship.nix

@@ -5,17 +5,53 @@ in
 {
   options.my.cli.shell.starship = {
     enable = lib.mkEnableOption "starship prompt";
-  };
+    format = lib.mkOption {
-
+      type = with lib.types; listOf singleLineStr;
-  config = lib.mkIf cfg.enable {
-    my.hm = {
-      programs.starship = {
-        enable = true;
-        settings = lib.recursiveUpdate (with builtins; fromTOML (readFile ./starship-preset.toml)) {
-          add_newline = false;
-          nix_shell.disabled = true;
-        };
-      };
     };
   };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      my.hm = {
+        programs.starship = {
+          enable = true;
+          settings = lib.recursiveUpdate (with builtins; fromTOML (readFile ./starship-preset.toml)) {
+            add_newline = false;
+            command_timeout = 2000;
+            nix_shell.disabled = true;
+            format =
+              let
+                dedupDollar =
+                  list:
+                  let
+                    result =
+                      builtins.foldl'
+                        (
+                          acc: elem:
+                          if lib.hasPrefix "$" elem then
+                            if builtins.elem elem acc.seen then
+                              acc
+                            else
+                              acc
+                              // {
+                                result = acc.result ++ [ elem ];
+                                seen = acc.seen ++ [ elem ];
+                              }
+                          else
+                            acc // { result = acc.result ++ [ elem ]; }
+                        )
+                        {
+                          result = [ ];
+                          seen = [ ];
+                        }
+                        (lib.reverseList list);
+                  in
+                  lib.reverseList result.result;
+              in
+              "$all" + lib.concatStrings (dedupDollar cfg.format);
+          };
+        };
+      };
+    })
+  ];
 }

modules/cli/shell/zsh.nix

@@ -50,7 +50,6 @@ in
           ];
         };
         shellAliases = {
-          x = "extract";
           ls = "lsd";
           svim = "doasedit";
           nf = "fastfetch";

modules/cli/shpool.nix

@@ -0,0 +1,43 @@
+{
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.my.cli.shpool;
+in
+{
+  options.my.cli.shpool = {
+    enable = lib.mkEnableOption "shpool";
+  };
+
+  config = lib.mkIf cfg.enable {
+    my.hm = {
+      services.shpool = {
+        enable = true;
+        systemd = true;
+        settings = {
+          motd = "never";
+          prompt_prefix = "";
+          forward_env = [ "PATH" ];
+        };
+      };
+      programs.starship = {
+        settings = {
+          custom.shpool = {
+            description = "Display current shpool session name";
+            when = ''test -n "$SHPOOL_SESSION_NAME"'';
+            command = "echo $SHPOOL_SESSION_NAME";
+            symbol = " ";
+            style = "fg:#dea584";
+            format = "[$symbol \\[$output\\] ]($style)";
+          };
+        };
+      };
+    };
+    my.cli.shell.starship.format = [
+      "\${custom.shpool}"
+      "$character"
+    ];
+  };
+}

modules/cli/tmux.nix

@@ -0,0 +1,55 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.my.cli.tmux;
+in
+{
+  options.my.cli.tmux = {
+    enable = lib.mkEnableOption "tmux";
+  };
+
+  config = lib.mkIf cfg.enable {
+    my.hm = {
+      programs.tmux = {
+        enable = true;
+        extraConfig = ''
+          set-option -g mouse on
+          set-option -a terminal-features ",xterm-256color:RGB,focus,clipboard,usstyle"
+        '';
+        plugins = [
+          (pkgs.tmuxPlugins.mkTmuxPlugin {
+            pluginName = "tokyo-night-tmux";
+            rtpFilePath = "tokyo-night.tmux";
+            version = "legacy";
+            src = pkgs.fetchFromGitHub {
+              owner = "janoamaral";
+              repo = "tokyo-night-tmux";
+              rev = "16469dfad86846138f594ceec780db27039c06cd";
+              hash = "sha256-EKCgYan0WayXnkSb2fDJxookdBLW0XBKi2hf/YISwJE=";
+            };
+          })
+        ];
+      };
+      programs.starship = {
+        settings = {
+          custom.tmux = {
+            description = "Display current tmux session name";
+            when = ''test -n "$TMUX"'';
+            command = "tmux display-message -p '#S'";
+            symbol = " ";
+            style = "bold green";
+            format = "[$symbol \\[$output\\] ]($style)";
+          };
+        };
+      };
+    };
+    my.cli.shell.starship.format = [
+      "\${custom.tmux}"
+      "$character"
+    ];
+  };
+}

modules/cli/vcs/jj.nix

@@ -60,11 +60,10 @@ in
       programs.starship = {
         settings = {
           custom = {
+            # Borrowed from https://github.com/jj-vcs/jj/wiki/Starship/b18afc53417848f58333b24d446b8e2522b42bd2#alternative-prompt
             jj = {
               ignore_timeout = true;
               description = "The current jj status";
-              # when = "${lib.getExe pkgs.jj-starship} detect";
-              # command = "${lib.getExe pkgs.jj-starship}";
               when = true;
               command = ''
                 jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '

modules/coding/editor/neovim/default.nix

@@ -27,6 +27,9 @@ in
 
           ripgrep # telescope
 
+          vscode-json-languageserver
+          vscode-langservers-extracted
+          taplo
           typos-lsp
         ];
       };

modules/coding/editor/neovim/nvim/lazy-lock.json

@@ -1,45 +1,44 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" },
+  "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
+  "blink.cmp": { "branch": "main", "commit": "f9e855c4d96e1264f7c818844f5a0166ad48c212" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
-  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
-  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "c7d37ca22b461f64e26f8f6701b2586128ed0bef" },
   "glance.nvim": { "branch": "master", "commit": "bf86d8b79dce808e65fdb6e9269d0b4ed6d2eefc" },
   "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "inlay-hints.nvim": { "branch": "master", "commit": "12c48937702906f67dfbd7f64b1c0d8861635506" },
+  "inlay-hints.nvim": { "branch": "master", "commit": "990e1f96699b8293b6665b9e73b16128c66684e6" },
-  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
-  "leap.nvim": { "branch": "main", "commit": "f19d43590c4b6d31188ee1ea2954d2b7558a9e11" },
+  "leap.nvim": { "branch": "main", "commit": "02bf52e49c72cc5dabb53ec9494d10d304f0b2c9" },
-  "lspkind.nvim": { "branch": "master", "commit": "dbac5149fb5fb1b642266ff268b1e0f4ebac9293" },
+  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
-  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
+  "mini.nvim": { "branch": "main", "commit": "8c40d95931cbe6138391af9180e59439ed2e69df" },
+  "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
+  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
+  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
-  "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "419b082102fa813739588dd82e19a8b6b2442855" },
+  "nvim-lspconfig": { "branch": "master", "commit": "276ce3bc878243dc63c32b75790c4296d11848f6" },
-  "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
+  "nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" },
   "nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" },
   "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" },
-  "nvim-tree.lua": { "branch": "master", "commit": "5757bcf0447d22d8f78826bc5c59b28da2824c3b" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
-  "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" },
-  "outline.nvim": { "branch": "main", "commit": "1967ef50036b0b1eac4977aeede55915a741afe0" },
+  "outline.nvim": { "branch": "main", "commit": "0eb9289ab39c91caf8b3ed0e3a17764809d69558" },
   "pest.vim": { "branch": "master", "commit": "7cfcb43f824e74d13dfe631359fff2ec23836a77" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "d6b802552cbe7d643a3b6b31f419c248d1f1e220" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "97bf4b8ef9298644a29fcd9dd41a0210cf08cac7" },
-  "render-markdown.nvim": { "branch": "main", "commit": "c54380dd4d8d1738b9691a7c349ecad7967ac12e" },
+  "render-markdown.nvim": { "branch": "main", "commit": "3da7bb459f6cff03980dd1e106c46f3e62ff4d9f" },
-  "ripgrep": { "branch": "master", "commit": "0a88cccd5188074de96f54a4b6b44a63971ac157" },
+  "ripgrep": { "branch": "master", "commit": "119a58a400ea948c2d2b0cd4ec58361e74478641" },
-  "telescope.nvim": { "branch": "master", "commit": "0d8b6eaa0b5ae6bb3d9785f7a3ba4a4c6c1b1af2" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
+  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
-  "tree-sitter-nu": { "branch": "main", "commit": "4c149627cc592560f77ead1c384e27ec85926407" },
+  "tree-sitter-nu": { "branch": "main", "commit": "6544c4383643cf8608d50def2247a7af8314e148" },
-  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "vim-floaterm": { "branch": "master", "commit": "a11b930f55324e9b05e2ef16511fe713f1b456a7" },
+  "vim-floaterm": { "branch": "master", "commit": "fd4bdd66eca56c6cc59f2119e4447496d8cde2ea" },
-  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }
+  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
+  "workspace-diagnostics.nvim": { "branch": "main", "commit": "60f9175b2501ae3f8b1aba9719c0df8827610c8e" }
 }

modules/coding/editor/neovim/nvim/lua/plugins/autopairs.lua

@@ -1,25 +0,0 @@
-M = {
-  check_ts = true,
-  ts_config = {
-    lua = { "string", "source" },
-    javascript = { "string", "template_string" },
-  },
-  fast_wrap = {
-    map = "<M-e>",
-    chars = { "{", "[", "(", '"', "'" },
-    pattern = [=[[%'%"%)%>%]%)%}%,]]=],
-    end_key = "$",
-    keys = "qwertyuiopzxcvbnmasdfghjkl",
-    check_comma = true,
-    highlight = "Search",
-    highlight_grey = "Comment",
-  },
-}
-
-local cmp_autopairs = require("nvim-autopairs.completion.cmp")
-local ok, cmp = pcall(require, "cmp")
-if ok then
-  cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))
-end
-
-return M

modules/coding/editor/neovim/nvim/lua/plugins/bufferline.lua

@@ -1,5 +1,6 @@
 local buf_kill = require("core.globals").buf_kill
 
+--- @type bufferline.UserConfig
 M = {
   highlights = {
     buffer_selected = {
@@ -10,7 +11,7 @@ M = {
     diagnostics = "nvim_lsp",
     offsets = {
       {
-        filetype = "NvimTree",
+        filetype = "neo-tree",
         text = "File Explorer",
         highlight = "Directory",
         text_align = "center",

modules/coding/editor/neovim/nvim/lua/plugins/cmp/cmp.lua

@@ -1,64 +1,32 @@
-local cmp = require("cmp")
+--- @type blink.cmp.Config
-
 M = {
-  window = {
+  keymap = {
-    completion = {
+    -- <Tab> to accept
-      border = "rounded",
+    preset = "super-tab",
-      scrollbar = "║",
+  },
-    },
+  appearance = {
-    documentation = {
+    nerd_font_variant = "mono",
-      border = "rounded",
+  },
-      scrollbar = "║",
+  completion = {
+    -- By default, you may press `<c-space>` to show the documentation.
+    -- Optionally, set `auto_show = true` to show the documentation after a delay.
+    documentation = { auto_show = true, auto_show_delay_ms = 1000 },
+  },
+  sources = {
+    default = { "lsp", "path", "snippets", "lazydev" },
+    providers = {
+      lazydev = { module = "lazydev.integrations.blink", score_offset = 100 },
     },
   },
-  formatting = {
+  snippets = { preset = "luasnip" },
-    format = require("lspkind").cmp_format({
+
-      mode = "symbol",
+  -- See :h blink-cmp-config-fuzzy for more information
-      maxwidth = 50,
+  fuzzy = {
-      ellipsis_char = "...",
+    implementation = "lua",
-    }),
   },
-  snippet = {
+
-    expand = function(args)
+  -- Shows a signature help window while you type arguments for a function
-      require("luasnip").lsp_expand(args.body)
+  signature = { enabled = true },
-    end,
-  },
-  mapping = cmp.mapping.preset.insert({
-    ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-    ["<C-f>"] = cmp.mapping.scroll_docs(4),
-    ["<Escape>"] = cmp.mapping.abort(),
-    ["<Tab>"] = cmp.mapping.confirm({ select = true }),
-    ["<Up>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_prev_item()
-      else
-        fallback()
-      end
-    end, {
-      "i",
-      "s",
-    }),
-    ["<Down>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_next_item()
-      else
-        fallback()
-      end
-    end, {
-      "i",
-      "s",
-    }),
-  }),
-  sources = cmp.config.sources({
-    { name = "nvim_lsp" },
-    { name = "luasnip" },
-    { name = "path" },
-  }, {
-    { name = "buffer" },
-  }),
 }
 
-vim.o.wildmenu = true
-vim.o.pumheight = 10
-
 return M

modules/coding/editor/neovim/nvim/lua/plugins/indent-blankline.lua

@@ -1,3 +1,8 @@
+-- rainbow-delimiters integration
+local hooks = require("ibl.hooks")
+hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark)
+
+--- @type ibl.config
 M = {
   enabled = true,
   indent = {
@@ -6,6 +11,7 @@ M = {
   scope = {
     enabled = true,
     show_start = false,
+    highlight = vim.g.rainbow_delimiters.highlight,
   },
 }
 

modules/coding/editor/neovim/nvim/lua/plugins/lsp/fidget.lua

@@ -1,3 +0,0 @@
-M = {}
-
-return M

modules/coding/editor/neovim/nvim/lua/plugins/lsp/lspconfig.lua

@@ -75,22 +75,27 @@ local servers = {
   biome = {},
   clangd = {},
   cssls = {},
+  eslint = {},
   gopls = {},
   html = {},
   java_language_server = {},
   jsonls = {},
   pyright = {},
+  taplo = {},
   ts_ls = {},
   typos_lsp = {},
   -- keep-sorted end
 }
 
-local capabilities = require("cmp_nvim_lsp").default_capabilities()
+local capabilities = {
-capabilities = vim.lsp.protocol.make_client_capabilities()
+  textDocument = {
-capabilities.textDocument.foldingRange = {
+    foldingRange = {
-  dynamicRegistration = false,
+      dynamicRegistration = false,
-  lineFoldingOnly = true,
+      lineFoldingOnly = true,
+    },
+  },
 }
+capabilities = require("blink.cmp").get_lsp_capabilities(capabilities)
 for server, config in pairs(servers) do
   config["capabilities"] = capabilities
   vim.lsp.config(server, config)

modules/coding/editor/neovim/nvim/lua/plugins/lsp/signature.lua

@@ -1,19 +0,0 @@
-M = {
-  bind = true, -- This is mandatory, otherwise border config won't get registered.
-  handler_opts = {
-    border = "rounded",
-  },
-  hint_prefix = "^ ",
-  toggle_key = "<C-k>",
-}
-
-vim.keymap.set(
-  { "n" },
-  "<leader>k",
-  require("lsp_signature").toggle_float_win,
-  { silent = true, noremap = true, desc = "toggle signature" }
-)
-
-vim.keymap.set({ "n" }, "K", vim.lsp.buf.signature_help, { silent = true, noremap = true, desc = "toggle signature" })
-
-return M

modules/coding/editor/neovim/nvim/lua/plugins/nvim-tree.lua

@@ -1,32 +0,0 @@
-M = {
-  sync_root_with_cwd = true,
-  diagnostics = {
-    enable = false,
-    debounce_delay = 50,
-    show_on_dirs = true,
-  },
-  filters = {
-    git_ignored = false,
-  },
-}
-
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
-local opt = require("core.globals").keymap_opt
-vim.keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>", opt)
-vim.keymap.set("n", "<leader>te", ":NvimTreeFocus<CR>", opt)
-
-vim.api.nvim_create_autocmd("BufEnter", {
-  group = vim.api.nvim_create_augroup("NvimTreeCloseOnLast", { clear = true }),
-  pattern = "NvimTree*",
-  callback = function()
-    if vim.api.nvim_call_function("winlayout", {})[1] == "leaf" and vim.bo.filetype == "NvimTree" then
-      vim.defer_fn(function()
-        vim.cmd("NvimTreeClose")
-      end, 10)
-    end
-  end,
-})
-
-return M

modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua

@@ -14,7 +14,6 @@ package.path = package.path .. ";" .. vim.fn.stdpath("config") .. "/lua/"
 local plugins = {
   {
     "folke/tokyonight.nvim",
-    lazy = false,
     priority = 1000,
     config = function()
       vim.cmd.colorscheme("tokyonight-storm")
@@ -22,23 +21,66 @@ local plugins = {
   },
   {
     "nvim-lualine/lualine.nvim",
-    lazy = false,
     dependencies = { { "nvim-tree/nvim-web-devicons", lazy = true } },
     config = function()
       require("lualine").setup(require("plugins.lualine"))
     end,
   },
   {
-    "nvim-tree/nvim-tree.lua",
+    "echasnovski/mini.nvim",
-    dependencies = { { "nvim-tree/nvim-web-devicons", lazy = true } },
-    lazy = false,
     config = function()
-      require("nvim-tree").setup(require("plugins.nvim-tree"))
+      -- Better Around/Inside textobjects
+      --
+      -- Examples:
+      --  - va)  - [V]isually select [A]round [)]paren
+      --  - yinq - [Y]ank [I]nside [N]ext [Q]uote
+      --  - ci'  - [C]hange [I]nside [']quote
+      require("mini.ai").setup({ n_lines = 500 })
+
+      -- Add/delete/replace surroundings (brackets, quotes, etc.)
+      --
+      -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
+      -- - sd'   - [S]urround [D]elete [']quotes
+      -- - sr)'  - [S]urround [R]eplace [)] [']
+      require("mini.surround").setup()
+
+      -- ... and there is more!
+      --  Check out: https://github.com/echasnovski/mini.nvim
     end,
   },
+  {
+    "nvim-neo-tree/neo-tree.nvim",
+    version = "*",
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      "nvim-tree/nvim-web-devicons",
+      "MunifTanjim/nui.nvim",
+    },
+    cmd = "Neotree",
+    keys = {
+      { "\\", ":Neotree reveal toggle<CR>", desc = "Toggle NeoTree", silent = true },
+      { "<leader>e", ":Neotree reveal toggle<CR>", desc = "Toggle NeoTree", silent = true },
+    },
+    --- @type neotree.Config
+    opts = {
+      close_if_last_window = true,
+      filesystem = {
+        filtered_items = {
+          hide_dotfiles = false,
+        },
+        window = {
+          width = 30,
+          mappings = {
+            ["\\"] = "close_window",
+            ["<leader>e"] = "close_window",
+            ["<c-]>"] = "set_root",
+          },
+        },
+      },
+    },
+  },
   {
     "nvim-treesitter/nvim-treesitter",
-    lazy = false,
     dependencies = {
       "nvim-treesitter/nvim-treesitter-textobjects",
       "nushell/tree-sitter-nu",
@@ -58,6 +100,7 @@ local plugins = {
   {
     "lukas-reineke/indent-blankline.nvim",
     event = "VeryLazy",
+    dependencies = { "https://gitlab.com/HiPhish/rainbow-delimiters.nvim" },
     config = function()
       require("ibl").setup(require("plugins.indent-blankline"))
     end,
@@ -69,7 +112,7 @@ local plugins = {
   },
   {
     "neovim/nvim-lspconfig",
-    dependencies = { "hrsh7th/cmp-nvim-lsp" },
+    dependencies = { "saghen/blink.cmp" },
     event = "VeryLazy",
     config = function()
       require("plugins.lsp.lspconfig")
@@ -117,7 +160,10 @@ local plugins = {
   {
     "MysticalDevil/inlay-hints.nvim",
     event = "LspAttach",
-    dependencies = { "neovim/nvim-lspconfig" },
+    dependencies = {
+      "neovim/nvim-lspconfig",
+      "onsails/lspkind.nvim",
+    },
     opts = {},
   },
   {
@@ -128,27 +174,30 @@ local plugins = {
     end,
   },
   {
-    "L3MON4D3/LuaSnip",
+    "saghen/blink.cmp",
-    event = "InsertEnter",
+    event = "VeryLazy",
-    dependencies = { { "rafamadriz/friendly-snippets", lazy = true } },
-    build = "make install_jsregexp",
-    config = function()
-      require("luasnip").setup(require("plugins.cmp.luasnip"))
-    end,
-  },
-  {
-    "hrsh7th/nvim-cmp",
     dependencies = {
-      "hrsh7th/cmp-nvim-lsp",
+      {
-      "L3MON4D3/LuaSnip",
+        "L3MON4D3/LuaSnip",
-      "saadparwaiz1/cmp_luasnip",
+        event = "InsertEnter",
-      "rafamadriz/friendly-snippets",
+        dependencies = { { "rafamadriz/friendly-snippets", lazy = true } },
-      "hrsh7th/cmp-path",
+        build = "make install_jsregexp",
-      "onsails/lspkind.nvim",
+        config = function()
+          require("luasnip").setup(require("plugins.cmp.luasnip"))
+        end,
+      },
+      {
+        "folke/lazydev.nvim",
+        ft = "lua",
+        opts = {
+          library = {
+            { path = "${3rd}/luv/library", words = { "vim%.uv" } },
+          },
+        },
+      },
     },
-    event = "InsertEnter",
     config = function()
-      require("cmp").setup(require("plugins.cmp.cmp"))
+      require("blink.cmp").setup(require("plugins.cmp.cmp"))
     end,
   },
   {
@@ -159,10 +208,7 @@ local plugins = {
   {
     "windwp/nvim-autopairs",
     event = "InsertEnter",
-    dependencies = { "hrsh7th/nvim-cmp" },
+    opts = {},
-    config = function()
-      require("nvim-autopairs").setup(require("plugins.autopairs"))
-    end,
   },
   {
     "akinsho/bufferline.nvim",
@@ -207,7 +253,7 @@ local plugins = {
     },
   },
   {
-    "ggandor/leap.nvim",
+    "https://codeberg.org/andyg/leap.nvim",
     dependencies = { "tpope/vim-repeat" },
     config = function()
       vim.keymap.set({ "n", "x", "o" }, "s", "<Plug>(leap)")

modules/coding/editor/neovim/nvim/lua/plugins/rainbow-delimiters.lua

@@ -1,4 +1,5 @@
 local rainbow_delimiters = require("rainbow-delimiters")
+--- @type rainbow_delimiters.config
 vim.g.rainbow_delimiters = {
   strategy = {
     [""] = rainbow_delimiters.strategy["global"],

modules/coding/editor/neovim/nvim/lua/plugins/treesitter.lua

@@ -1,9 +1,11 @@
+--- @type TSConfig
 M = {
   auto_install = true,
   parser_install_dir = "$HOME/.local/share/nvim/lazy/nvim-treesitter",
   sync_install = true,
   modules = {},
   ignore_install = {},
+  ensure_installed = {},
 
   highlight = { enable = true },
   indent = { enable = true },

modules/coding/editor/vscode.nix

@@ -13,10 +13,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    my.hm.programs.vscode.enable = true;
     my.hm = {
       programs.vscode = {
-        package = pkgs.vscodium;
+        enable = true;
+        package = pkgs.vscodium-wayland;
       };
     };
     my.persist.homeDirs = [

modules/desktop/browser/default'.nix

@@ -3,11 +3,11 @@
   options.my.desktop.browser.default = {
     command = lib.mkOption {
       type = lib.types.str;
-      default = "chromium";
+      default = "zen-beta";
     };
     desktop = lib.mkOption {
       type = lib.types.str;
-      default = "chromium-browser.desktop";
+      default = "zen-beta.desktop";
     };
   };
 }

modules/desktop/browser/zen.nix

@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  hostname,
   ...
 }:
 let
@@ -16,6 +17,7 @@ in
     my.hm.programs.zen-browser = {
       enable = true;
       nativeMessagingHosts = [ pkgs.firefoxpwa ];
+      suppressXdgMigrationWarning = hostname == "imxyy-nix";
       policies = {
         # find more options here: https://mozilla.github.io/policy-templates/
         DisableAppUpdate = true;
@@ -23,7 +25,7 @@ in
       };
     };
     my.persist.homeDirs = [
-      ".zen"
+      ".config/zen"
     ];
   };
 }

modules/desktop/gaming/minecraft.nix

@@ -14,16 +14,13 @@ in
 
   config = lib.mkIf cfg.enable {
     my.hm.home.packages = [
-      (pkgs.hmcl.overrideAttrs {
+      pkgs.hmcl
-        postFixup = ''
-          substituteInPlace $out/share/applications/HMCL.desktop --replace-fail 'Exec=hmcl' 'Exec=sh -c "cd ~/.local/share/hmcl; hmcl"'
-        '';
-      })
     ];
 
     my.persist.homeDirs = [
       ".minecraft"
       ".local/share/hmcl"
+      ".hmcl"
     ];
   };
 }

modules/desktop/media/all.nix

@@ -10,7 +10,7 @@ in
   config = lib.mkIf cfg.enable {
     my.desktop.media = {
       mpv.enable = true;
-      shotwell.enable = true;
+      loupe.enable = true;
       thunderbird.enable = true;
       vlc.enable = true;
       splayer.enable = true;

modules/desktop/media/loupe.nix

@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.my.desktop.media.loupe;
+in
+{
+  options.my.desktop.media.loupe = {
+    enable = lib.mkEnableOption "loupe";
+  };
+
+  config = lib.mkIf cfg.enable {
+    my.hm.home.packages = [ pkgs.loupe ];
+  };
+}

modules/desktop/media/shotwell.nix

@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.my.desktop.media.shotwell;
-in
-{
-  options.my.desktop.media.shotwell = {
-    enable = lib.mkEnableOption "shotwell";
-  };
-
-  config = lib.mkIf cfg.enable {
-    my.hm.home.packages = [ pkgs.shotwell ];
-  };
-}

modules/desktop/wm/niri/config.nix

@@ -5,6 +5,9 @@
   assets,
   ...
 }:
+let
+  settings = config.my.hm.programs.niri.settings;
+in
 {
   config = lib.mkIf config.my.desktop.wm.niri.enable {
     my.hm.programs.niri.settings = {
@@ -18,7 +21,7 @@
 
       layout = {
         gaps = 23;
-        center-focused-column = "always";
+        center-focused-column = "on-overflow";
         always-center-single-column = true;
         focus-ring.enable = false;
         border = {
@@ -47,6 +50,10 @@
         ];
         default-column-width.proportion = 0.8;
         background-color = "transparent";
+        tab-indicator = {
+          width = 10;
+          place-within-column = true;
+        };
       };
 
       animations = {
@@ -97,41 +104,50 @@
         }
       ];
 
-      environment = {
+      environment.NIXOS_OZONE_WL = "1";
-        QT_QPA_PLATFORM = "wayland;xcb";
-        XDG_SESSION_TYPE = "wayland";
-        XDG_CURRENT_DESKTOP = "niri";
-        XDG_SESSION_DESKTOP = "niri";
 
-        NIXOS_OZONE_WL = "1";
+      spawn-at-startup = lib.mkBefore (
-        NOCTALIA_SETTINGS_FALLBACK = "${config.my.hm.xdg.configHome}/noctalia/gui-settings.json";
+        map (c: { command = c; }) [
-      };
+          (
+            [
+              "dbus-update-activation-environment"
+              "--systemd"
+            ]
+            ++ builtins.attrNames settings.environment
+          )
 
-      spawn-at-startup = map (c: { command = c; }) [
+          [
-        [
+            "${lib.getExe pkgs.swaybg}"
-          "${lib.getExe pkgs.swaybg}"
+            "-m"
-          "-m"
+            "fill"
-          "fill"
+            "-i"
-          "-i"
+            (toString assets.wallpaper)
-          (toString assets.wallpaper)
+          ]
+          [
+            "wl-paste"
+            "--type"
+            "text"
+            "--watch"
+            "cliphist"
+            "store"
+          ]
+          [
+            "wl-paste"
+            "--type"
+            "image"
+            "--watch"
+            "cliphist"
+            "store"
+          ]
+          # TODO: Is there a better way?
+          [
+            "systemctl"
+            "restart"
+            "--user"
+            "noctalia-shell.service"
+          ]
         ]
-        [
+      );
-          "wl-paste"
-          "--type"
-          "text"
-          "--watch"
-          "cliphist"
-          "store"
-        ]
-        [
-          "wl-paste"
-          "--type"
-          "image"
-          "--watch"
-          "cliphist"
-          "store"
-        ]
-      ];
 
       binds =
         let
@@ -146,19 +162,15 @@
         in
         with config.my.hm.lib.niri.actions;
         {
-          "Ctrl+Alt+T".action.spawn = [
-            "kitty"
-          ];
-          "Mod+T".action.spawn = [
-            "kitty"
-          ];
           "Mod+Return".action.spawn = [
             "kitty"
+            "-1"
           ];
           "Mod+G".action.spawn = [ config.my.desktop.browser.default.command ];
           "Mod+E".action.spawn = [ "nautilus" ];
           "Mod+R".action.spawn = noctalia "launcher toggle";
           "Mod+V".action.spawn = noctalia "launcher clipboard";
+          "Mod+W".action.spawn = noctalia "launcher windows";
 
           "XF86AudioRaiseVolume" = {
             allow-when-locked = true;
@@ -265,6 +277,7 @@
           "Mod+C".action = center-column;
           "Mod+F".action = toggle-window-floating;
           "Mod+H".action = expand-column-to-available-width;
+          "Mod+T".action = toggle-column-tabbed-display;
 
           "Mod+Minus".action.set-column-width = "-10%";
           "Mod+Equal".action.set-column-width = "+10%";

modules/desktop/wm/niri/default.nix

@@ -169,6 +169,10 @@ in
                   id = "Microphone";
                   displayMode = "onhover";
                 }
+                {
+                  id = "Battery";
+                  hideIfNotDetected = true;
+                }
               ];
             };
           };
@@ -197,7 +201,10 @@ in
             ];
             position = "top_left";
             shortcuts = {
-              left = [ { id = "Bluetooth"; } ];
+              left = [
+                { id = "Bluetooth"; }
+                { id = "Network"; }
+              ];
               right = [ { id = "Notifications"; } ];
             };
           };

modules/i18n/fcitx5.nix

@@ -115,7 +115,7 @@ in
                 desktop,
               }:
               {
-                ${pkg} = final.symlinkJoin {
+                "${pkg}-wayland" = final.symlinkJoin {
                   pname = prev.${pkg}.pname;
                   version = prev.${pkg}.version;
                   paths = [ prev.${pkg} ];

overlays/default.nix

@@ -18,6 +18,8 @@ in
       lib.infuse prev {
         cage.__output.patches.__append = [ ./cage-specify-output-name.patch ];
         bottles.__input.removeWarningPopup.__assign = true;
+
+        easytier.__assign = final.stable.easytier;
       };
   }
   //

pkgs/jj-starship.nix

@@ -1,18 +0,0 @@
-{ fetchFromGitHub, rustPlatform }:
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "jj-starship";
-  version = "0.2.1";
-
-  src = fetchFromGitHub {
-    owner = "dmmulroy";
-    repo = finalAttrs.pname;
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-wmQn1qw+jfxH9xBS7bdgWiK369bCeGV9klZzlFHrGOw=";
-  };
-
-  cargoHash = "sha256-dGutKgOG0gPDYcTODrBUmmJBl2k437E5/lz+9cFzgs4=";
-
-  meta = {
-    mainProgram = "jj-starship";
-  };
-})

secrets/et-imxyy-nix-server-nixremote.toml

@@ -1,5 +1,5 @@
 {
-	"data": "ENC[AES256_GCM,data:oA8Ig5psbIudrjtN65p5IpK6/3UdTogB3yMZ6o5FsD+D79FIieGfHTrthHay2IcMhMftPcoYJTrtO9wEBo08oRSicKRCzjp6P/6toxZrPXXOiyG7SomxxXv98UNNuSMDoSUSQq0C8kkYCiPH+DOWaXvmwg7RPhmsX24dnQbay1Nn5psO10K2BYYdhzeev7FXTxFAtyfegEx9rBoJxBs4IThoNtqZJSUEa6v9G4KgrKVQIL+RP9+5T+hCPfL7NKmNxzNls26fkVglWymMbNvbNuizmTeEuX7Bd9+RBCcrAmqGK1kJw6tujf1gOecGAjtT+W/MEg0XvJuRv66vm28AV62+M4Ej9w9Vjj6Tf5vXbimZOVZzJ8ObWPchiKMU4vz7fkGkf2bSJ6q/y7BncQHDIt3fIWZH+zIIlejxul+7GAHSm6y8BGjEyRKSYipQwrdtQtPuCFxpu/QDnp7qfHYyJIYZdtpGUFSymFcjiN3cDnugIYf/AiNmc4MJOs3Z+we0GmvD1if9ERZDUFSGZlfWw+8TDKaCP1Yp3nd70kL3yV9SIYQbNGsmcQ30lYWhf8lpBtTuirfpTHBzJ3RM8xbJR3etY93Y1zQrFiju1GWJH5okvpZWk3WggMXIIr1Rcp1iB9F60XZmP9J3d+stjcl5qQG+gIsPCls4y07N7mn6g/OSowC2Ov45CweJQOGdhxXt8HbNm3BaWpAwiYr9VD3hxb3mldfDljquZCLiKxacynYVl7uvTDaQLUI=,iv:iPQQ/bZe+iNtv+vy1n3YW4mywYxwvyBVohr8ELycU8g=,tag:0lF1KADdhunLM1CEmzqwXA==,type:str]",
+	"data": "ENC[AES256_GCM,data:woTNsrZnU3IclRXuh41H82YHeFa6U8aT+ILtjUQ9P80Rz7sUwGinh7z+5bNJkhdTub4BZ+ySl8Ov0XfDKWClT4AmbcRCuwwN8BfOJ59v+fyzsBSu8Y7wXSPciY+T/4rn60HlnVCyjX23dMNWwuN08bS/4iDw+/Ur80/3li2Azl5+37y/S2ZbFU0FP3OCy/G5+rGI0IFTCzRMfB/wpDhesxGzi1epKWvFx0q1Qnv0SiaZlo8mpG+G997mltBMlVkmAiNq57VAVs1ZBDAOf56q1UUHMtExAQt0zad5YWZeBgXQYWG8AFgOhSBiqjpFkUkfysv1mYqWnA7Ej/fD/H8e1uckC6KT9m4w1l71JmIkuUMW8PN/66cGYwZ/gMrZTAwlaVqiYPE1ppmnvrQxukQMgj40y27sWauMK+biPRNTrkU7egjH0IHCHHE49vq3VDFa48SAYXiBCHV+e/Gy9Em1ImRn2lCzAoKUtI5ilccg6MyUbug+1aDWx5NBkhpVw751HyLiSjNyphzVZewo9hGun2F+Fl9NdhM5xpq4tM9bbnsm0y44Vt8FJU0dmY6lfq1qqI3MjLg14iET/WLTorxH0i1iJUYy8Z6FJ7ArGUv6qw7ECNH0ZeUiNk0vICniyRlr+9JGFiHesX5oajXVxOp6vA6FnA4j1jeUvOLViiRc8DxLZziyA7ZdKDXwPJ4JKA==,iv:Df76Q6DoA6lI6xv7nnN6bjsaMPK7dnM/WvVd/O4h6qs=,tag:Yi/inQbd1wCY+PPbq0By9w==,type:str]",
 	"sops": {
 		"age": [
 			{
@@ -15,8 +15,8 @@
 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFhGYmtrZyBSSEdH\nOGZDWDFhMzB2aVErTDU0Vk1WbnBSa0hmTGNMaXI3aTBuQWMvQkRJCnFpYkRFblZV\nRzF1eGdmTzFQcGhTWFZKdmhyNzRHdEFFSjh2Tnl1NXlpSkUKLS0tIHFLSVJiRkpw\nV2taUVdlS1h1V1Y4aE5JUWVmK1d5UjRleVY1Y0VvcmQrMnMKpD5nffC057mv+1wz\nXL8bOS3vBFoupi7IbKw56e0nGkRuMq+Hf2eCKZDRRlLbIi353xXFki7PKDk7ltu9\n2olKQQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-12-06T08:17:32Z",
+		"lastmodified": "2026-01-30T13:42:20Z",
-		"mac": "ENC[AES256_GCM,data:MhxnoWuoChPShQZ1lbPGRf/IHLMYLUIGAbE2Rd8OoNOvDy+HA2RsQexKqQUbEZ5Nwz0epLxbiONdDdvpeREOFTMYuKKqR7HlbgX7/lMzqcUnKczdsHdrZL869EodWE0jjULtOtWlSOtVmEJXDLj0t67/nt0IDSvhm8hx1i+wFUw=,iv:3QjJPGUMWZNLvwwqq7qiTe56/Fy0jFAPEKBEgBPFCOE=,tag:0LkLaPHktgGZQvANH+4qlA==,type:str]",
+		"mac": "ENC[AES256_GCM,data:xZmGhEqVh5SIcIfaqOSs1YV23QHXachtBx40C+oyasFvUBhqcniuDHcuFQSmzteywC6jH3r91ilppPjWERz6ml5cfHzBdkbirpbWJg5Hqj+yLz3f98tGkAMmZyc/zc6XkM9BbWQI+R3R9bEaFZ95bnzNeno0EwneEM4aGW1ZsKI=,iv:oz197xm93q7aG3utudgMr3nVdS1IcmTxfnhy7Jc1N9o=,tag:Ar4s0Yjb/xApc0YgpikKtg==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.11.0"
 	}

secrets/et-imxyy-nix-server.toml

@@ -1,5 +1,5 @@
 {
-	"data": "ENC[AES256_GCM,data:h/Pbvnv4Yl4FbXGZVzbIgFe5U25PxsMnVvFxjKMadzPmGEkuUcTuJIiAgmCvEOQaDDSczvKnElh7LI9ZA2VnjP+Y4m0Owh/01MWCHuU+FSlUZGGlEPFZAYrjyxaPW5O3hroizX30FanCNn+n4WJBuAqGuvqAXknXB2Bp8qNUoL5na/J0a1U03upyRIF+FgWWzKsKS5qRLPJposkbMSIFd3n+S3emISDsYIIOEYUhaTkc0L/l4av/VLvKHszd0fUfEn0fFpR7qYCFvomDQ5svLOlxZRQrqv1WV6nCl/WyLK05DPozig6WaC+xa5XUZ0e1JtT5t3QK17XC7PnEwnORbzU8wcWWjOXhs6zsm2stwWzXvsYgzh0cMXfELwlp9QvFp19GqQF3VytWXhDrL5IpcYBb7/3vf6SzElx3kE7LHqBeNZMhRcpedi4ZLBMo1dUoA01Wso5BKs23WVXlLttoNpVXGWTxb/hJZpL3qX8LvXl1m47wiX5d0/6KJDKlupgC9rMHijsuXEVuDONOY6SZGWGlvX6/fudEIt6gHF5ipGJRKstTy580RVJ2MuCObvZSNV/csAnmQLmjmrVzeIv7L4YiSa6hi+Pjvh+yh93LbGy9YDu7MP2m4s4cioUZZTU7tNbC+I+GGSQclwQrGkhjsfCkmA4yJAu4ZOzC5MexZpL89OpsoZ7gQSIBGr1dWvC3+gQIllUvtgDGIqdyWdi7J88DIKNmPMo6c/+dIhZG96v/y7x0Fhi9EwMc/iTH16VV/5Nvpw==,iv:q6mrVJBEaVmVrESZZgIiyBMkVR117CQ9aCZgXFrhLW8=,tag:79/1yxfSrPjixcAellYfZw==,type:str]",
+	"data": "ENC[AES256_GCM,data:TroErAaIJCpWgVkxmoCgxCekphwh5x9oiFXnENXoiXiAaWnUWSB9y2sNbuGTxq8ngWt9pnZ4ZWWCiLaMvk1b/rjJCZzF3mJh/SuzqUkrayspTPcSTbQVHOHlrH7TKVSBJDQCZmAw0k4E0unSxoujEOorymzTY8ZxJTuSu3ugOez7Z48bDTgv4xMG9CvJku/HKakg/DgrAGaTXgfwal4hSB/9inNd9e1uq4clrkDhsN+zg6uJ+EHre/MUkf2MaIG5EI3y904+jm5Zvm5gTynPCjbVvVyjjXenGOwzS3fkxSVJjDvZItn3QZpKC/OqyrrX+c0zEiQMK880E1Ru4f13QphgWoMkthtdNSRoJqKHuK8UJ5onlfOmLkfQjKQ5cIYWgyI7dq5Rfx2yGbNMNEwAQodN3AC5NaLHdcFbs9Yi2VSAKbv5aEifizHYy3HgjxYcSW0EM53/Sn/CL8G2HK7ei7qeYbTT9bFbpgbPYiUeBuaN2Jfx13Mh5yWs98NhhIltjWtrtvvtBrBf7tPo2nAGVW781MaGF5uS44WVjxMMrFPq6WHRB9pwop5AS475h6ihmUIx4Pg/3JFV1uLXtvEeNuiBOULrwdkt1MXRxz6uiYux3WdWpljq1AIvRCLN3Ehi8VYEWyvEbP3gMp9EeOeJYXZ07hFV5dJCJTF7V1sP8GOCWmj0Ro61CEH13OA8V97M8Vi6ZdQg/o+Q,iv:1/HTU2AHTRSPun59Xa28yjlg312bTdDkiicQzO8515E=,tag:T/wEKWpWbhri1ZttG1JRwg==,type:str]",
 	"sops": {
 		"age": [
 			{
@@ -15,8 +15,8 @@
 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFhGYmtrZyBFZ1J2\nNk9yWUNaemVBOFRiVmdmWGdRWVN0UG5Hc1lZRTBiaHdnS0E2UlN3CitPUmdjdVdu\nS1FXbjVCRkxZUk5KdW0xRzNheWJ1TWVYcUJMK3k0TlRFSWsKLS0tIFJSTlN4a29x\nWG8zUlcvYmlZQkQwT3hlWFlOVUIwSkt3SE5RTzhQWVIxUkUKVSMJtNCEZ1KpcUgQ\nkuTFjaBHvizq980kkbNbD4FgeCAPZ3CwXA8/nKhN03iPeFqwX5AsO0n3+ge/qMnO\nkoRc/Q==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-12-06T08:17:10Z",
+		"lastmodified": "2026-01-30T13:42:30Z",
-		"mac": "ENC[AES256_GCM,data:TcggNSUao5C6zGSy34feYSUPvzi0ovDug8ZrvW7yMash/1cGZDGemwPy7fSfPdMWFcWfeGPWUH3nd4p3qzFLzyVGvVGPHTi8oiDcEQtqnye60otBwHdT2vcMoXawSFNe5r8c2llNUgYf7iIBBU1n2l7qCl1kjfl55KvlInZFCuo=,iv:9bpo1DKlBCpciVEdotkHkTMsmH/bueYixzyTw+i4SzE=,tag:Cp6C38XuMhM+pT/TDqJoMA==,type:str]",
+		"mac": "ENC[AES256_GCM,data:KuB/Zdzy5gKDayUY0YhSNrKMnG1tdzRnxZvsTjj79lYoZzQ/9Tw1mAmn3vBjJx/aZtpXusxN12uxP1vzqFoAOpvbXGTDRv7fhCaq1CSayWSrhddwRlAIaQ6tUAOOu/fcoofTB6KWJNFhhDwn+o5lF48cgp1m7SL+op1NDkXBoK0=,iv:J0jUA9LfBoT1hBgoItqYdM6MmRhamTZCo9/TJKF18ck=,tag:SynvQk7+D83JAikLH4HNSg==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.11.0"
 	}

secrets/et-imxyy-nix-x16.toml

@@ -1,5 +1,5 @@
 {
-	"data": "ENC[AES256_GCM,data:T2IS0YoXom06cIz/MBUVOnYQtGaMvrlmirkzXkG4pWVm4oKSmRaVoBoIrMpS+/R5AcBc6ZUvPXLl51OXoCWtRhqWW4lVVX9dIcbpufO0N4m/nH3oa9gvHdzZ5TxXrVGg7UnFcVfOfCGPhsTBNVtVDfRsZ9VozDSXeRoisd1D35xjoKEeultmMCg5CMoD4d0aPtBe6LCz8qxUxhsfx7AY0iNYFYxtXSj+uusRfFQvZiOkmSwnxdottRNIDgBXzeN4cxheuoRs7xxQ5NNbAVKMZbk/2R4eE234pXUsnhqUOsnDDwPkBStl46rxO1lMilp5IxPgLDGwqsWVQvKDP1O/jLKoIB0l7Qx3K5UvS3Tp7AcleVuUDywaV2J+b1vD+/2ogNHEKHBbULyVCDMzlAODxKzMYMx8v9D2YqKkDyoy/YRmSVpTnkHV3e4fnSwqrt8/VyjhT9f1N0jAS77UGKunuMHWLVO4tu/DKL7oGM5vb/nf3BYAqMhNSsVeX5R6GIxIJXn1FxPdWvYOryyXV5ynapkBalGKxj43LE810jVDQNQHsQ4eNn86QHfXikVCwOYXRz0CkG1fYam6Cm/GJaZz3tO+1BZclo/3Pd7hmcDYbu2EFC256HkNMcp4PQOVlzMhwW9z5Sv6UQ828JpzZ/AC4fPcrbpPNEX862L8c4mnDkuMsVRBT5Xo7hNmZxZXhNCe9U5M4z4FTDiCzfO4+V3ww4VCVpTlHjZYjEjmlBoy5EBl8l/K2QJDhX1DegxEKsraKhM=,iv:76ZNqA2wbZT04gEAyzxfKubwkCRfWZQKoCbLJWKhB+g=,tag:Qj0aG830OJmzVRc7NIjxHA==,type:str]",
+	"data": "ENC[AES256_GCM,data:pOo8Rmhpw99QVkUKR/MHo1MoRfKzWgiqXxxX22g2ZzjvinCO9X/N6m63I1XlpiOMVmpEvzFtvQXfaZy7a4D4qLmpa48jsEgGLPm8QXbPFpXNCAVLKU10msKxw/m04dZbB6fJADvG5TM6wMFmsETLl0wMPXPffW2SI4CysSZsmSXUZKGAKjr4sPkUCDW9iiCKTo75r5eLVE3HH8j1OeIknzTDX4zJkoci70pVm7CnKi7bjt515cbq3V9aug7U34I79UlGOB0NWNEU10KodbjnZlY56+K0UBsz5ao+BwRIbxf40a5QUXd0bluqzHENpXlsUja0eSKG1kWFsB+ek5S48GA1SjRkXpStvZoHpUZ7YjeENdqvS1rjteUkrexSB0h3PntJmreERcZoO+MJYVsa5MpF8VkEz6oI9v+ECUA70YEZw7IszsHhq3NnR21aUTok/S23XpbEbxFuKdseQ+8VrBI6z+udIS8o579xcLBXSDhe9vvrdqjMw4enQI03/eKWMjUD8e5r6VbzSaNIQAeh+D9A0CR8EceyFcccY9/XfB2iPzVK1F/PaiAh6oMxWRnyj2wg3GWVoxNHsOKloWfPN68X30V5izvIWlmStRfjvC7yakEde8B6V3PabO8rQlezuasNCvqKIw==,iv:eKRT3L7YXMpJa+QGy7MuB73RsjVIZlaXbc2A2UKrZzw=,tag:7YZ2pqP0xUo9N2ByTEwW/g==,type:str]",
 	"sops": {
 		"age": [
 			{
@@ -15,8 +15,8 @@
 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFhGYmtrZyB5RjZU\nR0RVcTg3L3RQSmZnQnJhNm5vaW5URkNySUNORVJTRzVyWVVHdHdvCkd6Y2tvV1Av\nSjF6NkVNNjdKWnZyNi96bU9sY2VkalJNdWpxQUcyT2R3MFkKLS0tIEpkeFpWUE9t\nY0ROMS84QmM2U3M5aUN3ZkdQZi9JYnZCRzl4eDg4NzlrUW8KcuCDvvHFl/oyjVAo\nDlH1OOwPELWVWqckshUkX1MCMW+Qcv5R52jICVlyBVsyb+eiX4Bxgo4KM352KhWB\n5hPnIg==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-11-22T14:16:58Z",
+		"lastmodified": "2026-01-30T13:42:54Z",
-		"mac": "ENC[AES256_GCM,data:HjYkIjlNmRzkFgg7fNtnTsEAoyJZmn9PkdcMmt/pqrq1VhLlA4WRlRpQ13Ah481kLHQ6OtOrVhJZ9NzHVa1kjojOqMEkj4IJ2nqX9fUGLYPsOV+e2KuVk82pQdrorge7WnsWxHzE73NPWwBc7duKFcgays0HHeKyygMxK/L5Y10=,iv:+eF8GGCmp+hQKBJRljEcBzM1ihqUtd59R5U1vYbBdl8=,tag:wG9Bhw77IlXy5r1rF4dgOA==,type:str]",
+		"mac": "ENC[AES256_GCM,data:dRhW2TK8VoeAAgxieq13N9DOpDebn23pzSGVOUR1CREv7xBlQNbbG5oZ8wtOMmVPtYYITsbrP+83Bvc3hAgF+TJ5Q+bUIc79YrpKE4JQpIkF54XWuQS+xr6CQViRu9IkNSAINSDBGC/h7TQJbU+VynUbwTTJWdDwFOZRDCWxlXY=,iv:33D22OwdZ/0p5PTy6iPjoiOOHqMA12NTCYSWSUMTQ6U=,tag:Kal99S7ufV+JsTspWaX7OQ==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.11.0"
 	}

secrets/et-imxyy-nix.toml

@@ -1,5 +1,5 @@
 {
-	"data": "ENC[AES256_GCM,data:krNquVVDLJZRUJ4CyNo3zbrqchFBnermnvuW3339terrINV+A0MSfN+f3qbNdUWklwujKIPCvvjowZxZwJK71ncogpmuijDjkYRbpha6HSAdp1wjdj9mHNFiSGZm/FjXknSoxcrLrSXLJ+YDI9GkqpJ51UN0wvLD6ADXgcU1dTnxdzf/9/xX7RjxKDo4e4f2KLokA2TZMhi41Sa2pWOaBc7ZFT+d25a1h3rShbMK8BDEeGTMraWuaIm76kUgjRJi1OSdLk69a/a8alNPeWox/G2tWypMSYqvlLXnnMorE/4UYbkV09vrzb7F5Cv4/mqDVyr4e5kHZ0bs/5ZgTCXi9BvLLT0CnWC+9pCrRy/N/qHjNgffR69Mngh6Ty0mgsKKK3kmMITxXUnjhdooScR+VYErAF4clY1d7LuvffJG9obZg4BVl1xu+DrAAHKJJId5cgRl0sTaEsY66h7VSTtw1xjCfaeGSYamE2K/EuMay+GzUvtSVt2fUJQQ/uxPTj0DomNUsMSKdI7K23A0YEqo58tEJb4+CHgrOvI/25e+o5gyjRdDCe849tcQt8hbvGPMIONqcxAQz2Wa2VGeE3JZulvsILNdp31r56gmLfw1hsdnV9uWbzEbAZ6LNRBlJ/mXkCzCXMGouJRoLuGEkpfhCl98MUEX3etIdu6Ir9iKAy87MTZ/WW1yK9kzMdKd+YYU56E=,iv:KqJbHa2yjBhMq2IDhjMjwxqUTfluLQu43CxrHfqNkb4=,tag:wLfqFdih8oGg5yaXzvbC3Q==,type:str]",
+	"data": "ENC[AES256_GCM,data:bNSkFEL7BCq7LJYzK1X0Fn8To+So2+QTSFUN1DZDFlvekywoebj7txSM7jSQKYC3+Henond0MRRsriVOHu61i/k/i7fjOHPi93of4ny5wcS+t3NrFvN3RufNjQqe8CD+y4mDaUge8GGrFBWhtQV+1uw5hbXFOIq8l9JqkfJ8y6bhBi/fznCdO847zvZ0hAesjmrE/tflWn/T7pkNnfrVFOJR0FnXsVavlAVbSxtsrppaZPOgJFNwJ4ch6rP5PxHSyCpsbkak9H2nJOWJdXKGobKG3g01YCjgYMOX9rIfOnFcCBNyZWPGLx9ZT0h4XsHWM++L9lCNHjy4Z40wyl7YMq797HlKEcGEv2RM2KsfO/66836v3JzT6ZAO32otCbSa8e5vaYSKBZVZM/wrzNcE/XTNDRAQij3a3+bZtZDnxhZSQ3FJQVGm4agCbbO8Dqx7buWHGhgMmxnR6ClC3Ilgm9GHAWKXPBCDT3IEgc6S2g5MVKurKcR2Abffl/mN6KQjNocbIXKMu+dvInuW+30Mit5dp/dYBmWIrRqKO/hQtwDFp6jLHo4O+7h7/2YJDlh07W+ejT7vJy1+C0K4eAXSoGTahSgo61Y2F8LKHGBwAxl8N4ri0jKKOH7wB4pkyU+ryjQaeFhB6g==,iv:8f9JchFynDlOnYjrJiK/9ltkykaw5J8rWDwt+QFwzOc=,tag:owaHraC+WUQKn7hMXHcCaQ==,type:str]",
 	"sops": {
 		"age": [
 			{
@@ -15,8 +15,8 @@
 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFhGYmtrZyA4RjNs\nWlYvc0tEN2hOUTA5SEV6MUhTeFViRTBqVWJLcGVDZ0JROCtONlQ0CnU0Z2FWQUlw\nakt0dk1nbVFHaVlyMjBqS3hCSDdHZEYwT0pXaXhOclFvSjgKLS0tIG9ZZUQ2dTI5\nWFVJanhac0QxVHM2b04wNE1jcHdHa3JJYzBlTE1iS1ZPTHcKZPvA9MwYT4JfG3/F\nqSI09TWeEv7TAWGeZr6OS++egtpdVoM3hF8s1B1TZb3bf/BMqo49NEkvD56pOKvo\no0jjHw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-12-06T08:16:57Z",
+		"lastmodified": "2026-01-30T13:42:41Z",
-		"mac": "ENC[AES256_GCM,data:CanRJamcOHb/rfQY9l6EDQSXHTFex2bvUy60MetTtjYNbIHOOXhNvvkNnO4vD6Wrq/ciZGyeqY7OB5+6bCpogVKbdhyyUA2gZM0dxymvPywk/T1cBiqCMNN9JBgrL8BqhBCVtGbtY82MnhK7c4caOqlxmhqRwyELFW1XwwTrqqI=,iv:PGx/qQr3XBt+WqQPKe3SYZTCWHbEeq+jOX43qRdcnPU=,tag:AaOG/jj21DKHP0Oeybc60g==,type:str]",
+		"mac": "ENC[AES256_GCM,data:SRxuYiRBCgdYid5GlYDoPbhPWuNPq2A+ItvIuEg8H2RZPpovbdDaj1wO7Jkioy+s5bbf4d8eha3v7hXOmU8cMJ7VdTfQXbJlYMGvGoW14G3d13lT8pyb1goswatF4U9CkSBDVLyyCARloLQQD4jfrts7kvdif/Z8kikStpvsHw0=,iv:h7pf0aAVAEkw1b0W9aYIEYVdq43tByngFI0z1xw3lqE=,tag:/URMCOLxBWxLdXNDr5e0Ig==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.11.0"
 	}

secrets/frp.env

@@ -1,4 +1,4 @@
-FRP_SERVER_ADDR=ENC[AES256_GCM,data:qLByokyez4CQjrTiyOA=,iv:XLHWlL3arHUiBJU9lFjhnGuGCV7uncelom+ppDY92yo=,tag:6VrLeNhY8UOpCafOALmm3A==,type:str]
+FRP_SERVER_ADDR=ENC[AES256_GCM,data:sFBlvhOCWwSB/TpQMEJ6h75hLqI=,iv:D31p3jLjU33TRDxoolAxsTLxlPjm2tq0OesNqzNX3t0=,tag:TZGcOt8kGTFQqgHe6mO30g==,type:str]
 FRP_AUTH_TOKEN=ENC[AES256_GCM,data:CXFJwOOHEbtn1PI0TQc=,iv:yItYliwZGxZs8YAWksV7BqJP3TUBadxXpf99J5nXR3A=,tag:9earTQfuoLO132UZnTjlWQ==,type:str]
 sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDltTWRrUSA3MGVN\nU2NSR2F1R3g0dldCbGtaZGRtRCt3NGg2YnZQTGVDN3RtaEhUMkVzCnJrdzlRSTB4\nVG14KzNXUHlib1RGTy9DVnJwdDRaaTZ5ZGVoWWUvNm9KSncKLS0tIGVpMlQzQ24v\nRVhVVTVSTWNlUVN3L0x0dFJMN3JxODZBTHdIUFJxZEViWjQKv+64wRf+a0Ci4XXp\nesM8zaQXeFPIstdsOJCj8yD5ARZi4kUnhRjRK1/xmjyLmh9h8rZ3QQyUF4uh+Jhi\nQJ0Qkw==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_0__map_recipient=ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO
@@ -6,7 +6,7 @@ sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb2
 sops_age__list_1__map_recipient=ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB28jpN+h5euh3NtdN+A+EtqgIatC22e4i1TPTioKire
 sops_age__list_2__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFhGYmtrZyAwZFFW\ncERDSnRiL0dMbmVQMGhDMWNSbXpUVVhXeXJreEVzN2dmNlJpWG5nCmV2OGVUMmZ3\nQjRqdGlnc3FtWVpxbHhnMk9xeW9BVUdoTlFud3RKRHNKcVUKLS0tIHZpbTltYnNk\nZEVqUWlhdmloRGVQU05YMkF5aUdmNExPVysxZm55czdZVEEKWo3hFbF1007tSgYq\nzVK1ycmeQglKDNPS1yVedBoF/gj1L69EmjhiOLMMwAetMINufQQpcFRR88VQlqQp\nMPaXMQ==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_2__map_recipient=ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMb5G/ieEYBOng66YeyttBQLThyM6W//z2POsNyq4Rw/
-sops_lastmodified=2025-11-15T11:39:18Z
+sops_lastmodified=2026-02-09T12:55:51Z
-sops_mac=ENC[AES256_GCM,data:YW53nGjb0ypDpKslt1oQW44jKYD7qYMR4S0O8BQl53Td4MNN/T7mz7q9Z7CWSY0G9sz5Y/lNjlWtQ7wZItbXfYeD34T0Zo/kyIGmM8GLNdn1P0yCd5Z09Y48cyyOaJLz8OK+/qEo1wTjf82BvpYzE6adeYuTSzxlvYTt91N5UNI=,iv:ZWLMYlSS6wiuv5UVjaf5o6asewYxp5wBrXlEhrL/R/s=,tag:ZKt7BtaSPNtmdTary9PUjg==,type:str]
+sops_mac=ENC[AES256_GCM,data:QrjmzfIEQJ0jLF1+yTAqeY3xvgTVT9KDpK1ZoAaYwbUf3GHC2jjZOqWdLtteZuHQZ3Dy+hO550cbiAYVnUUCjdDTPz0apmT+dIH0JtEjOeA7SEwpt/bSwbAFLEDPeXdPAInWsWyOLB2MY5SjDCOP54+rhb2CDnwkgTH7iBPw5l8=,iv:5568pH2EZ7xwB3m8O4GrJ8j+/fNrOwhwCqN3qwj1DQ4=,tag:DAyqFr2PJnUP20+IZ54obQ==,type:str]
 sops_unencrypted_suffix=_unencrypted
 sops_version=3.11.0

secrets/mihomo.yaml

@@ -10,39 +10,22 @@ external-controller-cors:
         - ENC[AES256_GCM,data:Ow==,iv:C2R4gooPGj4lranMXP6Uu+nCbGhVk1S37dBKbYgdsRU=,tag:onXhjT4c/qMoayForPKwEQ==,type:str]
     allow-private-network: ENC[AES256_GCM,data:mxDrog==,iv:L4hT2zLieK7nQnp5GvdHTsnSkeTz61v77nr281lAcag=,tag:jCQgs+0aDrl7BSZYxI7qUw==,type:bool]
 proxies:
-    - name: ENC[AES256_GCM,data:524kL2VUV/Zr,iv:up5Map4oTAPmalvdpiZAob4wrxMAPu9w3Nk8VclDPOI=,tag:9FKxdoiHzUI9LBpt9QOy4g==,type:str]
+    - type: ENC[AES256_GCM,data:82CKWRU=,iv:MmoXN4hqcC2BE93Tfex3swEj50XK6jmjLIWAyRs8WRI=,tag:faiVNIHjq0fRMLiiJoWamg==,type:str]
-      type: ENC[AES256_GCM,data:C7hjfARP,iv:r+5/qimlashka+qMjrtlsOEMBFuN8/4SDrzzW/WM+KE=,tag:VVpvomQxVFxh/GTRW59p6g==,type:str]
+      name: ENC[AES256_GCM,data:mLelhl+5dSLY5TIjoTw=,iv:cJtCH/fMib1KapWVQGsRgy5yRCUC5EZq4RdahEb7NyQ=,tag:ree+OgPt6ixLigZVo06dwQ==,type:str]
-      server: ENC[AES256_GCM,data:UlqxHe1H1J1OH4Ld,iv:um1xP8HAqMTv8sqZewFBFaIoKq5MaVqultx7q9A9v4A=,tag:gGR1Uxwcap2gZYBmPuG76A==,type:str]
+      server: ENC[AES256_GCM,data:Y5fvB0IJTMLASoZTxGKK47Vy,iv:O7OXDcbN7MlZvXYMgUiaPAUEi+L71kkjNmjuA3yeVp4=,tag:3V0w5k2K247W0VLHP3NG0Q==,type:str]
-      port: ENC[AES256_GCM,data:x46frQ==,iv:y3ZtVJQP3q08duFGUXSH5xLo9Q6GZmGvhmCKzNiztfE=,tag:2k6WGrK1wGa4QwOYJHnwkw==,type:int]
+      port: ENC[AES256_GCM,data:wX7PiQ0=,iv:TjP+EpALTY1JvJ3A3D+Y3+2e4WfXCEU1TW0c5Jm5iLs=,tag:MK6Of14YD8286wZMaiU/uw==,type:int]
-      password: ENC[AES256_GCM,data:SoxJyZJLwxRQoErQ1ZHObnM=,iv:YVDRtTb0P15vA67ZUQgCBX1s16iqjrtG0oodE9RPDMI=,tag:zsKj2mwEWwDtJ9QGtbix2g==,type:str]
+      uuid: ENC[AES256_GCM,data:ctolvO2CZR0rBmygCZ5xJT9z+CXr4tBhPXK/XeZLUQG+B0l4,iv:2kpDYwMRDgOgZZDlT/ubbNGgwziIx66qgQr7AKb1X7M=,tag:lPr7yX309LKCXPXhr9XgCA==,type:str]
-      sni: ENC[AES256_GCM,data:rkDSKvEwqgNZE4Yh,iv:Nfi9j5/IKygbSDgBAvAzHrqEYFMQPXjdI3aKHNiFdFs=,tag:N7MZw4nUOGlo4RIo08DAmA==,type:str]
-      skip-cert-verify: ENC[AES256_GCM,data:uea1ExU=,iv:z7oRGpeLjzXA1RB5E3ucJu/bPo110v81AFR+4dDQYwA=,tag:AsorLzyJfwJNsJShlXQBtw==,type:bool]
-      alpn:
-        - ENC[AES256_GCM,data:bG8=,iv:7UIRMQ7KGnZUPvfFMGLcworWFQFdd9toCasEeg/IEco=,tag:QwkRWsGXBGxODKIasUqXuA==,type:str]
-    - name: ENC[AES256_GCM,data:xaDTRcazw8v4yIfIXg==,iv:oH0Rq1OBLYY32EipIUv0mjIKjq/ybJergz/BIHknJDk=,tag:Qk8LoifCjYvaYWEWytfZAg==,type:str]
-      type: ENC[AES256_GCM,data:82CKWRU=,iv:MmoXN4hqcC2BE93Tfex3swEj50XK6jmjLIWAyRs8WRI=,tag:faiVNIHjq0fRMLiiJoWamg==,type:str]
-      server: ENC[AES256_GCM,data:xPCnWkVYwD2Ty0IzUJPvY6U=,iv:Vz2QPfHSsVc3jVWj4hPNkMl2zCAvQgb9UdmMTEjdLHM=,tag:Ym1vSk7J5Zfi5UAVoCNq7Q==,type:str]
-      port: ENC[AES256_GCM,data:x46frQ==,iv:y3ZtVJQP3q08duFGUXSH5xLo9Q6GZmGvhmCKzNiztfE=,tag:2k6WGrK1wGa4QwOYJHnwkw==,type:int]
-      udp: ENC[AES256_GCM,data:8iM4vQ==,iv:5nefyZ4vsEhp1/XwUbmXKnIIcxEtd5SohSQ873OgOkQ=,tag:iz+362f4UOcJyphLB5tSww==,type:bool]
-      uuid: ENC[AES256_GCM,data:VetgP1G1uk96GkbkSfjxSEm95IInxRqntOBiwF0CmMXMpIzY,iv:Kzh8gb6Lu3yiy5wXIUBOy/U2m4apjeFbLu5sKBwGWUc=,tag:y4LGosvnP8ndmyUQ/MMHTg==,type:str]
-      flow: ENC[AES256_GCM,data:vHCtuVUj2yIKxyizOXTuyQ==,iv:+shc6Vge0B6xo4+2vW7QdO7k/Jh9w8Fu1zMSusgbiEs=,tag:2KSP/SBjp8ytO2pfBAKVVg==,type:str]
       tls: ENC[AES256_GCM,data:bzKiJg==,iv:gQCofh2q5oB1gjNPgRfCALO04ELEvzRCwQYjzMzSQEM=,tag:QEqyUd5uYS4QzbG0tL89vw==,type:bool]
-      servername: ENC[AES256_GCM,data:MnvMN8il4yFs0w==,iv:LXpx+PWbHboJebeW/9fWg1Pcbqbwli47AsKM6+3BYKE=,tag:jZxyCkjpospSIM/6nXfmMA==,type:str]
+      servername: ENC[AES256_GCM,data:+qhHvM8+7o8dS5l0hdA=,iv:NE+Il3P11fhhLQ8OT5ExCwWBQROrN/h2iEkVoHGBwh8=,tag:j/M3aX61J0KMWmf7CGt52g==,type:str]
-      alpn:
+      flow: ENC[AES256_GCM,data:vHCtuVUj2yIKxyizOXTuyQ==,iv:+shc6Vge0B6xo4+2vW7QdO7k/Jh9w8Fu1zMSusgbiEs=,tag:2KSP/SBjp8ytO2pfBAKVVg==,type:str]
-        - ENC[AES256_GCM,data:bG8=,iv:7UIRMQ7KGnZUPvfFMGLcworWFQFdd9toCasEeg/IEco=,tag:QwkRWsGXBGxODKIasUqXuA==,type:str]
+      client-fingerprint: ENC[AES256_GCM,data:88kICBNA,iv:i3h8X0hpUeezcEiRd2nbrjVGZ6NLHH7Ka50bRFoIwEo=,tag:OFkRfXxPWYX+eXoVnCLGpQ==,type:str]
-        - ENC[AES256_GCM,data:pOVgMomF7xs=,iv:KfTzpFOCBb6TLGs3ONHKbN7xSroiiqNYxgh+OLc2+OA=,tag:c54xKm85/lQC6MYUiYmz5A==,type:str]
+      skip-cert-verify: ENC[AES256_GCM,data:SKLBC3I=,iv:3YVYwUL1TkF1Q2jP8POxTXj9P32snbnQKU9QNdQRNOE=,tag:vtelcGHAUrMqNttYVk8JZA==,type:bool]
       reality-opts:
-        public-key: ENC[AES256_GCM,data:msJSCf4irU8nGMZqSNU9sbZXD8bvJKvGXgPNGbGWZr1Ss3p1FWT7EuDwNg==,iv:EZzHRBuAni9/CYD1pBhq7xmjCG3bsH+MvaYtv63UYnA=,tag:+3AM644/OO3sIDMXQMypyg==,type:str]
+        public-key: ENC[AES256_GCM,data:njlpWUGKonBXtEo7KiNKsjiwmq9ia3MulDG2HCCtcBrGtHO1w1OzRoI07A==,iv:kXR0X8BEYSU3O8vSJ2d12Ckl+kD6c1tI7UHCAIyfTto=,tag:4Pwk3MEKu7yJf1LKl1C9oA==,type:str]
-        short-id: ENC[AES256_GCM,data:ERSoFfp8UlRBJr/6CRUgWQ==,iv:sWuK6zVbT2gNGDuhl981aXmg/IUenLH9Xk+EUsGbL6o=,tag:qTNB3XYJudknkQUgJA/mow==,type:str]
+      ws-opts: {}
-    - name: ENC[AES256_GCM,data:zKRNc9xfDgCx8Yxpp0I=,iv:plmHDReDGfVCz1i7QlN/Oo+5hhME2mw0il+LdgE+pN4=,tag:BtXj8qG5UeAYMAbcWSRnaQ==,type:str]
+      http-opts: {}
-      type: ENC[AES256_GCM,data:C7hjfARP,iv:r+5/qimlashka+qMjrtlsOEMBFuN8/4SDrzzW/WM+KE=,tag:VVpvomQxVFxh/GTRW59p6g==,type:str]
+      grpc-opts: {}
-      server: ENC[AES256_GCM,data:xPCnWkVYwD2Ty0IzUJPvY6U=,iv:Vz2QPfHSsVc3jVWj4hPNkMl2zCAvQgb9UdmMTEjdLHM=,tag:Ym1vSk7J5Zfi5UAVoCNq7Q==,type:str]
+      network: ENC[AES256_GCM,data:8I3g,iv:mspjQ+Py5SRWATFhMFJ/f4gfWi1eN4564vdExupMUPo=,tag:9kUBTuI7A14GgJvDJHXK9Q==,type:str]
-      port: ENC[AES256_GCM,data:x46frQ==,iv:y3ZtVJQP3q08duFGUXSH5xLo9Q6GZmGvhmCKzNiztfE=,tag:2k6WGrK1wGa4QwOYJHnwkw==,type:int]
-      password: ENC[AES256_GCM,data:SoxJyZJLwxRQoErQ1ZHObnM=,iv:YVDRtTb0P15vA67ZUQgCBX1s16iqjrtG0oodE9RPDMI=,tag:zsKj2mwEWwDtJ9QGtbix2g==,type:str]
-      sni: ENC[AES256_GCM,data:+PlKKl8N73CiANmWYnMLQDI=,iv:NizAQl+xLuvJHVpGfzrJLNa1b+B7q2SbIHpLjdoUjfY=,tag:tdNPsIgMO1s3CRggRm+gpA==,type:str]
-      skip-cert-verify: ENC[AES256_GCM,data:uea1ExU=,iv:z7oRGpeLjzXA1RB5E3ucJu/bPo110v81AFR+4dDQYwA=,tag:AsorLzyJfwJNsJShlXQBtw==,type:bool]
-      alpn:
-        - ENC[AES256_GCM,data:bG8=,iv:7UIRMQ7KGnZUPvfFMGLcworWFQFdd9toCasEeg/IEco=,tag:QwkRWsGXBGxODKIasUqXuA==,type:str]
 proxy-providers:
     ykk:
         type: ENC[AES256_GCM,data:QFH7Kw==,iv:uBwdbVdfQuoJ4wIxT9lAS/b0C167IwJbD2KhrB1VzkM=,tag:8ogC9VITAOfeMtceq20Wtw==,type:str]
@@ -53,9 +36,7 @@ proxy-groups:
     - name: ENC[AES256_GCM,data:O6LAzFQ=,iv:a+dfdy14adLlYbJQ5wAQLsD5hxuEXKW8Y/erhBVAREE=,tag:79++dpg2E2Mtc8y63nRcHw==,type:str]
       type: ENC[AES256_GCM,data:JR3d3D1p,iv:n0u8vayA0PVDM7yvh2pk36S8EeqMnZRN8TZlwNnEC3U=,tag:ZmxXOralviL2xyd8+hN3ZA==,type:str]
       proxies:
-        - ENC[AES256_GCM,data:fDVLR0770KUF,iv:prsxi6lcvMg6I+2o4rlAYuepUdjAPHpFfzCf6LyXj3M=,tag:rXMVs9EBOq5oCWHYtesZXQ==,type:str]
+        - ENC[AES256_GCM,data:iRhpnZDi+EB1zehjdNo=,iv:t0Q6014Ho/bFORPEFI4HT6gKb7h6U7jC1V9rMWh493s=,tag:ePnnKndYJ2UYZ9LtkdOjlg==,type:str]
-        - ENC[AES256_GCM,data:BRdw54Oq5sR2SaFXg/U=,iv:yS1MyVh0MjxctPFE1D3wrbVqztJJM8JP0gtkqgu6zdY=,tag:rJtHptplT8ZiPOXiQqvr8w==,type:str]
-        - ENC[AES256_GCM,data:TW/0H4P69iT9PGWLWw==,iv:5yDS6O1IAY9XGc/uKF25tcWxYZ1AWTd525W2bOCN0Ko=,tag:SMb3TVPjADtYCMtDzlfibA==,type:str]
       use:
         - ENC[AES256_GCM,data:hGy4,iv:LS9vHmdXUMuy0Na1z5YMpB+vEwKFLfezsftdWcWjTv0=,tag:lueXcksvaPC1yKpHT2zUag==,type:str]
 rules:
@@ -92,7 +73,7 @@ sops:
             FY9SvbPWXVTcJiLwjpcD8tSMdqcTHTJXcLAWSCjyFF91ihBUanQ7TcdXvZTGfdY0
             pOoJmg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-11-22T14:17:52Z"
+    lastmodified: "2026-02-11T03:50:06Z"
-    mac: ENC[AES256_GCM,data:QM1+5nj2tr9jv7gzFtH5eccn0UC0kMPK+mPu57E3UbPdyQoewFyBIbtkDddmr31VQmZjU9RB0vwtvY/lOgZuxRGQckckgj0ZZhdPAT7lKaUxLatnzOs8U3JWGWsc3vUM22yB5L5kuJSc/dx8XoXnSvL2gTwcygpxts4dLoj4Te8=,iv:B96/ZkxnaiwhQrSqUUsVHyzZ7tW6mDTeF0/tCCRdSUs=,tag:RVMKX8pOfpgVt/7Qn2smhg==,type:str]
+    mac: ENC[AES256_GCM,data:SqQbTjyvC7ev2egnq9swpQcLjVW1yZ0Yiv6DzNTupUVkl8yP4L6pGJ9P0EiuX/JFPFhAv+x61uudGNUUEu2pPdgHO80glBriATM54o7KILVkrm5TYQVZbD9YsAQsmPw3etVeaMk1a6dgIExW8+DG+KLq/qI/fJk1K0mWv9RR940=,iv:fwqW6E9vVFcLVm4mdI/zZlNeq55yz2AyKKvvx9D1nFA=,tag:qoyhpooNb/taN64s926nRw==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.11.0

treefmt.nix

@@ -7,10 +7,6 @@
       nixfmt.enable = true;
       stylua.enable = true;
       keep-sorted.enable = true;
-      typos = {
-        enable = true;
-        configFile = "typos.toml";
-      };
     };
   };
 }