chore: update flake.lock; use treefmt

It has been broken for thousands of years.

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+indent_style = space
+end_of_line = lf
+charset = utf-8
+insert_final_newline = false
+
+[*.{nix,lua,yaml,css}]
+indent_size = 2
+
+[Makefile]
+indent_size = 4

.lazy.lua

@@ -0,0 +1,21 @@
+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,
+  },
+}

.sops.yaml

@@ -1,13 +1,11 @@
 keys:
-  - &imxyy-nix age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns
+  - &imxyy-nix ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO
-  - &imxyy-nix-server age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6
+  - &imxyy-nix-server ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB28jpN+h5euh3NtdN+A+EtqgIatC22e4i1TPTioKire
-  - &imxyy-nix-x16 age1r0fv0tagxupfacv0aaxk5ss7sqvswv6kq8tk3x46ndqrj6f5afvqegahxq
+  - &imxyy-nix-x16 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMb5G/ieEYBOng66YeyttBQLThyM6W//z2POsNyq4Rw/
-  - &imxyy-cloudwin age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8
 creation_rules:
-  - path_regex: secrets/.*\.(yaml|toml|json|env|dae|txt|conf)$
+  - path_regex: secrets/.*\..*
     key_groups:
       - age:
         - *imxyy-nix
         - *imxyy-nix-server
         - *imxyy-nix-x16
-        - *imxyy-cloudwin

README.md

@@ -24,20 +24,18 @@ As for Flakes, refer to
 
 ## Components
 
-|                               | NixOS(Wayland)                                          |
+|                               | NixOS(Wayland)                               |
-| ----------------------------- | :------------------------------------------------------ |
+| ----------------------------- | :------------------------------------------- |
-| **Window Manager**            | Niri                                                    |
+| **Window Manager**            | Niri                                         |
-| **Terminal Emulator**         | Alacritty & Kitty & Foot & Ghostty                      |
+| **Desktop Shell**             | Noctalia Shell                               |
-| **Bar**                       | Waybar                                                  |
+| **Terminal Emulator**         | Kitty                                        |
-| **Application Launcher**      | wofi                                                    |
+| **Input method framework**    | Fcitx5                                       |
-| **Notification Daemon**       | SwayNotificationCenter                                  |
+| **Shell**                     | Zsh                                          |
-| **Input method framework**    | Fcitx5                                                  |
+| **Netease Cloudmusic Player** | go-musicfox                                  |
-| **Shell**                     | Zsh                                                     |
+| **Media Player**              | mpv                                          |
-| **Netease Cloudmusic Player** | go-musicfox                                             |
+| **Text Editor**               | Neovim                                       |
-| **Media Player**              | mpv                                                     |
+| **Fonts**                     | Noto Sans CJK & Jetbrains Mono & Nerd Font   |
-| **Text Editor**               | Neovim                                                  |
+| **Filesystem**                | Btrfs                                        |
-| **Fonts**                     | Noto Sans CJK & Jetbrains Mono & Nerd Font              |
-| **Filesystem**                | btrfs subvolumes, clean '/' every boot for impermanence |
 
 And more...
 

config/base.nix

@@ -1,4 +1,8 @@
-{ config, hostname, ... }:
+{
+  config,
+  hostname,
+  ...
+}:
 {
   # I prefer this to the default issue text
   # ported from ArchLinux IIRC
@@ -11,7 +15,7 @@
   systemd.services."systemd-machine-id-commit".enable = !config.my.persist.enable;
 
   my = {
-    home = {
+    hm = {
       # nicely reload system units when changing configs
       systemd.user.startServices = "sd-switch";
       home.stateVersion = "24.11";

config/hosts/imxyy-nix-server/ai.nix

@@ -4,7 +4,7 @@
     enable = true;
     host = "127.0.0.1";
     port = 8089;
-    package = pkgs.stable.open-webui;
+    package = pkgs.open-webui;
   };
   services.caddy.virtualHosts."ai.imxyy.top" = {
     extraConfig = ''

config/hosts/imxyy-nix-server/build.nix

@@ -1,13 +1,12 @@
 {
   config,
-  lib,
   pkgs,
-  sopsRoot,
+  secrets,
   ...
 }:
 {
   sops.secrets.et-imxyy-nix-server-nixremote = {
-    sopsFile = sopsRoot + /et-imxyy-nix-server-nixremote.toml;
+    sopsFile = secrets.et-imxyy-nix-server-nixremote;
     format = "binary";
   };
   environment.systemPackages = [ pkgs.easytier ];
@@ -15,10 +14,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix-server-nixremote.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
+      Restart = "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
+      RestartSec = 30;
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];
@@ -37,6 +34,7 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBWOy0QmAyxENg/O5m3cus8U3c9jCLioivwcWsh5/a82 imxyy-hisense-pad"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8pivvE8PMtsOxmccfNhH/4KehDKhBfUfJbQZxo/SZT imxyy-ace5"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKALTBn/QSGcSPgMg0ViSazFcaA0+nEF05EJpjbsI6dE imxyy_soope_@imxyy-cloudwin"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMb5G/ieEYBOng66YeyttBQLThyM6W//z2POsNyq4Rw/ imxyy@imxyy-nix-x16"
 
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIENauvvhVMLsUwH9cPYsvnOg7VCL3a4yEiKm8I524TE efl@efl-nix"
     ];

config/hosts/imxyy-nix-server/code.nix

@@ -7,26 +7,22 @@
     }
   ];
   services.postgresql.ensureDatabases = [ "coder" ];
-  virtualisation.oci-containers = {
+  virtualisation.oci-containers.containers.coder = {
-    containers = {
+    image = "ghcr.io/coder/coder:latest";
-      coder = {
+    environment = {
-        image = "ghcr.io/coder/coder:latest";
+      CODER_ACCESS_URL = "https://coder.imxyy.top";
-        environment = {
+      CODER_HTTP_ADDRESS = "0.0.0.0:8086";
-          CODER_ACCESS_URL = "https://coder.imxyy.top";
+      CODER_PG_CONNECTION_URL = "postgresql://coder:coderdatabase@127.0.0.1/coder?sslmode=disable";
-          CODER_HTTP_ADDRESS = "0.0.0.0:8086";
-          CODER_PG_CONNECTION_URL = "postgresql://coder:coderdatabase@127.0.0.1/coder?sslmode=disable";
-        };
-        extraOptions = [
-          "--network=host"
-          "--group-add=${toString config.users.groups.podman.gid}"
-        ];
-        volumes = [
-          "/var/lib/coder:/home/coder/.config"
-          "/var/run/docker.sock:/var/run/docker.sock"
-        ];
-        ports = [ "8086:8086" ];
-      };
     };
+    extraOptions = [
+      "--network=host"
+      "--group-add=${toString config.users.groups.podman.gid}"
+    ];
+    volumes = [
+      "/var/lib/coder:/home/coder/.config"
+      "/var/run/docker.sock:/var/run/docker.sock"
+    ];
+    ports = [ "8086:8086" ];
   };
   services.caddy.virtualHosts."coder.imxyy.top" = {
     extraConfig = ''

config/hosts/imxyy-nix-server/default.nix

@@ -15,7 +15,6 @@
     ./vault.nix
     ./homepage.nix
     ./code.nix
-    ./yesplaymusic.nix
     ./ai.nix
     ./grafana.nix
     ./note.nix
@@ -23,5 +22,8 @@
     ./minio.nix
     ./build.nix
     ./immich.nix
+
+    ./efl.nix
+    ./plant.nix
   ];
 }

config/hosts/imxyy-nix-server/docker.nix

@@ -5,5 +5,10 @@
     enable = true;
     dockerCompat = true;
     dockerSocket.enable = true;
+    defaultNetwork.settings.dns_enabled = true;
+  };
+  # avoid collision with dnsmasq
+  virtualisation.containers = {
+    containersConf.settings.network.dns_bind_port = 5353;
   };
 }

config/hosts/imxyy-nix-server/efl.nix

@@ -0,0 +1,54 @@
+{ config, secrets, ... }:
+{
+  sops.secrets.efl-tuwunel-env = {
+    sopsFile = secrets.efl-tuwunel;
+    format = "dotenv";
+  };
+  virtualisation.oci-containers.containers = {
+    tuwunel = {
+      image = "jevolk/tuwunel:latest";
+      volumes = [
+        "tuwunel_db:/var/lib/tuwunel"
+      ];
+      ports = [ "6167:6167" ];
+      networks = [ "podman" ];
+      environment = {
+        TUWUNEL_SERVER_NAME = "mtx.eflx.top";
+        TUWUNEL_PORT = "6167";
+        TUWUNEL_ADDRESS = "0.0.0.0";
+        TUWUNEL_WELL_KNOWN__SERVER = "mtx.eflx.top:443";
+        TUWUNEL_WELL_KNOWN__CLIENT = "https://mtx.eflx.top";
+      };
+      environmentFiles = [
+        config.sops.secrets.efl-tuwunel-env.path
+      ];
+    };
+    mautrix-telegram = {
+      image = "dock.mau.dev/mautrix/telegram:latest";
+      ports = [ "8099:8099" ];
+      networks = [ "podman" ];
+      extraOptions = [ "--ip=10.88.0.254" ];
+      volumes = [ "/var/lib/efl-mautrix-telegram:/data" ];
+    };
+
+    send = {
+      image = "lanol/filecodebox:latest";
+      ports = [ "12345:12345" ];
+      volumes = [ "/var/lib/send:/app/data:rw" ];
+    };
+  };
+  services.caddy.virtualHosts."mtx.eflx.top" = {
+    extraConfig = ''
+      reverse_proxy :6167 {
+        header_up X-Real-IP {remote_host}
+      }
+    '';
+  };
+  services.caddy.virtualHosts."send.eflx.top" = {
+    extraConfig = ''
+      reverse_proxy :12345 {
+        header_up X-Real-IP {remote_host}
+      }
+    '';
+  };
+}

config/hosts/imxyy-nix-server/home.nix

