25 changed files with 254 additions and 229 deletions
--- a/flake.lock
+++ b/flake.lock
@ -141,11 +141,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749436314,
-        "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=",
+        "lastModified": 1749147380,
+        "narHash": "sha256-UvCI5f1qD9l1fCQkoG/kJI0yNjDQIiJaN7gkve8fmII=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a",
+        "rev": "d74db625a5cf3f46cf8fa545d6ef10bd3463ea07",
        "type": "github"
      },
      "original": {
@ -222,11 +222,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "lastModified": 1748821116,
+        "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
        "type": "github"
      },
      "original": {
@ -357,11 +357,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1749432877,
-        "narHash": "sha256-z3fWdIANU38HVqgqAhBM0lHq7OTa3Ncxs4Hh/dejEk8=",
+        "lastModified": 1748959729,
+        "narHash": "sha256-wYUaAhGSetByNQrwUhppxNwubtP8BK3zfhOIllm5mEE=",
        "owner": "helix-editor",
        "repo": "helix",
-        "rev": "2b26d27416b4b0fb2286bf05aae173ec23dd6592",
+        "rev": "f6878f62f74430cff188e7978d06c5ed143179e9",
        "type": "github"
      },
      "original": {
@ -378,11 +378,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749400020,
-        "narHash": "sha256-0nTmHO8AYgRYk5v6zw5oZ3x9nh+feb+Isn7WNe318M0=",
+        "lastModified": 1749160002,
+        "narHash": "sha256-IM3xKjsKxhu7Y1WdgTltrLKiOJS8nW7D4SUDEMNr7CI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2835e8ba0ad99ba86d4a5e497a962ec9fa35e48f",
+        "rev": "68cc9eeb3875ae9682c04629f20738e1e79d72aa",
        "type": "github"
      },
      "original": {
@ -443,11 +443,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1749396815,
-        "narHash": "sha256-vwr2vLETE4CSi4c6SFoQyP+uBUnvwPPQmn+1D1207ts=",
+        "lastModified": 1749144707,
+        "narHash": "sha256-JcSmySCB3pOtzeWMaEksZgaiNedEDIC6qyBezkK+92Q=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "e6db401ff0aa3b03507b4819f9a44deab3cfcf2f",
+        "rev": "32d49ef427be377c82d32ce74ff3082c2c992199",
        "type": "github"
      },
      "original": {
@ -476,11 +476,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1749327170,
-        "narHash": "sha256-mBrxeWd7L8oAIh6G2PgKuZAzqyZMyjBpHEAcSSTbhJg=",
+        "lastModified": 1749112952,
+        "narHash": "sha256-ajI1cXa2AgdZSELvlVaQZd0XMi4eM8H3Ys0Ek8a/roI=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "f918eabe6a144e78c62c3fc0cfa7fe32e4623e5a",
+        "rev": "242ebf294514cc22f4f9d83c0566c8ffe1cb8d8a",
        "type": "github"
      },
      "original": {
@ -497,11 +497,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1749424580,
-        "narHash": "sha256-mt45T2JVYPLwJs3Gi0Hr6Eo5TE+sPyWUDq/H6Qg66ek=",
+        "lastModified": 1749121763,
+        "narHash": "sha256-TVFiyMBs+3KEzZVwf/n1zedUWzPrMPzud/2Jiho8dcE=",
        "owner": "lilyinstarlight",
        "repo": "nixos-cosmic",
-        "rev": "fae5ebd4d5da1db8323a673728ebecc06b9dc653",
+        "rev": "c89df80b72b4e1802fd91a35f4857868c953c1c0",
        "type": "github"
      },
      "original": {
@ -512,11 +512,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1749195551,
-        "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
+        "lastModified": 1749056381,
+        "narHash": "sha256-QITcurR19KZlrCngBoCjsFF2BdYsiCG4UqmlrVcLb8Q=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
+        "rev": "029bd66faa180e11262dd1bc2732254c33415f52",
        "type": "github"
      },
      "original": {
@ -528,11 +528,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1749143949,
-        "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
+        "lastModified": 1748929857,
+        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
+        "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
        "type": "github"
      },
      "original": {
@ -559,11 +559,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1749237914,
-        "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=",
+        "lastModified": 1749086602,
+        "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265",
+        "rev": "4792576cb003c994bd7cc1edada3129def20b27d",
        "type": "github"
      },
      "original": {
@ -575,11 +575,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1749173751,
-        "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=",
+        "lastModified": 1748995628,
+        "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91",
+        "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b",
        "type": "github"
      },
      "original": {
@ -591,11 +591,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1749285348,
-        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
+        "lastModified": 1748929857,
+        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
+        "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
        "type": "github"
      },
      "original": {
@ -650,11 +650,11 @@
    "nur-rycee": {
      "flake": false,
      "locked": {
-        "lastModified": 1749269004,
-        "narHash": "sha256-20eV5kl7iP7ODy9ZNW2SAg8bIg2ttud+IWs7UHxsbE0=",
+        "lastModified": 1749143092,
+        "narHash": "sha256-IrVT37SUU8/B3X53rwEzDrx3djGLIfa8tmsyqVJxpR4=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "c579adeca940c70ac7dd661a1cda662f2d1fb158",
+        "rev": "d62d10f250ca6a37cbbe05a35a0e1e7ae3b4b5c2",
        "type": "gitlab"
      },
      "original": {
@ -714,11 +714,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749350575,
-        "narHash": "sha256-ltLegOYrp69v/7BXlNfSwUPrt2DvF7N668pV4a6rWRA=",
+        "lastModified": 1749091064,
+        "narHash": "sha256-TGtYjzRX0sueFhwYsnNNFF5TTKnpnloznpIghLzxeXo=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "24d5806474b0779d373f381f00d75ad51fd45099",
+        "rev": "12419593ce78f2e8e1e89a373c6515885e218acb",
        "type": "github"
      },
      "original": {
@ -775,11 +775,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1749398498,
-        "narHash": "sha256-Usx6sGnT/D8ZnWiZg+J1OY3dp4ZssMQiN1XeXcsL/cs=",
+        "lastModified": 1749165619,
+        "narHash": "sha256-E1KgTswgmzBGv+8WijQRghlyIP6k+LPzj9j8bq9BlLU=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "5869510e48e64d916dc6905dc664a02b0f85f1bd",
+        "rev": "8456dfa7f60e6b4499b0498fc88e9b8b57d4d7d7",
        "type": "github"
      },
      "original": {
@ -926,11 +926,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1749194973,
-        "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=",
+        "lastModified": 1748243702,
+        "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
+        "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
        "type": "github"
      },
      "original": {
@ -959,11 +959,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1749315541,
-        "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=",
+        "lastModified": 1748488455,
+        "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba",
+        "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
        "type": "github"
      },
      "original": {
--- a/home/david/configurations/Akun/default.nix
+++ b/home/david/configurations/Akun/default.nix
@ -17,6 +17,7 @@
    in {
      firefox.enable = true;
      fuzzel.enable = true;
+      helix.enable = true;
      gpg.enable = true;
      git = {
        inherit name signKey;
@ -47,7 +48,6 @@
    wallpaper.enable = true;
    accounts.email.enable = true;
    programs = {
-      helix.enable = true;
      openssh.enable = true;
    };
  };
--- a/home/david/configurations/Akun/niri.nix
+++ b/home/david/configurations/Akun/niri.nix
@ -2,6 +2,7 @@
  inherit (inputs.niri-flake.lib.kdl) node leaf plain flag;
 in {
  david.programs.niri = {
+    DISPLAY = ":1";
    extraConfig = let
      output = node "output";
    in [
--- a/home/david/configurations/Tytonidae/default.nix
+++ b/home/david/configurations/Tytonidae/default.nix
@ -20,6 +20,7 @@
      rustypaste-cli.enable = true;
      firefox.enable = true;
      fuzzel.enable = true;
+      helix.enable = true;
      gpg.enable = true;
      jujutsu = {
        enable = true;
@ -44,7 +45,6 @@
      obs.enable = true;
      chromium.enable = true;
      espanso.enable = true;
-      ion.enable = true;
    };
  };

@ -53,7 +53,6 @@
    accounts.email.enable = true;
    programs = {
      openssh.enable = true;
-      helix.enable = true;
    };
  };

--- a/home/david/configurations/Tytonidae/niri.nix
+++ b/home/david/configurations/Tytonidae/niri.nix
@ -2,6 +2,7 @@
  inherit (inputs.niri-flake.lib.kdl) node leaf plain flag;
 in {
  david.programs.niri = {
+    DISPLAY = ":1";
    extraConfig = let
      output = node "output";
    in [
@ -35,5 +36,33 @@ in {
        (leaf "transform" "normal")
      ])
    ];
+    # settings = {
+    #   outputs = {
+    #     DP-1 = {
+    #       mode = {
+    #         width = 2560;
+    #         height = 1440;
+    #         refresh = 169.900;
+    #       };
+    #       scale = 1;
+    #       position = {
+    #         x = 0;
+    #         y = 0;
+    #       };
+    #     };
+    #     eDP-1 = {
+    #       mode = {
+    #         width = 2560;
+    #         height = 1440;
+    #         refresh = 165.003;
+    #       };
+    #       scale = 1.5;
+    #       position = {
+    #         x = 2560;
+    #         y = 0;
+    #       };
+    #     };
+    #   };
+    # };
  };
 }
--- a/home/david/modules/programs/default.nix
+++ b/home/david/modules/programs/default.nix
@ -3,6 +3,5 @@
    ./openssh.nix
    ./niri
    ./wluma
-    ./helix.nix
  ];
 }
--- a/home/david/modules/programs/helix.nix
+++ b/home/david/modules/programs/helix.nix
@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.david.programs.helix;
-in {
-  options = {
-    david.programs.helix = {
-      enable = lib.mkEnableOption "helix";
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    youthlic.programs.helix = {
-      enable = true;
-      extraPackages = with pkgs; [
-        editor-runtime
-      ];
-    };
-  };
-}
--- a/home/david/modules/programs/niri/config.nix
+++ b/home/david/modules/programs/niri/config.nix
@ -4,6 +4,7 @@
  lib,
  inputs,
  osConfig ? null,
+  DISPLAY,
  ...
 }: let
  inherit (lib) getExe getExe';
@ -32,6 +33,7 @@
  waybar = getExe config.programs.waybar.package;
  swaync = getExe config.services.swaync.package;
  fcitx5 = lib.getExe' osConfig.i18n.inputMethod.package "fcitx5";
+  xwayland-satellite = lib.getExe pkgs.xwayland-satellite;
  sleep = lib.getExe' pkgs.coreutils "sleep";

  polkit-kde-agent = getExe' pkgs.kdePackages.polkit-kde-agent-1 "polkit-kde-agent";
@ -390,6 +392,7 @@ in
      (spawn-at-startup [swaybg "-i" "${config.home.homeDirectory}/wallpaper/01.png"])
      (spawn-at-startup [polkit-kde-agent])
      (spawn-at-startup [wl-paste "--watch" cliphist "store"])
+      (spawn-at-startup [xwayland-satellite "${DISPLAY}"])
      (spawn-at-startup [sh "-c" "${sleep} 10; ${fcitx5} --replace"])
      (plain "input" [
        (plain "touchpad" [
@ -444,6 +447,9 @@ in
          })
        ])
      ])
