chore: update flake.lock

R.I.P. chaotic-nyx 😢

.editorconfig

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

.lazy.lua

@@ -0,0 +1,38 @@
+vim.lsp.config("nixd", {
+  settings = {
+    nixd = {
+      nixpkgs = {
+        expr = "import <nixpkgs> { }",
+      },
+      options = {
+        nixos = {
+          expr = '(builtins.getFlake ("git+file://" + toString ./.)).nixosConfigurations.'
+            .. vim.uv.os_gethostname()
+            .. ".options",
+        },
+      },
+    },
+  },
+})
+
+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

Makefile

@@ -4,6 +4,14 @@ switch:
 	@echo "Rebuilding NixOS..."
 	@nh os switch .
 
+switch-offline:
+	@echo "Rebuilding NixOS without net..."
+	@nh os switch . --no-net
+
+offline:
+	@echo "Rebuilding NixOS without net..."
+	@nh os switch . --no-net
+
 boot:
 	@echo "Rebuilding NixOS..."
 	@nh os boot .
@@ -20,14 +28,8 @@ update:
 	@echo "Updating flakes..."
 	@nix flake update
 
-history:
-	@nix profile history --profile /nix/var/nix/profiles/system
-
-replpkgs:
-	@nix repl -f flake:nixpkgs
-
 repl:
-	@nh os repl .
+	@nixos-rebuild repl --flake .
 
 cleandry:
 	@echo "Listing all generations older than 15 days..."
@@ -46,4 +48,4 @@ fmt:
 	@echo "Formatting nix files..."
 	@nix fmt
 
-.PHONY: os home news update history repl clean gc fmt
+.PHONY: all switch switch-offline boot test vm update repl cleandry clean gc fmt

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...
 
@@ -51,4 +49,4 @@ And more...
 - `overlays/` - nixpkgs overlays
 - `vars.nix` - my variables
 - `secrets/` - secrets managed by sops-nix. see [./secrets](./secrets) for details
-- `flake.nix` - flake entry
+- `flake.nix` - flake entry

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

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-{
-  services.open-webui = {
-    enable = true;
-    host = "127.0.0.1";
-    port = 8089;
-    package = pkgs.stable.open-webui;
-  };
-  services.caddy.virtualHosts."ai.imxyy.top" = {
-    extraConfig = ''
-      reverse_proxy :8089 {
-        header_up X-Real-IP {remote_host}
-      }
-    '';
-  };
-}

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

@@ -1,13 +1,13 @@
 {
   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;
+    restartUnits = [ "easytier-nixremote.service" ];
     format = "binary";
   };
   environment.systemPackages = [ pkgs.easytier ];
@@ -15,10 +15,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 +35,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