@@ -1,11 +1,13 @@
-{ ... }:
+{ lib, ... }:
 {
   my = {
     cli.all.enable = true;
+    cli.media.all.enable = lib.mkForce false;
     coding.editor.neovim.enable = true;
     coding.misc.enable = true;
     coding.langs.lua.enable = true;
     coding.langs.rust.enable = true;
+    fonts.enable = lib.mkForce false;
     persist = {
       enable = true;
       homeDirs = [

config/hosts/imxyy-nix-server/homepage.nix

@@ -1,14 +1,10 @@
 {
-  virtualisation.oci-containers = {
+  virtualisation.oci-containers.containers.sun-panel = {
-    containers = {
+    image = "hslr/sun-panel:latest";
-      sun-panel = {
+    volumes = [
-        image = "hslr/sun-panel:latest";
+      "/var/lib/sun-panel:/app/conf"
-        volumes = [
+    ];
-          "/var/lib/sun-panel:/app/conf"
+    ports = [ "8085:3002" ];
-        ];
-        ports = [ "8085:3002" ];
-      };
-    };
   };
   services.caddy.virtualHosts."home.imxyy.top" = {
     extraConfig = ''

config/hosts/imxyy-nix-server/immich.nix

@@ -1,5 +1,9 @@
 { ... }:
 {
+  users.users.immich = {
+    home = "/mnt/nas/immich";
+    createHome = true;
+  };
   services.immich = {
     enable = true;
     host = "127.0.0.1";

config/hosts/imxyy-nix-server/matrix.nix

@@ -1,46 +1,104 @@
 {
-  services.matrix-synapse = {
+  config,
+  secrets,
+  ...
+}:
+{
+  nixpkgs.config.permittedInsecurePackages = [
+    "olm-3.2.16"
+  ];
+  sops.secrets.tuwunel-reg-token = {
+    sopsFile = secrets.tuwunel-reg-token;
+    format = "binary";
+    owner = config.services.matrix-tuwunel.user;
+    group = config.services.matrix-tuwunel.group;
+  };
+  sops.secrets.tuwunel-turn-secret = {
+    sopsFile = secrets.tuwunel-turn-secret;
+    format = "binary";
+    owner = config.services.matrix-tuwunel.user;
+    group = config.services.matrix-tuwunel.group;
+  };
+  services.matrix-tuwunel = {
     enable = true;
-    settings = {
+    settings.global = {
-      server_name = "matrix.imxyy.top";
+      address = [ "127.0.0.1" ];
-      public_baseurl = "https://matrix.imxyy.top";
+      port = [ 8094 ];
-      listeners = [
+      server_name = "imxyy.top";
-        {
+      well_known = {
-          port = 8094;
+        server = "matrix.imxyy.top:443";
-          bind_addresses = [ "127.0.0.1" ];
+        client = "https://matrix.imxyy.top";
-          type = "http";
+      };
-          tls = false;
+
-          x_forwarded = true;
+      allow_registration = true;
-          resources = [
+      registration_token_file = config.sops.secrets.tuwunel-reg-token.path;
-            {
+
-              names = [
+      suppress_push_when_active = true;
-                "client"
+
-                "federation"
+      turn_uris = [
-              ];
+        "turn:hk.vkvm.imxyy.top?transport=udp"
-              compress = true;
+        "turn:hk.vkvm.imxyy.top?transport=tcp"
-            }
-          ];
-        }
       ];
-      turn_uris = [ "turns:vkvm.imxyy.top:5349" ];
+      turn_secret_file = config.sops.secrets.tuwunel-turn-secret.path;
-      turn_shared_secret = "ac779a48c03bb451839569d295a29aa6ab8c264277bec2df9c9c7f5e22936288";
+
-      turn_user_lifetime = "1h";
+      new_user_displayname_suffix = "";
-      database_type = "psycopg2";
-      database_args.database = "matrix-synapse";
     };
-    extraConfigFiles = [
+  };
-      "/var/lib/matrix-synapse/secret"
+  services.caddy.virtualHosts."imxyy.top" = {
-    ];
+    extraConfig = ''
+      handle /.well-known/matrix/server {
+        header Content-Type application/json
+        header "Access-Control-Allow-Origin" "*"
+
+        respond `{"m.server": "matrix.imxyy.top:443"}` 200
+      }
+      handle /.well-known/matrix/client {
+        header Content-Type application/json
+        header "Access-Control-Allow-Origin" "*"
+
+        respond `{"m.homeserver": {"base_url": "https://matrix.imxyy.top/"}}` 200
+      }
+    '';
   };
   services.caddy.virtualHosts."matrix.imxyy.top" = {
     extraConfig = ''
       reverse_proxy :8094
-      handle_path /_matrix {
-        reverse_proxy :8094
-      }
-      handle_path /_synapse/client {
-        reverse_proxy :8094
-      }
     '';
   };
+
+  sops.secrets.mautrix-telegram = {
+    sopsFile = secrets.mautrix-telegram;
+    format = "dotenv";
+    owner = "mautrix-telegram";
+    group = "mautrix-telegram";
+  };
+  services.mautrix-telegram = {
+    enable = true;
+    environmentFile = config.sops.secrets.mautrix-telegram.path;
+    settings = {
+      homeserver = {
+        address = "http://127.0.0.1:8094";
+        domain = "imxyy.top";
+      };
+      appservice = {
+        address = "http://127.0.0.1:8098";
+        hostname = "127.0.0.1";
+        port = "8098";
+        bot_username = "telegrambot";
+      };
+      bridge = {
+        username_template = "telegram_{userid}";
+        alias_template = "telegram_{groupname}";
+        displayname_template = "{displayname} (Telegram)";
+        permissions = {
+          "@imxyy_soope_:imxyy.top" = "admin";
+        };
+      };
+      telegram = {
+        # borrowed from https://github.com/telegramdesktop/tdesktop/blob/9bdc19e2fd4d497c8f403891848383a88faadc25/snap/snapcraft.yaml#L134-L135
+        api_id = "611335";
+        api_hash = "d524b414d21f4d37f08684c1df41ac9c";
+      };
+    };
+  };
 }

config/hosts/imxyy-nix-server/minecraft.nix

@@ -8,9 +8,10 @@
       WorkingDirectory = "/opt/minecraft/fabric1.20.6";
       ExecStart = "${lib.getExe' pkgs.openjdk21 "java"} -Xms1G -Xmx5G -jar fabric-server-mc.1.20.6-loader.0.15.11-launcher.1.0.1.jar";
       Restart = "always";
-      RestartSec = "10s";
+      RestartSec = 120;
     };
   };
+
   my.persist = {
     nixosDirs = [
       "/opt/minecraft"

config/hosts/imxyy-nix-server/minio.nix

@@ -1,7 +1,7 @@
-{ config, sopsRoot, ... }:
+{ config, secrets, ... }:
 {
   sops.secrets.minio-env = {
-    sopsFile = sopsRoot + /minio.env;
+    sopsFile = secrets.minio;
     format = "dotenv";
   };
   services.minio = {
@@ -16,11 +16,4 @@
     ];
     rootCredentialsFile = config.sops.secrets.minio-env.path;
   };
-  services.caddy.virtualHosts."minio.imxyy.top" = {
-    extraConfig = ''
-      handle_path /* {
-          reverse_proxy :9000
-      }
-    '';
-  };
 }

config/hosts/imxyy-nix-server/net.nix

@@ -3,7 +3,7 @@
   lib,
   pkgs,
   username,
-  sopsRoot,
+  secrets,
   ...
 }:
 {
@@ -131,26 +131,29 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO imxyy@imxyy-nix"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBWOy0QmAyxENg/O5m3cus8U3c9jCLioivwcWsh5/a82 imxyy-hisense-pad"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8pivvE8PMtsOxmccfNhH/4KehDKhBfUfJbQZxo/SZT imxyy-ace5"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKALTBn/QSGcSPgMg0ViSazFcaA0+nEF05EJpjbsI6dE imxyy_soope_@imxyy-cloudwin"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMb5G/ieEYBOng66YeyttBQLThyM6W//z2POsNyq4Rw/ imxyy@imxyy-nix-x16"
   ];
   users.users.${username}.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO imxyy@imxyy-nix"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBWOy0QmAyxENg/O5m3cus8U3c9jCLioivwcWsh5/a82 imxyy-hisense-pad"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8pivvE8PMtsOxmccfNhH/4KehDKhBfUfJbQZxo/SZT imxyy-ace5"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKALTBn/QSGcSPgMg0ViSazFcaA0+nEF05EJpjbsI6dE imxyy_soope_@imxyy-cloudwin"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMb5G/ieEYBOng66YeyttBQLThyM6W//z2POsNyq4Rw/ imxyy@imxyy-nix-x16"
   ];
 
   sops.secrets.dae-imxyy-nix-server = {
-    sopsFile = sopsRoot + /dae-imxyy-nix-server.dae;
+    sopsFile = secrets.dae-imxyy-nix-server;
     format = "binary";
   };
   services.dae = {
     enable = true;
     configFile = config.sops.secrets.dae-imxyy-nix-server.path;
   };
-  systemd.services.dae.after = [ "sops-nix.service" ];
+  systemd.services.dae = {
+    after = [ "sops-nix.service" ];
+    serviceConfig.MemoryMax = "1G";
+  };
   sops.secrets.mihomo = {
-    sopsFile = sopsRoot + /mihomo.yaml;
+    sopsFile = secrets.mihomo;
     format = "yaml";
     key = "";
   };
@@ -162,7 +165,7 @@
   };
 
   sops.secrets.frp-env = {
-    sopsFile = sopsRoot + /frp.env;
+    sopsFile = secrets.frp;
     format = "dotenv";
   };
   systemd.services.frp.serviceConfig.EnvironmentFile = [
@@ -205,20 +208,6 @@
           localPort = 443;
           customDomains = [ "oidc.imxyy.top" ];
         }
-        {
-          name = "headscale-http";
-          type = "http";
-          localIP = "127.0.0.1";
-          localPort = 80;
-          customDomains = [ "headscale.imxyy.top" ];
-        }
-        {
-          name = "headscale-https";
-          type = "https";
-          localIP = "127.0.0.1";
-          localPort = 443;
-          customDomains = [ "headscale.imxyy.top" ];
-        }
 
         {
           name = "mail-http";
@@ -302,21 +291,6 @@
           customDomains = [ "coder.imxyy.top" ];
         }
 
-        {
-          name = "music-http";
-          type = "http";
-          localIP = "127.0.0.1";
-          localPort = 80;
-          customDomains = [ "music.imxyy.top" ];
-        }
-        {
-          name = "music-https";
-          type = "https";
-          localIP = "127.0.0.1";
-          localPort = 443;
-          customDomains = [ "music.imxyy.top" ];
-        }
-
         {
           name = "ai-http";
           type = "http";
@@ -347,21 +321,6 @@
           customDomains = [ "grafana.imxyy.top" ];
         }
 
-        {
-          name = "note-http";
-          type = "http";
-          localIP = "127.0.0.1";
-          localPort = 80;
-          customDomains = [ "note.imxyy.top" ];
-        }
-        {
-          name = "note-https";
-          type = "https";
-          localIP = "127.0.0.1";
-          localPort = 443;
-          customDomains = [ "note.imxyy.top" ];
-        }
-
         {
           name = "siyuan-http";
           type = "http";
@@ -377,6 +336,20 @@
           customDomains = [ "sy.imxyy.top" ];
         }
 
+        {
+          name = "matrix-root-http";
+          type = "http";
+          localIP = "127.0.0.1";
+          localPort = 80;
+          customDomains = [ "imxyy.top" ];
+        }
+        {
+          name = "matrix-root-https";
+          type = "https";
+          localIP = "127.0.0.1";
+          localPort = 443;
+          customDomains = [ "imxyy.top" ];
+        }
         {
           name = "matrix-http";
           type = "http";
@@ -408,63 +381,54 @@
         }
 
         {
-          name = "minecraft";
+          name = "memo-http";
-          type = "tcp";
+          type = "http";
           localIP = "127.0.0.1";
-          localPort = 25565;
+          localPort = 80;
-          remotePort = 25565;
+          customDomains = [ "memo.imxyy.top" ];
+        }
+        {
+          name = "memo-https";
+          type = "https";
+          localIP = "127.0.0.1";
+          localPort = 443;
+          customDomains = [ "memo.imxyy.top" ];
+        }
+
+        {
+          name = "efl-matrix-http";
+          type = "http";
+          localIP = "127.0.0.1";
+          localPort = 80;
+          customDomains = [ "mtx.eflx.top" ];
+        }
+        {
+          name = "efl-matrix-https";
+          type = "https";
+          localIP = "127.0.0.1";
+          localPort = 443;
+          customDomains = [ "mtx.eflx.top" ];
+        }
+        {
+          name = "efl-send-http";
+          type = "http";
+          localIP = "127.0.0.1";
+          localPort = 80;
+          customDomains = [ "send.eflx.top" ];
+        }
+        {
+          name = "efl-send-https";
+          type = "https";
+          localIP = "127.0.0.1";
+          localPort = 443;
+          customDomains = [ "send.eflx.top" ];
         }
       ];
     };
   };
 
-  services.tailscale = {
-    enable = true;
-    useRoutingFeatures = "both";
-    extraSetFlags = [ "--accept-dns=false" ];
-  };
-  services.headscale = {
-    enable = true;
-    address = "0.0.0.0";
-    port = 8080;
-    settings = {
-      logtail.enabled = false;
-      server_url = "https://headscale.imxyy.top";
-      dns.magic_dns = false;
-      dns.override_local_dns = false;
-      ip_prefixes = "100.64.0.0/10";
-
-      oidc = {
-        only_start_if_oidc_is_available = true;
-        issuer = "https://oidc.imxyy.top";
-        client_id = "https://headscale.imxyy.top";
-        allowed_domains = [
-          "imxyy.top"
-          "*.imxyy.top"
-        ];
-        client_secret = "";
-        expiry = 0;
-        extra_params.domain_hint = "imxyy.top";
-      };
-    };
-  };
-  systemd.services."headscale" = {
-    serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
-    };
-    after = [
-      "podman-obligator.service"
-    ];
-    requires = [
-      "podman-obligator.service"
-    ];
-  };
-
   sops.secrets.et-imxyy-nix-server = {
-    sopsFile = sopsRoot + /et-imxyy-nix-server.toml;
+    sopsFile = secrets.et-imxyy-nix-server;
     format = "binary";
   };
   environment.systemPackages = [ pkgs.easytier ];
@@ -472,10 +436,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix-server.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
+      Restart = "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
+      RestartSec = 30;
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];
@@ -485,34 +447,23 @@
     ];
   };
 
-  virtualisation.oci-containers = {
+  virtualisation.oci-containers.containers.obligator = {
-    containers = {
+    image = "anderspitman/obligator:latest";
-      obligator = {
+    volumes = [
-        image = "anderspitman/obligator:latest";
+      "/var/lib/obligator:/data"
-        volumes = [
+      "/var/lib/obligator:/api"
-          "/var/lib/obligator:/data"
+    ];
-          "/var/lib/obligator:/api"
+    ports = [ "8081:1616" ];
-        ];
+    cmd = [
-        ports = [ "8081:1616" ];
+      "-storage-dir"
-        cmd = [
+      "/data"
-          "-storage-dir"
+      "-api-socket-dir"
-          "/data"
+      "/api"
-          "-api-socket-dir"
+      "-root-uri"
-          "/api"
+      "https://oidc.imxyy.top"
-          "-root-uri"
+      "-port"
-          "https://oidc.imxyy.top"
+      "1616"
-          "-port"
+    ];
-          "1616"
-        ];
-      };
-    };
-  };
-  services.caddy.virtualHosts."headscale.imxyy.top" = {
-    extraConfig = ''
-      reverse_proxy :8080 {
-        header_up X-Real-IP {remote_host}
-      }
-    '';
   };
   services.caddy.virtualHosts."oidc.imxyy.top" = {
     extraConfig = ''
@@ -524,9 +475,10 @@
 
   systemd.services.ddns-go =
     let
-      ddns-go = pkgs.buildGoModule rec {
+      version = "6.6.7";
+      ddns-go = pkgs.buildGoModule {
+        inherit version;
         pname = "ddns-go";
-        version = "6.6.7";
         src = pkgs.fetchFromGitHub {
           owner = "jeessy2";
           repo = "ddns-go";
@@ -561,7 +513,6 @@
         "git"
         "vault"
         "coder"
-        "headscale"
         "grafana"
         "matrix"
         "note"
@@ -570,23 +521,22 @@
         "music"
         "ai"
         "sy"
-        "minio"
+        "immich"
       ];
     in
     {
       enable = true;
       resolveLocalQueries = false;
       settings = {
-        server = [
+        no-resolv = true;
-          "120.53.53.53"
+        server = [ "192.168.3.1" ];
-          "223.5.5.5"
-        ];
         address = map (sub: "/${sub}.imxyy.top/192.168.3.2") subDomains ++ [
           "/imxyy-nix-server/192.168.3.2"
           "/imxyy-cloudwin/192.168.3.4"
           "/printer.home/192.168.3.53"
         ];
         cache-size = 0;
+        log-queries = "extra";
       };
     };
 }

config/hosts/imxyy-nix-server/nextcloud.nix

@@ -31,7 +31,6 @@ in
     hostName = nextcloud;
     home = "/mnt/nas/nextcloud";
     https = true;
-    nginx.recommendedHttpHeaders = true;
     caching.redis = true;
     configureRedis = true;
     database.createLocally = true;

config/hosts/imxyy-nix-server/nixos.nix

@@ -2,7 +2,7 @@
   lib,
   config,
   username,
-  sopsRoot,
+  secrets,
   ...
 }:
 {
@@ -13,17 +13,16 @@
     timeout = 0;
   };
 
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-
   systemd.services.nix-daemon = {
     environment.TMPDIR = "/var/cache/nix";
     serviceConfig.CacheDirectory = "nix";
   };
   environment.variables.NIX_REMOTE = "daemon";
 
+  my.audio.enable = false;
+
   sops.secrets.imxyy-nix-server-hashed-password = {
-    sopsFile = sopsRoot + /imxyy-nix-server-hashed-password.txt;
+    sopsFile = secrets.imxyy-nix-server-hashed-password;
     format = "binary";
     neededForUsers = true;
   };

config/hosts/imxyy-nix-server/note.nix

@@ -1,61 +1,52 @@
 {
   config,
-  sopsRoot,
+  secrets,
   ...
 }:
 {
   sops.secrets = {
-    flatnote-env = {
-      sopsFile = sopsRoot + /flatnote.env;
-      format = "dotenv";
-    };
     siyuan-env = {
-      sopsFile = sopsRoot + /siyuan.env;
+      sopsFile = secrets.siyuan;
       format = "dotenv";
     };
   };
-  virtualisation.oci-containers = {
+  virtualisation.oci-containers.containers = {
-    containers = {
+    siyuan = {
-      flatnotes = {
+      image = "apkdv/siyuan-unlock:v3.1.30";
-        image = "dullage/flatnotes:latest";
+      volumes = [
-        volumes = [
+        "/mnt/nas/siyuan/workspace:/workspace"
-          "/mnt/nas/flatnotes/data:/data"
+        "/mnt/nas/siyuan:/home/siyuan"
-        ];
+      ];
-        environmentFiles = [
+      cmd = [
-          "${config.sops.secrets.flatnote-env.path}"
+        "--workspace=/workspace"
-        ];
+      ];
-        ports = [ "8093:8080" ];
+      environment = {
-      };
+        PUID = "0";
-      siyuan = {
+        PGID = "0";
-        image = "apkdv/siyuan-unlock:v3.1.30";
-        volumes = [
-          "/mnt/nas/siyuan/workspace:/workspace"
-          "/mnt/nas/siyuan:/home/siyuan"
-        ];
-        cmd = [
-          "--workspace=/workspace"
-        ];
-        environment = {
-          PUID = "0";
-          PGID = "0";
-        };
-        environmentFiles = [
-          "${config.sops.secrets.siyuan-env.path}"
-        ];
-        ports = [ "8095:6806" ];
       };
+      environmentFiles = [
+        "${config.sops.secrets.siyuan-env.path}"
+      ];
+      ports = [ "8095:6806" ];
+    };
+    memos = {
+      image = "neosmemo/memos:stable";
+      volumes = [
+        "/mnt/nas/memos:/var/opt/memos"
+      ];
+      ports = [ "8097:5230" ];
     };
   };
   services.caddy.virtualHosts = {
-    "note.imxyy.top" = {
-      extraConfig = ''
-        reverse_proxy :8093
-      '';
-    };
     "sy.imxyy.top" = {
       extraConfig = ''
         reverse_proxy :8095
       '';
     };
+    "memo.imxyy.top" = {
+      extraConfig = ''
+        reverse_proxy :8097
+      '';
+    };
   };
 }

config/hosts/imxyy-nix-server/plant.nix

@@ -0,0 +1,74 @@
+{
+  inputs,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  app = pkgs.buildNpmPackage (finalAttrs: {
+    pname = "HF-plant";
+    version = "unstable-2025-09-21";
+
+    src = inputs.plant;
+
+    buildPhase = ''
+      runHook preBuild
+
+      npm run build
+      npm run build:proxy
+
+      runHook postBuild
+    '';
+    installPhase = ''
+      runHook preInstall
+
+      mkdir $out
+      mv dist $out
+      cp .env proxy-server-bundled.js $out
+
+      runHook postInstall
+    '';
+
+    npmDepsHash = "sha256-ret4BtjrEt8L1nlvJmFiejAKmbz89Z7NSiKs+qlB51w=";
+  });
+in
+{
+  systemd.services.HF-plant-proxy = {
+    after = [ "network.target" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      ExecStart = "${lib.getExe pkgs.bash} -c 'source ${app}/.env; export FEISHU_APP_ID FEISHU_APP_SECRET AMAP_JSCODE; ${lib.getExe pkgs.nodejs} ${app}/proxy-server-bundled.js'";
+      Restart = "always";
+      RestartSec = 120;
+    };
+  };
+  services.caddy.virtualHosts."plant.imxyy.top" = {
+    extraConfig = ''
+      handle /api/* {
+        reverse_proxy localhost:3001
+      }
+
+      handle /* {
+        root * ${app}/dist
+        try_files {path} /index.html
+        file_server
+      }
+    '';
+  };
+  services.frp.settings.proxies = [
+    {
+      name = "plant-http";
+      type = "http";
+      localIP = "127.0.0.1";
+      localPort = 80;
+      customDomains = [ "plant.imxyy.top" ];
+    }
+    {
+      name = "plant-https";
+      type = "https";
+      localIP = "127.0.0.1";
+      localPort = 443;
+      customDomains = [ "plant.imxyy.top" ];
+    }
+  ];
+}

config/hosts/imxyy-nix-server/vault.nix

@@ -1,7 +1,7 @@
-{ config, sopsRoot, ... }:
+{ config, secrets, ... }:
 {
   sops.secrets.vaultwarden-env = {
-    sopsFile = sopsRoot + /vaultwarden.env;
+    sopsFile = secrets.vaultwarden;
     format = "dotenv";
   };
   services.postgresql.ensureUsers = [

config/hosts/imxyy-nix-server/virt.nix

@@ -13,7 +13,7 @@ let
 in
 {
   boot = {
-    initrd.kernelModules = [
+    initrd.kernelModules = lib.mkBefore [
       "vfio_pci"
       "vfio"
       "vfio_iommu_type1"

config/hosts/imxyy-nix-server/yesplaymusic.nix

@@ -1,23 +0,0 @@
-{
-  virtualisation.oci-containers.containers."YesPlayMusic" = {
-    image = "git.imxyy.top/imxyy1soope1/yesplaymusic:latest";
-    environment = {
-      "NODE_TLS_REJECT_UNAUTHORIZED" = "0";
-    };
-    volumes = [
-      "/etc/localtime:/etc/localtime:ro"
-    ];
-    ports = [
-      "8088:80/tcp"
-    ];
-    log-driver = "journald";
-  };
-
-  services.caddy.virtualHosts."music.imxyy.top" = {
-    extraConfig = ''
-      reverse_proxy :8088 {
-        header_up X-Real-IP {remote_host}
-      }
-    '';
-  };
-}

config/hosts/imxyy-nix-wsl/home.nix

@@ -1,10 +1,10 @@
 { lib, username, ... }:
 {
-  my.home.programs.zsh.shellAliases = {
+  my.hm.programs.zsh.shellAliases = {
     localproxy_on = "export http_proxy=http://192.168.128.1:7890 https_proxy=http://192.168.128.1:7890 all_proxy=socks://192.168.128.1:7890";
   };
   my = {
-    sops.sshKeyPath = "/home/${username}/.ssh/id_ed25519";
+    sops.sshKeyFile = "/home/${username}/.ssh/id_ed25519";
     coding.all.enable = true;
     coding.editor.vscode.enable = lib.mkForce false;
     cli.misc.enable = true;

config/hosts/imxyy-nix-x16/home.nix

@@ -1,43 +1,50 @@
 {
   config,
-  lib,
   pkgs,
   username,
   ...
 }:
 {
-  my.home = {
+  my.hm = {
     home.packages = with pkgs; [
       localsend
 
-      rclone
-
       wpsoffice-cn
       wps-office-fonts
       ttf-wps-fonts
-      evince
+      papers
 
       anki
 
       ayugram-desktop
-      telegram-desktop
       signal-desktop
-      discord
+      element-desktop
+      fractal
       qq
       wechat
 
       gnome-clocks
-
-      wineWowPackages.waylandFull
-
-      pavucontrol
-      pamixer
     ];
     programs.zsh = {
       sessionVariables = {
         PATH = "/home/${username}/bin:$PATH";
       };
     };
+
+    programs.niri.settings = {
+      environment.STEAM_FORCE_DESKTOPUI_SCALING = "1.25";
+      outputs = {
+        eDP-1 = {
+          enable = true;
+          mode = {
+            width = 1920;
+            height = 1200;
+            refresh = 60.002;
+          };
+          scale = 1.25;
+        };
+      };
+    };
   };
 
   my = {
@@ -45,8 +52,7 @@
     cli.all.enable = true;
     coding.all.enable = true;
     desktop.all.enable = true;
-
+    virt.moonlight.enable = true;
-    desktop.browser.librewolf.enable = lib.mkForce false;
 
     i18n.fcitx5.enable = true;
 
@@ -54,14 +60,14 @@
       enable = true;
       defaultApplications =
         let
-          browser = [ "zen-beta.desktop" ];
+          browser = [ config.my.desktop.browser.default.desktop ];
           editor = [ "codium.desktop" ];
           imageviewer = [ "org.gnome.Shotwell-Viewer.desktop" ];
         in
         {
-          "inode/directory" = [ "nemo.desktop" ];
+          "inode/directory" = [ "org.gnome.Nautilus.desktop" ];
 
-          "application/pdf" = [ "org.gnome.Evince.desktop" ];
+          "application/pdf" = [ "org.gnome.Papers.desktop" ];
 
           "text/*" = editor;
           "application/json" = editor;
@@ -92,15 +98,6 @@
           "image/png" = imageviewer;
           "image/webp" = imageviewer;
         };
-      extraBookmarks =
-        let
-          homedir = config.my.home.home.homeDirectory;
-        in
-        [
-          "file://${homedir}/NAS NAS"
-          "file://${homedir}/NAS/imxyy_soope_ NAS imxyy_soope_"
-          "file://${homedir}/NAS/imxyy_soope_/OS NAS OS"
-        ];
     };
     persist = {
       enable = true;
@@ -118,23 +115,26 @@
         ".local/state"
         ".local/share/Anki2"
         ".local/share/shotwell"
-        ".local/share/cheat.sh"
         ".local/share/Kingsoft"
 
         ".local/share/AyuGramDesktop"
-        ".local/share/TelegramDesktop"
+        ".local/share/fractal"
         ".config/Signal"
-        ".config/discord"
+        ".config/Element"
         ".config/QQ"
         ".xwechat"
 
         ".config/Kingsoft"
         ".config/dconf"
-        ".config/gh"
-        ".config/pulse"
         ".config/pip"
-        ".config/libreoffice"
         ".config/sunshine"
+
+        ".gemini"
+        ".claude"
+        ".claude-code-router"
+      ];
+      homeFiles = [
+        ".claude.json"
       ];
     };
   };

config/hosts/imxyy-nix-x16/net.nix

@@ -1,8 +1,7 @@
 {
   config,
-  lib,
   pkgs,
-  sopsRoot,
+  secrets,
   ...
 }:
 {
@@ -10,10 +9,51 @@
     "biosdevname=0"
     "net.ifnames=0"
   ];
-  networking.networkmanager.enable = true;
+  networking = {
+    networkmanager.enable = true;
+    firewall.enable = false;
+    nftables = {
+      enable = true;
+      flushRuleset = true;
+      ruleset = ''
+        table inet firewall {
+          set LANv4 {
+            type ipv4_addr
+            flags interval
+
+            elements = { 10.0.0.0/8, 100.64.0.0/10, 172.16.0.0/12, 192.168.0.0/16, 169.254.0.0/16 }
+          }
+          set LANv6 {
+            type ipv6_addr
+            flags interval
+
+            elements = { fd00::/8, fe80::/10 }
+          }
+
+          chain output {
+            type filter hook output priority 100; policy accept;
+          }
+
+          chain input {
+            type filter hook input priority 0; policy drop;
+            iif lo accept
+            ct state invalid drop
+            ct state established,related accept
+
+            ip saddr @LANv4 accept
+            ip6 saddr @LANv6 accept
+          }
+
+          chain forward {
+            type filter hook forward priority 0; policy drop;
+          }
+        }
+      '';
+    };
+  };
 
   sops.secrets.dae-imxyy-nix-x16 = {
-    sopsFile = sopsRoot + /dae-imxyy-nix-x16.dae;
+    sopsFile = secrets.dae-imxyy-nix-x16;
     format = "binary";
   };
   services.dae = {
@@ -22,7 +62,7 @@
   };
   systemd.services.dae.after = [ "sops-nix.service" ];
   sops.secrets.mihomo = {
-    sopsFile = sopsRoot + /mihomo.yaml;
+    sopsFile = secrets.mihomo;
     format = "yaml";
     key = "";
   };
@@ -34,7 +74,7 @@
   };
 
   sops.secrets.et-imxyy-nix-x16 = {
-    sopsFile = sopsRoot + /et-imxyy-nix-x16.toml;
+    sopsFile = secrets.et-imxyy-nix-x16;
     format = "binary";
   };
   environment.systemPackages = with pkgs; [
@@ -44,10 +84,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix-x16.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
+      Restart = "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
+      RestartSec = 30;
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];

config/hosts/imxyy-nix-x16/nixos.nix

@@ -1,9 +1,8 @@
 {
-  lib,
   pkgs,
   config,
   username,
-  sopsRoot,
+  secrets,
   ...
 }:
 {
@@ -36,72 +35,11 @@
   };
   environment.variables.NIX_REMOTE = "daemon";
 
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = false;
-    alsa.support32Bit = false;
-    pulse.enable = false;
-    audio.enable = false;
-  };
-  services.pulseaudio = {
-    enable = true;
-    support32Bit = true;
-    package = pkgs.pulseaudioFull;
-    extraConfig = ''
-      load-module module-switch-on-connect
-      unload-module module-suspend-on-idle
-    '';
-  };
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-    settings = {
-      General = {
-        Enable = "Source,Sink,Media,Socket";
-        Disable = "HeadSet";
-        MultiProfile = "multiple";
-      };
-    };
-  };
-  users.extraUsers.${username}.extraGroups = [ "audio" ];
-
-  fonts = {
-    enableDefaultPackages = false;
-    fontDir.enable = true;
-
-    packages = with pkgs; [
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-emoji
-
-      jetbrains-mono
-
-      nerd-fonts.symbols-only
-    ];
-
-    fontconfig.defaultFonts = {
-      serif = [
-        "Noto Serif CJK SC"
-        "Noto Serif"
-        "Symbols Nerd Font"
-      ];
-      sansSerif = [
-        "Noto Sans CJK SC"
-        "Noto Sans"
-        "Symbols Nerd Font"
-      ];
-      monospace = [
-        "JetBrains Mono"
-        "Noto Sans Mono CJK SC"
-        "Symbols Nerd Font Mono"
-      ];
-      emoji = [ "Noto Color Emoji" ];
-    };
-  };
-
   services.printing.enable = true;
 
+  services.upower.enable = true;
+  services.power-profiles-daemon.enable = true;
+
   services.keyd = {
     enable = true;
     keyboards.default.settings = {
@@ -134,7 +72,7 @@
   ];
 
   sops.secrets.imxyy-nix-rclone = {
-    sopsFile = sopsRoot + /imxyy-nix-rclone.conf;
+    sopsFile = secrets.imxyy-nix-rclone;
     format = "binary";
   };
   fileSystems = {
@@ -154,21 +92,6 @@
         "vfs-cache-mode=full"
       ];
     };
-    "/home/${username}/NAS" = {
-      device = "//10.0.0.1/share";
-      fsType = "cifs";
-      options = [
-        "username=nas"
-        "password=nasshare"
-        "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"
-        "nodev"
-        "nofail"
-        "uid=1000"
-        "gid=100"
-        "vers=3"
-        "rw"
-      ];
-    };
   };
 
   my.persist.nixosDirs = [ "/etc/NetworkManager/system-connections" ];

config/hosts/imxyy-nix/default.nix

@@ -5,5 +5,6 @@
     ./home.nix
     ./virt.nix
     ./net.nix
+    ./podman.nix
   ];
 }

config/hosts/imxyy-nix/home.nix

@@ -1,37 +1,29 @@
 {
   config,
-  lib,
   pkgs,
   username,
   ...
 }:
 {
-  my.home = {
+  my.hm = {
     home.packages = with pkgs; [
       localsend
 
-      rclone
-
       wpsoffice-cn
       wps-office-fonts
       ttf-wps-fonts
-      evince
+      papers
 
       anki
 
-      ayugram-desktop
+      working.ayugram-desktop
-      telegram-desktop
       signal-desktop
-      discord
+      element-desktop
+      fractal
       qq
       wechat
 
       gnome-clocks
-
-      wineWowPackages.waylandFull
-
-      pavucontrol
-      pamixer
     ];
     programs.zsh = {
       shellAliases = {
@@ -91,22 +83,20 @@
     coding.all.enable = true;
     desktop.all.enable = true;
 
-    desktop.browser.librewolf.enable = lib.mkForce false;
-
     i18n.fcitx5.enable = true;
 
     xdg = {
       enable = true;
       defaultApplications =
         let
-          browser = [ "zen-beta.desktop" ];
+          browser = [ config.my.desktop.browser.default.desktop ];
           editor = [ "codium.desktop" ];
           imageviewer = [ "org.gnome.Shotwell-Viewer.desktop" ];
         in
         {
-          "inode/directory" = [ "nemo.desktop" ];
+          "inode/directory" = [ "org.gnome.Nautilus.desktop" ];
 
-          "application/pdf" = [ "org.gnome.Evince.desktop" ];
+          "application/pdf" = [ "org.gnome.Papers.desktop" ];
 
           "text/*" = editor;
           "application/json" = editor;
@@ -137,16 +127,6 @@
           "image/png" = imageviewer;
           "image/webp" = imageviewer;
         };
-      extraBookmarks =
-        let
-          homedir = config.my.home.home.homeDirectory;
-        in
-        [
-          "file://${homedir}/Documents/%E7%8F%AD%E7%BA%A7%E4%BA%8B%E5%8A%A1 班级事务"
-          "file://${homedir}/NAS NAS"
-          "file://${homedir}/NAS/imxyy_soope_ NAS imxyy_soope_"
-          "file://${homedir}/NAS/imxyy_soope_/OS NAS OS"
-        ];
     };
     persist = {
       enable = true;
@@ -162,23 +142,23 @@
         ".local/state"
         ".local/share/Anki2"
         ".local/share/shotwell"
-        ".local/share/cheat.sh"
         ".local/share/Kingsoft"
 
         ".local/share/AyuGramDesktop"
-        ".local/share/TelegramDesktop"
+        ".local/share/fractal"
         ".config/Signal"
-        ".config/discord"
+        ".config/Element"
         ".config/QQ"
         ".xwechat"
 
         ".config/Kingsoft"
         ".config/dconf"
-        ".config/gh"
-        ".config/pulse"
         ".config/pip"
-        ".config/libreoffice"
         ".config/sunshine"
+
+        ".gemini"
+        ".claude"
+        ".claude-code-router"
       ];
     };
   };

config/hosts/imxyy-nix/net.nix

@@ -2,8 +2,7 @@
   config,
   lib,
   pkgs,
-  sopsRoot,
+  secrets,
-  username,
   ...
 }:
 {
@@ -70,6 +69,7 @@
           chain input {
             type filter hook input priority 0; policy drop;
             iif lo accept
+            iifname waydroid0 accept
             ct state invalid drop
             ct state established,related accept
 
@@ -79,6 +79,9 @@
 
           chain forward {
             type filter hook forward priority 0; policy drop;
+
+            iifname waydroid0 accept
+            oifname waydroid0 accept
           }
         }
       '';
@@ -86,7 +89,7 @@
   };
 
   sops.secrets.dae-imxyy-nix = {
-    sopsFile = sopsRoot + /dae-imxyy-nix.dae;
+    sopsFile = secrets.dae-imxyy-nix;
     format = "binary";
   };
   services.dae = {
@@ -95,7 +98,7 @@
   };
   systemd.services.dae.after = [ "sops-nix.service" ];
   sops.secrets.mihomo = {
-    sopsFile = sopsRoot + /mihomo.yaml;
+    sopsFile = secrets.mihomo;
     format = "yaml";
     key = "";
   };
@@ -107,7 +110,7 @@
   };
 
   sops.secrets.et-imxyy-nix = {
-    sopsFile = sopsRoot + /et-imxyy-nix.toml;
+    sopsFile = secrets.et-imxyy-nix;
     format = "binary";
   };
   environment.systemPackages = [ pkgs.easytier ];
@@ -115,10 +118,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
+      Restart = "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
+      RestartSec = 30;
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];

config/hosts/imxyy-nix/nixos.nix

@@ -3,7 +3,7 @@
   pkgs,
   config,
   username,
-  sopsRoot,
+  secrets,
   ...
 }:
 let
@@ -22,7 +22,7 @@ let
         temp = line.split(" ")
         bus = temp[1]
         device = temp[3][:-1]
-        subprocess.run(["${lib.getExe usbreset}", f"/dev/bus/usb/{bus}/{device}"])
+        subprocess.run(["${lib.getExe' pkgs.usbutils "usbreset"}", f"{bus}/{device}"])
         return True
 
     if __name__ == "__main__":
@@ -36,44 +36,6 @@ let
             with open("/tmp/.btreseted", "w"):
                 ...
   '';
-  usbreset = pkgs.writeCBin "usbreset" ''
-    #include <stdio.h>
-    #include <unistd.h>
-    #include <fcntl.h>
-    #include <sys/ioctl.h>
-
-    #include <linux/usbdevice_fs.h>
-
-    int main(int argc, char **argv)
-    {
-        const char *filename;
-        int fd;
-        int rc;
-
-        if (argc != 2) {
-            fprintf(stderr, "Usage: usbreset device-filename\n");
-            return 1;
-        }
-        filename = argv[1];
-
-        fd = open(filename, O_WRONLY);
-        if (fd < 0) {
-            perror("Error opening output file");
-            return 1;
-        }
-
-        printf("Resetting USB device %s\n", filename);
-        rc = ioctl(fd, USBDEVFS_RESET, 0);
-        if (rc < 0) {
-            perror("Error in ioctl");
-            return 1;
-        }
-        printf("Reset successful\n");
-
-        close(fd);
-        return 0;
-    }
-  '';
 in
 {
   security.pam.loginLimits = [
@@ -111,84 +73,26 @@ in
   };
   environment.variables.NIX_REMOTE = "daemon";
 
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = false;
-    alsa.support32Bit = false;
-    pulse.enable = false;
-    audio.enable = false;
-  };
-  services.pulseaudio = {
-    enable = true;
-    support32Bit = true;
-    package = pkgs.pulseaudioFull;
-    extraConfig = ''
-      load-module module-switch-on-connect
-      unload-module module-suspend-on-idle
-    '';
-  };
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-    settings = {
-      General = {
-        Enable = "Source,Sink,Media,Socket";
-        Disable = "HeadSet";
-        MultiProfile = "multiple";
-      };
-    };
-  };
-  users.extraUsers.${username}.extraGroups = [ "audio" ];
-
-  fonts = {
-    enableDefaultPackages = false;
-    fontDir.enable = true;
-
-    packages = with pkgs; [
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-emoji
-
-      jetbrains-mono
-
-      nerd-fonts.symbols-only
-    ];
-
-    fontconfig.defaultFonts = {
-      serif = [
-        "Noto Serif CJK SC"
-        "Noto Serif"
-        "Symbols Nerd Font"
-      ];
-      sansSerif = [
-        "Noto Sans CJK SC"
-        "Noto Sans"
-        "Symbols Nerd Font"
-      ];
-      monospace = [
-        "JetBrains Mono"
-        "Noto Sans Mono CJK SC"
-        "Symbols Nerd Font Mono"
-      ];
-      emoji = [ "Noto Color Emoji" ];
-    };
-  };
-
   services.printing.enable = true;
 
   services.keyd = {
     enable = true;
-    keyboards.default.settings = {
+    keyboards = {
-      main = {
+      default.settings = {
-        capslock = "overload(control, esc)";
+        main = {
-        home = "end";
+          capslock = "overload(control, esc)";
+          home = "end";
+        };
+        shift = {
+          home = "home";
+        };
+        control = {
+          delete = "print";
+        };
       };
-      shift = {
+      kone-pro-owl-eye = {
-        home = "home";
+        ids = [ "1e7d:2dcd" ];
-      };
+        settings.main.mouse2 = "rightmouse";
-      control = {
-        delete = "print";
       };
     };
   };
@@ -199,6 +103,9 @@ in
   programs.wireshark.package = pkgs.wireshark;
   users.users.${username}.extraGroups = [ "wireshark" ];
 
+  virtualisation.waydroid.enable = true;
+  my.persist.homeDirs = [ ".local/share/waydroid" ];
+
   services.sunshine = {
     enable = true;
     autoStart = true;
@@ -225,7 +132,7 @@ in
   ];
 
   sops.secrets.imxyy-nix-rclone = {
-    sopsFile = sopsRoot + /imxyy-nix-rclone.conf;
+    sopsFile = secrets.imxyy-nix-rclone;
     format = "binary";
   };
   fileSystems = {

config/hosts/imxyy-nix/podman.nix

@@ -0,0 +1,35 @@
+{
+  lib,
+  pkgs,
+  username,
+  ...
+}:
+{
+  virtualisation.podman = {
+    enable = true;
+    dockerCompat = true;
+    dockerSocket.enable = true;
+  };
+  users.users.${username}.extraGroups = [ "podman" ];
+  environment.systemPackages = [ pkgs.distrobox ];
+  my.hm.programs.distrobox = {
+    enable = true;
+    settings = {
+      container_image_default = "docker.io/archlinux:latest";
+    };
+    containers = {
+      archlinux = {
+        image = "archlinux:latest";
+      };
+    };
+  };
+  my.hm.programs.zsh.initContent = lib.mkBefore ''
+    if [ -n "''${CONTAINER_ID+1}" ]; then
+      export ZSH_DISABLE_COMPFIX=true
+    fi
+  '';
+  my.persist.homeDirs = [
+    ".config/containers"
+    ".local/share/containers"
+  ];
+}

flake.lock

@@ -5,11 +5,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1746562888,
+        "lastModified": 1755819240,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
         "type": "github"
       },
       "original": {
@@ -21,27 +21,28 @@
     "base16-fish": {
       "flake": false,
       "locked": {
-        "lastModified": 1622559957,
+        "lastModified": 1754405784,
-        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
         "type": "github"
       },
       "original": {
         "owner": "tomyun",
         "repo": "base16-fish",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
         "type": "github"
       }
     },
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1748408240,
+        "lastModified": 1752979451,
-        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
+        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
+        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
         "type": "github"
       },
       "original": {
@@ -98,6 +99,26 @@
         "type": "github"
       }
     },
+    "catppuccin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1763110997,
+        "narHash": "sha256-S2vF+3D/9vna3/vBV7LHiGUbp+ltPsQhvccIyim6VQg=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "e6928cdd3dd20636326c2756d2bc8fd1cd825768",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "chaotic": {
       "inputs": {
         "flake-schemas": "flake-schemas",
@@ -107,11 +128,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1752141190,
+        "lastModified": 1762966292,
-        "narHash": "sha256-RHNq77Z84BtLTwyRtrBffm5V9006Dqw4vh3vrvULlxM=",
+        "narHash": "sha256-WJtAHPDOJRd/ecQJBFyuyqBIbDG0ocdQuBGPBRRsgew=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "ef0794b8e94eea166407141f7e92da75f6df925a",
+        "rev": "037d0bb4a6b51609e66fab2221d3bca2d3b5fa3b",
         "type": "github"
       },
       "original": {
@@ -128,11 +149,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750940343,
+        "lastModified": 1763015923,
-        "narHash": "sha256-qmc/jreM09MOwQ8dOa/+yyh99rU7TowSqo8L33VHfto=",
+        "narHash": "sha256-IJGWKVxztJT/NsonaRjWm5OaW07Rg+kBr6NMhfQiJzM=",
         "owner": "Bali10050",
         "repo": "Darkly",
-        "rev": "77770c8d3c35f7ad39da2c57122c360096df0aac",
+        "rev": "5a323b775695f889b495d9f499eceb38ed538b42",
         "type": "github"
       },
       "original": {
@@ -171,11 +192,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1752129689,
+        "lastModified": 1763150544,
-        "narHash": "sha256-0Xq5tZbvgZvxbbxv6kRHFuZE4Tq2za016NXh32nX0+Q=",
+        "narHash": "sha256-Vnps7OKuHLqOTBRnspMhjHQ11mKyfUlhHEZ2anTEAp8=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "70bb04a7de606a75ba0a2ee9d47b99802780b35d",
+        "rev": "6479b325536a1c87dedbc67d5ee4cb42ce014438",
         "type": "github"
       },
       "original": {
@@ -187,11 +208,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1748383148,
+        "lastModified": 1758112371,
-        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
+        "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
+        "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
         "type": "github"
       },
       "original": {
@@ -219,11 +240,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1761588595,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
@@ -273,27 +294,6 @@
       }
     },
     "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
@@ -301,11 +301,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751413152,
+        "lastModified": 1756770412,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "rev": "4524271976b625a4a605beefd893f270620fd751",
         "type": "github"
       },
       "original": {
@@ -457,17 +457,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1748528448,
+        "lastModified": 1755219990,
-        "narHash": "sha256-Tyn+PgBm78Ibq28/WbEz8+pYJZMdbJKsyXMCpT6TjrM=",
+        "narHash": "sha256-/znXwik9nC9TY6dwq0SR60MAi9IEZi2InRSRjfhKu1s=",
         "owner": "imxyy1soope1",
         "repo": "go-musicfox",
-        "rev": "1870fd3501631577ad4daef1489b03885abcb037",
+        "rev": "938c4d6bb2a318bc6251f3b11fa8cf54d29b4419",
         "type": "github"
       },
       "original": {
         "owner": "imxyy1soope1",
-        "ref": "master",
         "repo": "go-musicfox",
+        "rev": "938c4d6bb2a318bc6251f3b11fa8cf54d29b4419",
         "type": "github"
       }
     },
@@ -500,11 +500,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751824240,
+        "lastModified": 1762787259,
-        "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=",
+        "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fd9e55f5fac45a26f6169310afca64d56b681935",
+        "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e",
         "type": "github"
       },
       "original": {
@@ -520,11 +520,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752202894,
+        "lastModified": 1762964643,
-        "narHash": "sha256-knafgng4gCjZIUMyAEWjxxdols6n/swkYnbWr+oF+1w=",
+        "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fab659b346c0d4252208434c3c4b3983a4b38fec",
+        "rev": "827f2a23373a774a8805f84ca5344654c31f354b",
         "type": "github"
       },
       "original": {
@@ -542,11 +542,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743604125,
+        "lastModified": 1762964643,
-        "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
+        "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
+        "rev": "827f2a23373a774a8805f84ca5344654c31f354b",
         "type": "github"
       },
       "original": {
@@ -595,11 +595,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751529406,
+        "lastModified": 1762856455,
-        "narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=",
+        "narHash": "sha256-x7zgteJWIlbVexL2ubOadUXKlHSjh0RAjLO1KfWdgpU=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d",
+        "rev": "29a671ae20223d182eaf54b963a735230497c2f9",
         "type": "github"
       },
       "original": {
@@ -658,21 +658,17 @@
       "inputs": {
         "niri-stable": "niri-stable",
         "niri-unstable": "niri-unstable",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_5",
-          "nixpkgs"
+        "nixpkgs-stable": "nixpkgs-stable",
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs-stable"
-        ],
         "xwayland-satellite-stable": "xwayland-satellite-stable",
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1752078530,
+        "lastModified": 1763126448,
-        "narHash": "sha256-TrRmlYdhWcadWvBpDjB9Xlry4uT4ZUIO46d+o5tjtCQ=",
+        "narHash": "sha256-LVYJJObvkWwR8QB/Srr6Rks+Fw2lYvnRNOH0etV9DM8=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "d231d92313192d4d0c78d6ef04167fed9dee87cf",
+        "rev": "add7bcf2925547e180cc2fe6d5f4b5e7c579d086",
         "type": "github"
       },
       "original": {
@@ -684,16 +680,16 @@
     "niri-stable": {
       "flake": false,
       "locked": {
-        "lastModified": 1748151941,
+        "lastModified": 1756556321,
-        "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
         "type": "github"
       },
       "original": {
         "owner": "YaLTeR",
-        "ref": "v25.05.1",
+        "ref": "v25.08",
         "repo": "niri",
         "type": "github"
       }
@@ -701,11 +697,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1750791124,
+        "lastModified": 1763014447,
-        "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=",
+        "narHash": "sha256-nmu7S8J9IJKLQyIkSU8QWYHygrfw76NHGTkcr+bXMX0=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c",
+        "rev": "a52df533c4694b5ed0a04140af60fd26146df911",
         "type": "github"
       },
       "original": {
@@ -804,11 +800,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752199438,
+        "lastModified": 1762908663,
-        "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=",
+        "narHash": "sha256-HqdYfzBaidYX+EYAcXDFCggXJPZBv2fusMwhc7/4+cI=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "d34d9412556d3a896e294534ccd25f53b6822e80",
+        "rev": "debc562c48c445f9f08778ecb9fc6b35197623ad",
         "type": "github"
       },
       "original": {
@@ -819,11 +815,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1751984180,
+        "lastModified": 1762844143,
-        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
+        "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+        "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
         "type": "github"
       },
       "original": {
@@ -847,11 +843,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1752206449,
+        "lastModified": 1763185868,
-        "narHash": "sha256-NVAbC/s4CupABWGXF8M9mDiVw/n0YCftxwc1KatVjDk=",
+        "narHash": "sha256-jKSDU/8nSpYyyd8i0jZMSeq0N6DT2AAT/L3GrIOSrUw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1bd4d0d4a678d48b63eb18f457d74df2fcee6c69",
+        "rev": "9ef55366d2e9176fb46469a753c7d2161bb06710",
         "type": "github"
       },
       "original": {
@@ -863,11 +859,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1752203688,
+        "lastModified": 1763049705,
-        "narHash": "sha256-uJ054F5PVGPu5SvLPMevhdY/EfK0X5DUyRtXhQYNUyo=",
+        "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1763182931,
+        "narHash": "sha256-L3ocbCSpekZCLSDuByaSfb6rwe7Qban8d782bc/j0l4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a70a12c75e13aa546c20ce0fe515de634d52c39e",
+        "rev": "d82502b7773487d325a541ce84deb166cea3748a",
         "type": "github"
       },
       "original": {
@@ -879,20 +891,36 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1752124863,
+        "lastModified": 1762977756,
-        "narHash": "sha256-5rWuf6RAlMDp/CAEuyYEz7ryxzgjxOCgUDhWEef864c=",
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "40de82b434526744da778ed53c742c1282d9e75e",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable-small",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nixpkgs-working": {
+      "locked": {
+        "lastModified": 1762844143,
+        "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1730531603,
@@ -943,40 +971,62 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1751984180,
+        "lastModified": 1762977756,
-        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nur": {
+    "nixpkgs_6": {
-      "inputs": {
-        "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_5"
-      },
       "locked": {
-        "lastModified": 1752207112,
+        "lastModified": 1761236834,
-        "narHash": "sha256-dnVoQSGQqEGJQzS6iHAG95c0oFrezzBinwu1bDLj9J4=",
+        "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
-        "owner": "nix-community",
+        "owner": "nixos",
-        "repo": "NUR",
+        "repo": "nixpkgs",
-        "rev": "f166dc14862dfec043f9545e8291cc4402f8b866",
+        "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "nixos",
-        "repo": "NUR",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nur_2": {
+    "noctalia": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "quickshell": [
+          "quickshell"
+        ],
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1761994152,
+        "narHash": "sha256-m4N7mX++iUY64gFVlW19jL311b+R8ejktJ64E6EzVLQ=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "rev": "34a6947ad69ff9aec4960e0d1d618a0c041943ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "rev": "34a6947ad69ff9aec4960e0d1d618a0c041943ca",
+        "type": "github"
+      }
+    },
+    "nur": {
       "inputs": {
         "flake-parts": [
           "stylix",
@@ -988,11 +1038,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751906969,
+        "lastModified": 1758998580,
-        "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=",
+        "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25",
+        "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
         "type": "github"
       },
       "original": {
@@ -1001,6 +1051,23 @@
         "type": "github"
       }
     },
+    "plant": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1758423341,
+        "narHash": "sha256-dHcKh7T8I70bKPwgqO5MxZ9bWHINwzRPhFp5waQy2r8=",
+        "ref": "refs/heads/master",
+        "rev": "08dc0b3889797eb3618c7475c3c367ec0e5fdf40",
+        "revCount": 6,
+        "type": "git",
+        "url": "ssh://git@git.imxyy.top:2222/imxyy1soope1/HF-plant.git"
+      },
+      "original": {
+        "rev": "08dc0b3889797eb3618c7475c3c367ec0e5fdf40",
+        "type": "git",
+        "url": "ssh://git@git.imxyy.top:2222/imxyy1soope1/HF-plant.git"
+      }
+    },
     "quickshell": {
       "inputs": {
         "nixpkgs": [
@@ -1008,21 +1075,22 @@
         ]
       },
       "locked": {
-        "lastModified": 1752146885,
+        "lastModified": 1763115162,
-        "narHash": "sha256-ZJK989GL+bTCQSxbG8v8/7tHMCEl/FPovkeDBNyClQE=",
+        "narHash": "sha256-TgHTFlFI9tZ4kp4yy8fcfy98srgcob9gcOeuKjs1Mw4=",
-        "ref": "refs/heads/master",
+        "owner": "outfoxxed",
-        "rev": "d7079b75241c6e2b67f2429996fa7679ffc052e2",
+        "repo": "quickshell",
-        "revCount": 616,
+        "rev": "a00ff0394431d1fe3f33ae0934c981930e2a1efb",
-        "type": "git",
+        "type": "github"
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
       "original": {
-        "type": "git",
+        "owner": "outfoxxed",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
+        "repo": "quickshell",
+        "type": "github"
       }
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "chaotic": "chaotic",
         "darkly": "darkly",
         "fenix": "fenix",
@@ -1037,23 +1105,26 @@
           "nixpkgs-unstable"
         ],
         "nixpkgs-master": "nixpkgs-master",
-        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-stable": "nixpkgs-stable_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "nur": "nur",
+        "nixpkgs-working": "nixpkgs-working",
+        "noctalia": "noctalia",
+        "plant": "plant",
         "quickshell": "quickshell",
         "sops-nix": "sops-nix",
         "stylix": "stylix",
+        "treefmt": "treefmt",
         "zen": "zen"
       }
     },
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1752086493,
+        "lastModified": 1762860488,
-        "narHash": "sha256-USpVUdiWXDfPoh+agbvoBQaBhg3ZdKZgHXo/HikMfVo=",
+        "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "6e3abe164b9036048dce1a3aa65a7e7e5200c0d3",
+        "rev": "2efc80078029894eec0699f62ec8d5c1a56af763",
         "type": "github"
       },
       "original": {
@@ -1071,11 +1142,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751856221,
+        "lastModified": 1762915112,
-        "narHash": "sha256-/QE1eV0ckFvgRMcKjZqgdJDoXFNwSMepwRoBjaw2MCk=",
+        "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "34cae4b56929c5b340e1c5b10d9a98a425b2a51e",
+        "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02",
         "type": "github"
       },
       "original": {
@@ -1091,15 +1162,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1751606940,
+        "lastModified": 1763111468,
-        "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
+        "narHash": "sha256-EK8coWrd1AkP4813/tY0fNqaJ0B5tyS/FfC6TSL8P0M=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
+        "rev": "d623efbbaa7cb0f1b13d7191029dc669f260460a",
         "type": "github"
       },
       "original": {
         "owner": "Mic92",
+        "ref": "pull/779/merge",
         "repo": "sops-nix",
         "type": "github"
       }
@@ -1111,13 +1183,13 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_3",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nur": "nur_2",
+        "nur": "nur",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -1125,11 +1197,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1752201883,
+        "lastModified": 1762264356,
-        "narHash": "sha256-SZVbQ4YThvYU50cJ4W4GNMy7/rVOJI8qmXqbEcRNsug=",
+        "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "d395780b9c5c36f191b990b2021c71af180a1982",
+        "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b",
         "type": "github"
       },
       "original": {
@@ -1168,6 +1240,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -1204,11 +1291,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1750770351,
+        "lastModified": 1757716333,
-        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
+        "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
+        "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
         "type": "github"
       },
       "original": {
@@ -1220,11 +1307,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1751159871,
+        "lastModified": 1757811970,
-        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
+        "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
+        "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
         "type": "github"
       },
       "original": {
@@ -1236,11 +1323,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1751158968,
+        "lastModified": 1757811247,
-        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
+        "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
+        "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
         "type": "github"
       },
       "original": {
@@ -1249,19 +1336,37 @@
         "type": "github"
       }
     },
+    "treefmt": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1762938485,
+        "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {
-        "lastModified": 1748488455,
+        "lastModified": 1755491097,
-        "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
         "type": "github"
       },
       "original": {
         "owner": "Supreeeme",
-        "ref": "v0.6",
+        "ref": "v0.7",
         "repo": "xwayland-satellite",
         "type": "github"
       }
@@ -1269,11 +1374,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1751228685,
+        "lastModified": 1762747449,
-        "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=",
+        "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b",
+        "rev": "6338574bc5c036487486acde264f38f39ea15fad",
         "type": "github"
       },
       "original": {
@@ -1290,11 +1395,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752164817,
+        "lastModified": 1763171103,
-        "narHash": "sha256-LJFIx27IOUowLsJn5wci9mHZ4CesJsiAivQWDjnZPCc=",
+        "narHash": "sha256-8yIUdnaYIx3f96ZW+gklifdhB7Zs+jLi8VPfL9owitw=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "9193992c4c2c4349b4280ec2b49648cae208fe63",
+        "rev": "85d439e2c3271d50581392c88e9d60d6e2e87bf8",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,9 +3,10 @@
 
   inputs = {
     # Nixpkgs
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/release-25.05";
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
+    nixpkgs-working.url = "github:nixos/nixpkgs/9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4";
     # nixpkgs.follows = "nixpkgs-stable";
     nixpkgs.follows = "nixpkgs-unstable";
     # nixpkgs.follows = "nixpkgs-master";
@@ -13,53 +14,86 @@
     # Nyxpkgs
     chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
 
-    # SOPS
+    # TODO: sops-nix: remove pr patch once merged
-    sops-nix.url = "github:Mic92/sops-nix";
+    # https://github.com/Mic92/sops-nix/pull/779
-    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
+    sops-nix = {
+      url = "github:Mic92/sops-nix/pull/779/merge";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Home manager
-    home-manager.url = "github:nix-community/home-manager/master";
+    home-manager = {
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager/master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Impermanence
     impermanence.url = "github:nix-community/impermanence";
 
-    # NUR
-    nur.url = "github:nix-community/NUR";
-
     # Niri
     niri.url = "github:sodiboo/niri-flake";
-    niri.inputs.nixpkgs.follows = "nixpkgs";
-    niri.inputs.nixpkgs-stable.follows = "nixpkgs-stable";
 
-    quickshell.url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
+    darkly = {
-    quickshell.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:Bali10050/Darkly";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    darkly.url = "github:Bali10050/Darkly";
+    stylix = {
-    darkly.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:danth/stylix";
-
+      inputs.nixpkgs.follows = "nixpkgs";
-    stylix.url = "github:danth/stylix";
+    };
-    stylix.inputs.nixpkgs.follows = "nixpkgs";
 
     # go-musicfox
-    go-musicfox.url = "github:imxyy1soope1/go-musicfox/master";
+    go-musicfox = {
-    go-musicfox.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:imxyy1soope1/go-musicfox/938c4d6bb2a318bc6251f3b11fa8cf54d29b4419";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # NixOS-WSL
-    nixos-wsl.url = "github:nix-community/NixOS-WSL";
+    nixos-wsl = {
-    nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/NixOS-WSL";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    fenix.url = "github:nix-community/fenix";
+    fenix = {
-    fenix.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     zen.url = "github:0xc000022070/zen-browser-flake";
     zen.inputs.nixpkgs.follows = "nixpkgs";
 
-    infuse.url = "git+https://codeberg.org/amjoseph/infuse.nix";
+    quickshell = {
-    infuse.flake = false;
+      url = "github:outfoxxed/quickshell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    noctalia = {
+      url = "github:noctalia-dev/noctalia-shell/34a6947ad69ff9aec4960e0d1d618a0c041943ca";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.quickshell.follows = "quickshell"; # Use same quickshell version
+    };
 
-    haumea.url = "github:nix-community/haumea/v0.2.2";
+    plant = {
-    haumea.inputs.nixpkgs.follows = "nixpkgs";
+      url = "git+ssh://git@git.imxyy.top:2222/imxyy1soope1/HF-plant.git?rev=08dc0b3889797eb3618c7475c3c367ec0e5fdf40";
+      flake = false;
+    };
+
+    catppuccin = {
+      url = "github:catppuccin/nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    infuse = {
+      url = "git+https://codeberg.org/amjoseph/infuse.nix";
+      flake = false;
+    };
+
+    haumea = {
+      url = "github:nix-community/haumea/v0.2.2";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    treefmt.url = "github:numtide/treefmt-nix";
   };
 
   outputs =
@@ -71,10 +105,10 @@
     let
       inherit (self) outputs;
       vars = import ./vars.nix;
-      forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
+      forAllSystems = lib.genAttrs lib.systems.flakeExposed;
       forAllHosts =
         mkSystem:
-        nixpkgs.lib.attrsets.mergeAttrsList (
+        lib.mergeAttrsList (
           builtins.map (hostname: {
             ${hostname} = mkSystem hostname;
           }) (builtins.attrNames (builtins.readDir ./config/hosts))
@@ -104,23 +138,22 @@
         }
       );
 
-      # workaround for "treefmt warning"
       formatter = forAllSystems (
         system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
+          treefmtEval = inputs.treefmt.lib.evalModule pkgs ./treefmt.nix;
         in
-        pkgs.writeShellApplication {
+        treefmtEval.config.build.wrapper
-          name = "nixfmt-wrapper";
+      );
-
+      check = forAllSystems (
-          runtimeInputs = with pkgs; [
+        system:
-            fd
+        let
-            nixfmt-rfc-style
+          pkgs = nixpkgs.legacyPackages.${system};
-          ];
+          treefmtEval = inputs.treefmt.lib.evalModule pkgs ./treefmt.nix;
-
+        in
-          text = ''
+        {
-            fd "$@" -t f -e nix -x nixfmt '{}'
+          formatting = treefmtEval.config.build.check self;
-          '';
         }
       );
 
@@ -136,19 +169,10 @@
             inputs.niri.overlays.niri
             inputs.fenix.overlays.default
             (final: prev: {
-              darkly-qt5 = inputs.darkly.packages.${final.system}.darkly-qt5;
+              darkly-qt5 = inputs.darkly.packages.${final.stdenv.hostPlatform.system}.darkly-qt5;
-              darkly-qt6 = inputs.darkly.packages.${final.system}.darkly-qt6;
+              darkly-qt6 = inputs.darkly.packages.${final.stdenv.hostPlatform.system}.darkly-qt6;
-            })
+
-            (final: prev: {
+              noctalia-shell = inputs.noctalia.packages.${final.stdenv.hostPlatform.system}.default;
-              quickshell = inputs.quickshell.packages.${final.system}.default.override {
-                withJemalloc = true;
-                withQtSvg = true;
-                withWayland = true;
-                withPipewire = false;
-                withPam = false;
-                withX11 = false;
-                withHyprland = false;
-              };
             })
             (final: prev: {
               inherit lib;
@@ -160,6 +184,7 @@
                 inputs.sops-nix.homeManagerModules.sops
                 inputs.impermanence.nixosModules.home-manager.impermanence
                 inputs.stylix.homeModules.stylix
+                inputs.noctalia.homeModules.default
                 inputs.zen.homeModules.beta
                 # workaround for annoying stylix
                 (
@@ -185,8 +210,24 @@
               outputs
               hostname
               ;
-            sopsRoot = ./secrets;
+            assets =
-          } // vars;
+              with lib.haumea;
+              load {
+                src = ./assets;
+                loader = [
+                  (matchers.always loaders.path)
+                ];
+              };
+            secrets =
+              with lib.haumea;
+              load {
+                src = ./secrets;
+                loader = [
+                  (matchers.always loaders.path)
+                ];
+              };
+          }
+          // vars;
           modules =
             (lib.umport {
               paths = [ ./modules ];
@@ -197,7 +238,7 @@
               recursive = true;
             })
             ++ [
-              (lib.mkAliasOptionModule [ "my" "home" ] [ "home-manager" "users" vars.username ])
+              (lib.mkAliasOptionModule [ "my" "hm" ] [ "home-manager" "users" vars.username ])
               ./config/base.nix
               ./config/hosts/${hostname}
               inputs.chaotic.nixosModules.default
@@ -205,6 +246,7 @@
               inputs.impermanence.nixosModules.impermanence
               inputs.home-manager.nixosModules.default
               inputs.niri.nixosModules.niri
+              inputs.catppuccin.nixosModules.catppuccin
               home
               pkgsConf
             ];

lib/default.nix

@@ -36,7 +36,7 @@
       optionName = packageName;
       config' = lib.mkMerge [
         {
-          my.home.home.packages = [ (lib.getAttrFromPath packagePath pkgs) ];
+          my.hm.home.packages = [ (lib.getAttrFromPath packagePath pkgs) ];
         }
         extraConfig
       ];
@@ -55,7 +55,7 @@
 
       config' = lib.mkMerge [
         {
-          my.home.programs = lib.setAttrByPath [ programName "enable" ] true;
+          my.hm.programs = lib.setAttrByPath [ programName "enable" ] true;
         }
         extraConfig
       ];

modules/audio.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  pkgs,
+  username,
+  ...
+}:
+lib.my.makeSwitch {
+  inherit config;
+  default = true;
+  optionName = "default audio settings";
+  optionPath = [ "audio" ];
+  config' = {
+    security.rtkit.enable = true;
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      audio.enable = true;
+    };
+    users.extraUsers.${username}.extraGroups = [ "audio" ];
+    my.persist.homeDirs = [ ".local/state/wireplumber" ];
+    my.hm.home.packages = [ pkgs.pwvucontrol ];
+  };
+}

modules/bluetooth.nix

@@ -0,0 +1,20 @@
+{ config, lib, ... }:
+lib.my.makeSwitch {
+  inherit config;
+  default = true;
+  optionName = "default bluetooth settings";
+  optionPath = [ "bluetooth" ];
+  config' = {
+    hardware.bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+      settings = {
+        General = {
+          Enable = "Source,Sink,Media,Socket";
+          Disable = "HeadSet";
+          MultiProfile = "multiple";
+        };
+      };
+    };
+  };
+}

modules/cli/media/all.nix

@@ -9,7 +9,6 @@ lib.my.makeSwitch {
   ];
   config' = {
     my.cli.media = {
-      cava.enable = true;
       go-musicfox.enable = true;
       mpd.enable = true;
       ffmpeg.enable = true;

modules/cli/media/cava/config/config

@@ -1,167 +0,0 @@
-## Configuration file for CAVA. Default values are commented out. Use either ';' or '#' for commenting.
-
-
-[general]
-
-# Smoothing mode. Can be 'normal', 'scientific' or 'waves'.
-mode = normal
-
-# Accepts only non-negative values.
-framerate = 60
-
-# 'autosens' will attempt to decrease sensitivity if the bars peak. 1 = on, 0 = off
-# 'overshoot' allows bars to overshoot (in % of terminal height) without initiating autosens.
-; autosens = 1
-; overshoot = 20
-
-# Manual sensitivity in %. Autosens must be turned off for this to take effect.
-# 200 means double height. Accepts only non-negative values.
-; sensitivity = 100
-
-# The number of bars (0-200). 0 sets it to auto (fill up console).
-# Bars' width and space between bars in number of characters.
-bars = 0
-bar_width = 5
-bar_spacing = 1
-
-# Lower and higher cutoff frequencies for lowest and highest bars
-# the bandwidth of the visualizer.
-# Note: there is a minimum total bandwidth of 43Mhz x number of bars.
-# Cava will automatically increase the higher cutoff if a too low band is specified.
-; lower_cutoff_freq = 50
-; higher_cutoff_freq = 10000
-
-
-
-[input]
-
-# Audio capturing method. Possible methods are: 'pulse', 'alsa' or 'fifo'.
-# Defaults to 'pulse', 'alsa' or 'fifo', in that order, dependent on what support cava was built with.
-#
-# All input methods uses the same config variable 'source'
-# to define where it should get the audio.
-#
-# For pulseaudio 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink
-# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them).
-#
-# For alsa 'source' will be the capture device.
-# For fifo 'source' will be the path to fifo-file.
-method = pulse
-source = auto
-
-; method = alsa
-; source = hw:Loopback,1
-
-; method = fifo
-; source = /tmp/mpd.fifo
-
-
-
-[output]
-
-# Ouput method. Can be 'ncurses', 'noncurses' or 'raw'.
-# 'noncurses' is for systems that does not suport ncurses.
-# 'raw' is a 16 bit data stream of the bar heights that can be used to send to other applications.
-# 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above.
-method = ncurses
-
-# Visual styles. Can be 'stereo' or 'mono'.
-# 'stereo' mirrors both channels with low frequencies in center.
-# 'mono' averages both channels and outputs left to right lowest to highest frequencies.
-style = mono
-
-# Raw output target. A fifo will be created if target does not exist.
-; raw_target = /dev/stdout
-
-# Raw data format. Can be 'binary' or 'ascii'.
-; data_format = binary
-
-# Binary bit format, can be '8bit' (0-255) or '16bit' (0-65530).
-; bit_format = 16bit
-
-# Ascii max value. In 'ascii' mode range will run from 0 to value specified here
-; ascii_max_range = 1000
-
-# Ascii delimiters. In ascii format each bar and frame is separated by a delimiters.
-# Use decimal value in ascii table (i.e. 59 = ';' and 10 = '\n' (line feed)).
-; bar_delimiter = 59
-; frame_delimiter = 10
-
-
-
-# [color]
-
-# # Colors can be one of seven predefined: black, blue, cyan, green, magenta, red, white, yellow.
-# # Or defined by hex code '#xxxxxx' (hex code must be within ''). User defined colors requires a
-# # terminal that can change color definitions such as Gnome-terminal or rxvt.
-# ; background = black
-# ; foreground = cyan
-
-# # Gradient mode, only hex defined colors are supported, background must also be defined in hex
-# # or remain commented out. 1 = on, 0 = off. Warning: for certain terminal emulators cava will
-# # not able to restore color definitions on exit, simply restart your terminal to restore colors.
-# gradient = 1
-# gradient_color_1 = '#0099ff'
-# gradient_color_2 = '#ff3399'
-
-
-
-[smoothing]
-
-# Multiplier for the integral smoothing calculations. Takes values from 0-0.99.
-# Higher values means smoother, but less precise. Set to 0 to disable.
-; integral = 0.7
-
-# Disables or enables the so-called "Monstercat smoothing". Set to 0 to disable.
-; monstercat = 1
-; waves = 1
-
-# Set gravity multiplier for "drop off". Higher values means bars will drop faster.
-# Accepts only non-negative values. 0.5 means half gravity, 2 means double. Set to 0 to disable "drop off".
-; gravity = 2
-
-
-# In bar height, bars that would have been lower that this will not be drawn.
-; ignore = 0
-
-
-[eq]
-
-# This one is tricky. You can have as much keys as you want.
-# Remember to uncomment more then one key! More keys = more precision.
-# Look at readme.md on github for further explanations and examples.
-#; 1 = 1 # bass
-#; 2 = 1
-#; 3 = 1 # midtone
-#; 4 = 1
-#; 5 = 1 # treble
-1=1
-2=1
-3=2
-4=1
-5=1
-
-[color]
-
-#background = '#191724'
-gradient = 1
-gradient_count = 6
-gradient_color_1 = '#31748f'
-gradient_color_2 = '#9ccfd8'
-gradient_color_3 = '#c4a7e7'
-gradient_color_4 = '#ebbcba'
-gradient_color_5 = '#f6c177'
-gradient_color_6 = '#eb6f92'
-
-[color]
-
-gradient = 1
-
-gradient_color_1 = '#94e2d5'
-gradient_color_2 = '#89dceb'
-gradient_color_3 = '#74c7ec'
-gradient_color_4 = '#89b4fa'
-gradient_color_5 = '#cba6f7'
-gradient_color_6 = '#f5c2e7'
-gradient_color_7 = '#eba0ac'
-gradient_color_8 = '#f38ba8'

modules/cli/media/cava/config/config-applet

@@ -1,167 +0,0 @@
-## Configuration file for CAVA. Default values are commented out. Use either ';' or '#' for commenting.
-
-
-[general]
-
-# Smoothing mode. Can be 'normal', 'scientific' or 'waves'.
-mode = normal
-
-# Accepts only non-negative values.
-framerate = 60
-
-# 'autosens' will attempt to decrease sensitivity if the bars peak. 1 = on, 0 = off
-# 'overshoot' allows bars to overshoot (in % of terminal height) without initiating autosens.
-; autosens = 1
-; overshoot = 20
-
-# Manual sensitivity in %. Autosens must be turned off for this to take effect.
-# 200 means double height. Accepts only non-negative values.
-; sensitivity = 100
-
-# The number of bars (0-200). 0 sets it to auto (fill up console).
-# Bars' width and space between bars in number of characters.
-bars = 0
-bar_width = 2
-bar_spacing = 1
-
-# Lower and higher cutoff frequencies for lowest and highest bars
-# the bandwidth of the visualizer.
-# Note: there is a minimum total bandwidth of 43Mhz x number of bars.
-# Cava will automatically increase the higher cutoff if a too low band is specified.
-; lower_cutoff_freq = 50
-; higher_cutoff_freq = 10000
-
-
-
-[input]
-
-# Audio capturing method. Possible methods are: 'pulse', 'alsa' or 'fifo'.
-# Defaults to 'pulse', 'alsa' or 'fifo', in that order, dependent on what support cava was built with.
-#
-# All input methods uses the same config variable 'source'
-# to define where it should get the audio.
-#
-# For pulseaudio 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink
-# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them).
-#
-# For alsa 'source' will be the capture device.
-# For fifo 'source' will be the path to fifo-file.
-method = pulse
-source = auto
-
-; method = alsa
-; source = hw:Loopback,1
-
-; method = fifo
-; source = /tmp/mpd.fifo
-
-
-
-[output]
-
-# Ouput method. Can be 'ncurses', 'noncurses' or 'raw'.
-# 'noncurses' is for systems that does not suport ncurses.
-# 'raw' is a 16 bit data stream of the bar heights that can be used to send to other applications.
-# 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above.
-method = ncurses
-
-# Visual styles. Can be 'stereo' or 'mono'.
-# 'stereo' mirrors both channels with low frequencies in center.
-# 'mono' averages both channels and outputs left to right lowest to highest frequencies.
-style = mono
-
-# Raw output target. A fifo will be created if target does not exist.
-; raw_target = /dev/stdout
-
-# Raw data format. Can be 'binary' or 'ascii'.
-; data_format = binary
-
-# Binary bit format, can be '8bit' (0-255) or '16bit' (0-65530).
-; bit_format = 16bit
-
-# Ascii max value. In 'ascii' mode range will run from 0 to value specified here
-; ascii_max_range = 1000
-
-# Ascii delimiters. In ascii format each bar and frame is separated by a delimiters.
-# Use decimal value in ascii table (i.e. 59 = ';' and 10 = '\n' (line feed)).
-; bar_delimiter = 59
-; frame_delimiter = 10
-
-
-
-# [color]
-
-# # Colors can be one of seven predefined: black, blue, cyan, green, magenta, red, white, yellow.
-# # Or defined by hex code '#xxxxxx' (hex code must be within ''). User defined colors requires a
-# # terminal that can change color definitions such as Gnome-terminal or rxvt.
-# ; background = black
-# ; foreground = cyan
-
-# # Gradient mode, only hex defined colors are supported, background must also be defined in hex
-# # or remain commented out. 1 = on, 0 = off. Warning: for certain terminal emulators cava will
-# # not able to restore color definitions on exit, simply restart your terminal to restore colors.
-# gradient = 1
-# gradient_color_1 = '#0099ff'
-# gradient_color_2 = '#ff3399'
-
-
-
-[smoothing]
-
-# Multiplier for the integral smoothing calculations. Takes values from 0-0.99.
-# Higher values means smoother, but less precise. Set to 0 to disable.
-; integral = 0.7
-
-# Disables or enables the so-called "Monstercat smoothing". Set to 0 to disable.
-; monstercat = 1
-; waves = 1
-
-# Set gravity multiplier for "drop off". Higher values means bars will drop faster.
-# Accepts only non-negative values. 0.5 means half gravity, 2 means double. Set to 0 to disable "drop off".
-; gravity = 1
-
-
-# In bar height, bars that would have been lower that this will not be drawn.
-; ignore = 0
-
-
-[eq]
-
-# This one is tricky. You can have as much keys as you want.
-# Remember to uncomment more then one key! More keys = more precision.
-# Look at readme.md on github for further explanations and examples.
-#; 1 = 1 # bass
-#; 2 = 1
-#; 3 = 1 # midtone
-#; 4 = 1
-#; 5 = 1 # treble
-1=1
-2=1
-3=2
-4=1
-5=1
-
-[color]
-
-#background = '#191724'
-gradient = 1
-gradient_count = 6
-gradient_color_1 = '#31748f'
-gradient_color_2 = '#9ccfd8'
-gradient_color_3 = '#c4a7e7'
-gradient_color_4 = '#ebbcba'
-gradient_color_5 = '#f6c177'
-gradient_color_6 = '#eb6f92'
-
-[color]
-
-gradient = 1
-
-gradient_color_1 = '#94e2d5'
-gradient_color_2 = '#89dceb'
-gradient_color_3 = '#74c7ec'
-gradient_color_4 = '#89b4fa'
-gradient_color_5 = '#cba6f7'
-gradient_color_6 = '#f5c2e7'
-gradient_color_7 = '#eba0ac'
-gradient_color_8 = '#f38ba8'

modules/cli/media/cava/config/shaders/bar_spectrum.frag

@@ -1,79 +0,0 @@
-#version 330
-
-in vec2 fragCoord;
-out vec4 fragColor;
-
-// bar values. defaults to left channels first (low to high), then right (high to low).
-uniform float bars[512];
-
-uniform int bars_count;    // number of bars (left + right) (configurable)
-uniform int bar_width;    // bar width (configurable), not used here
-uniform int bar_spacing;    // space bewteen bars (configurable)
-
-uniform vec3 u_resolution; // window resolution
-
-//colors, configurable in cava config file (r,g,b) (0.0 - 1.0)
-uniform vec3 bg_color; // background color
-uniform vec3 fg_color; // foreground color
-
-uniform int gradient_count;
-uniform vec3 gradient_colors[8]; // gradient colors
-
-vec3 normalize_C(float y,vec3 col_1, vec3 col_2, float y_min, float y_max)
-{
-    //create color based on fraction of this color and next color
-    float yr = (y - y_min) / (y_max - y_min);
-    return col_1 * (1.0 - yr) + col_2 * yr;
-}
-
-void main()
-{
-    // find which bar to use based on where we are on the x axis
-    float x = u_resolution.x * fragCoord.x;
-    int bar = int(bars_count * fragCoord.x);
-
-    //calculate a bar size
-    float bar_size = u_resolution.x / bars_count;
-
-    //the y coordinate and bar values are the same
-    float y =  bars[bar];
-
-    // make sure there is a thin line at bottom
-    if (y * u_resolution.y < 1.0)
-    {
-      y = 1.0 / u_resolution.y;
-    }
-
-    //draw the bar up to current height
-    if (y > fragCoord.y)
-    {
-        //make some space between bars basen on settings
-        if (x > (bar + 1) * (bar_size) - bar_spacing)
-        {
-            fragColor = vec4(bg_color,1.0);
-        }
-        else
-        {
-            if (gradient_count == 0)
-            {
-                fragColor = vec4(fg_color,1.0);
-            }
-            else
-            {
-                //find which color in the configured gradient we are at
-                int color = int((gradient_count - 1) * fragCoord.y);
-
-                //find where on y this and next color is supposed to be
-                float y_min = color / (gradient_count - 1.0);
-                float y_max = (color + 1.0) / (gradient_count - 1.0);
-
-                //make color
-                fragColor = vec4(normalize_C(fragCoord.y, gradient_colors[color], gradient_colors[color + 1], y_min, y_max), 1.0);
-            }
-        }
-    }
-    else
-    {
-        fragColor = vec4(bg_color,1.0);
-    }
-}

modules/cli/media/cava/config/shaders/normalized_bars.frag

@@ -1,38 +0,0 @@
-#version 330
-
-in vec2 fragCoord;
-out vec4 fragColor;
-
-// bar values. defaults to left channels first (low to high), then right (high to low).
-uniform float bars[512];
-
-uniform int bars_count;    // number of bars (left + right) (configurable)
-
-uniform vec3 u_resolution; // window resolution, not used here
-
-//colors, configurable in cava config file
-uniform vec3 bg_color; // background color(r,g,b) (0.0 - 1.0), not used here
-uniform vec3 fg_color; // foreground color, not used here
-
-float normalize_C(float x, float x_min, float x_max, float r_min, float r_max )
-{
-	float xr;
-	xr = (r_max-r_min) * (x - x_min) / (x_max - x_min) + r_min;
-	return xr;
-}
-
-void main()
-{
-    // find which bar to use based on where we are on the x axis
-    int bar = int(bars_count * fragCoord.x);
-
-    // create a normal along the y axis based on the bar height
-    float x = normalize_C(fragCoord.y, 1.0, 0.0, 0.0, bars[bar]);
-
-    // set color
-    fragColor.r=fg_color.x*x;
-    fragColor.g=fg_color.y*x;
-    fragColor.b=fg_color.z*x;
-    fragColor.a=1.0;
-
-}

modules/cli/media/cava/config/shaders/northern_lights.frag

@@ -1,34 +0,0 @@
-#version 330
-
-in vec2 fragCoord;
-out vec4 fragColor;
-
-// bar values. defaults to left channels first (low to high), then right (high to low).
-uniform float bars[512];
-
-uniform int bars_count;    // number of bars (left + right) (configurable)
-
-uniform vec3 u_resolution; // window resolution, not used here
-
-//colors, configurable in cava config file
-uniform vec3 bg_color; // background color(r,g,b) (0.0 - 1.0), not used here
-uniform vec3 fg_color; // foreground color, not used here
-
-void main()
-{
-    // find which bar to use based on where we are on the x axis
-    int bar = int(bars_count * fragCoord.x);
-
-    float bar_y = 1.0 - abs((fragCoord.y - 0.5)) * 2.0;
-    float y = (bars[bar]) * bar_y;
-
-    float bar_x = (fragCoord.x - float(bar) / float(bars_count)) * bars_count;
-    float bar_r = 1.0 - abs((bar_x - 0.5)) * 2;
-
-    bar_r = bar_r * bar_r * 2;
-
-    // set color
-    fragColor.r = fg_color.x * y * bar_r;
-    fragColor.g = fg_color.y * y * bar_r;
-    fragColor.b = fg_color.z * y * bar_r;
-}

modules/cli/media/cava/config/shaders/pass_through.vert

@@ -1,14 +0,0 @@
-#version 330
-
-
-// Input vertex data, different for all executions of this shader.
-layout(location = 0) in vec3 vertexPosition_modelspace;
-
-// Output data ; will be interpolated for each fragment.
-out vec2 fragCoord;
-
-void main()
-{
-    gl_Position =  vec4(vertexPosition_modelspace,1);
-    fragCoord  = (vertexPosition_modelspace.xy+vec2(1,1))/2.0;
-}

modules/cli/media/cava/default.nix

@@ -1,22 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-lib.my.makeHomePackageConfig {
-  inherit config pkgs;
-  packageName = "cava";
-  packagePath = [ "cava" ];
-  optionPath = [
-    "cli"
-    "media"
-    "cava"
-  ];
-  extraConfig = {
-    my.home.xdg.configFile."cava" = {
-      source = ./config;
-      recursive = true;
-    };
-  };
-}

modules/cli/media/go-musicfox.nix

@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  secrets,
   ...
 }:
 lib.my.makeSwitch {
@@ -14,12 +15,16 @@ lib.my.makeSwitch {
   ];
   config' = {
     my = {
-      home = {
+      hm = {
         home.packages = with pkgs; [
           playerctl
           go-musicfox
         ];
-        xdg.configFile."go-musicfox/go-musicfox.ini".source = ./go-musicfox.ini;
+        sops.secrets.go-musicfox = {
+          sopsFile = secrets."go-musicfox.ini";
+          format = "binary";
+          path = "${config.my.hm.xdg.configHome}/go-musicfox/go-musicfox.ini";
+        };
       };
 
       cli.media.mpd.enable = true;

modules/cli/media/go-musicfox/go-musicfox.ini

@@ -1,97 +0,0 @@
-# 启动页配置
-[startup]
-# 是否显示启动页
-show=false
-# 启动页进度条是否有回弹效果
-progressOutBounce=true
-# 启动页时长
-loadingSeconds=2
-# 启动页欢迎语
-welcome=musicfox
-# 启动时自动签到
-signin=false
-
-# 进度条配置
-[progress]
-# 进度条已加载字符
-fullChar=#
-# 进度条未加载字符
-emptyChar=
-
-# 主页面配置
-[main]
-# 是否显示标题
-showTitle=true
-# 加载中提示
-loadingText=[加载中...]
-# 歌曲音质，可选项：standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), jymaster(超清母带) 进行音质判断
-songLevel=hires
-# 主题颜色
-# 随机
-# primaryColor=random
-# 经典网易云音乐红
-#primaryColor="#ea403f"
-primaryColor="#6186D9"
-# 是否显示歌词
-showLyric=true
-# 歌词偏移 ms
-lyricOffset=0
-# 显示歌词翻译
-showLyricTrans=true
-# 是否显示通知信息
-showNotify=false
-# 开启pprof, --pprof时会开启
-pprofPort=9876
-# altScreen显示模式
-altScreen=true
-# 双列显示，开启务必使用等宽字体
-doubleColumn=true
-# 下载目录，默认为$HOME/.go-musicfox/download
-downloadDir=/home/imxyy/Music/go-musicfox
-# 缓存目录，默认为${MUSICFOX_ROOT}/cache
-cacheDir=/home/imxyy/Music/go-musicfox/.cache
-# 缓存大小（以MB为单位），0为不使用缓存，-1为不限制，默认为0
-cacheLimit=-1
-# 是否显示歌单下所有歌曲，默认不开启，仅获取歌单前1000首，开启后可能会占用更多内存（大量歌曲数据）和带宽（会同时发送多个请求获取歌单下歌曲数据）
-showAllSongsOfPlaylist=false
-# 动态显示menu行数
-dynamicMenuRows=true
-enableMouseEvent = false
-
-[autoplay]
-# 是否开启自动播放，默认不开启
-autoPlay=true
-# 自动播放歌单，dailyReco,like,no（保持上次退出时的设置，无视offset）,name:歌单名，默认dailyReco
-autoPlayList="no"
-# 播放偏移，0为第一首，-1为最后一首，默认为0
-offset=0
-# 播放模式，listLoop, order, singleLoop, random, intelligent（心动）, last（上次退出时的模式）,default，默认为last
-playMode=singleLoop
-
-[player]
-# 播放引擎 beep / mpd(需要安装配置mpd) / osx(Mac才可用)
-# 不填Mac默认使用osx，其他系统默认使用beep（推荐的配置）
-engine=mpd
-# beep使用的mp3解码器，可选：go-mp3, minimp3 (minimp3更少的CPU占用，但是稳定性不如go-mp3)
-#beepMp3Decoder=go-mp3
-
-# mpd配置
-mpdBin=mpd
-# !!!注意!!! 一定要在配置文件中设置pid_file，否则在退出时不会kill掉mpd进程
-mpdConfigFile=/home/imxyy/.config/mpd/mpd.conf
-mpdNetwork=tcp
-mpdAddr=127.0.0.1:6600
-
-[unm]
-# UNM开关
-switch=true
-# UNM源: kuwo,kugou,migu,qq
-sources=kuwo,kugou
-# UNM搜索其他平台限制 0-3
-searchLimit=0
-# 解除会员限制
-enableLocalVip=true
-# 解除音质限制
-unlockSoundEffects=true
-# QQ音乐cookie文件
-qqCookieFile=

modules/cli/media/mpd/default.nix

@@ -13,7 +13,7 @@ lib.my.makeSwitch {
     "mpd"
   ];
   config' = {
-    my.home = {
+    my.hm = {
       home.packages = with pkgs.stable; [
         mpd
         mpc-cli

modules/cli/media/mpd/mpd.conf

@@ -23,8 +23,3 @@ audio_output {
     type        "pipewire"
     name        "pipewire"
 }
-
-audio_output {
-    type        "pulse"
-    name        "pulseaudio"
-}

modules/cli/misc.nix

@@ -42,15 +42,18 @@ lib.my.makeSwitch {
       dnsutils
 
       killall
+
+      comma
     ];
 
     programs.dconf.enable = true;
 
-    my.home = {
+    my.hm = {
       home.packages = with pkgs; [
         lsd
         fd
         neofetch
+        fastfetch
         fzf
         bat
         ripgrep
@@ -80,6 +83,119 @@ lib.my.makeSwitch {
         enableAutoUpdates = true;
         settings.updates.auto_update = true;
       };
+      programs.television = {
+        enable = true;
+        enableZshIntegration = true;
+      };
+      xdg.configFile."fastfetch/config.jsonc".text = ''
+        {
+          "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+          "display": {
+            "separator": "  "
+          },
+          "modules": [
+            // Title
+            {
+              "type": "title",
+              "format": "{user-name-colored}{#}@{host-name-colored}"
+            },
+            {
+              "type": "custom",
+              "format": "---------------"
+            },
+            // System Information
+            {
+              "type": "custom",
+              "format": "{#}System Information"
+            },
+            {
+              "type": "os",
+              "key": "{#keys}󰍹 OS"
+            },
+            {
+              "type": "kernel",
+              "key": "{#keys}󰒋 Kernel"
+            },
+            {
+              "type": "uptime",
+              "key": "{#keys}󰅐 Uptime"
+            },
+            {
+              "type": "packages",
+              "key": "{#keys}󰏖 Packages",
+              "format": "{all}"
+            },
+            {
+              "type": "custom",
+              "format": ""
+            },
+            // Desktop Environment
+            {
+              "type": "custom",
+              "format": "{#}Desktop Environment"
+            },
+            {
+              "type": "de",
+              "key": "{#keys}󰧨 DE"
+            },
+            {
+              "type": "wm",
+              "key": "{#keys}󱂬 WM"
+            },
+            {
+              "type": "wmtheme",
+              "key": "{#keys}󰉼 Theme"
+            },
+            {
+              "type": "display",
+              "key": "{#keys}󰹑 Resolution"
+            },
+            {
+              "type": "shell",
+              "key": "{#keys}󰞷 Shell"
+            },
+            {
+              "type": "terminalfont",
+              "key": "{#keys}󰛖 Font"
+            },
+            {
+              "type": "custom",
+              "format": ""
+            },
+            // Hardware Information
+            {
+              "type": "custom",
+              "format": "{#}Hardware Information"
+            },
+            {
+              "type": "cpu",
+              "key": "{#keys}󰻠 CPU"
+            },
+            {
+              "type": "gpu",
+              "key": "{#keys}󰢮 GPU"
+            },
+            {
+              "type": "memory",
+              "key": "{#keys}󰍛 Memory"
+            },
+            {
+              "type": "disk",
+              "key": "{#keys}󰋊 Disk (/)",
+              "folders": "/"
+            },
+            {
+              "type": "custom",
+              "format": ""
+            },
+            // Colors
+            {
+              "type": "colors",
+              "symbol": "circle"
+            },
+          ]
+        }
+      '';
     };
   };
 }

modules/cli/monitor/btop/default.nix

@@ -14,7 +14,7 @@ lib.my.makeHomePackageConfig {
     "btop"
   ];
   extraConfig = {
-    my.home.xdg.configFile."btop" = {
+    my.hm.xdg.configFile."btop" = {
       source = ./config;
       recursive = true;
     };

modules/cli/shell/zsh.nix

@@ -15,9 +15,9 @@ lib.my.makeSwitch {
   ];
   config' = {
     my.persist.homeDirs = [ ".local/share/zoxide" ];
-    my.home =
+    my.hm =
       let
-        stateHome = config.my.home.xdg.stateHome;
+        stateHome = config.my.hm.xdg.stateHome;
         zsh-syntax-highlighting = pkgs.fetchFromGitHub {
           owner = "zsh-users";
           repo = "zsh-syntax-highlighting";
@@ -44,11 +44,11 @@ lib.my.makeSwitch {
               jj = {
                 ignore_timeout = true;
                 description = "The current jj status";
-                when = "jj root";
+                when = true;
-                symbol = " ";
                 command = ''
                   jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '
                     separate(" ",
+                      " ",
                       change_id.shortest(4),
                       bookmarks,
                       "|",
@@ -64,19 +64,9 @@ lib.my.makeSwitch {
                         "(no description set)",
                       ) ++ raw_escape_sequence("\x1b[0m"),
                     )
-                  '
+                  ' || (starship module git_branch && starship module git_status)
                 '';
               };
-              git_branch = {
-                when = true;
-                command = "jj root >/dev/null 2>&1 || starship module git_branch";
-                description = "Only show git_branch if we're not in a jj repo";
-              };
-              git_status = {
-                when = true;
-                command = "jj root >/dev/null 2>&1 || starship module git_status";
-                description = "Only show git_status if we're not in a jj repo";
-              };
             };
             git_state.disabled = true;
             git_commit.disabled = true;
@@ -88,7 +78,7 @@ lib.my.makeSwitch {
         };
         programs.zsh = {
           enable = true;
-          dotDir = ".config/zsh";
+          dotDir = "${config.my.hm.xdg.configHome}/zsh";
           history = {
             path = "${stateHome}/zsh_history";
             ignorePatterns = [
@@ -117,7 +107,7 @@ lib.my.makeSwitch {
             x = "extract";
             ls = "lsd";
             svim = "sudoedit";
-            nf = "neofetch";
+            nf = "fastfetch";
             tmux = "tmux -T RGB,focus,overline,mouse,clipboard,usstyle";
             pastart = "pasuspender true";
           };

modules/cli/vcs/git.nix

@@ -16,22 +16,24 @@ lib.my.makeHomeProgramConfig {
     "git"
   ];
   extraConfig = {
-    my.home = {
+    my.hm = {
       programs.git = {
-        userName = "${userfullname}";
+        settings = {
-        userEmail = "${useremail}";
-        signing = {
-          format = "ssh";
-          signByDefault = true;
-          key = "/home/${username}/.ssh/id_ed25519";
-        };
-        extraConfig = {
-          push.autoSetupRemote = true;
           gpg.ssh.allowedSignersFile =
             (pkgs.writeText "allowed_signers" ''
               imxyy1soope1@gmail.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO imxyy@imxyy-nix
               imxyy@imxyy.top ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO imxyy@imxyy-nix
             '').outPath;
+          push.autoSetupRemote = true;
+          user = {
+            name = userfullname;
+            email = useremail;
+          };
+        };
+        signing = {
+          format = "ssh";
+          signByDefault = true;
+          key = "/home/${username}/.ssh/id_ed25519";
         };
       };
       programs.lazygit = {

modules/cli/vcs/jj.nix

@@ -16,7 +16,7 @@ lib.my.makeHomeProgramConfig {
     "jj"
   ];
   extraConfig = {
-    my.home = {
+    my.hm = {
       programs.jujutsu = {
         settings = {
           user = {
@@ -26,6 +26,7 @@ lib.my.makeHomeProgramConfig {
           ui = {
             graph.style = "square";
             default-command = "status";
+            conflict-marker-style = "snapshot";
           };
           signing = {
             backend = "ssh";

modules/coding/editor/neovim/default.nix

@@ -13,7 +13,7 @@ lib.my.makeHomeProgramConfig {
     "neovim"
   ];
   extraConfig = {
-    my.home = {
+    my.hm = {
       xdg.configFile."nvim/init.lua".source = ./nvim/init.lua;
       xdg.configFile."nvim/lua" = {
         source = ./nvim/lua;
@@ -26,31 +26,9 @@ lib.my.makeHomeProgramConfig {
         vimAlias = true;
         vimdiffAlias = true;
         extraPackages = with pkgs; [
-          gcc
+          gcc # treesitter
-          gnumake
 
-          pyright
+          ripgrep # telescope
-
-          clang-tools
-
-          rust-analyzer
-          pest-ide-tools
-
-          nixd
-
-          gotools
-          gopls
-
-          stylua
-          lua-language-server
-
-          nodePackages.vscode-langservers-extracted
-          nodePackages.typescript-language-server
-          vue-language-server
-          typescript
-          nodejs
-
-          ripgrep
         ];
       };
     };

modules/coding/editor/neovim/nvim/init.lua

@@ -4,5 +4,3 @@ require("core.keymaps")
 require("langs.langs-setup")
 
 require("plugins.plugins-setup")
-
-require("core.autostart")

modules/coding/editor/neovim/nvim/lua/core/autostart.lua

@@ -1,7 +0,0 @@
--- Open tree when in config dir
-local configdir = vim.fn.system("echo $HOME/.config")
-configdir = string.sub(configdir, 1, string.len(configdir) - 1)
-if string.find(vim.fn.system("pwd"), configdir) ~= nil then
-  vim.cmd("NvimTreeOpen")
-  vim.cmd("NvimTmuxNavigateRight")
-end

modules/coding/editor/neovim/nvim/lua/core/keymaps.lua

@@ -7,33 +7,21 @@ local buf_kill = globals.buf_kill
 
 keymap.set("v", "<S-pageup>", ":m '<-2<CR>gv=gv", opt)
 keymap.set("v", "<S-pagedown>", ":m '>+1<CR>gv=gv", opt)
+keymap.set({ "i", "n", "v" }, "<S-up>", "<up>", opt)
+keymap.set({ "i", "n", "v" }, "<S-down>", "<down>", opt)
 
 keymap.set("n", "<leader>nh", ":nohl<CR>", opt)
 
 keymap.set("n", "<leader>sv", "<C-w>v", opt)
 keymap.set("n", "<leader>sh", "<C-w>s", opt)
 
-keymap.set("i", "<S-up>", "<ESC>v<up>", opt)
-keymap.set("i", "<S-down>", "<ESC>v<down>", opt)
-keymap.set("n", "<S-up>", "v<up>", opt)
-keymap.set("n", "<S-down>", "v<down>", opt)
-keymap.set("v", "<S-up>", "<up>", opt)
-keymap.set("v", "<S-down>", "<down>", opt)
-
-keymap.set("i", "<S-left>", "<ESC>v<left>", opt)
-keymap.set("i", "<S-right>", "<ESC>v<right>", opt)
-keymap.set("n", "<S-left>", "v<left>", opt)
-keymap.set("n", "<S-right>", "v<right>", opt)
-keymap.set("v", "<S-left>", "<left>", opt)
-keymap.set("v", "<S-right>", "<right>", opt)
-
 keymap.set("v", ".", ">gv", opt)
 keymap.set("v", ",", "<gv", opt)
 
 keymap.set({ "n", "v" }, "<pageup>", "9k", opt)
 keymap.set({ "n", "v" }, "<pagedown>", "9j", opt)
-keymap.set("i", "<pageup>", "<up><up><up><up><up><up><up><up><up>", opt)
+keymap.set("i", "<pageup>", string.rep("<up>", 9), opt)
-keymap.set("i", "<pagedown>", "<down><down><down><down><down><down><down><down><down>", opt)
+keymap.set("i", "<pagedown>", string.rep("<down>", 9), opt)
 
 keymap.set("n", "<leader>ww", ":w<CR>", opt)
 keymap.set("n", "<leader>so", ":so<CR>", opt)
@@ -54,15 +42,6 @@ keymap.set("n", "L", ":BufferLineCycleNext<CR>", opt)
 keymap.set("n", "<A-h>", ":BufferLineMovePrev<CR>", opt)
 keymap.set("n", "<A-l>", ":BufferLineMoveNext<CR>", opt)
 
--- reload config
-keymap.set("n", "<leader>rc", ":so ~/.config/nvim/init.lua<CR>", opt)
-keymap.set("n", "<leader>rp", ":so ~/.config/nvim/lua/plugins/plugins-setup.lua<CR>", opt)
-
--- Workspaces
-keymap.set("n", "<leader>wo", ":Telescope workspaces<CR>", opt)
-keymap.set("n", "<leader>wa", ":WorkspacesAdd<CR>", opt)
-keymap.set("n", "<leader>wr", ":WorkspacesRemove<CR>", opt)
-
 -- Neovide config
 if vim.g.neovide then
   keymap.set("v", "<C-C>", '"+y', opt)

modules/coding/editor/neovim/nvim/lua/core/options.lua

@@ -30,6 +30,8 @@ opt.timeoutlen = 500
 
 opt.completeopt = ""
 
+opt.exrc = true
+
 opt.autoread = true
 vim.g.autoread = true
 

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

@@ -9,6 +9,7 @@ local servers = {
   "cssls",
   "nixd",
   "html",
+  "java_language_server",
 }
 
 local extra_config = {
@@ -35,7 +36,7 @@ local extra_config = {
   },
   rust_analyzer = {
     settings = {
-      rust_analyzer = {
+      ["rust-analyzer"] = {
         check = {
           command = "clippy",
         },
@@ -63,8 +64,8 @@ local extra_config = {
     },
   },
   qmlls = {
-    cmd = {"qmlls", "-E"}
+    cmd = { "qmlls", "-E" },
-  }
+  },
 }
 
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
@@ -73,7 +74,6 @@ capabilities.textDocument.foldingRange = {
   dynamicRegistration = false,
   lineFoldingOnly = true,
 }
-local lspconfig = require("lspconfig")
 for _, server in ipairs(servers) do
   local extra = extra_config[server] or {}
   local config = {
@@ -82,5 +82,6 @@ for _, server in ipairs(servers) do
   for k, v in pairs(extra) do
     config[k] = v
   end
-  lspconfig[server].setup(config)
+  vim.lsp.config(server, config)
+  vim.lsp.enable(server)
 end

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

@@ -1,6 +0,0 @@
-M = {
-  -- ensure_installed = require("plugins.lsp.servers")
-  ensure_installed = {},
-}
-
-return M

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

@@ -1,11 +0,0 @@
-M = {
-  ui = {
-    icons = {
-      package_installed = "✓",
-      package_pending = "➜",
-      package_uninstalled = "✗",
-    },
-  },
-}
-
-return M

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

@@ -1,14 +0,0 @@
-M = {
-  "lua_ls",
-  "pyright",
-  "gopls",
-  "clangd",
-  "rust_analyzer",
-  "ts_ls",
-  "jsonls",
-  "cssls",
-  "nil_ls",
-  "html",
-}
-
-return M

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

@@ -17,4 +17,16 @@ 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

@@ -62,6 +62,11 @@ local plugins = {
       require("ibl").setup(require("plugins.indent-blankline"))
     end,
   },
+  {
+    "norcalli/nvim-colorizer.lua",
+    event = "VeryLazy",
+    opt = {},
+  },
   {
     "neovim/nvim-lspconfig",
     dependencies = { "hrsh7th/cmp-nvim-lsp" },
@@ -113,7 +118,7 @@ local plugins = {
     "MysticalDevil/inlay-hints.nvim",
     event = "LspAttach",
     dependencies = { "neovim/nvim-lspconfig" },
-    opts = {}
+    opts = {},
   },
   {
     "hedyhli/outline.nvim",
@@ -149,7 +154,7 @@ local plugins = {
   {
     "numToStr/Comment.nvim",
     event = "VeryLazy",
-    opts = {}
+    opts = {},
   },
   {
     "windwp/nvim-autopairs",
@@ -179,22 +184,42 @@ local plugins = {
       require("telescope").setup(require("plugins.telescope"))
     end,
   },
+  {
+    "dnlhc/glance.nvim",
+    cmd = "Glance",
+    keys = {
+      {
+        "<leader>lr",
+        "<cmd>Glance references<cr>",
+      },
+      {
+        "<leader>ld",
+        "<cmd>Glance definitions<cr>",
+      },
+      {
+        "<leader>lD",
+        "<cmd>Glance type_definitions<cr>",
+      },
+      {
+        "<leader>li",
+        "<cmd>Glance implementations<cr>",
+      },
+    },
+  },
   {
     "ggandor/leap.nvim",
     dependencies = { "tpope/vim-repeat" },
     config = function()
-      require("leap").set_default_mappings()
+      vim.keymap.set({ "n", "x", "o" }, "s", "<Plug>(leap)")
+      vim.keymap.set("n", "S", "<Plug>(leap-from-window)")
       -- Exclude whitespace and the middle of alphabetic words from preview:
       --   foobar[baaz] = quux
       --   ^----^^^--^^-^-^--^
-      require('leap').opts.preview_filter = function(ch0, ch1, ch2)
+      require("leap").opts.preview_filter = function(ch0, ch1, ch2)
-        return not (
+        return not (ch1:match("%s") or ch0:match("%a") and ch1:match("%a") and ch2:match("%a"))
-          ch1:match('%s') or
-          ch0:match('%a') and ch1:match('%a') and ch2:match('%a')
-        )
       end
-      require('leap.user').set_repeat_keys('<enter>', '<backspace>')
+      require("leap.user").set_repeat_keys("<enter>", "<backspace>")
-    end
+    end,
   },
   {
     "alexghergh/nvim-tmux-navigation",

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

@@ -35,9 +35,6 @@ keymap.set("n", "<leader>gf", builtin.git_files, opt)
 keymap.set("n", "<leader>fg", builtin.live_grep, opt)
 keymap.set("n", "<leader>fb", builtin.buffers, opt)
 keymap.set("n", "<leader>fh", builtin.help_tags, opt)
--- keymap.set('n', '<leader>lD', builtin.diagnostics, opt)
-keymap.set("n", "<leader>ld", builtin.lsp_definitions, opt)
-keymap.set("n", "<leader>lr", builtin.lsp_references, opt)
 keymap.set("n", "<leader>ls", builtin.lsp_document_symbols, opt)
 keymap.set("n", "<leader>/", builtin.current_buffer_fuzzy_find, opt)
 

modules/coding/editor/vscode.nix

@@ -13,7 +13,7 @@ lib.my.makeHomeProgramConfig {
     "vscode"
   ];
   extraConfig = {
-    my.home = {
+    my.hm = {
       programs.vscode = {
         package = pkgs.vscodium;
       };

modules/coding/langs/all.nix

@@ -15,6 +15,7 @@ lib.my.makeSwitch {
       python.enable = true;
       rust.enable = true;
       lua.enable = true;
+      java.enable = true;
       qml.enable = true;
     };
   };

modules/coding/langs/c.nix

@@ -13,7 +13,7 @@ lib.my.makeSwitch {
     "c"
   ];
   config' = {
-    my.home.home.packages = with pkgs; [
+    my.hm.home.packages = with pkgs; [
       gcc
       clang-tools
       cmake

modules/coding/langs/go.nix

@@ -14,6 +14,10 @@ lib.my.makeHomePackageConfig {
     "go"
   ];
   extraConfig = {
+    my.hm.home.packages = with pkgs; [
+      gotools
+      gopls
+    ];
     my.persist.homeDirs = [
       "go"
     ];

modules/coding/langs/java.nix

@@ -0,0 +1,21 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.my.makeSwitch {
+  inherit config;
+  optionName = "java";
+  optionPath = [
+    "coding"
+    "langs"
+    "java"
+  ];
+  config' = {
+    my.hm.home.packages = with pkgs; [
+      openjdk25
+      java-language-server
+    ];
+  };
+}

modules/coding/langs/js.nix

@@ -13,12 +13,14 @@ lib.my.makeSwitch {
     "js"
   ];
   config' = {
-    my.home = {
+    my.hm = {
       home.packages = with pkgs; [
         nodejs
-        nodePackages.npm
+        pnpm
-
         typescript
+
+        nodePackages.typescript-language-server
+        vue-language-server
       ];
       home.file.".npmrc".text = ''
         prefix = ''${HOME}/.npm-global
@@ -31,6 +33,7 @@ lib.my.makeSwitch {
     my.persist.homeDirs = [
       ".npm"
       ".npm-global"
+      ".local/share/pnpm"
     ];
   };
 }

modules/coding/langs/lua.nix

@@ -13,8 +13,10 @@ lib.my.makeSwitch {
     "lua"
   ];
   config' = {
-    my.home.home.packages = with pkgs; [
+    my.hm.home.packages = with pkgs; [
       luajit
+      stylua
+      lua-language-server
     ];
   };
 }

modules/coding/langs/python.nix

@@ -14,8 +14,9 @@ lib.my.makeHomePackageConfig {
     "python"
   ];
   extraConfig = {
-    my.home.home.packages = with pkgs; [
+    my.hm.home.packages = with pkgs; [
       uv
+      pyright
     ];
   };
 }

modules/coding/langs/qml.nix

@@ -13,7 +13,7 @@ lib.my.makeSwitch {
     "qml"
   ];
   config' = {
-    my.home.home.packages = with pkgs; [
+    my.hm.home.packages = with pkgs; [
       kdePackages.qtdeclarative
     ];
   };

modules/coding/langs/rust.nix

@@ -13,7 +13,7 @@ lib.my.makeSwitch {
     "rust"
   ];
   config' = {
-    my.home = {
+    my.hm = {
       home.packages = with pkgs; [
         (fenix.stable.withComponents [
           "cargo"
@@ -21,8 +21,11 @@ lib.my.makeSwitch {
           "rust-src"
           "rustc"
           "rustfmt"
+          "rust-analyzer"
         ])
         evcxr # rust repl
+
+        pest-ide-tools
       ];
       home.file.".cargo/config.toml".text = ''
         [source.crates-io]
@@ -34,6 +37,9 @@ lib.my.makeSwitch {
         [net]
         git-fetch-with-cli = true
       '';
+      programs.zsh.initContent = lib.mkAfter ''
+        export PATH=$PATH:$HOME/.cargo/bin
+      '';
     };
     my.persist.homeDirs = [
       ".cargo"

modules/coding/misc.nix

@@ -12,7 +12,7 @@ lib.my.makeSwitch {
     "misc"
   ];
   config' = {
-    my.home = {
+    my.hm = {
       home.packages = with pkgs; [
         gnumake
         github-cli # gh

modules/desktop/all.nix

@@ -11,12 +11,10 @@ lib.my.makeSwitch {
       browser.all.enable = true;
       gaming.all.enable = true;
       media.all.enable = true;
-      notify.all.enable = true;
       screencast.all.enable = true;
       terminal.all.enable = true;
       wm.all.enable = true;
       style.enable = true;
-      quickshell.enable = true;
       wine.enable = true;
     };
   };

modules/desktop/browser/all.nix

@@ -10,7 +10,6 @@ lib.my.makeSwitch {
   config' = {
     my.desktop.browser = {
       firefox.enable = true;
-      librewolf.enable = true;
       chromium.enable = true;
       zen.enable = true;
     };

modules/desktop/browser/chromium.nix

@@ -13,7 +13,7 @@ lib.my.makeHomeProgramConfig {
     "chromium"
   ];
   extraConfig = {
-    my.home.programs.chromium = {
+    my.hm.programs.chromium = {
       package = pkgs.ungoogled-chromium;
       extensions = [
         {

modules/desktop/browser/default'.nix

@@ -0,0 +1,13 @@
+{ lib, ... }:
+{
+  options.my.desktop.browser.default = {
+    command = lib.mkOption {
+      type = lib.types.str;
+      default = "chromium";
+    };
+    desktop = lib.mkOption {
+      type = lib.types.str;
+      default = "chromium-browser.desktop";
+    };
+  };
+}

modules/desktop/browser/librewolf.nix

@@ -1,15 +0,0 @@
-{ config, lib, ... }:
-lib.my.makeHomeProgramConfig {
-  inherit config;
-  programName = "librewolf";
-  optionPath = [
-    "desktop"
-    "browser"
-    "librewolf"
-  ];
-  extraConfig = {
-    my.persist.homeDirs = [
-      ".librewolf"
-    ];
-  };
-}

modules/desktop/browser/zen.nix

@@ -13,7 +13,7 @@ lib.my.makeHomeProgramConfig {
     "zen"
   ];
   extraConfig = {
-    my.home.programs.zen-browser = {
+    my.hm.programs.zen-browser = {
       enable = true;
       nativeMessagingHosts = [ pkgs.firefoxpwa ];
       policies = {

modules/desktop/gaming/minecraft.nix

@@ -13,18 +13,17 @@ lib.my.makeSwitch {
     "minecraft"
   ];
   config' = {
-    my.home.home.packages = with pkgs; [
+    my.hm.home.packages = [
-      hmcl
+      (pkgs.hmcl.overrideAttrs {
-
+        postFixup = ''
-      openjdk21
+          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"
     ];
-    my.persist.homeFiles = [
-      ".hmcl.json"
-    ];
   };
 }

modules/desktop/notify/all.nix

@@ -1,16 +0,0 @@
-{ config, lib, ... }:
-lib.my.makeSwitch {
-  inherit config;
-  optionName = "all desktop notify tools";
-  optionPath = [
-    "desktop"
-    "notify"
-    "all"
-  ];
-  config' = {
-    my.desktop.notify = {
-      dunst.enable = true;
-      swaync.enable = true;
-    };
-  };
-}

modules/desktop/notify/dunst/default.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-lib.my.makeHomePackageConfig {
-  inherit config pkgs;
-  packageName = "dunst";
-  packagePath = [ "dunst" ];
-  optionPath = [
-    "desktop"
-    "notify"
-    "dunst"
-  ];
-  extraConfig = {
-    my.home.xdg.configFile."dunst/dunstrc".source = ./dunstrc;
-  };
-}

modules/desktop/notify/dunst/dunstrc

@@ -1,459 +0,0 @@
-# See dunst(5) for all configuration options
-
-[global]
-    ### Display ###
-
-    # Which monitor should the notifications be displayed on.
-    monitor = 0
-
-    # Display notification on focused monitor.  Possible modes are:
-    #   mouse: follow mouse pointer
-    #   keyboard: follow window with keyboard focus
-    #   none: don't follow anything
-    #
-    # "keyboard" needs a window manager that exports the
-    # _NET_ACTIVE_WINDOW property.
-    # This should be the case for almost all modern window managers.
-    #
-    # If this option is set to mouse or keyboard, the monitor option
-    # will be ignored.
-    follow = mouse
-
-    ### Geometry ###
-
-    # dynamic width from 0 to 300
-    # width = (0, 300)
-    # constant width of 300
-    width = 300
-
-    # The maximum height of a single notification, excluding the frame.
-    height = 300
-
-    # Position the notification in the top right corner
-    origin = top-right
-
-    # Offset from the origin
-    offset = 5x15
-
-    # Scale factor. It is auto-detected if value is 0.
-    scale = 0
-
-    # Maximum number of notification (0 means no limit)
-    notification_limit = 20
-
-    ### Progress bar ###
-
-    # Turn on the progess bar. It appears when a progress hint is passed with
-    # for example dunstify -h int:value:12
-    progress_bar = true
-
-    # Set the progress bar height. This includes the frame, so make sure
-    # it's at least twice as big as the frame width.
-    progress_bar_height = 10
-
-    # Set the frame width of the progress bar
-    progress_bar_frame_width = 1
-
-    # Set the minimum width for the progress bar
-    progress_bar_min_width = 150
-
-    # Set the maximum width for the progress bar
-    progress_bar_max_width = 300
-
-    # Corner radius for the progress bar. 0 disables rounded corners.
-    progress_bar_corner_radius = 2
-
-    # Corner radius for the icon image.
-    icon_corner_radius = 0
-
-    # Show how many messages are currently hidden (because of
-    # notification_limit).
-    indicate_hidden = yes
-
-    # The transparency of the window.  Range: [0; 100].
-    # This option will only work if a compositing window manager is
-    # present (e.g. xcompmgr, compiz, etc.). (X11 only)
-    transparency = 0
-
-    # Draw a line of "separator_height" pixel height between two
-    # notifications.
-    # Set to 0 to disable.
-    # If gap_size is greater than 0, this setting will be ignored.
-    separator_height = 2
-
-    # Padding between text and separator.
-    padding = 8
-
-    # Horizontal padding.
-    horizontal_padding = 8
-
-    # Padding between text and icon.
-    text_icon_padding = 0
-
-    # Defines width in pixels of frame around the notification window.
-    # Set to 0 to disable.
-    frame_width = 3
-
-    # Defines color of the frame around the notification window.
-    frame_color = "#2A2C36"
-
-    # Size of gap to display between notifications - requires a compositor.
-    # If value is greater than 0, separator_height will be ignored and a border
-    # of size frame_width will be drawn around each notification instead.
-    # Click events on gaps do not currently propagate to applications below.
-    gap_size = 4
-
-    # Define a color for the separator.
-    # possible values are:
-    #  * auto: dunst tries to find a color fitting to the background;
-    #  * foreground: use the same color as the foreground;
-    #  * frame: use the same color as the frame;
-    #  * anything else will be interpreted as a X color.
-    separator_color = frame
-
-    # Sort messages by urgency.
-    sort = yes
-
-    # Don't remove messages, if the user is idle (no mouse or keyboard input)
-    # for longer than idle_threshold seconds.
-    # Set to 0 to disable.
-    # A client can set the 'transient' hint to bypass this. See the rules
-    # section for how to disable this if necessary
-    # idle_threshold = 120
-
-    ### Text ###
-
-    font = JetBrains Mono 11
-
-    # The spacing between lines.  If the height is smaller than the
-    # font height, it will get raised to the font height.
-    line_height = 0
-
-    # Possible values are:
-    # full: Allow a small subset of html markup in notifications:
-    #        <b>bold</b>
-    #        <i>italic</i>
-    #        <s>strikethrough</s>
-    #        <u>underline</u>
-    #
-    #        For a complete reference see
-    #        <https://docs.gtk.org/Pango/pango_markup.html>.
-    #
-    # strip: This setting is provided for compatibility with some broken
-    #        clients that send markup even though it's not enabled on the
-    #        server. Dunst will try to strip the markup but the parsing is
-    #        simplistic so using this option outside of matching rules for
-    #        specific applications *IS GREATLY DISCOURAGED*.
-    #
-    # no:    Disable markup parsing, incoming notifications will be treated as
-    #        plain text. Dunst will not advertise that it has the body-markup
-    #        capability if this is set as a global setting.
-    #
-    # It's important to note that markup inside the format option will be parsed
-    # regardless of what this is set to.
-    markup = full
-
-    # The format of the message.  Possible variables are:
-    #   %a  appname
-    #   %s  summary
-    #   %b  body
-    #   %i  iconname (including its path)
-    #   %I  iconname (without its path)
-    #   %p  progress value if set ([  0%] to [100%]) or nothing
-    #   %n  progress value if set without any extra characters
-    #   %%  Literal %
-    # Markup is allowed
-    format = "<b>%s</b>\n%b"
-
-    # Alignment of message text.
-    # Possible values are "left", "center" and "right".
-    alignment = left
-
-    # Vertical alignment of message text and icon.
-    # Possible values are "top", "center" and "bottom".
-    vertical_alignment = center
-
-    # Show age of message if message is older than show_age_threshold
-    # seconds.
-    # Set to -1 to disable.
-    show_age_threshold = 60
-
-    # Specify where to make an ellipsis in long lines.
-    # Possible values are "start", "middle" and "end".
-    ellipsize = middle
-
-    # Ignore newlines '\n' in notifications.
-    ignore_newline = no
-
-    # Stack together notifications with the same content
-    stack_duplicates = true
-
-    # Hide the count of stacked notifications with the same content
-    hide_duplicate_count = false
-
-    # Display indicators for URLs (U) and actions (A).
-    show_indicators = false
-
-    ### Icons ###
-
-    # Recursive icon lookup. You can set a single theme, instead of having to
-    # define all lookup paths.
-    enable_recursive_icon_lookup = true
-
-    # Set icon theme (only used for recursive icon lookup)
-    icon_theme = Win11, breeze
-    # You can also set multiple icon themes, with the leftmost one being used first.
-    # icon_theme = "Adwaita, breeze"
-
-    # Align icons left/right/top/off
-    icon_position = left
-
-    # Scale small icons up to this size, set to 0 to disable. Helpful
-    # for e.g. small files or high-dpi screens. In case of conflict,
-    # max_icon_size takes precedence over this.
-    min_icon_size = 32
-
-    # Scale larger icons down to this size, set to 0 to disable
-    max_icon_size = 32
-
-    # Paths to default icons (only neccesary when not using recursive icon lookup)
-    icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
-
-    ### History ###
-
-    # Should a notification popped up from history be sticky or timeout
-    # as if it would normally do.
-    sticky_history = yes
-
-    # Maximum amount of notifications kept in history
-    history_length = 20
-
-    ### Misc/Advanced ###
-
-    # dmenu path.
-    dmenu = /usr/bin/dmenu -p dunst:
-
-    # Browser for opening urls in context menu.
-    browser = /usr/bin/microsoft-edge-stable
-
-    # Always run rule-defined scripts, even if the notification is suppressed
-    always_run_script = true
-
-    # Define the title of the windows spawned by dunst
-    title = Dunst
-
-    # Define the class of the windows spawned by dunst
-    class = Dunst
-
-    # Define the corner radius of the notification window
-    # in pixel size. If the radius is 0, you have no rounded
-    # corners.
-    # The radius will be automatically lowered if it exceeds half of the
-    # notification height to avoid clipping text and/or icons.
-    corner_radius = 10
-
-    # Ignore the dbus closeNotification message.
-    # Useful to enforce the timeout set by dunst configuration. Without this
-    # parameter, an application may close the notification sent before the
-    # user defined timeout.
-    ignore_dbusclose = false
-
-    ### Wayland ###
-    # These settings are Wayland-specific. They have no effect when using X11
-
-    # Uncomment this if you want to let notications appear under fullscreen
-    # applications (default: overlay)
-    layer = top
-
-    # Set this to true to use X11 output on Wayland.
-    force_xwayland = false
-
-    ### Legacy
-
-    # Use the Xinerama extension instead of RandR for multi-monitor support.
-    # This setting is provided for compatibility with older nVidia drivers that
-    # do not support RandR and using it on systems that support RandR is highly
-    # discouraged.
-    #
-    # By enabling this setting dunst will not be able to detect when a monitor
-    # is connected or disconnected which might break follow mode if the screen
-    # layout changes.
-    force_xinerama = false
-
-    ### mouse
-
-    # Defines list of actions for each mouse event
-    # Possible values are:
-    # * none: Don't do anything.
-    # * do_action: Invoke the action determined by the action_name rule. If there is no
-    #              such action, open the context menu.
-    # * open_url: If the notification has exactly one url, open it. If there are multiple
-    #             ones, open the context menu.
-    # * close_current: Close current notification.
-    # * close_all: Close all notifications.
-    # * context: Open context menu for the notification.
-    # * context_all: Open context menu for all notifications.
-    # These values can be strung together for each mouse event, and
-    # will be executed in sequence.
-    mouse_left_click = do_action, close_current
-    mouse_middle_click = close_all
-    mouse_right_click = close_current
-
-# Experimental features that may or may not work correctly. Do not expect them
-# to have a consistent behaviour across releases.
-[experimental]
-    # Calculate the dpi to use on a per-monitor basis.
-    # If this setting is enabled the Xft.dpi value will be ignored and instead
-    # dunst will attempt to calculate an appropriate dpi value for each monitor
-    # using the resolution and physical size. This might be useful in setups
-    # where there are multiple screens with very different dpi values.
-    per_monitor_dpi = false
-
-
-[urgency_low]
-    # IMPORTANT: colors have to be defined in quotation marks.
-    # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#1E1E2E"
-    foreground = "#888888"
-    timeout = 10
-    # Icon for notifications with low urgency, uncomment to enable
-    #default_icon = /path/to/icon
-
-[urgency_normal]
-    background = "#1E1E2E"
-    foreground = "#ffffff"
-    timeout = 10
-    # Icon for notifications with normal urgency, uncomment to enable
-    default_icon = /home/imxyy/Pictures/icon/notice.png
-
-[urgency_critical]
-    background = "#1E1E2E"
-    foreground = "#CB2027"
-    #frame_color = "#94393E"
-    timeout = 0
-    # Icon for notifications with critical urgency, uncomment to enable
-    default_icon = /home/imxyy/Pictures/icon/critical.png
-
-# Every section that isn't one of the above is interpreted as a rules to
-# override settings for certain messages.
-#
-# Messages can be matched by
-#    appname (discouraged, see desktop_entry)
-#    body
-#    category
-#    desktop_entry
-#    icon
-#    match_transient
-#    msg_urgency
-#    stack_tag
-#    summary
-#
-# and you can override the
-#    background
-#    foreground
-#    format
-#    frame_color
-#    fullscreen
-#    new_icon
-#    set_stack_tag
-#    set_transient
-#    set_category
-#    timeout
-#    urgency
-#    icon_position
-#    skip_display
-#    history_ignore
-#    action_name
-#    word_wrap
-#    ellipsize
-#    alignment
-#    hide_text
-#
-# Shell-like globbing will get expanded.
-#
-# Instead of the appname filter, it's recommended to use the desktop_entry filter.
-# GLib based applications export their desktop-entry name. In comparison to the appname,
-# the desktop-entry won't get localized.
-#
-# SCRIPTING
-# You can specify a script that gets run when the rule matches by
-# setting the "script" option.
-# The script will be called as follows:
-#   script appname summary body icon urgency
-# where urgency can be "LOW", "NORMAL" or "CRITICAL".
-#
-# NOTE: It might be helpful to run dunst -print in a terminal in order
-# to find fitting options for rules.
-
-# Disable the transient hint so that idle_threshold cannot be bypassed from the
-# client
-#[transient_disable]
-#    match_transient = yes
-#    set_transient = no
-#
-# Make the handling of transient notifications more strict by making them not
-# be placed in history.
-#[transient_history_ignore]
-#    match_transient = yes
-#    history_ignore = yes
-
-# fullscreen values
-# show: show the notifications, regardless if there is a fullscreen window opened
-# delay: displays the new notification, if there is no fullscreen window active
-#        If the notification is already drawn, it won't get undrawn.
-# pushback: same as delay, but when switching into fullscreen, the notification will get
-#           withdrawn from screen again and will get delayed like a new notification
-#[fullscreen_delay_everything]
-#    fullscreen = delay
-#[fullscreen_show_critical]
-#    msg_urgency = critical
-#    fullscreen = show
-
-#[espeak]
-#    summary = "*"
-#    script = dunst_espeak.sh
-
-#[script-test]
-#    summary = "*script*"
-#    script = dunst_test.sh
-
-#[ignore]
-#    # This notification will not be displayed
-#    summary = "foobar"
-#    skip_display = true
-
-#[history-ignore]
-#    # This notification will not be saved in history
-#    summary = "foobar"
-#    history_ignore = yes
-
-#[skip-display]
-#    # This notification will not be displayed, but will be included in the history
-#    summary = "foobar"
-#    skip_display = yes
-
-#[signed_on]
-#    appname = Pidgin
-#    summary = "*signed on*"
-#    urgency = low
-#
-#[signed_off]
-#    appname = Pidgin
-#    summary = *signed off*
-#    urgency = low
-#
-#[says]
-#    appname = Pidgin
-#    summary = *says*
-#    urgency = critical
-#
-#[twitter]
-#    appname = Pidgin
-#    summary = *twitter.com*
-#    urgency = normal
-#
-#[stack-volumes]
-#    appname = "some_volume_notifiers"
-#    set_stack_tag = "volume"
-#
-# vim: ft=cfg

modules/desktop/notify/swaync/config/config.json

@@ -1,62 +0,0 @@
-{
-    "$schema": "/etc/xdg/swaync/configSchema.json",
-    "positionX": "right",
-    "positionY": "top",
-    "control-center-positionX": "none",
-    "control-center-positionY": "none",
-    "control-center-margin-top": 8,
-    "control-center-margin-bottom": 8,
-    "control-center-margin-right": 8,
-    "control-center-margin-left": 8,
-    "control-center-height": 600,
-    "control-center-width": 400,
-    "fit-to-screen": false,
-    "layer": "top",
-    "control-center-layer": "top",
-    "cssPriority": "user",
-    "notification-icon-size": 40,
-    "notification-body-image-height": 100,
-    "notification-body-image-width": 200,
-    "notification-inline-replies": true,
-    "notification-2fa-action": false,
-    "timeout": 10,
-    "timeout-low": 5,
-    "timeout-critical": 0,
-    "notification-window-width": 317,
-    "keyboard-shortcuts": true,
-    "image-visibility": "when-available",
-    "transition-time": 200,
-    "hide-on-clear": false,
-    "hide-on-action": false,
-    "script-fail-notify": true,
-    "widgets": [
-        "inhibitors",
-        "title",
-        "dnd",
-        "mpris",
-        "notifications"
-    ],
-    "widget-config": {
-        "inhibitors": {
-            "text": "Inhibitors",
-            "button-text": "Clear All",
-            "clear-all-button": true
-        },
-        "title": {
-            "text": "Notifications",
-            "clear-all-button": true,
-            "button-text": "Clear All"
-        },
-        "dnd": {
-            "text": "Do Not Disturb"
-        },
-        "label": {
-            "max-lines": 5,
-            "text": "Label Text"
-        },
-        "mpris": {
-            "image-size": 96,
-            "image-radius": 12
-        }
-    }
-}

modules/desktop/notify/swaync/config/style.css

@@ -1,410 +0,0 @@
-/*
- * vim: ft=less
- */
-
-@define-color cc-bg rgba(42, 44, 54, 0.5);
-
-@define-color noti-border-color rgba(255, 255, 255, 0.15);
-@define-color noti-bg rgba(42, 44, 54, 0.6);
-@define-color noti-bg-hover rgba(52, 54, 64, 0.6);
-@define-color noti-bg-focus rgba(55, 57, 67, 0.4);
-@define-color noti-close-bg rgba(255, 255, 255, 0.1);
-@define-color noti-close-bg-hover rgba(255, 255, 255, 0.15);
-
-@define-color text-color rgba(255, 255, 255, 0.6);
-@define-color text-color-low rgba(136, 136, 136, 0.6);
-
-@define-color mpris-album-art-overlay rgba(52, 54, 64, 0.6);
-@define-color mpris-button-hover rgba(55, 57, 67, 0.4);
-
-@define-color bg-selected rgb(0, 128, 255);
-
-* {
-    font-family: monospace;
-}
-
-.low {
-    color: @text-color-low;
-}
-
-.normal {
-    color: @text-color;
-}
-
-.critical {
-    color: red;
-}
-
-
-.testing {
-    background-color: red;
-}
-
-.notification-row {
-    all: unset;
-    font-size: 11px;
-    transition: all 200ms ease;
-    outline: none;
-    margin-bottom: 4px;
-    border-radius: 12px;
-}
-
-.notification-row:hover {
-    background: transparent;
-}
-
-.control-center .notification-row:focus,
-.control-center .notification-row:hover {
-    opacity: 1;
-    background: transparent;
-}
-
-.notification-row:focus .notification,
-.notification-row:hover .notification {
-    /* box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.5); */
-    /* box-shadow: 0px 0px 0px 3px @bg-selected; */
-    box-shadow: none;
-}
-
-.control-center .notification {
-    box-shadow: none;
-}
-
-.control-center .notification-row {
-    opacity: 0.5;
-}
-
-.notification {
-    background: @noti-bg;
-    transition: all 200ms ease;
-    border-radius: 12px;
-    margin: 6px 6px;
-    box-shadow: none;
-    padding: 0;
-}
-
-.notification-content {
-    background: transparent;
-    padding: 6px;
-    border-radius: 12px;
-}
-
-.close-button {
-    background: @noti-close-bg;
-    color: @text-color;
-    text-shadow: none;
-    padding: 0;
-    border-radius: 100%;
-    margin-top: 10px;
-    margin-right: 10px;
-    box-shadow: none;
-    border: none;
-    min-width: 24px;
-    min-height: 24px;
-}
-
-.close-button:hover {
-    box-shadow: none;
-    background: @noti-close-bg-hover;
-    transition: all 0.15s ease-in-out;
-    border: none;
-}
-
-.notification-default-action,
-.notification-action {
-    padding: 4px;
-    margin: 0;
-    box-shadow: none;
-    background: @noti-bg;
-    border: 0px;
-    color: white;
-    transition: all 200ms ease;
-}
-
-.notification-default-action:hover,
-.notification-action:hover {
-    -gtk-icon-effect: none;
-    background: @noti-bg-hover;
-}
-
-.notification-default-action {
-    border-radius: 12px;
-}
-
-/* When alternative actions are visible */
-.notification-default-action:not(:only-child) {
-    border-bottom-left-radius: 0px;
-    border-bottom-right-radius: 0px;
-}
-
-.notification-action {
-    border-radius: 0px;
-    border-top: none;
-    border-right: none;
-}
-
-/* add bottom border radius to eliminate clipping */
-.notification-action:first-child {
-    border-bottom-left-radius: 12px;
-}
-
-.notification-action:last-child {
-    border-bottom-right-radius: 12px;
-    border-right: 1px solid @noti-border-color;
-}
-
-.image {}
-
-.body-image {
-    margin-top: 6px;
-    background-color: white;
-    border-radius: 12px;
-}
-
-.summary {
-    font-size: 16px;
-    font-weight: bold;
-    background: transparent;
-    color: @text-color;
-    text-shadow: none;
-}
-
-.time {
-    font-size: 16px;
-    font-weight: bold;
-    background: transparent;
-    color: @text-color;
-    text-shadow: none;
-    margin-right: 18px;
-}
-
-.body {
-    font-size: 15px;
-    font-weight: normal;
-    background: transparent;
-    color: @text-color;
-    text-shadow: none;
-}
-
-.control-center {
-    background: @cc-bg;
-    border-radius: 12px;
-    background-clip: border-box;
-    padding: 4px;
-    box-shadow: none;
-}
-
-.control-center-list {
-    background: transparent;
-}
-
-.control-center-list-placeholder {
-    opacity: 0.5;
-}
-
-.floating-notifications {
-    background: transparent;
-}
-
-/* Window behind control center and on all other monitors */
-.blank-window {
-    background: transparent;
-}
-
-/*** Widgets ***/
-
-/* Title widget */
-.widget-title {
-    margin: 8px;
-    font-size: 1.5rem;
-    font-weight: bold;
-    color: @text-color;
-}
-
-.widget-title>button {
-    font-size: initial;
-    color: @text-color;
-    text-shadow: none;
-    background: @noti-bg;
-    border: 0px;
-    box-shadow: none;
-    border-radius: 12px;
-}
-
-.widget-title>button:hover {
-    background: @noti-bg-hover;
-}
-
-/* DND widget */
-.widget-dnd {
-    margin: 8px;
-    font-size: 1.1rem;
-    color: @text-color;
-}
-
-.widget-dnd>switch {
-    font-size: initial;
-    border-radius: 12px;
-    background: @noti-bg;
-    border: 0px;
-    box-shadow: none;
-}
-
-.widget-dnd>switch:checked {
-    background: @text-color-low;
-}
-
-.widget-dnd>switch slider {
-    background: @noti-bg-hover;
-    border-radius: 12px;
-}
-
-/* Label widget */
-.widget-label {
-    margin: 8px;
-}
-
-.widget-label>label {
-    font-size: 1.1rem;
-}
-
-/* Mpris widget */
-.widget-mpris {
-    color: @text-color
-}
-
-.widget-mpris-player {
-    padding: 16px;
-    margin: 16px;
-    background-color: @mpris-album-art-overlay;
-    border-radius: 12px;
-    box-shadow: none;
-}
-
-.widget-mpris-album-art {
-    border-radius: 12px;
-    box-shadow: none;
-}
-
-.widget-mpris-player button {
-    /* The media player buttons (play, pause, next, etc...) */
-    color: @text-color;
-    /*background-color: @mpris-button-hover;*/
-}
-
-.widget-mpris-player button:disabled {
-    /* The media player buttons (play, pause, next, etc...) */
-    color: @text-color-low;
-    /*background-color: @mpris-button-hover;*/
-}
-
-.widget-mpris-player button:hover {
-    /* The media player buttons (play, pause, next, etc...) */
-    background-color: @mpris-button-hover;
-    /*background-color: @mpris-button-hover;*/
-}
-
-.widget-mpris>box>button {
-    color: @text-color;
-}
-
-.widget-mpris>box>button:disabled {
-    color: @text-color-low;
-}
-
-.widget-mpris-title {
-    font-weight: bold;
-    font-size: 1.25rem;
-}
-
-.widget-mpris-subtitle {
-    font-size: 1.1rem;
-}
-
-/* Buttons widget */
-.widget-buttons-grid {
-    padding: 8px;
-    margin: 8px;
-    border-radius: 12px;
-    border: 0px;
-    background-color: @noti-bg;
-}
-
-.widget-buttons-grid>flowbox>flowboxchild>button {
-    color: @text-color;
-    background: @noti-bg;
-    border: 0px;
-    border-radius: 12px;
-}
-
-.widget-buttons-grid>flowbox>flowboxchild>button:hover {
-    background: @noti-bg-hover;
-}
-
-/* Menubar widget */
-.widget-menubar>box>.menu-button-bar>button {
-    border: none;
-    background: transparent;
-    background: red;
-}
-
-/* .AnyName { Name defined in config after #
- *   background-color: @noti-bg;
- *   padding: 8px;
- *   margin: 8px;
- *   border-radius: 12px;
- * }
- * 
- * .AnyName>button {
- *   background: transparent;
- *   border: none;
- * }
- * 
- * .AnyName>button:hover {
- *   background-color: @noti-bg-hover;
- * }
- */
-
-.topbar-buttons>button {
-    /* Name defined in config after # */
-    border: none;
-    background: transparent;
-    background: blue;
-}
-
-/* Volume widget */
-
-.widget-volume {
-    background-color: @noti-bg;
-    padding: 8px;
-    margin: 8px;
-    border-radius: 12px;
-}
-
-/* Backlight widget */
-.widget-backlight {
-    background-color: @noti-bg;
-    padding: 8px;
-    margin: 8px;
-    border-radius: 12px;
-}
-
-/* Title widget */
-.widget-inhibitors {
-    margin: 8px;
-    font-size: 1.5rem;
-}
-
-.widget-inhibitors>button {
-    font-size: initial;
-    color: white;
-    text-shadow: none;
-    background: @noti-bg;
-    border: 1px solid @noti-border-color;
-    box-shadow: none;
-    border-radius: 12px;
-}
-
-.widget-inhibitors>button:hover {
-    background: @noti-bg-hover;
-}

modules/desktop/notify/swaync/default.nix

@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-lib.my.makeHomePackageConfig {
-  inherit config pkgs;
-  packageName = "swaync";
-  packagePath = [ "swaynotificationcenter" ];
-  optionPath = [
-    "desktop"
-    "notify"
-    "swaync"
-  ];
-  extraConfig = {
-    my.home = {
-      programs.niri.settings.binds."Mod+End".action.spawn = [
-        "swaync-client"
-        "-t"
-        "-sw"
-      ];
-      xdg.configFile."swaync" = {
-        source = ./config;
-        recursive = true;
-      };
-    };
-  };
-}

modules/desktop/quickshell/config/components/bar/Battery.qml

@@ -1,48 +0,0 @@
-import Quickshell
-import Quickshell.Services.UPower
-import QtQuick
-import QtQuick.Layouts
-import org.kde.kirigami
-
-Rectangle {
-    id: bat
-
-    Layout.preferredWidth: batIcon.width
-    Layout.fillHeight: true
-    color: 'transparent'
-
-    readonly property var battery: UPower.displayDevice
-    readonly property int percentage: Math.round(battery.percentage * 100)
-    property var size: height * 0.4
-
-    visible: battery.isLaptopBattery
-
-    Icon {
-        id: batIcon
-        anchors.centerIn: parent
-
-        implicitHeight: bat.size
-        implicitWidth: bat.size
-
-        // This recolors the entire svg, instead of only classless components.
-        // Hopefully in the future classes can be selected for recoloring.
-        isMask: true
-        color: 'white'
-
-        source: {
-            const nearestTen = Math.round(bat.percentage / 10) * 10;
-            const number = nearestTen.toString().padStart(2, "0");
-            let charging;
-
-            if (bat.battery.state == UPowerDeviceState.Charging) {
-                charging = "-charging";
-            } else if (bat.battery.state.toString() == UPowerDeviceState.FullyCharged) {
-                charging = "-charged";
-            } else {
-                charging = "";
-            }
-
-            return Quickshell.iconPath(`battery-level-${number}${charging}-symbolic`);
-        }
-    }
-}

modules/desktop/quickshell/config/components/bar/Clock.qml

@@ -1,16 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import "../../utils"
-
-Rectangle {
-    Layout.fillHeight: true
-    color: "transparent"
-    implicitWidth: clockText.width
-
-    Text {
-        id: clockText
-        text: Time.time
-        color: Colors.fg
-        anchors.centerIn: parent
-    }
-}

modules/desktop/quickshell/config/components/bar/Mpris.qml

@@ -1,14 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-
-Rectangle {
-    Layout.fillHeight: true
-    color: "salmon"
-    implicitWidth: mprisText.width
-
-    Text {
-        id: mprisText
-        text: "Mpris"
-        anchors.centerIn: parent
-    }
-}

modules/desktop/quickshell/config/components/bar/Resources.qml

@@ -1,54 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import "../../utils"
-
-Rectangle {
-    id: resources
-
-    Layout.fillHeight: true
-    color: "transparent"
-    implicitWidth: rowLayout.width
-
-    property int valueSize: 8
-    property int textSize: 6
-
-    property string valueColor: "white"
-    property string textColor: "lightgray"
-
-    RowLayout {
-        id: rowLayout
-        anchors.centerIn: parent
-
-        ColumnLayout {
-            id: cpuColumn
-            Label {
-                color: textColor
-                font.pointSize: textSize
-                text: "CPU"
-                Layout.alignment: Qt.AlignCenter
-            }
-            Label {
-                color: valueColor
-                font.pointSize: valueSize
-                text: Resources.cpu_percent + "%"
-                Layout.alignment: Qt.AlignCenter
-            }
-        }
-
-        ColumnLayout {
-            Label {
-                color: textColor
-                font.pointSize: textSize
-                text: "MEM"
-                Layout.alignment: Qt.AlignCenter
-            }
-            Label {
-                color: valueColor
-                font.pointSize: valueSize
-                text: Resources.mem_percent + "%"
-                Layout.alignment: Qt.AlignCenter
-            }
-        }
-    }
-}

modules/desktop/quickshell/config/components/bar/Text.qml

@@ -1,5 +0,0 @@
-import QtQuick
-
-Text {
-    renderType: Text.NativeRendering
-}

modules/desktop/quickshell/config/components/bar/Tray.qml

@@ -1,14 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-
-Rectangle {
-    Layout.fillHeight: true
-    color: "lightblue"
-    implicitWidth: trayText.width
-
-    Text {
-        id: trayText
-        text: "Tray"
-        anchors.centerIn: parent
-    }
-}