+      (plain "environment" [
+        (leaf "DISPLAY" DISPLAY)
+      ])
      (plain "overview" [
        ])
    ] # others
--- a/home/david/modules/programs/niri/default.nix
+++ b/home/david/modules/programs/niri/default.nix
@ -13,6 +13,9 @@ in {
      extraConfig = lib.mkOption {
        type = inputs.niri-flake.lib.kdl.types.kdl-document;
      };
+      DISPLAY = lib.mkOption {
+        type = lib.types.str;
+      };
    };
  };
  config = lib.mkMerge [
@ -21,9 +24,16 @@ in {
    }
    (
      lib.mkIf cfg.enable {
+        home.sessionVariables = {
+          inherit (cfg) DISPLAY;
+        };
        youthlic.programs.niri = {
+          # settings = lib.mkMerge [(import ./settings.nix args) cfg.settings];
          config =
-            (lib.toList (import ./config.nix args))
+            (lib.toList (import ./config.nix (args
+              // {
+                inherit (cfg) DISPLAY;
+              })))
            ++ (lib.toList cfg.extraConfig);
        };
        david.programs.wluma.enable = true;
--- a/home/modules/programs/default.nix
+++ b/home/modules/programs/default.nix
@ -30,6 +30,5 @@
    ./zoxide.nix
    ./fzf.nix
    ./eza.nix
-    ./ion.nix
  ];
 }