@@ -1,33 +1,10 @@
-{ config, ... }:
 {
-  services.postgresql.ensureUsers = [
+  services.coder = {
-    {
+    enable = true;
-      name = "coder";
+    accessUrl = "https://coder.imxyy.top";
-      ensureDBOwnership = true;
+    listenAddress = "127.0.0.1:8086";
-    }
-  ];
-  services.postgresql.ensureDatabases = [ "coder" ];
-  virtualisation.oci-containers = {
-    containers = {
-      coder = {
-        image = "ghcr.io/coder/coder:latest";
-        environment = {
-          CODER_ACCESS_URL = "https://coder.imxyy.top";
-          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" ];
-      };
-    };
   };
+  users.users.coder.extraGroups = [ "podman" ];
   services.caddy.virtualHosts."coder.imxyy.top" = {
     extraConfig = ''
       reverse_proxy :8086 {

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

@@ -1,27 +0,0 @@
-{
-  imports = [
-    ./nixos.nix
-    ./hardware.nix
-    ./home.nix
-    ./virt.nix
-    ./docker.nix
-    ./minecraft.nix
-    ./samba.nix
-    ./net.nix
-    ./caddy.nix
-    ./nextcloud.nix
-    ./mail.nix
-    ./gitea.nix
-    ./vault.nix
-    ./homepage.nix
-    ./code.nix
-    ./yesplaymusic.nix
-    ./ai.nix
-    ./grafana.nix
-    ./note.nix
-    ./matrix.nix
-    ./minio.nix
-    ./build.nix
-    ./immich.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,55 @@
+{ config, secrets, ... }:
+{
+  sops.secrets.efl-tuwunel-env = {
+    sopsFile = secrets.efl-tuwunel;
+    restartUnits = [ "podman-tuwunel.service" ];
+    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/hardware.nix

@@ -18,15 +18,17 @@ in
   ];
   boot.initrd.kernelModules = [ "amdgpu" ];
   boot.kernelModules = [ "kvm-amd" ];
-  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos;
+  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_xanmod_latest;
-  services.scx.enable = true;
+  services.scx = {
+    enable = true;
+    scheduler = "scx_rusty";
+  };
   boot.extraModulePackages = [ ];
   boot.tmp.useTmpfs = true;
   boot.supportedFilesystems = [ "zfs" ];
   boot.zfs = {
     extraPools = [ "data" ];
     forceImportRoot = false;
-    package = pkgs.zfs_cachyos;
   };
   services.zfs.autoScrub.enable = true;
   services.btrfs.autoScrub.enable = true;

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

@@ -1,11 +1,14 @@
-{ ... }:
+{ 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;
+    coding.langs.js.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,107 @@
 {
-  services.matrix-synapse = {
+  config,
+  secrets,
+  ...
+}:
+{
+  nixpkgs.config.permittedInsecurePackages = [
+    "olm-3.2.16"
+  ];
+  sops.secrets.tuwunel-reg-token = {
+    sopsFile = secrets.tuwunel-reg-token;
+    restartUnits = [ "tuwunel.service" ];
+    format = "binary";
+    owner = config.services.matrix-tuwunel.user;
+    group = config.services.matrix-tuwunel.group;
+  };
+  sops.secrets.tuwunel-turn-secret = {
+    sopsFile = secrets.tuwunel-turn-secret;
+    restartUnits = [ "tuwunel.service" ];
+    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;
+    restartUnits = [ "mautrix-telegram.service" ];
+    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,8 @@
-{ config, sopsRoot, ... }:
+{ config, secrets, ... }:
 {
   sops.secrets.minio-env = {
-    sopsFile = sopsRoot + /minio.env;
+    sopsFile = secrets.minio;
+    restartUnits = [ "minio.service" ];
     format = "dotenv";
   };
   services.minio = {
@@ -16,11 +17,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,31 @@
     "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;
+    restartUnits = [ "dae.service" ];
     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;
+    restartUnits = [ "mihomo.service" ];
     format = "yaml";
     key = "";
   };
@@ -162,7 +167,8 @@
   };
 
   sops.secrets.frp-env = {
-    sopsFile = sopsRoot + /frp.env;
+    sopsFile = secrets.frp;
+    restartUnits = [ "frp.service" ];
     format = "dotenv";
   };
   systemd.services.frp.serviceConfig.EnvironmentFile = [
@@ -172,7 +178,7 @@
     enable = true;
     role = "client";
     settings = {
-      serverAddr = "hk.vkvm.imxyy.top";
+      serverAddr = "{{ .Envs.FRP_SERVER_ADDR }}";
       serverPort = 7000;
       auth.token = "{{ .Envs.FRP_AUTH_TOKEN }}";
       proxies = [
@@ -205,20 +211,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 +294,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 +324,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 +339,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 +384,55 @@
         }
 
         {
-          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;
+    restartUnits = [ "easytier.service" ];
     format = "binary";
   };
   environment.systemPackages = [ pkgs.easytier ];
@@ -472,10 +440,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 +451,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 +479,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 +517,6 @@
         "git"
         "vault"
         "coder"
-        "headscale"
         "grafana"
         "matrix"
         "note"
@@ -570,23 +525,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

@@ -17,9 +17,9 @@ in
 
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud31;
+    package = pkgs.nextcloud32;
     extraApps = {
-      inherit (pkgs.nextcloud31.packages.apps)
+      inherit (pkgs.nextcloud32.packages.apps)
         bookmarks
         previewgenerator
         spreed
@@ -31,20 +31,26 @@ in
     hostName = nextcloud;
     home = "/mnt/nas/nextcloud";
     https = true;
-    nginx.recommendedHttpHeaders = true;
     caching.redis = true;
     configureRedis = true;
     database.createLocally = true;
+    notify_push.enable = true;
     config = {
       dbtype = "pgsql";
       adminpassFile = toString (pkgs.writeText "nextcloud-pass" "admin12345!");
       adminuser = "admin";
     };
-    settings.trusted_domains = [
+    settings = {
-      hostname
+      trusted_domains = [
-      "192.168.3.2"
+        hostname
-      "10.0.0.1"
+        "192.168.3.2"
-    ];
+        "10.0.0.1"
+      ];
+      trusted_proxies = [
+        "127.0.0.1"
+        "192.168.3.0/24"
+      ];
+    };
     phpExtraExtensions =
       all: with all; [
         pdlib
@@ -53,7 +59,7 @@ in
     phpOptions = {
       "opcache.enable" = 1;
       "opcache.enable_cli" = 1;
-      "opcache.interned_strings_buffer" = 8;
+      "opcache.interned_strings_buffer" = 23;
       "opcache.max_accelerated_files" = 10000;
       "opcache.memory_consumption" = 128;
       "opcache.save_comments" = 1;
@@ -94,9 +100,12 @@ in
   */
   services.caddy.virtualHosts."nextcloud.imxyy.top" = {
     extraConfig = ''
-      reverse_proxy :8084 {
+      reverse_proxy http://127.0.0.1:8084 {
-        header_up X-Real-IP {remote_host}
+        trusted_proxies 192.168.3.0/24
       }
+
+      redir /.well-known/carddav /remote.php/dav/ 301
+      redir /.well-known/caldav /remote.php/dav/ 301
     '';
   };
 

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

@@ -2,28 +2,30 @@
   lib,
   config,
   username,
-  sopsRoot,
+  secrets,
   ...
 }:
 {
   boot.loader = {
     efi.canTouchEfiVariables = true;
-    systemd-boot.enable = true;
+    systemd-boot = {
+      enable = true;
+      configurationLimit = 10;
+    };
     grub.enable = false;
     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,51 @@
 {
   config,
-  sopsRoot,
+  secrets,
   ...
 }:
 {
-  sops.secrets = {
+  sops.secrets.siyuan-env = {
-    flatnote-env = {
+    sopsFile = secrets.siyuan;
-      sopsFile = sopsRoot + /flatnote.env;
+    restartUnits = [ "siyuan.service" ];
-      format = "dotenv";
+    format = "dotenv";
-    };
-    siyuan-env = {
-      sopsFile = sopsRoot + /siyuan.env;
-      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/rss.nix

@@ -0,0 +1,55 @@
+{ config, secrets, ... }:
+let
+  redisUrl = config.services.redis.servers.rsshub.unixSocket;
+in
+{
+  sops.secrets.rsshub-env = {
+    sopsFile = secrets.rsshub;
+    restartUnits = [ "podman-rsshub.service" ];
+    format = "dotenv";
+  };
+  users.users.rsshub = {
+    home = "/var/empty";
+    group = "rsshub";
+    isSystemUser = true;
+  };
+  users.groups.rsshub.members = [ "rsshub" ];
+  services.redis.servers.rsshub = {
+    enable = true;
+    user = "rsshub";
+  };
+  virtualisation.oci-containers.containers.rsshub = {
+    image = "diygod/rsshub";
+    volumes = [
+      "${redisUrl}:${redisUrl}"
+    ];
+    ports = [ "8100:1200" ];
+    networks = [ "podman" ];
+    environment = {
+      CACHE_TYPE = "redis";
+      REDIS_URL = "${redisUrl}";
+    };
+    environmentFiles = [ config.sops.secrets.rsshub-env.path ];
+  };
+  services.caddy.virtualHosts."rss.imxyy.top" = {
+    extraConfig = ''
+      reverse_proxy :8100
+    '';
+  };
+  services.frp.settings.proxies = [
+    {
+      name = "rsshub-http";
+      type = "http";
+      localIP = "127.0.0.1";
+      localPort = 80;
+      customDomains = [ "rss.imxyy.top" ];
+    }
+    {
+      name = "rsshub-https";
+      type = "https";
+      localIP = "127.0.0.1";
+      localPort = 443;
+      customDomains = [ "rss.imxyy.top" ];
+    }
+  ];
+}

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

@@ -0,0 +1,49 @@
+{ config, secrets, ... }:
+{
+  sops.secrets.sshwifty = {
+    sopsFile = secrets.sshwifty;
+    format = "binary";
+  };
+  services.sshwifty = {
+    enable = true;
+    sharedKeyFile = config.sops.secrets.sshwifty.path;
+    settings = {
+      Servers = [
+        {
+          ListenInterface = "0.0.0.0";
+          ListenPort = 8101;
+          InitialTimeout = 10;
+          ReadTimeout = 120;
+          WriteTimeout = 120;
+          HeartbeatTimeout = 10;
+          ReadDelay = 10;
+          WriteDelay = 10;
+          TLSCertificateFile = "";
+          TLSCertificateKeyFile = "";
+          ServerMessage = "";
+        }
+      ];
+    };
+  };
+  services.caddy.virtualHosts."ssh.imxyy.top" = {
+    extraConfig = ''
+      reverse_proxy :8101
+    '';
+  };
+  services.frp.settings.proxies = [
+    {
+      name = "sshwifty-http";
+      type = "http";
+      localIP = "127.0.0.1";
+      localPort = 80;
+      customDomains = [ "ssh.imxyy.top" ];
+    }
+    {
+      name = "sshwifty-https";
+      type = "https";
+      localIP = "127.0.0.1";
+      localPort = 443;
+      customDomains = [ "ssh.imxyy.top" ];
+    }
+  ];
+}

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

@@ -1,7 +1,8 @@
-{ config, sopsRoot, ... }:
+{ config, secrets, ... }:
 {
   sops.secrets.vaultwarden-env = {
-    sopsFile = sopsRoot + /vaultwarden.env;
+    sopsFile = secrets.vaultwarden;
+    restartUnits = [ "vaultwarden.service" ];
     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/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./nixos.nix
-    ./home.nix
-  ];
-}

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/default.nix

@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./nixos.nix
-    ./hardware.nix
-    ./home.nix
-    ./net.nix
-  ];
-}

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

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  username,
   ...
 }:
 let
@@ -22,7 +21,7 @@ in
       verbose = false;
     };
 
-    kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos;
+    kernelPackages = lib.mkForce pkgs.linuxPackages_xanmod_latest;
     kernelModules = [ "kvm-amd" ];
 
     tmp.useTmpfs = true;
@@ -30,7 +29,10 @@ in
       "fs.file-max" = 9223372036854775807;
     };
   };
-  services.scx.enable = true;
+  services.scx = {
+    enable = true;
+    scheduler = "scx_rusty";
+  };
 
   fileSystems."/" = {
     device = btrfs;

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,52 @@
     "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;
+    restartUnits = [ "dae.service" ];
     format = "binary";
   };
   services.dae = {
@@ -22,7 +63,8 @@
   };
   systemd.services.dae.after = [ "sops-nix.service" ];
   sops.secrets.mihomo = {
-    sopsFile = sopsRoot + /mihomo.yaml;
+    sopsFile = secrets.mihomo;
+    restartUnits = [ "mihomo.service" ];
     format = "yaml";
     key = "";
   };
@@ -34,7 +76,8 @@
   };
 
   sops.secrets.et-imxyy-nix-x16 = {
-    sopsFile = sopsRoot + /et-imxyy-nix-x16.toml;
+    sopsFile = secrets.et-imxyy-nix-x16;
+    restartUnits = [ "easytier.service" ];
     format = "binary";
   };
   environment.systemPackages = with pkgs; [
@@ -44,10 +87,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,
   ...
 }:
 {
@@ -22,7 +21,10 @@
 
   boot.loader = {
     efi.canTouchEfiVariables = true;
-    systemd-boot.enable = true;
+    systemd-boot = {
+      enable = true;
+      configurationLimit = 10;
+    };
     grub.enable = false;
     timeout = 0;
   };
@@ -36,72 +38,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 +75,7 @@
   ];
 
   sops.secrets.imxyy-nix-rclone = {
-    sopsFile = sopsRoot + /imxyy-nix-rclone.conf;
+    sopsFile = secrets.imxyy-nix-rclone;
     format = "binary";
   };
   fileSystems = {
@@ -154,21 +95,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

@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./nixos.nix
-    ./hardware.nix
-    ./home.nix
-    ./virt.nix
-    ./net.nix
-  ];
-}

config/hosts/imxyy-nix/hardware.nix

@@ -23,7 +23,7 @@ in
       verbose = false;
     };
 
-    kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos;
+    kernelPackages = lib.mkForce pkgs.linuxPackages_xanmod_latest;
     kernelModules = [ "kvm-amd" ];
 
     tmp.useTmpfs = true;
@@ -36,7 +36,10 @@ in
       "resume_offset=6444127"
     ];
   };
-  services.scx.enable = true;
+  services.scx = {
+    enable = true;
+    scheduler = "scx_rusty";
+  };
 
   fileSystems."/" = {
     device = btrfs;

config/hosts/imxyy-nix/home.nix

@@ -1,43 +1,35 @@
 {
   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 = {
       shellAliases = {
-        cageterm = "cage -m DP-2 -s -- alacritty -o font.size=20";
+        cageterm = "cage -m DP-1 -s -- alacritty -o font.size=20";
-        cagefoot = "cage -m DP-2 -s -- foot --font=monospace:size=20";
+        cagefoot = "cage -m DP-1 -s -- foot --font=monospace:size=20";
-        cagekitty = "cage -m DP-2 -s -- kitty -o font_size=20";
+        cagekitty = "cage -m DP-1 -s -- kitty -o font_size=20";
       };
       sessionVariables = {
         no_proxy = "192.168.3.0/24";
@@ -53,7 +45,7 @@
     programs.niri.settings = {
       environment.STEAM_FORCE_DESKTOPUI_SCALING = "1.25";
       outputs = {
-        DP-2 = {
+        DP-1 = {
           enable = true;
           mode = {
             width = 2560;
@@ -66,7 +58,7 @@
             y = 0;
           };
         };
-        DP-3 = {
+        DP-2 = {
           enable = true;
           mode = {
             width = 2560;
@@ -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,8 @@
   };
 
   sops.secrets.dae-imxyy-nix = {
-    sopsFile = sopsRoot + /dae-imxyy-nix.dae;
+    sopsFile = secrets.dae-imxyy-nix;
+    restartUnits = [ "dae.service" ];
     format = "binary";
   };
   services.dae = {
@@ -95,7 +99,8 @@
   };
   systemd.services.dae.after = [ "sops-nix.service" ];
   sops.secrets.mihomo = {
-    sopsFile = sopsRoot + /mihomo.yaml;
+    sopsFile = secrets.mihomo;
+    restartUnits = [ "mihomo.service" ];
     format = "yaml";
     key = "";
   };
@@ -107,7 +112,8 @@
   };
 
   sops.secrets.et-imxyy-nix = {
-    sopsFile = sopsRoot + /et-imxyy-nix.toml;
+    sopsFile = secrets.et-imxyy-nix;
+    restartUnits = [ "easytier.service" ];
     format = "binary";
   };
   environment.systemPackages = [ pkgs.easytier ];
@@ -115,10 +121,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,76 +3,25 @@
   pkgs,
   config,
   username,
-  sopsRoot,
+  secrets,
   ...
 }:
 let
-  btreset = pkgs.writeScriptBin "btreset" ''
+  btreset = pkgs.writeShellScriptBin "btreset" ''
-    #!${lib.getExe pkgs.python3}
+    LOCKFILE="/tmp/.btreseted"
+    SYM="BT"
 
-    import subprocess
+    if [ -f "$LOCKFILE" ] && [ "$1" != "-f" ]; then
-    import os
+      exit 0
-    import sys
+    fi
 
-    SYM = "BT"
+    ${lib.getExe' pkgs.usbutils "lsusb"} | grep "$SYM" | while read -r line; do
+      bus=$(echo "$line" | awk '{print $2}')
+      dev=$(echo "$line" | awk '{print $4}' | tr -d ':')
+      ${lib.getExe' pkgs.usbutils "usbreset"} "$bus/$dev"
 
-    def action(line: str) -> bool:
+      touch "$LOCKFILE"
-        if line.find(SYM) == -1:
+    done
-            return False
-        temp = line.split(" ")
-        bus = temp[1]
-        device = temp[3][:-1]
-        subprocess.run(["${lib.getExe usbreset}", f"/dev/bus/usb/{bus}/{device}"])
-        return True
-
-    if __name__ == "__main__":
-        if os.path.exists("/tmp/.btreseted") and len(sys.argv) == 1 and "-f" not in sys.argv[1:]:
-            exit(0)
-        res_byte = subprocess.check_output("/run/current-system/sw/bin/lsusb")
-        res = res_byte.decode()
-        lst = res.split("\n")
-
-        if any(tuple(map(action, lst))):
-            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
 {
@@ -97,7 +46,10 @@ in
 
   boot.loader = {
     efi.canTouchEfiVariables = true;
-    systemd-boot.enable = true;
+    systemd-boot = {
+      enable = true;
+      configurationLimit = 10;
+    };
     grub.enable = false;
     timeout = 0;
   };
@@ -111,84 +63,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 +93,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 +122,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,36 @@
+{
+  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";
+        additional_packages = "nvim";
+      };
+    };
+  };
+  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.nix

@@ -3,63 +3,96 @@
 
   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-stable.url = "github:nixos/nixpkgs/release-25.11";
     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";
 
-    # Nyxpkgs
+    # TODO: sops-nix: remove pr patch once merged
-    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
+    # https://github.com/Mic92/sops-nix/pull/779
-
+    sops-nix = {
-    # SOPS
+      url = "github:Mic92/sops-nix/pull/779/merge";
-    sops-nix.url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
-    sops-nix.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";
+      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";
+    noctalia = {
-    infuse.flake = false;
+      url = "github:noctalia-dev/noctalia-shell/v3.6.2";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    haumea.url = "github:nix-community/haumea/v0.2.2";
+    angrr = {
-    haumea.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:linyinfeng/angrr";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    plant = {
+      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";
+
+    my-templates.url = "git+https://git.imxyy.top/imxyy1soope1/flake-templates";
   };
 
   outputs =
@@ -71,10 +104,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 +137,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;
-          '';
         }
       );
 
@@ -135,20 +167,12 @@
             inputs.go-musicfox.overlays.default
             inputs.niri.overlays.niri
             inputs.fenix.overlays.default
+            inputs.angrr.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,26 +210,45 @@
               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 ];
               exclude = [
                 ./modules/virt/types
-                ./modules/desktop/wm/niri/waybar
               ];
               recursive = true;
             })
+            ++ (lib.umport {
+              paths = [ ./config/hosts/${hostname} ];
+              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
               inputs.sops-nix.nixosModules.sops
               inputs.impermanence.nixosModules.impermanence
               inputs.home-manager.nixosModules.default
               inputs.niri.nixosModules.niri
+              inputs.catppuccin.nixosModules.catppuccin
+              inputs.angrr.nixosModules.angrr
               home
               pkgsConf
             ];

lib/default.nix

@@ -13,7 +13,7 @@
       cfg = lib.getAttrFromPath optionPath config.my;
     in
     {
-      options.my = lib.setAttrByPath (optionPath) {
+      options.my = lib.setAttrByPath optionPath {
         enable = (lib.mkEnableOption optionName) // {
           inherit default;
         };
@@ -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,9 +9,7 @@ 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,21 +15,25 @@ 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;
+          format = "binary";
+          path = "${config.my.hm.xdg.configHome}/go-musicfox/config.toml";
+        };
       };
 
-      cli.media.mpd.enable = true;
+      desktop.media.mpv.enable = lib.mkForce true;
 
       persist.homeDirs = [
-        ".config/go-musicfox/db"
+        ".local/share/go-musicfox/db"
       ];
       persist.homeFiles = [
-        ".config/go-musicfox/cookie"
+        ".local/share/go-musicfox/cookie"
       ];
     };
   };

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

@@ -1,28 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-lib.my.makeSwitch {
-  inherit config;
-  optionName = "mpd";
-  optionPath = [
-    "cli"
-    "media"
-    "mpd"
-  ];
-  config' = {
-    my.home = {
-      home.packages = with pkgs.stable; [
-        mpd
-        mpc-cli
-      ];
-      services.mpris-proxy.enable = true;
-      xdg.configFile."mpd/mpd.conf".source = ./mpd.conf;
-    };
-    my.persist.homeFiles = [
-      ".config/mpd/mpd.db"
-    ];
-  };
-}

modules/cli/media/mpd/mpd.conf

@@ -1,30 +0,0 @@
-bind_to_address   "127.0.0.1"
-port              "6600"
-music_directory   "/home/imxyy/Music/go-musicfox/.cache"
-pid_file          "/home/imxyy/.config/mpd/mpd.pid"
-db_file           "/home/imxyy/.config/mpd/mpd.db"
-
-input {
-    plugin      "file"
-    enabled     "yes"
-}
-
-input {
-    plugin      "curl"
-    enabled     "yes"
-}
-
-decoder {
-    plugin      "ffmpeg"
-    enabled     "yes"
-}
-
-audio_output {
-    type        "pipewire"
-    name        "pipewire"
-}
-
-audio_output {
-    type        "pulse"
-    name        "pulseaudio"
-}

modules/cli/misc.nix

@@ -2,9 +2,6 @@
   config,
   lib,
   pkgs,
-  username,
-  userfullname,
-  useremail,
   ...
 }:
 lib.my.makeSwitch {
@@ -42,15 +39,22 @@ lib.my.makeSwitch {
       dnsutils
 
       killall
+
+      comma
     ];
 
     programs.dconf.enable = true;
 
-    my.home = {
+    my.persist.homeDirs = [
+      ".local/share/zoxide"
+      ".config/television/cable"
+    ];
+    my.hm = {
       home.packages = with pkgs; [
         lsd
         fd
         neofetch
+        fastfetch
         fzf
         bat
         ripgrep
@@ -80,6 +84,125 @@ lib.my.makeSwitch {
         enableAutoUpdates = true;
         settings.updates.auto_update = true;
       };
+      programs.television = {
+        enable = true;
+        enableZshIntegration = true;
+        enableFishIntegration = true;
+      };
+      programs.zoxide = {
+        enable = true;
+        enableZshIntegration = true;
+        enableFishIntegration = 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/all.nix

@@ -10,6 +10,8 @@ lib.my.makeSwitch {
   config' = {
     my.cli.shell = {
       zsh.enable = true;
+      fish.enable = true;
+      starship.enable = true;
     };
   };
 }

modules/cli/shell/defaultShell.nix

@@ -0,0 +1,34 @@
+{
+  lib,
+  config,
+  username,
+  ...
+}:
+let
+  cfg = config.my.cli.shell;
+in
+{
+  options.my.cli.shell.default = lib.mkOption {
+    type = lib.types.enum [
+      "fish"
+      "zsh"
+    ];
+    default = "fish";
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.default == "fish") {
+      my.cli.shell.fish.enable = true;
+      users.users.${username} = {
+        shell = config.my.hm.programs.fish.package;
+        # do not need `programs.fish.enable = true` since fish is managed by home-manager
+        ignoreShellProgramCheck = true;
+      };
+    })
+
+    (lib.mkIf (cfg.default == "zsh") {
+      my.cli.shell.zsh.enable = true;
+      users.users.${username}.shell = config.my.hm.programs.zsh.package;
+    })
+  ];
+}

modules/cli/shell/fish.nix

@@ -0,0 +1,102 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.my.makeSwitch {
+  inherit config;
+  default = true;
+  optionName = "default fish settings";
+  optionPath = [
+    "cli"
+    "shell"
+    "fish"
+  ];
+  config' = {
+    my.persist.homeDirs = [
+      ".local/share/fish"
+    ];
+    my.hm = {
+      xdg.configFile."fish/themes/tokyonight_storm.theme".source = builtins.fetchurl {
+        url = "https://raw.githubusercontent.com/folke/tokyonight.nvim/refs/tags/v4.14.1/extras/fish_themes/tokyonight_storm.theme";
+        sha256 = "02n1w5x65683c8mlwg1rav06iqm3xk90zq45qmygpm7pzyn8dqh1";
+      };
+      programs.fish = {
+        enable = true;
+        plugins = [
+          {
+            name = "extract";
+            src = pkgs.fetchFromGitHub {
+              owner = "hexclover";
+              repo = "fish-extract-ng";
+              tag = "v0.1";
+              hash = "sha256-yef5NX4HdZ3ab/2AzNrvvhi0CbeTvXYKZmyH76gIpyk=";
+            };
+          }
+        ];
+        shellAliases = {
+          la = "lsd -lah";
+          ls = "lsd";
+          svim = "doasedit";
+          nf = "fastfetch";
+          tmux = "tmux -T RGB,focus,overline,mouse,clipboard,usstyle";
+        };
+        interactiveShellInit = lib.mkBefore ''
+          fish_vi_key_bindings
+          fish_config theme choose tokyonight_storm
+        '';
+        functions = {
+          fish_greeting = "";
+          yank_to_clipboard = {
+            description = "Insert latest killring entry into the system clipboard";
+            body = ''printf "%s" "$fish_killring[1]" | fish_clipboard_copy'';
+          };
+          fish_user_key_bindings = ''
+            # make vi mode yanks copy to clipboard
+            bind yy kill-whole-line yank_to_clipboard yank
+            bind Y kill-whole-line yank_to_clipboard yank
+            bind y,\$ kill-line yank_to_clipboard yank
+            bind y,\^ backward-kill-line yank_to_clipboard yank
+            bind y,0 backward-kill-line yank_to_clipboard yank
+            bind y,w kill-word yank_to_clipboard yank
+            bind y,W kill-bigword yank_to_clipboard yank
+            bind y,i,w forward-single-char forward-single-char backward-word kill-word yank_to_clipboard yank
+            bind y,i,W forward-single-char forward-single-char backward-bigword kill-bigword yank_to_clipboard yank
+            bind y,a,w forward-single-char forward-single-char backward-word kill-word yank_to_clipboard yank
+            bind y,a,W forward-single-char forward-single-char backward-bigword kill-bigword yank_to_clipboard yank
+            bind y,e kill-word yank_to_clipboard yank
+            bind y,E kill-bigword yank_to_clipboard yank
+            bind y,b backward-kill-word yank_to_clipboard yank
+            bind y,B backward-kill-bigword yank_to_clipboard yank
+            bind y,g,e backward-kill-word yank_to_clipboard yank
+            bind y,g,E backward-kill-bigword yank_to_clipboard yank
+            bind y,f begin-selection forward-jump kill-selection yank_to_clipboard yank end-selection
+            bind y,t begin-selection forward-jump-till kill-selection yank_to_clipboard yank end-selection
+            bind y,F begin-selection backward-jump kill-selection yank_to_clipboard yank end-selection
+            bind y,T begin-selection backward-jump-till kill-selection yank_to_clipboard yank end-selection
+            bind y,h backward-char begin-selection kill-selection yank_to_clipboard yank end-selection
+            bind y,l begin-selection kill-selection yank_to_clipboard yank end-selection
+            bind y,i,b jump-till-matching-bracket and jump-till-matching-bracket and begin-selection jump-till-matching-bracket kill-selection yank_to_clipboard yank end-selection
+            bind y,a,b jump-to-matching-bracket and jump-to-matching-bracket and begin-selection jump-to-matching-bracket kill-selection yank_to_clipboard yank end-selection
+            bind y,i backward-jump-till and repeat-jump-reverse and begin-selection repeat-jump kill-selection yank_to_clipboard yank end-selection
+            bind y,a backward-jump and repeat-jump-reverse and begin-selection repeat-jump kill-selection yank_to_clipboard yank end-selection
+            bind -M visual -m default y kill-selection yank_to_clipboard yank end-selection repaint-mode
+
+            # use system clipboard for vi mode pastes
+            bind -s p 'set -g fish_cursor_end_mode exclusive' forward-char 'set -g fish_cursor_end_mode inclusive' fish_clipboard_paste
+            bind -s P fish_clipboard_paste
+          '';
+
+          nix-closure-size = {
+            body = ''
+              nix path-info --recursive --size --closure-size \
+                            --human-readable $(readlink -f $(which $program))
+            '';
+            argumentNames = [ "program" ];
+          };
+        };
+      };
+    };
+  };
+}

modules/cli/shell/starship.nix

@@ -0,0 +1,21 @@
+{ config, lib, ... }:
+lib.my.makeSwitch {
+  inherit config;
+  optionName = "starship prompt";
+  optionPath = [
+    "cli"
+    "shell"
+    "starship"
+  ];
+  config' = {
+    my.hm = {
+      programs.starship = {
+        enable = true;
+        settings = lib.recursiveUpdate (with builtins; fromTOML (readFile ./starship-preset.toml)) {
+          add_newline = false;
+          nix_shell.disabled = true;
+        };
+      };
+    };
+  };
+}

modules/cli/shell/zsh.nix

@@ -14,114 +14,46 @@ lib.my.makeSwitch {
     "zsh"
   ];
   config' = {
-    my.persist.homeDirs = [ ".local/share/zoxide" ];
+    my.hm = {
-    my.home =
+      home.packages = with pkgs; [
-      let
+        fzf
-        stateHome = config.my.home.xdg.stateHome;
+      ];
-        zsh-syntax-highlighting = pkgs.fetchFromGitHub {
+      programs.zsh = {
-          owner = "zsh-users";
+        enable = true;
-          repo = "zsh-syntax-highlighting";
+        dotDir = "${config.my.hm.xdg.configHome}/zsh";
-          rev = "0.8.0";
+        history = {
-          hash = "sha256-iJdWopZwHpSyYl5/FQXEW7gl/SrKaYDEtTH9cGP7iPo=";
+          path = "${config.my.hm.xdg.stateHome}/zsh_history";
+          ignorePatterns = [
+            "la"
+          ];
         };
-        fzf-tab = pkgs.fetchFromGitHub {
+        autosuggestion.enable = true;
-          owner = "Aloxaf";
+        syntaxHighlighting.enable = true;
-          repo = "fzf-tab";
+        plugins = [
-          rev = "v1.2.0";
+          {
-          hash = "sha256-q26XVS/LcyZPRqDNwKKA9exgBByE0muyuNb0Bbar2lY=";
+            name = "fzf-tab";
-        };
+            src = pkgs.zsh-fzf-tab;
-      in
+            file = "share/fzf-tab/fzf-tab.plugin.zsh";
-      {
+          }
-        home.packages = with pkgs; [
-          fzf
-          zoxide
         ];
-        programs.starship = {
+        oh-my-zsh = {
           enable = true;
-          settings = lib.recursiveUpdate (with builtins; fromTOML (readFile ./starship-preset.toml)) {
+          theme = "gentoo";
-            add_newline = false;
+          plugins = [
-            custom = {
+            "git"
-              jj = {
+            "git-extras"
-                ignore_timeout = true;
+            "extract"
-                description = "The current jj status";
+            "sudo"
-                when = "jj root";
+          ];
-                symbol = " ";
-                command = ''
-                  jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '
-                    separate(" ",
-                      change_id.shortest(4),
-                      bookmarks,
-                      "|",
-                      concat(
-                        if(conflict, "💥"),
-                        if(divergent, "🚧"),
-                        if(hidden, "👻"),
-                        if(immutable, "🔒"),
-                      ),
-                      raw_escape_sequence("\x1b[1;32m") ++ if(empty, "(empty)"),
-                      raw_escape_sequence("\x1b[1;32m") ++ coalesce(
-                        truncate_end(29, description.first_line(), "…"),
-                        "(no description set)",
-                      ) ++ raw_escape_sequence("\x1b[0m"),
-                    )
-                  '
-                '';
-              };
-              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;
-            git_metrics.disabled = true;
-            git_branch.disabled = true;
-            git_status.disabled = true;
-            nix_shell.disabled = true;
-          };
         };
-        programs.zsh = {
+        shellAliases = {
-          enable = true;
+          x = "extract";
-          dotDir = ".config/zsh";
+          ls = "lsd";
-          history = {
+          svim = "doasedit";
-            path = "${stateHome}/zsh_history";
+          nf = "fastfetch";
-            ignorePatterns = [
+          tmux = "tmux -T RGB,focus,overline,mouse,clipboard,usstyle";
-              "la"
-            ];
-          };
-          initContent = lib.mkAfter ''
-            source ${fzf-tab}/fzf-tab.plugin.zsh
-
-            eval "$(zoxide init zsh)"
-            source ${zsh-syntax-highlighting}/zsh-syntax-highlighting.plugin.zsh
-            source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-          '';
-          oh-my-zsh = {
-            enable = true;
-            theme = "gentoo";
-            plugins = [
-              "git"
-              "git-extras"
-              "extract"
-              "sudo"
-              "dotenv"
-            ];
-          };
-          shellAliases = {
-            x = "extract";
-            ls = "lsd";
-            svim = "sudoedit";
-            nf = "neofetch";
-            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";
@@ -40,6 +41,43 @@ lib.my.makeHomeProgramConfig {
         };
       };
       home.packages = [ pkgs.lazyjj ];
+      programs.starship = {
+        settings = {
+          custom = {
+            jj = {
+              ignore_timeout = true;
+              description = "The current jj status";
+              when = true;
+              command = ''
+                jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '
+                  separate(" ",
+                    " ",
+                    change_id.shortest(4),
+                    bookmarks,
+                    "|",
+                    concat(
+                      if(conflict, "💥"),
+                      if(divergent, "🚧"),
+                      if(hidden, "👻"),
+                      if(immutable, "🔒"),
+                    ),
+                    raw_escape_sequence("\x1b[1;32m") ++ if(empty, "(empty)"),
+                    raw_escape_sequence("\x1b[1;32m") ++ coalesce(
+                      truncate_end(29, description.first_line(), "…"),
+                      "(no description set)",
+                    ) ++ raw_escape_sequence("\x1b[0m"),
+                  )
+                ' || {starship module git_branch && starship module git_status}
+              '';
+            };
+          };
+          git_state.disabled = true;
+          git_commit.disabled = true;
+          git_metrics.disabled = true;
+          git_branch.disabled = true;
+          git_status.disabled = true;
+        };
+      };
     };
   };
 }

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/langs/go.lua

@@ -4,9 +4,6 @@ vim.api.nvim_create_autocmd("BufWritePre", {
   desc = "auto format Go files",
   callback = function()
     vim.lsp.buf.format()
-    -- vim.fn.system("go fmt " .. vim.fn.expand("%:p"))
-    -- vim.fn.system("goimports -w " .. vim.fn.expand("%:p"))
-    -- vim.cmd("edit")
   end,
   group = "Go",
 })

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

@@ -1,5 +1 @@
 require("langs.go")
--- require("langs.rust")
-require("langs.lualang")
-require("langs.nix")
-require("langs.markdown")

modules/coding/editor/neovim/nvim/lua/langs/lualang.lua

@@ -1,34 +0,0 @@
-vim.api.nvim_create_augroup("Lua", {})
-
-local old = {}
-vim.api.nvim_create_autocmd("BufEnter", {
-  pattern = { "*.lua" },
-  desc = "auto lua file indent",
-  callback = function()
-    local opt = vim.opt
-    -- Tab width setting
-    old.tabstop = opt.tabstop
-    old.shiftwidth = opt.shiftwidth
-    old.softtabstop = opt.softtabstop
-    old.expandtab = opt.expandtab
-    opt.tabstop = 2
-    opt.shiftwidth = 2
-    opt.softtabstop = 2
-    opt.expandtab = true
-    opt.autoindent = true
-  end,
-  group = "Lua",
-})
-vim.api.nvim_create_autocmd("BufLeave", {
-  pattern = { "*.lua" },
-  desc = "auto lua file indent",
-  callback = function()
-    local opt = vim.opt
-    -- Tab width setting
-    opt.tabstop = old.tabstop
-    opt.shiftwidth = old.shiftwidth
-    opt.softtabstop = old.softtabstop
-    opt.expandtab = old.expandtab
-  end,
-  group = "Lua",
-})

modules/coding/editor/neovim/nvim/lua/langs/markdown.lua

@@ -1,34 +0,0 @@
-vim.api.nvim_create_augroup("Markdown", {})
-
-local old = {}
-vim.api.nvim_create_autocmd("BufEnter", {
-  pattern = { "*.md" },
-  desc = "auto md file indent",
-  callback = function()
-    local opt = vim.opt
-    -- Tab width setting
-    old.tabstop = opt.tabstop
-    old.shiftwidth = opt.shiftwidth
-    old.softtabstop = opt.softtabstop
-    old.expandtab = opt.expandtab
-    opt.tabstop = 2
-    opt.shiftwidth = 2
-    opt.softtabstop = 2
-    opt.expandtab = true
-    opt.autoindent = true
-  end,
-  group = "Markdown",
-})
-vim.api.nvim_create_autocmd("BufLeave", {
-  pattern = { "*.md" },
-  desc = "auto markdown file indent",
-  callback = function()
-    local opt = vim.opt
-    -- Tab width setting
-    opt.tabstop = old.tabstop
-    opt.shiftwidth = old.shiftwidth
-    opt.softtabstop = old.softtabstop
-    opt.expandtab = old.expandtab
-  end,
-  group = "Markdown",
-})

modules/coding/editor/neovim/nvim/lua/langs/nix.lua

@@ -1,34 +0,0 @@
-vim.api.nvim_create_augroup("Nix", {})
-
-local old = {}
-vim.api.nvim_create_autocmd("BufEnter", {
-  pattern = { "*.nix" },
-  desc = "auto nix file indent",
-  callback = function()
-    local opt = vim.opt
-    -- Tab width setting
-    old.tabstop = opt.tabstop
-    old.shiftwidth = opt.shiftwidth
-    old.softtabstop = opt.softtabstop
-    old.expandtab = opt.expandtab
-    opt.tabstop = 2
-    opt.shiftwidth = 2
-    opt.softtabstop = 2
-    opt.expandtab = true
-    opt.autoindent = true
-  end,
-  group = "Nix",
-})
-vim.api.nvim_create_autocmd("BufLeave", {
-  pattern = { "*.nix" },
-  desc = "auto nix file indent",
-  callback = function()
-    local opt = vim.opt
-    -- Tab width setting
-    opt.tabstop = old.tabstop
-    opt.shiftwidth = old.shiftwidth
-    opt.softtabstop = old.softtabstop
-    opt.expandtab = old.expandtab
-  end,
-  group = "Nix",
-})

modules/coding/editor/neovim/nvim/lua/langs/rust.lua

@@ -1,10 +0,0 @@
-vim.api.nvim_create_augroup("Rust", {})
-vim.api.nvim_create_autocmd("BufWritePost", {
-  pattern = { "*.rs" },
-  desc = "auto format Rust files",
-  callback = function()
-    vim.fn.system("rustfmt " .. vim.fn.expand("%:p"))
-    vim.cmd("edit")
-  end,
-  group = "Rust",
-})

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

@@ -1,17 +1,4 @@
 local servers = {
-  "lua_ls",
-  "pyright",
-  "gopls",
-  "clangd",
-  "rust_analyzer",
-  "ts_ls",
-  "jsonls",
-  "cssls",
-  "nixd",
-  "html",
-}
-
-local extra_config = {
   lua_ls = {
     settings = {
       Lua = {
@@ -35,7 +22,7 @@ local extra_config = {
   },
   rust_analyzer = {
     settings = {
-      rust_analyzer = {
+      ["rust-analyzer"] = {
         check = {
           command = "clippy",
         },
@@ -51,20 +38,30 @@ local extra_config = {
   nixd = {
     settings = {
       nixd = {
+        formatting = {
+          command = { "nixfmt" },
+        },
         nixpkgs = {
           expr = "import <nixpkgs> { }",
         },
-        options = {
-          nixos = {
-            expr = '(builtins.getFlake ("git+file://" + toString ./.)).nixosConfigurations.imxyy-nix.options',
-          },
-        },
       },
     },
   },
+  tinymist = {
+    cmd = { "tinymist" },
+    filetypes = { "typst" },
+  },
   qmlls = {
-    cmd = {"qmlls", "-E"}
+    cmd = { "qmlls", "-E" },
-  }
+  },
+  pyright = {},
+  gopls = {},
+  clangd = {},
+  ts_ls = {},
+  jsonls = {},
+  cssls = {},
+  html = {},
+  java_language_server = {},
 }
 
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
@@ -73,14 +70,8 @@ capabilities.textDocument.foldingRange = {
   dynamicRegistration = false,
   lineFoldingOnly = true,
 }
-local lspconfig = require("lspconfig")
+for server, config in pairs(servers) do
-for _, server in ipairs(servers) do
+  config["capabilities"] = capabilities
-  local extra = extra_config[server] or {}
+  vim.lsp.config(server, config)
-  local config = {
+  vim.lsp.enable(server)
-    capabilities = capabilities,
-  }
-  for k, v in pairs(extra) do
-    config[k] = v
-  end
-  lspconfig[server].setup(config)
 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",
@@ -256,6 +281,12 @@ local plugins = {
     ft = "pest",
     opts = {},
   },
+
+  {
+    "nmac427/guess-indent.nvim",
+    event = "VeryLazy",
+    opts = {},
+  },
 }
 
 require("lazy").setup(plugins, {})

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,7 +15,9 @@ lib.my.makeSwitch {
       python.enable = true;
       rust.enable = true;
       lua.enable = true;
+      java.enable = true;
       qml.enable = true;
+      typst.enable = true;
     };
   };
 }

modules/coding/langs/c.nix

@@ -13,8 +13,9 @@ lib.my.makeSwitch {
     "c"
   ];
   config' = {
-    my.home.home.packages = with pkgs; [
+    my.hm.home.packages = with pkgs; [
       gcc
+      (lib.hiPrio clang)
       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/langs/typst.nix

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

modules/coding/misc.nix

@@ -12,12 +12,20 @@ lib.my.makeSwitch {
     "misc"
   ];
   config' = {
-    my.home = {
+    my.hm = {
       home.packages = with pkgs; [
         gnumake
         github-cli # gh
       ];
-      programs.direnv.enable = true;
+      programs.direnv = {
+        enable = true;
+        config = {
+          global = {
+            warn_timeout = 0;
+            hide_env_diff = false;
+          };
+        };
+      };
     };
     my.persist.homeDirs = [
       ".local/share/direnv"