diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 929f442c..c38d2421 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -138,6 +138,9 @@ [Tombi](https://tombi-toml.github.io/tombi/) language server, linter, and formatter. +- Added [hlargs.nvim](https://github.com/m-demare/hlargs.nvim) support as + `visuals.hlargs-nvim`. + [Machshev](https://github.com/machshev): - Added `ruff` and `ty` LSP support for Python under `programs.python`. diff --git a/flake.lock b/flake.lock index 0b4c58d5..0810a856 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "mnw": { "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "lastModified": 1767030222, + "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "rev": "75bb637454b0fbbb5ed652375a4bf7ffd28bcf6f", "type": "github" }, "original": { @@ -58,26 +58,27 @@ ] }, "locked": { - "lastModified": 1765720983, - "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", "owner": "feel-co", "repo": "ndg", - "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "type": "github" }, "original": { "owner": "feel-co", + "ref": "refs/tags/v2.6.0", "repo": "ndg", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1768395095, + "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6e58193f..4a35cf91 100644 --- a/flake.nix +++ b/flake.nix @@ -139,7 +139,7 @@ # Alternative documentation generator ndg = { - url = "github:feel-co/ndg"; + url = "github:feel-co/ndg?ref=refs/tags/v2.6.0"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/modules/plugins/visuals/default.nix b/modules/plugins/visuals/default.nix index 3a44aa45..3caf6e32 100644 --- a/modules/plugins/visuals/default.nix +++ b/modules/plugins/visuals/default.nix @@ -11,6 +11,7 @@ in { ./cinnamon-nvim ./fidget-nvim ./highlight-undo + ./hlargs-nvim ./indent-blankline ./nvim-cursorline ./nvim-scrollbar diff --git a/modules/plugins/visuals/hlargs-nvim/config.nix b/modules/plugins/visuals/hlargs-nvim/config.nix new file mode 100644 index 00000000..5dcb4a19 --- /dev/null +++ b/modules/plugins/visuals/hlargs-nvim/config.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + cfg = config.vim.visuals.hlargs-nvim; +in { + vim = mkIf cfg.enable { + startPlugins = ["hlargs-nvim"]; + + pluginRC.hlargs-nvim = entryAnywhere '' + require('hlargs').setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/visuals/hlargs-nvim/default.nix b/modules/plugins/visuals/hlargs-nvim/default.nix new file mode 100644 index 00000000..0c880b9f --- /dev/null +++ b/modules/plugins/visuals/hlargs-nvim/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./hlargs-nvim.nix + ./config.nix + ]; +} diff --git a/modules/plugins/visuals/hlargs-nvim/hlargs-nvim.nix b/modules/plugins/visuals/hlargs-nvim/hlargs-nvim.nix new file mode 100644 index 00000000..8a7b05d8 --- /dev/null +++ b/modules/plugins/visuals/hlargs-nvim/hlargs-nvim.nix @@ -0,0 +1,9 @@ +{lib, ...}: let + inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.visuals.hlargs-nvim = { + enable = mkEnableOption "hlargs-nvim"; + setupOpts = mkPluginSetupOption "hlargs-nvim" {}; + }; +} diff --git a/npins/sources.json b/npins/sources.json index 824dac04..9bbcb6ff 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -708,6 +708,19 @@ "url": "https://github.com/tzachar/highlight-undo.nvim/archive/ee32e12693d70e66f954d09a504a7371d110fc27.tar.gz", "hash": "sha256-yU4i3uPI7qghxdevOuqzxu8gIol6pxgd7TIY6vnyfiU=" }, + "hlargs-nvim": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "m-demare", + "repo": "hlargs.nvim" + }, + "branch": "main", + "submodules": false, + "revision": "0b29317c944fb1f76503ce4540d6dceffbb5ccd2", + "url": "https://github.com/m-demare/hlargs.nvim/archive/0b29317c944fb1f76503ce4540d6dceffbb5ccd2.tar.gz", + "hash": "sha256-WjmVefR0qk2ANWgyHSuYMTuCfzlVTF7tqzAL+uatKkc=" + }, "hop.nvim": { "type": "GitRelease", "repository": { @@ -2062,11 +2075,11 @@ "owner": "nvim-treesitter", "repo": "nvim-treesitter-textobjects" }, - "branch": "master", + "branch": "main", "submodules": false, - "revision": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c", - "url": "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/archive/71385f191ec06ffc60e80e6b0c9a9d5daed4824c.tar.gz", - "hash": "sha256-6hHKcQIdNn93YOSMccI+GFX84iVNHXLlSAxySTnQ6F4=" + "revision": "baa6b4ec28c8be5e4a96f9b1b6ae9db85ec422f8", + "url": "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/archive/baa6b4ec28c8be5e4a96f9b1b6ae9db85ec422f8.tar.gz", + "hash": "sha256-kbnZaUtIKXoBj4tFiQWSpGmI6Doke7PjoetqIhsI8lc=" }, "nvim-ts-autotag": { "type": "Git",