--- a/home/modules/programs/helix/default.nix
+++ b/home/modules/programs/helix/default.nix
@ -28,9 +28,14 @@
    stylix.targets.helix.enable = false;
    programs.helix = lib.mkIf cfg.enable {
      enable = true;
+      package = outputs.packages."${pkgs.system}".helix;
      defaultEditor = true;
      extraPackages = cfg.extraPackages;
-      settings = ./config.toml |> builtins.readFile |> builtins.fromTOML;
+      settings = let
+        config-file = builtins.readFile ./config.toml;
+        config = builtins.fromTOML config-file;
+      in
+        config;
      languages = {
        language-server = {
          neocmakelsp = {
--- a/home/modules/programs/ion.nix
+++ b/home/modules/programs/ion.nix
@ -1,18 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.youthlic.programs.ion;
-in {
-  options = {
-    youthlic.programs.ion = {
-      enable = lib.mkEnableOption "ion";
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    programs.ion = {
-      enable = true;
-    };
-  };
-}
--- a/home/modules/programs/niri.nix
+++ b/home/modules/programs/niri.nix
@ -12,6 +12,9 @@ in {
  options = {
    youthlic.programs.niri = {
      enable = lib.mkEnableOption "niri";
+      # settings = lib.mkOption {
+      #   type = lib.types.attrs;
+      # };
      config = lib.mkOption {
        type = inputs.niri-flake.lib.kdl.types.kdl-document;
      };
@ -27,6 +30,7 @@ in {
          (with pkgs; [
            swaynotificationcenter
            swaybg
+            xwayland-satellite
            kdePackages.polkit-kde-agent-1
            wl-clipboard
            cliphist
@ -67,6 +71,7 @@ in {
          swaylock.enable = true;
        };
        programs.niri = {
+          # settings = cfg.settings;
          config = cfg.config;
          package = niri;
        };
--- a/home/modules/programs/starship/default.nix
+++ b/home/modules/programs/starship/default.nix
@ -6,7 +6,6 @@
  cfg = config.youthlic.programs.starship;
  fish-cfg = config.youthlic.programs.fish;
  bash-cfg = config.youthlic.programs.bash;
-  ion-cfg = config.youthlic.programs.ion;
 in {
  options = {
    youthlic.programs.starship = {
@ -44,8 +43,5 @@ in {
        bleopt prompt_rps1_final='$(starship module time)'
      '';
    })
-    (lib.mkIf (cfg.enable && ion-cfg.enable) {
-      programs.starship.enableIonIntegration = true;
-    })
  ];
 }
--- a/home/modules/programs/zed.nix
+++ b/home/modules/programs/zed.nix
@ -48,7 +48,41 @@ in {
        "zig"
      ];
      extraPackages = with pkgs; [
-        editor-runtime
+        idris2Packages.idris2Lsp
+        lua-language-server
+        bash-language-server
+        shfmt
+        hurl
+        cmake-language-server
+        kdlfmt
+        rustfmt
+        clang-tools
+        libxml2
+        typstyle
+        pyright
+        ruff
+        gotools
+        yaml-language-server
+        taplo
+        markdown-oxide
+        marksman
+        nixd
+        deno
+        alejandra
+        vscode-langservers-extracted
+        fish-lsp
+        tailwindcss-language-server
+        gopls
+        golangci-lint-langserver
+        tinymist
+        delve
+        lldb
+        rust-analyzer
+        # nil
+        haskell-language-server
+        neocmakelsp
+        jdt-language-server
+        zls
      ];
      userSettings = {
        languages = {
--- a/nixos/modules/gui/niri.nix
+++ b/nixos/modules/gui/niri.nix
@ -23,7 +23,6 @@ in {
      cosmic-files
      kdePackages.qt6ct
      libsForQt5.qt5ct
-      xwayland-satellite-unstable
    ];
    xdg = {
      terminal-exec = {
--- a/overlays/additions/default.nix
+++ b/overlays/additions/default.nix
@ -5,7 +5,6 @@ in
    ./rime-ice.nix
    ./TrackersListCollection.nix
    ./OuterWildsTextAdventure.nix
-    ./editor-runtime.nix
  ]
  |> map (file: import file args)
  |> (overlays: (lib.composeManyExtensions overlays) final prev)
--- a/overlays/additions/editor-runtime.nix
+++ b/overlays/additions/editor-runtime.nix
@ -1,5 +0,0 @@
-{outputs, ...}: final: prev: let
-  inherit (prev.stdenv.hostPlatform) system;
-in {
-  inherit (outputs.packages.${system}) editor-runtime;
-}
--- a/overlays/modifications/default.nix
+++ b/overlays/modifications/default.nix
@ -9,7 +9,6 @@ in
    ./radicle-explorer.nix
    ./wshowkeys.nix
    ./QQ.nix
-    ./helix.nix
  ]
  |> map (file: import file args)
  |> (overlays: (lib.composeManyExtensions overlays) final prev)
--- a/overlays/modifications/helix.nix
+++ b/overlays/modifications/helix.nix
@ -1,5 +0,0 @@
-{outputs, ...}: final: prev: let
-  inherit (prev.stdenv.hostPlatform) system;
-in {
-  helix = outputs.packages."${system}".helix;
-}
--- a/pkgs/_sources/generated.json
+++ b/pkgs/_sources/generated.json
@ -22,7 +22,7 @@
    },
    "TrackersListCollection": {
        "cargoLocks": null,
-        "date": "2025-06-09",
+        "date": "2025-05-31",
        "extract": null,
        "name": "TrackersListCollection",
        "passthru": null,
@ -34,14 +34,14 @@
            "name": null,
            "owner": "XIU2",
            "repo": "TrackersListCollection",
-            "rev": "ee6c8a19de97a244cf33f618678fe89bd0d3e38c",
-            "sha256": "sha256-KaVR91W/2XbYIxFrE8aKvpJTE10Mfb25ZlMOR2dRL5M=",
+            "rev": "313c18fc1ae756ea99ae6275e4454ccff95d9b5d",
+            "sha256": "sha256-yCcWx/tnz7JjHs6wniuy6owqIMjZrOS13HBz4MgtiAg=",
            "sparseCheckout": [
                "all.txt"
            ],
            "type": "github"
        },
-        "version": "ee6c8a19de97a244cf33f618678fe89bd0d3e38c"
+        "version": "313c18fc1ae756ea99ae6275e4454ccff95d9b5d"
    },
    "dioxionary": {
        "cargoLocks": {
@ -136,7 +136,7 @@
    },
    "rime-ice": {
        "cargoLocks": null,
-        "date": "2025-06-06",
+        "date": "2025-05-29",
        "extract": null,
        "name": "rime-ice",
        "passthru": null,
@ -148,16 +148,16 @@
            "name": null,
            "owner": "iDvel",
            "repo": "rime-ice",
-            "rev": "b86e6147d68c229b45bb1f2a593f8b76155e964d",
-            "sha256": "sha256-ttGHvxv6ZImn6xBifsL4bc+7Q/RvarwPwegx9pT+Hsg=",
+            "rev": "2e0d8d9a3ba292ecca3f6dccb5719a06764917ca",
+            "sha256": "sha256-v+j2Bp7+OEbiWImf0/6YbZTTHlaORvtK2foXTfjZW9s=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "b86e6147d68c229b45bb1f2a593f8b76155e964d"
+        "version": "2e0d8d9a3ba292ecca3f6dccb5719a06764917ca"
    },
    "spotx": {
        "cargoLocks": null,
-        "date": "2025-05-31",
+        "date": "2025-05-24",
        "extract": null,
        "name": "spotx",
        "passthru": null,
@ -169,12 +169,12 @@
            "name": null,
            "owner": "SpotX-Official",
            "repo": "SpotX-Bash",
-            "rev": "b1de24ec4c23c45da373dcb64a44e372253a0c16",
-            "sha256": "sha256-bIfqqZLMboA5GKxz9EVv8GZQRVejheHw2nLTBS6AKyE=",
+            "rev": "5e9b08f91e55c210bbc64715b4ad698186b3c06b",
+            "sha256": "sha256-34lqV5p44Iqn2v6UJtVTrxwkHY7JXJueItBu/AhXo6A=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "b1de24ec4c23c45da373dcb64a44e372253a0c16"
+        "version": "5e9b08f91e55c210bbc64715b4ad698186b3c06b"
    },
    "tree-sitter-idris": {
        "cargoLocks": null,
@ -200,7 +200,7 @@
    },
    "wshowkeys-mao": {
        "cargoLocks": null,
-        "date": "2025-06-04",
+        "date": "2025-02-03",
        "extract": null,
        "name": "wshowkeys-mao",
        "passthru": null,
@ -212,11 +212,11 @@
            "name": null,
            "owner": "DreamMaoMao",
            "repo": "wshowkeys",
-            "rev": "bf18fba01eafd7659e242066abca0fd4938bf417",
-            "sha256": "sha256-KTtrmICFXXYBcPcGfZ32/UjQAEHSXF79PvSLCKbuCPw=",
+            "rev": "24364e5f40b7ccbed728fe88757f559d84fae234",
+            "sha256": "sha256-I1nnwaE1Wr1b5EzQ4CP5sDCY8ZBaxP2FYZdIsKcVXL4=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "bf18fba01eafd7659e242066abca0fd4938bf417"
+        "version": "24364e5f40b7ccbed728fe88757f559d84fae234"
    }
 }
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@ -15,18 +15,18 @@
  };
  TrackersListCollection = {
    pname = "TrackersListCollection";
-    version = "ee6c8a19de97a244cf33f618678fe89bd0d3e38c";
+    version = "313c18fc1ae756ea99ae6275e4454ccff95d9b5d";
    src = fetchFromGitHub {
      owner = "XIU2";
      repo = "TrackersListCollection";
-      rev = "ee6c8a19de97a244cf33f618678fe89bd0d3e38c";
+      rev = "313c18fc1ae756ea99ae6275e4454ccff95d9b5d";
      fetchSubmodules = false;
      deepClone = false;
      leaveDotGit = false;
      sparseCheckout = [ "all.txt" ];
-      sha256 = "sha256-KaVR91W/2XbYIxFrE8aKvpJTE10Mfb25ZlMOR2dRL5M=";
+      sha256 = "sha256-yCcWx/tnz7JjHs6wniuy6owqIMjZrOS13HBz4MgtiAg=";
    };
-    date = "2025-06-09";
+    date = "2025-05-31";
  };
  dioxionary = {
    pname = "dioxionary";
@ -92,27 +92,27 @@
  };
  rime-ice = {
    pname = "rime-ice";
-    version = "b86e6147d68c229b45bb1f2a593f8b76155e964d";
+    version = "2e0d8d9a3ba292ecca3f6dccb5719a06764917ca";
    src = fetchFromGitHub {
      owner = "iDvel";
      repo = "rime-ice";
-      rev = "b86e6147d68c229b45bb1f2a593f8b76155e964d";
+      rev = "2e0d8d9a3ba292ecca3f6dccb5719a06764917ca";
      fetchSubmodules = false;
-      sha256 = "sha256-ttGHvxv6ZImn6xBifsL4bc+7Q/RvarwPwegx9pT+Hsg=";
+      sha256 = "sha256-v+j2Bp7+OEbiWImf0/6YbZTTHlaORvtK2foXTfjZW9s=";
    };
-    date = "2025-06-06";
+    date = "2025-05-29";
  };
  spotx = {
    pname = "spotx";
-    version = "b1de24ec4c23c45da373dcb64a44e372253a0c16";
+    version = "5e9b08f91e55c210bbc64715b4ad698186b3c06b";
    src = fetchFromGitHub {
      owner = "SpotX-Official";
      repo = "SpotX-Bash";
-      rev = "b1de24ec4c23c45da373dcb64a44e372253a0c16";
+      rev = "5e9b08f91e55c210bbc64715b4ad698186b3c06b";
      fetchSubmodules = false;
-      sha256 = "sha256-bIfqqZLMboA5GKxz9EVv8GZQRVejheHw2nLTBS6AKyE=";
+      sha256 = "sha256-34lqV5p44Iqn2v6UJtVTrxwkHY7JXJueItBu/AhXo6A=";
    };
-    date = "2025-05-31";
+    date = "2025-05-24";
  };
  tree-sitter-idris = {
    pname = "tree-sitter-idris";
@ -131,14 +131,14 @@
  };
  wshowkeys-mao = {
    pname = "wshowkeys-mao";
-    version = "bf18fba01eafd7659e242066abca0fd4938bf417";
+    version = "24364e5f40b7ccbed728fe88757f559d84fae234";
    src = fetchFromGitHub {
      owner = "DreamMaoMao";
      repo = "wshowkeys";
-      rev = "bf18fba01eafd7659e242066abca0fd4938bf417";
+      rev = "24364e5f40b7ccbed728fe88757f559d84fae234";
      fetchSubmodules = false;
-      sha256 = "sha256-KTtrmICFXXYBcPcGfZ32/UjQAEHSXF79PvSLCKbuCPw=";
+      sha256 = "sha256-I1nnwaE1Wr1b5EzQ4CP5sDCY8ZBaxP2FYZdIsKcVXL4=";
    };
-    date = "2025-06-04";
+    date = "2025-02-03";
  };
 }
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -19,7 +19,6 @@ in
    wshowkeys-mao = callPackage ./wshowkeys-mao.nix {};
    OuterWildsTextAdventure = callPackage ./OuterWildsTextAdventure.nix {};
    QQ = callPackage ./QQ.nix {};
-    editor-runtime = callPackage ./editor-runtime.nix {};

    noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
    noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};
--- a/pkgs/editor-runtime.nix
+++ b/pkgs/editor-runtime.nix
@ -1,80 +0,0 @@
-{
-  symlinkJoin,
-  nixfmt-rfc-style,
-  idris2Packages,
-  lua-language-server,
-  bash-language-server,
-  shfmt,
-  hurl,
-  cmake-language-server,
-  kdlfmt,
-  rustfmt,
-  clang-tools,
-  libxml2,
-  typstyle,
-  pyright,
-  ruff,
-  gotools,
-  yaml-language-server,
-  taplo,
-  markdown-oxide,
-  marksman,
-  nixd,
-  deno,
-  alejandra,
-  vscode-langservers-extracted,
-  fish-lsp,
-  tailwindcss-language-server,
-  gopls,
-  golangci-lint-langserver,
-  tinymist,
-  delve,
-  lldb,
-  rust-analyzer,
-  # nil,
-  haskell-language-server,
-  neocmakelsp,
-  jdt-language-server,
-  zls,
-}:
-symlinkJoin {
-  name = "editor-runtime";
-  paths = [
-    nixfmt-rfc-style
-    idris2Packages.idris2Lsp
-    lua-language-server
-    bash-language-server
-    shfmt
-    hurl
-    cmake-language-server
-    kdlfmt
-    rustfmt
-    clang-tools
-    libxml2
-    typstyle
-    pyright
-    ruff
-    gotools
-    yaml-language-server
-    taplo
-    markdown-oxide
-    marksman
-    nixd
-    deno
-    alejandra
-    vscode-langservers-extracted
-    fish-lsp
-    tailwindcss-language-server
-    gopls
-    golangci-lint-langserver
-    tinymist
-    delve
-    lldb
-    rust-analyzer
-    # nil
-    haskell-language-server
-    neocmakelsp
-    jdt-language-server
-    zls
-  ];
-}
--- a/pkgs/helix/default.nix
+++ b/pkgs/helix/default.nix
@ -1,12 +1,87 @@
 {
+  lib,
  inputs,
  system,
  callPackage,
  symlinkJoin,
  makeWrapper,
+  nixfmt-rfc-style,
+  idris2Packages,
+  lua-language-server,
+  bash-language-server,
+  shfmt,
+  hurl,
+  cmake-language-server,
+  kdlfmt,
+  rustfmt,
+  clang-tools,
+  libxml2,
+  typstyle,
+  pyright,
+  ruff,
+  gotools,
+  yaml-language-server,
+  taplo,
+  markdown-oxide,
+  marksman,
+  nixd,
+  deno,
+  alejandra,
+  vscode-langservers-extracted,
+  fish-lsp,
+  tailwindcss-language-server,
+  gopls,
+  golangci-lint-langserver,
+  tinymist,
+  delve,
+  lldb,
+  rust-analyzer,
+  # nil,
+  haskell-language-server,
+  neocmakelsp,
+  jdt-language-server,
+  zls,
 }: let
  inherit (inputs.helix.packages."${system}") helix;
  runtime = callPackage ./runtime.nix {};
+  runtimeInputs = [
+    nixfmt-rfc-style
+    idris2Packages.idris2Lsp
+    lua-language-server
+    bash-language-server
+    shfmt
+    hurl
+    cmake-language-server
+    kdlfmt
+    rustfmt
+    clang-tools
+    libxml2
+    typstyle
+    pyright
+    ruff
+    gotools
+    yaml-language-server
+    taplo
+    markdown-oxide
+    marksman
+    nixd
+    deno
+    alejandra
+    vscode-langservers-extracted
+    fish-lsp
+    tailwindcss-language-server
+    gopls
+    golangci-lint-langserver
+    tinymist
+    delve
+    lldb
+    rust-analyzer
+    # nil
+    haskell-language-server
+    neocmakelsp
+    jdt-language-server
+    zls
+  ];
 in
  symlinkJoin {
    name = "helix-wrapped";
@ -17,6 +92,7 @@ in
    ];
    postBuild = ''
      wrapProgram $out/bin/hx \
+      --suffix PATH : ${lib.makeBinPath runtimeInputs} \
      --set HELIX_RUNTIME ${runtime}
    '';
  }