Commit 62ff2a7
Changed files (8)
lib
pkgs
helix-plugins
lib/default.nix
@@ -22,4 +22,7 @@ with pkgs.lib; {
nurDeprecatedReason = reason;
};
}));
+
+ removePackage = name: reason:
+ throw "${name} has been removed: ${reason}";
}
pkgs/helix-plugins/default.nix
@@ -1,54 +0,0 @@
-{
- lib,
- selfLib,
- newScope,
- callPackage,
- fetchFromCodeberg,
-}:
-lib.makeScope newScope (
- self:
- let
- helixPluginsNix = fetchFromCodeberg {
- owner = "maxschipper";
- repo = "helix-plugins-nix";
- rev = "629a6b9489dbab75b8bff3daaf4843f66f97e35c";
- hash = "sha256-Wq62h4qPsABKb0pJJDoXJvxVWSuBsShy3r4FioKqi2Y=";
- };
-
- upstream = callPackage "${helixPluginsNix}/pkgs/default.nix" { };
-
- deprecate =
- name: drv:
- selfLib.deprecatePackage name
- "use the package of the same name from helix-plugins-nix (https://codeberg.org/maxschipper/helix-plugins-nix) instead"
- drv;
- in
- {
- fcitx-focus = callPackage ./fcitx-focus.nix {
- buildHelixPluginWithNative = upstream.buildHelixPluginWithNative;
- };
-
- file-tree = deprecate "helixPlugins.file-tree" upstream.file-tree-hx;
- file-tree-hx = deprecate "helixPlugins.file-tree-hx" upstream.file-tree-hx;
-
- forest = deprecate "helixPlugins.forest" upstream.forest;
-
- glyph = deprecate "helixPlugins.glyph" upstream.glyph;
-
- helix-file-watcher = deprecate "helixPlugins.helix-file-watcher" upstream.helix-file-watcher;
-
- notify = deprecate "helixPlugins.notify" upstream.notify;
-
- oil = deprecate "helixPlugins.oil" upstream.oil;
-
- scooter = deprecate "helixPlugins.scooter" upstream.scooter;
- scooter-hx = deprecate "helixPlugins.scooter-hx" upstream.scooter;
-
- smith = callPackage ./smith.nix { buildHelixPlugin = upstream.buildHelixPlugin; };
-
- trail = deprecate "helixPlugins.trail" upstream.trail;
-
- wakatime = deprecate "helixPlugins.wakatime" upstream.wakatime;
- wakatime-hx = deprecate "helixPlugins.wakatime-hx" upstream.wakatime;
- }
-)
pkgs/helix-plugins/fcitx-focus.nix
@@ -1,32 +0,0 @@
-{
- lib,
- buildHelixPluginWithNative,
- fetchFromGitHub,
- nix-update-script,
-}:
-buildHelixPluginWithNative {
- pname = "helix-fcitx-focus";
- version = "0-unstable-2026-06-29";
-
- src = fetchFromGitHub {
- owner = "mtul0729";
- repo = "helix-fcitx-focus";
- rev = "d2572a926b9c71ee1f61666cff27a76096d1b323";
- hash = "sha256-Uo24YqtguCZD1nJL16+cI3GNJQfssFP2rRgUBSBNUxM=";
- };
-
- cargoHash = "sha256-LVNwdhn2h50un3r391JwPJiPhlTmRPl863rqB595RKo=";
-
- passthru.updateScript = nix-update-script {
- extraArgs = ["--version" "branch"];
- };
-
- meta = {
- description = "Steel native module for Helix fcitx5 focus and mode switching";
- homepage = "https://github.com/mtul0729/helix-fcitx-focus";
- license = with lib.licenses; [
- mit
- asl20
- ];
- };
-}
pkgs/helix-plugins/smith.nix
@@ -1,27 +0,0 @@
-{
- lib,
- buildHelixPlugin,
- fetchFromGitHub,
- nix-update-script,
-}:
-buildHelixPlugin {
- pname = "smith.hx";
- version = "0-unstable-2026-07-12";
-
- src = fetchFromGitHub {
- owner = "kn66";
- repo = "smith.hx";
- rev = "a5ddb240aad6999b7c095ceb352b90a12167034e";
- hash = "sha256-ccLoMI9E3v8BLPLKtrjg1c0UK5VgdBH6L/d59HaQ4yg=";
- };
-
- passthru.updateScript = nix-update-script {
- extraArgs = ["--version" "branch"];
- };
-
- meta = {
- description = "A declarative Helix plugin manager";
- homepage = "https://github.com/kn66/smith.hx";
- license = lib.licenses.mit;
- };
-}
scripts/gen-readme-config.json
@@ -1,8 +1,5 @@
{
"expand_attrs": {
- "helixPlugins": {
- "heading": true
- },
"spritz-wine-bin": {
"heading": false
}
scripts/gen-readme.py
@@ -70,6 +70,7 @@ let
builtins.concatMap (name:
let
v = attrs.${{name}};
+ evaluated = builtins.tryEval v;
fullPrefix = if prefix == "" then name else "${{prefix}}.${{name}}";
pkgInfo = {{
path = fullPrefix;
@@ -80,9 +81,10 @@ let
license = getLic v.meta;
}};
in
- if isDer v then
- if v.meta.nurRenamed or v.meta.nurDeprecated or false then [] else [ pkgInfo ]
- else if isScope v then collect fullPrefix v
+ if !evaluated.success then []
+ else if isDer evaluated.value then
+ if evaluated.value.meta.nurRenamed or evaluated.value.meta.nurDeprecated or false then [] else [ pkgInfo ]
+ else if isScope evaluated.value then collect fullPrefix evaluated.value
else []
) names;
in
default.nix
@@ -29,7 +29,7 @@ in rec {
harmonoid = callPackage ./pkgs/harmonoid {};
- helixPlugins = callPackage ./pkgs/helix-plugins {};
+ helixPlugins = selfLib.removePackage "helixPlugins" "use helix-plugins-nix (https://codeberg.org/maxschipper/helix-plugins-nix) instead";
kelivo = callPackage ./pkgs/kelivo {};
README.md
@@ -27,11 +27,4 @@
| `stinkpot` | [stinkpot](https://tangled.org/oppi.li/stinkpot) | `0-unstable-2026-08-18` | Not specified | sqlite-backed shell history |
| `sylvakru` | [sylvakru](https://github.com/AfalpHy/sylvakru) | `3.6.0` | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) | A cross-platform music player for local and self-hosted libraries |
-### helixPlugins
-
-| Path | Name | Version | License | Description |
-| --- | --- | --- | --- | --- |
-| `helixPlugins.fcitx-focus` | [helix-fcitx-focus](https://github.com/mtul0729/helix-fcitx-focus) | `0-unstable-2026-06-29` | [MIT](https://spdx.org/licenses/MIT.html) | Steel native module for Helix fcitx5 focus and mode switching |
-| `helixPlugins.smith` | [smith.hx](https://github.com/kn66/smith.hx) | `0-unstable-2026-07-12` | [MIT](https://spdx.org/licenses/MIT.html) | A declarative Helix plugin manager |
-
<!-- END_PACKAGE_TABLE -->