diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index 959a04b6..cac8ee51 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -36,7 +36,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@main - - uses: cachix/cachix-action@v16 + - uses: cachix/cachix-action@v15 with: authToken: ${{ secrets.CACHIX_TOKEN }} extraPullNames: nix-community diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index fbc12bc1..204dcba7 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v4 - name: "Delete old branches" - uses: beatlabs/delete-old-branches-action@v0.0.11 + uses: beatlabs/delete-old-branches-action@v0.0.10 with: repo_token: "${{ secrets.GITHUB_TOKEN }}" date: "1 months ago" diff --git a/configuration.nix b/configuration.nix index a243c970..692337db 100644 --- a/configuration.nix +++ b/configuration.nix @@ -234,7 +234,6 @@ isMaximal: { enable = false; cmp.enable = isMaximal; }; - codecompanion-nvim.enable = false; }; session = { diff --git a/docs/manual/configuring/custom-plugins/configuring.md b/docs/manual/configuring/custom-plugins/configuring.md index 5106d29b..c0935f03 100644 --- a/docs/manual/configuring/custom-plugins/configuring.md +++ b/docs/manual/configuring/custom-plugins/configuring.md @@ -67,7 +67,7 @@ of individual sections of configuration as needed. nvf provides helper functions in the extended library, usually under `inputs.nvf.lib.nvim.dag` that you may use. -Please refer to the [DAG section](#ch-dag-entries) in the nvf manual +Please refer to the [DAG section](/index.xhtml#ch-dag-entries) in the nvf manual to find out more about the DAG system. ::: diff --git a/docs/manual/configuring/custom-plugins/lazy-method.md b/docs/manual/configuring/custom-plugins/lazy-method.md index ae766535..c6fd7106 100644 --- a/docs/manual/configuring/custom-plugins/lazy-method.md +++ b/docs/manual/configuring/custom-plugins/lazy-method.md @@ -38,22 +38,3 @@ As of version **0.7**, we exposed an API for configuring lazy-loaded plugins via }; } ``` - -## LazyFile event {#sec-lazyfile-event} - -You can use the `LazyFile` user event to load a plugin when a file is opened: - -```nix -{ - config.vim.lazy.plugins = { - "aerial.nvim" = { - package = pkgs.vimPlugins.aerial-nvim; - event = [{event = "User"; pattern = "LazyFile";}]; - # ... - }; - }; -} -``` - -You can consider `LazyFile` as an alias to -`["BufReadPost" "BufNewFile" "BufWritePre"]` diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 5e09bb35..1a5b7e4c 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -2,25 +2,17 @@ ## Breaking changes -[Lspsaga documentation]: https://nvimdev.github.io/lspsaga/ - - `git-conflict` keybinds are now prefixed with `` to avoid conflicting with builtins. - `alpha` is now configured with nix, default config removed. -- Lspsaga module no longer ships default keybindings. The keybind format has - been changed by upstream, and old keybindings do not have equivalents under - the new API they provide. Please manually set your keybinds according to - [Lspsaga documentation] following the new API. - [NotAShelf](https://github.com/notashelf): [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim [render-markdown.nvim]: https://github.com/MeanderingProgrammer/render-markdown.nvim [yanky.nvim]: https://github.com/gbprod/yanky.nvim [yazi.nvim]: https://github.com/mikavilpas/yazi.nvim -[snacks.nvim]: https://github.com/folke/snacks.nvim - Add [typst-preview.nvim] under `languages.typst.extensions.typst-preview-nvim`. @@ -70,14 +62,6 @@ - Add [yazi.nvim] as a companion plugin for Yazi, the terminal file manager. -- Add [snacks.nvim] under `vim.utility.snacks-nvim` as a general-purpose utility - plugin. - -- Move LSPSaga to `setupOpts` format, allowing freeform configuration in - `vim.lsp.lspsaga.setupOpts`. - -- Lazyload Lspsaga and remove default keybindings for it. - [amadaluzia](https://github.com/amadaluzia): [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim @@ -89,7 +73,6 @@ [blink.cmp]: https://github.com/saghen/blink.cmp - Add [blink.cmp] support. -- Add `LazyFile` user event. [diniamo](https://github.com/diniamo): @@ -176,20 +159,16 @@ [thamenato](https://github.com/thamenato): [ruff]: (https://github.com/astral-sh/ruff) -[cue]: (https://cuelang.org/) - Add [ruff] as a formatter option in `vim.languages.python.format.type`. -- Add [cue] support under `vim.languages.cue`. [ARCIII](https://github.com/ArmandoCIII): [leetcode.nvim]: https://github.com/kawre/leetcode.nvim -[codecompanion-nvim]: https://github.com/olimorris/codecompanion.nvim - Add `vim.languages.zig.dap` support through pkgs.lldb dap adapter. Code Inspiration from `vim.languages.clang.dap` implementation. - Add [leetcode.nvim] plugin under `vim.utility.leetcode-nvim`. -- Add [codecompanion.nvim] plugin under `vim.assistant.codecompanion-nvim`. [nezia1](https://github.com/nezia1): @@ -247,7 +226,6 @@ - Add [blink.cmp] option to add [friendly-snippets](https://github.com/rafamadriz/friendly-snippets) so blink.cmp can source snippets from it. -- Fix [blink.cmp] breaking when built-in sources were modified. [TheColorman](https://github.com/TheColorman): @@ -263,16 +241,3 @@ [BANanaD3V](https://github.com/BANanaD3V): - `alpha` is now configured with nix. - -[viicslen](https://github.com/viicslen): - -- Add `intelephense` language server support under - `vim.languages.php.lsp.server` - -[Butzist](https://github.com/butzist): - -- Add Helm chart support under `vim.languages.helm`. - -[rice-cracker-dev](https://github.com/rice-cracker-dev): - -- `eslint_d` now checks for configuration files to load. diff --git a/flake.lock b/flake.lock index 3ced812a..3b624bec 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "mnw": { "locked": { - "lastModified": 1742255973, - "narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=", + "lastModified": 1738852285, + "narHash": "sha256-8Y1uyE6gGHxdU0Vcx2CMg/dAmDSxJw19aAl3TKbbo54=", "owner": "Gerg-L", "repo": "mnw", - "rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d", + "rev": "6ae73dc9cb72cea17bcc2e3d4670825f483e80e8", "type": "github" }, "original": { @@ -62,11 +62,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", + "lastModified": 1732053863, + "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=", "owner": "oxalica", "repo": "nil", - "rev": "577d160da311cc7f5042038456a0713e9863d09e", + "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362", "type": "github" }, "original": { @@ -77,11 +77,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741865919, - "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", + "lastModified": 1740303746, + "narHash": "sha256-XcdiWLEhjJkMxDLKQJ0CCivmYYCvA5MDxu9pMybM5kM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "rev": "2d068ae5c6516b2d04562de50a58c682540de9bf", "type": "github" }, "original": { @@ -93,17 +93,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", - "type": "github" + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, "nmd": { @@ -141,11 +138,11 @@ ] }, "locked": { - "lastModified": 1741055476, - "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", + "lastModified": 1731983527, + "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aefb7017d710f150970299685e8d8b549d653649", + "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b", "type": "github" }, "original": { diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix index ba1d7424..924cb4cc 100644 --- a/flake/legacyPackages/blink-cmp.nix +++ b/flake/legacyPackages/blink-cmp.nix @@ -5,7 +5,6 @@ git, src, version, - fetchpatch, }: let blink-fuzzy-lib = rustPlatform.buildRustPackage { pname = "blink-fuzzy-lib"; @@ -14,10 +13,11 @@ # TODO: remove this if plugin stops using nightly rust env.RUSTC_BOOTSTRAP = true; - useFetchCargoVendor = true; - cargoHash = "sha256-F1wh/TjYoiIbDY3J/prVF367MKk3vwM7LqOpRobOs7I="; - nativeBuildInputs = [git]; + cargoLock = { + lockFile = "${src}/Cargo.lock"; + allowBuiltinFetchGit = true; + }; }; libExt = @@ -34,19 +34,5 @@ in preInstall = '' mkdir -p target/release ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt} - echo -n "nix" > target/release/version ''; - - # Borrowed from nixpkgs - # TODO: Remove this patch when updating to next version - patches = [ - (fetchpatch { - name = "blink-add-bypass-for-nix.patch"; - url = "https://github.com/Saghen/blink.cmp/commit/6c83ef1ae34abd7ef9a32bfcd9595ac77b61037c.diff?full_index=1"; - hash = "sha256-304F1gDDKVI1nXRvvQ0T1xBN+kHr3jdmwMMp8CNl+GU="; - }) - ]; - - # Module for reproducing issues - nvimSkipModule = ["repro"]; } diff --git a/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix b/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix deleted file mode 100644 index 9ebe30c0..00000000 --- a/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix +++ /dev/null @@ -1,278 +0,0 @@ -{lib, ...}: let - inherit (lib.options) mkOption mkEnableOption; - inherit (lib.types) int str enum nullOr attrs; - inherit (lib.nvim.types) mkPluginSetupOption luaInline; -in { - options.vim.assistant = { - codecompanion-nvim = { - enable = mkEnableOption "complementary neovim plugin for codecompanion.nvim"; - - setupOpts = mkPluginSetupOption "codecompanion-nvim" { - opts = { - send_code = mkEnableOption "code from being sent to the LLM."; - - log_level = mkOption { - type = enum ["DEBUG" "INFO" "ERROR" "TRACE"]; - default = "ERROR"; - description = "Change the level of logging."; - }; - - language = mkOption { - type = str; - default = "English"; - description = "Specify which language an LLM should respond in."; - }; - }; - - display = { - diff = { - enabled = - mkEnableOption "" - // { - default = true; - description = "a diff view to see the changes made by the LLM."; - }; - - close_chat_at = mkOption { - type = int; - default = 240; - description = '' - Close an open chat buffer if the - total columns of your display are less than... - ''; - }; - - layout = mkOption { - type = enum ["vertical" "horizontal"]; - default = "vertical"; - description = "Type of split for default provider."; - }; - - provider = mkOption { - type = enum ["default" "mini_diff"]; - default = "default"; - description = "The preferred kind of provider."; - }; - }; - - inline = { - layout = mkOption { - type = enum ["vertical" "horizontal" "buffer"]; - default = "vertical"; - description = "Customize how output is created in new buffer."; - }; - }; - - chat = { - auto_scroll = mkEnableOption "automatic page scrolling."; - - show_settings = mkEnableOption '' - LLM settings to appear at the top of the chat buffer. - ''; - - start_in_insert_mode = mkEnableOption '' - opening the chat buffer in insert mode. - ''; - - show_header_separator = mkEnableOption '' - header separators in the chat buffer. - - Set this to false if you're using an - external markdown formatting plugin. - ''; - - show_references = - mkEnableOption "" - // { - default = true; - description = "references in the chat buffer."; - }; - - show_token_count = - mkEnableOption "" - // { - default = true; - description = "the token count for each response."; - }; - - intro_message = mkOption { - type = str; - default = "Welcome to CodeCompanion ✨! Press ? for options."; - description = "Message to appear in chat buffer."; - }; - - separator = mkOption { - type = str; - default = "─"; - description = '' - The separator between the - different messages in the chat buffer. - ''; - }; - - icons = { - pinned_buffer = mkOption { - type = str; - default = " "; - description = "The icon to represent a pinned buffer."; - }; - - watched_buffer = mkOption { - type = str; - default = "👀 "; - description = "The icon to represent a watched buffer."; - }; - }; - }; - - action_palette = { - width = mkOption { - type = int; - default = 95; - description = "Width of the action palette."; - }; - - height = mkOption { - type = int; - default = 10; - description = "Height of the action palette."; - }; - - prompt = mkOption { - type = str; - default = "Prompt "; - description = "Prompt used for interactive LLM calls."; - }; - - provider = mkOption { - type = enum ["default" "telescope" "mini_pick"]; - default = "default"; - description = "Provider used for the action palette."; - }; - - opts = { - show_default_actions = - mkEnableOption "" - // { - default = true; - description = "showing default actions in the action palette."; - }; - - show_default_prompt_library = - mkEnableOption "" - // { - default = true; - description = '' - showing default prompt library in the action palette. - ''; - }; - }; - }; - }; - - adapters = mkOption { - type = nullOr luaInline; - default = null; - description = "An adapter is what connects Neovim to an LLM."; - }; - - strategies = { - chat = { - adapter = mkOption { - type = nullOr str; - default = null; - description = "Adapter used for the chat strategy."; - }; - - keymaps = mkOption { - type = nullOr attrs; - default = null; - description = "Define or override the default keymaps."; - }; - - variables = mkOption { - type = nullOr luaInline; - default = null; - description = '' - Define your own variables - to share specific content. - ''; - }; - - slash_commands = mkOption { - type = nullOr luaInline; - default = null; - description = '' - Slash Commands (invoked with /) let you dynamically - insert context into the chat buffer, - such as file contents or date/time. - ''; - }; - - tools = mkOption { - type = nullOr attrs; - default = null; - description = '' - Configure tools to perform specific - tasks when invoked by an LLM. - ''; - }; - - roles = mkOption { - type = nullOr luaInline; - default = null; - description = '' - The chat buffer places user and LLM responses under a H2 header. - These can be customized in the configuration. - ''; - }; - }; - - inline = { - adapter = mkOption { - type = nullOr str; - default = null; - description = "Adapter used for the inline strategy."; - }; - - variables = mkOption { - type = nullOr luaInline; - default = null; - description = '' - Define your own variables - to share specific content. - ''; - }; - - keymaps = { - accept_change = { - n = mkOption { - type = str; - default = "ga"; - description = "Accept the suggested change."; - }; - }; - - reject_change = { - n = mkOption { - type = str; - default = "gr"; - description = "Reject the suggested change."; - }; - }; - }; - }; - }; - - prompt_library = mkOption { - type = nullOr attrs; - default = null; - description = '' - A prompt library is a collection of prompts - that can be used in the action palette. - ''; - }; - }; - }; - }; -} diff --git a/modules/plugins/assistant/codecompanion/config.nix b/modules/plugins/assistant/codecompanion/config.nix deleted file mode 100644 index 6b427d28..00000000 --- a/modules/plugins/assistant/codecompanion/config.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.modules) mkIf; - - cfg = config.vim.assistant.codecompanion-nvim; -in { - config = mkIf cfg.enable { - vim = { - startPlugins = [ - "plenary-nvim" - ]; - - lazy.plugins = { - codecompanion-nvim = { - package = "codecompanion-nvim"; - setupModule = "codecompanion"; - inherit (cfg) setupOpts; - }; - }; - - treesitter.enable = true; - }; - }; -} diff --git a/modules/plugins/assistant/codecompanion/default.nix b/modules/plugins/assistant/codecompanion/default.nix deleted file mode 100644 index 7f7b4452..00000000 --- a/modules/plugins/assistant/codecompanion/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./config.nix - ./codecompanion-nvim.nix - ]; -} diff --git a/modules/plugins/assistant/copilot/config.nix b/modules/plugins/assistant/copilot/config.nix index 525fe3bd..37da046f 100644 --- a/modules/plugins/assistant/copilot/config.nix +++ b/modules/plugins/assistant/copilot/config.nix @@ -37,12 +37,6 @@ in { inherit (cfg) setupOpts; after = mkIf cfg.cmp.enable "require('copilot_cmp').setup()"; - event = [ - { - event = "User"; - pattern = "LazyFile"; - } - ]; cmd = ["Copilot" "CopilotAuth" "CopilotDetach" "CopilotPanel" "CopilotStop"]; keys = [ (mkLuaKeymap ["n"] cfg.mappings.panel.accept (wrapPanelBinding ''require("copilot.panel").accept'' cfg.mappings.panel.accept) "[copilot] Accept suggestion" {}) diff --git a/modules/plugins/assistant/default.nix b/modules/plugins/assistant/default.nix index 697d54f6..5b5cf323 100644 --- a/modules/plugins/assistant/default.nix +++ b/modules/plugins/assistant/default.nix @@ -2,6 +2,5 @@ imports = [ ./chatgpt ./copilot - ./codecompanion ]; } diff --git a/modules/plugins/completion/blink-cmp/blink-cmp.nix b/modules/plugins/completion/blink-cmp/blink-cmp.nix index f5e38ed1..4290e1cb 100644 --- a/modules/plugins/completion/blink-cmp/blink-cmp.nix +++ b/modules/plugins/completion/blink-cmp/blink-cmp.nix @@ -1,6 +1,6 @@ {lib, ...}: let inherit (lib.options) mkEnableOption mkOption literalMD; - inherit (lib.types) bool listOf str either attrsOf submodule enum anything int nullOr; + inherit (lib.types) listOf str either attrsOf submodule enum anything int nullOr; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.types) mkPluginSetupOption luaInline pluginType; inherit (lib.nvim.binds) mkMappingOption; @@ -21,9 +21,8 @@ freeformType = anything; options = { module = mkOption { - type = nullOr str; - default = null; - description = "Provider module."; + type = str; + description = "module of the provider"; }; }; }; @@ -41,7 +40,7 @@ in { providers = mkOption { type = attrsOf providerType; default = {}; - description = "Settings for completion providers."; + description = "Settings for completion providers"; }; transform_items = mkOption { @@ -64,12 +63,6 @@ in { default = []; description = "List of sources to enable for cmdline. Null means use default source list."; }; - - keymap = mkOption { - type = keymapType; - default = {}; - description = "blink.cmp cmdline keymap"; - }; }; completion = { @@ -81,16 +74,6 @@ in { description = "Delay before auto show triggers"; }; }; - - menu.auto_show = mkOption { - type = bool; - default = true; - description = '' - Manages the appearance of the completion menu. You may prevent the menu - from automatically showing by this option to `false` and manually showing - it with the show keymap command. - ''; - }; }; keymap = mkOption { @@ -120,25 +103,7 @@ in { fuzzy = { prebuilt_binaries = { download = mkBool false '' - Auto-downloads prebuilt binaries. - - ::: .{warning} - Do not enable this option, as it does **not work** on Nix! - ::: - ''; - }; - - implementation = mkOption { - type = enum ["lua" "prefer_rust" "rust" "prefer_rust_with_warning"]; - default = "prefer_rust"; - description = '' - fuzzy matcher implementation for Blink. - - * `"lua"`: slower, Lua native fuzzy matcher implementation - * `"rust": use the SIMD fuzzy matcher, 'frizbee' - * `"prefer_rust"`: use the rust implementation, but fall back to lua - * `"prefer_rust_with_warning"`: use the rust implementation, and fall back to lua - if it is not available after emitting a warning. + Auto-downloads prebuilt binaries. Do not enable, it doesn't work on nix ''; }; }; @@ -157,14 +122,12 @@ in { sourcePlugins = let sourcePluginType = submodule { options = { - enable = mkEnableOption "this source"; package = mkOption { type = pluginType; description = '' `blink-cmp` source plugin package. ''; }; - module = mkOption { type = str; description = '' @@ -173,6 +136,7 @@ in { Should be present in the source's documentation. ''; }; + enable = mkEnableOption "this source"; }; }; in diff --git a/modules/plugins/completion/blink-cmp/config.nix b/modules/plugins/completion/blink-cmp/config.nix index 9302332e..875a4fd4 100644 --- a/modules/plugins/completion/blink-cmp/config.nix +++ b/modules/plugins/completion/blink-cmp/config.nix @@ -6,8 +6,8 @@ inherit (lib.modules) mkIf; inherit (lib.strings) optionalString; inherit (lib.generators) mkLuaInline; - inherit (lib.attrsets) attrValues filterAttrs mapAttrsToList; - inherit (lib.lists) map optional elem; + inherit (lib.attrsets) attrValues filterAttrs; + inherit (lib.lists) map optional; inherit (lib.nvim.lua) toLuaObject; inherit (builtins) concatStringsSep typeOf tryEval attrNames mapAttrs; @@ -24,22 +24,7 @@ enabledBlinkSources = filterAttrs (_source: definition: definition.enable) cfg.sourcePlugins; blinkSourcePlugins = map (definition: definition.package) (attrValues enabledBlinkSources); - - blinkBuiltins = [ - "path" - "lsp" - "snippets" - "buffer" - "omni" - ]; in { - assertions = - mapAttrsToList (provider: definition: { - assertion = elem provider blinkBuiltins || definition.module != null; - message = "`config.vim.autocomplete.blink-cmp.setupOpts.sources.providers.${provider}.module` is `null`: non-builtin providers must set `module`."; - }) - cfg.setupOpts.sources.providers; - vim = mkIf cfg.enable { startPlugins = ["blink-compat"] ++ blinkSourcePlugins ++ (optional cfg.friendly-snippets.enable "friendly-snippets"); lazy.plugins = { diff --git a/modules/plugins/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix index 749ebb7c..ce058876 100644 --- a/modules/plugins/completion/nvim-cmp/config.nix +++ b/modules/plugins/completion/nvim-cmp/config.nix @@ -60,6 +60,12 @@ in { enableSharedCmpSources = true; nvim-cmp = { + sources = { + nvim-cmp = null; + buffer = "[Buffer]"; + path = "[Path]"; + }; + sourcePlugins = ["cmp-buffer" "cmp-path"]; setupOpts = { diff --git a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix index 2c8c77d3..0c790455 100644 --- a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix +++ b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix @@ -98,16 +98,14 @@ in { sources = mkOption { type = attrsOf (nullOr str); - default = { - nvim-cmp = null; - buffer = "[Buffer]"; - path = "[Path]"; - }; - example = { - nvim-cmp = null; - buffer = "[Buffer]"; - }; + default = {}; description = "The list of sources used by nvim-cmp"; + example = literalExpression '' + { + nvim-cmp = null; + buffer = "[Buffer]"; + } + ''; }; sourcePlugins = mkOption { diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix index 085140dc..dac2c2f4 100644 --- a/modules/plugins/diagnostics/nvim-lint/config.nix +++ b/modules/plugins/diagnostics/nvim-lint/config.nix @@ -13,7 +13,7 @@ in { vim = { startPlugins = ["nvim-lint"]; pluginRC.nvim-lint = entryAnywhere '' - require("lint").linters_by_ft = ${toLuaObject cfg.linters_by_ft} + require("lint").setup(${toLuaObject cfg.setupOpts}) ''; }; }; diff --git a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix index b08d82be..2211211e 100644 --- a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix +++ b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix @@ -1,25 +1,27 @@ {lib, ...}: let inherit (lib.options) mkOption mkEnableOption; inherit (lib.types) attrsOf listOf str; + inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.diagnostics.nvim-lint = { enable = mkEnableOption "asynchronous linter plugin for Neovim [nvim-lint]"; + setupOpts = mkPluginSetupOption "nvim-lint" { + linters_by_ft = mkOption { + type = attrsOf (listOf str); + default = {}; + example = { + text = ["vale"]; + markdown = ["vale"]; + }; - # nvim-lint does not have a setup table. - linters_by_ft = mkOption { - type = attrsOf (listOf str); - default = {}; - example = { - text = ["vale"]; - markdown = ["vale"]; + description = '' + Map of filetype to formatters. This option takes a set of + `key = value` format where the `value` will be converted + to its Lua equivalent. You are responsible for passing the + correct Nix data types to generate a correct Lua value that + conform is able to accept. + ''; }; - description = '' - Map of filetype to formatters. This option takes a set of `key = value` - format where the `value` will be converted to its Lua equivalent - through `toLuaObject. You are responsible for passing the correct Nix - data types to generate a correct Lua value that conform is able to - accept. - ''; }; }; } diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix index d5672af0..9e70424b 100644 --- a/modules/plugins/languages/astro.nix +++ b/modules/plugins/languages/astro.nix @@ -72,16 +72,6 @@ ls_sources, null_ls.builtins.diagnostics.eslint_d.with({ command = "${getExe pkg}", - condition = function(utils) - return utils.root_has_file({ - "eslint.config.js", - "eslint.config.mjs", - ".eslintrc", - ".eslintrc.json", - ".eslintrc.js", - ".eslintrc.yml", - }) - end, }) ) ''; diff --git a/modules/plugins/languages/cue.nix b/modules/plugins/languages/cue.nix deleted file mode 100644 index 313e3233..00000000 --- a/modules/plugins/languages/cue.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: let - inherit (lib.options) mkEnableOption mkOption; - inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) package; - inherit (lib.nvim.types) mkGrammarOption; - - cfg = config.vim.languages.cue; -in { - options.vim.languages.cue = { - enable = mkEnableOption "CUE language support"; - - treesitter = { - enable = mkEnableOption "CUE treesitter" // {default = config.vim.languages.enableTreesitter;}; - - package = mkGrammarOption pkgs "cue"; - }; - - lsp = { - enable = mkEnableOption "CUE LSP support" // {default = config.vim.languages.enableLSP;}; - - package = mkOption { - type = package; - default = pkgs.cue; - description = "cue lsp implementation"; - }; - }; - }; - - config = mkIf cfg.enable (mkMerge [ - (mkIf cfg.treesitter.enable { - vim.treesitter.enable = true; - vim.treesitter.grammars = [cfg.treesitter.package]; - }) - - (mkIf cfg.lsp.enable { - vim.lsp.lspconfig.enable = true; - vim.lsp.lspconfig.sources.cue-lsp = '' - lspconfig.cue.setup { - capabilities = capabilities, - on_attach = default_on_attach, - cmd = {"${cfg.lsp.package}/bin/cue", "lsp"}, - } - ''; - }) - ]); -} diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index a963c3cd..31845b27 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -5,8 +5,6 @@ in { ./asm.nix ./astro.nix ./bash.nix - ./cue.nix - ./dart.nix ./clang.nix ./csharp.nix ./css.nix @@ -14,10 +12,6 @@ in { ./elixir.nix ./gleam.nix ./go.nix - ./hcl.nix - ./helm.nix - ./kotlin.nix - ./html.nix ./haskell.nix ./hcl.nix ./html.nix diff --git a/modules/plugins/languages/helm.nix b/modules/plugins/languages/helm.nix deleted file mode 100644 index d3fd636e..00000000 --- a/modules/plugins/languages/helm.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; - inherit (lib.modules) mkIf mkMerge; - inherit (lib.lists) isList; - inherit (lib.types) enum either listOf package str; - inherit (lib.nvim.types) mkGrammarOption; - inherit (lib.nvim.lua) expToLua; - - cfg = config.vim.languages.helm; - yamlCfg = config.vim.languages.yaml; - - helmCmd = - if isList cfg.lsp.package - then cfg.lsp.package - else ["${cfg.lsp.package}/bin/helm_ls" "serve"]; - yamlCmd = - if isList yamlCfg.lsp.package - then builtins.elemAt yamlCfg.lsp.package 0 - else "${yamlCfg.lsp.package}/bin/yaml-language-server"; - - defaultServer = "helm-ls"; - servers = { - helm-ls = { - package = pkgs.helm-ls; - lspConfig = '' - lspconfig.helm_ls.setup { - capabilities = capabilities, - on_attach = default_on_attach, - cmd = ${expToLua helmCmd}, - settings = { - ['helm-ls'] = { - yamlls = { - path = "${yamlCmd}" - } - } - } - } - ''; - }; - }; -in { - options.vim.languages.helm = { - enable = mkEnableOption "Helm language support"; - - treesitter = { - enable = mkEnableOption "Helm treesitter" // {default = config.vim.languages.enableTreesitter;}; - package = mkGrammarOption pkgs "helm"; - }; - - lsp = { - enable = mkEnableOption "Helm LSP support" // {default = config.vim.languages.enableLSP;}; - - server = mkOption { - description = "Helm LSP server to use"; - type = enum (attrNames servers); - default = defaultServer; - }; - - package = mkOption { - description = "Helm LSP server package"; - type = either package (listOf str); - default = servers.${cfg.lsp.server}.package; - }; - }; - }; - - config = mkIf cfg.enable (mkMerge [ - (mkIf cfg.treesitter.enable { - vim.treesitter.enable = true; - vim.treesitter.grammars = [cfg.treesitter.package]; - }) - - (mkIf cfg.lsp.enable { - vim.lsp.lspconfig.enable = true; - vim.lsp.lspconfig.sources.helm-lsp = servers.${cfg.lsp.server}.lspConfig; - }) - - { - # Enables filetype detection - vim.startPlugins = [pkgs.vimPlugins.vim-helm]; - } - ]); -} diff --git a/modules/plugins/languages/php.nix b/modules/plugins/languages/php.nix index 4dccc8cd..d921b11d 100644 --- a/modules/plugins/languages/php.nix +++ b/modules/plugins/languages/php.nix @@ -64,26 +64,6 @@ } ''; }; - - intelephense = { - package = pkgs.intelephense; - lspConfig = '' - lspconfig.intelephense.setup{ - capabilities = capabilities, - on_attach = default_on_attach, - cmd = ${ - if isList cfg.lsp.package - then expToLua cfg.lsp.package - else '' - { - "${getExe cfg.lsp.package}", - "--stdio" - }, - '' - } - } - ''; - }; }; in { options.vim.languages.php = { diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix index 4d96c20a..a3c55e10 100644 --- a/modules/plugins/languages/svelte.nix +++ b/modules/plugins/languages/svelte.nix @@ -72,16 +72,6 @@ ls_sources, null_ls.builtins.diagnostics.eslint_d.with({ command = "${getExe pkg}", - condition = function(utils) - return utils.root_has_file({ - "eslint.config.js", - "eslint.config.mjs", - ".eslintrc", - ".eslintrc.json", - ".eslintrc.js", - ".eslintrc.yml", - }) - end, }) ) ''; diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix index 790c235a..c9070554 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/ts.nix @@ -123,16 +123,6 @@ ls_sources, null_ls.builtins.diagnostics.eslint_d.with({ command = "${getExe pkg}", - condition = function(utils) - return utils.root_has_file({ - "eslint.config.js", - "eslint.config.mjs", - ".eslintrc", - ".eslintrc.json", - ".eslintrc.js", - ".eslintrc.yml", - }) - end, }) ) ''; diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix index c84b17cd..ef17b964 100644 --- a/modules/plugins/languages/yaml.nix +++ b/modules/plugins/languages/yaml.nix @@ -14,27 +14,14 @@ cfg = config.vim.languages.yaml; - onAttach = - if config.vim.languages.helm.lsp.enable - then '' - on_attach = function(client, bufnr) - local filetype = vim.bo[bufnr].filetype - if filetype == "helm" then - client.stop() - end - end'' - else "on_attach = default_on_attach"; - defaultServer = "yaml-language-server"; servers = { yaml-language-server = { package = pkgs.nodePackages.yaml-language-server; lspConfig = '' - - lspconfig.yamlls.setup { - capabilities = capabilities, - ${onAttach}, + capabilities = capabilities; + on_attach = default_on_attach; cmd = ${ if isList cfg.lsp.package then expToLua cfg.lsp.package diff --git a/modules/plugins/lsp/lspsaga/config.nix b/modules/plugins/lsp/lspsaga/config.nix index 811d0178..3af6b7f1 100644 --- a/modules/plugins/lsp/lspsaga/config.nix +++ b/modules/plugins/lsp/lspsaga/config.nix @@ -3,24 +3,51 @@ lib, ... }: let - inherit (lib.modules) mkIf mkDefault; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.strings) optionalString; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.binds) addDescriptionsToMappings mkSetLuaBinding; cfg = config.vim.lsp; + self = import ./lspsaga.nix {inherit lib;}; + + mappingDefinitions = self.options.vim.lsp.lspsaga.mappings; + mappings = addDescriptionsToMappings cfg.lspsaga.mappings mappingDefinitions; in { config = mkIf (cfg.enable && cfg.lspsaga.enable) { vim = { - lazy.plugins.lspsaga-nvim = { - package = "lspsaga-nvim"; - setupModule = "lspsaga"; - inherit (cfg.lspsaga) setupOpts; + startPlugins = ["lspsaga-nvim"]; - event = ["LspAttach"]; + maps = { + visual = mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').range_code_action"; + normal = mkMerge [ + (mkSetLuaBinding mappings.lspFinder "require('lspsaga.provider').lsp_finder") + (mkSetLuaBinding mappings.renderHoveredDoc "require('lspsaga.hover').render_hover_doc") + + (mkSetLuaBinding mappings.smartScrollUp "function() require('lspsaga.action').smart_scroll_with_saga(-1) end") + (mkSetLuaBinding mappings.smartScrollDown "function() require('lspsaga.action').smart_scroll_with_saga(1) end") + + (mkSetLuaBinding mappings.rename "require('lspsaga.rename').rename") + (mkSetLuaBinding mappings.previewDefinition "require('lspsaga.provider').preview_definition") + + (mkSetLuaBinding mappings.showLineDiagnostics "require('lspsaga.diagnostic').show_line_diagnostics") + (mkSetLuaBinding mappings.showCursorDiagnostics "require('lspsaga.diagnostic').show_cursor_diagnostics") + + (mkSetLuaBinding mappings.nextDiagnostic "require('lspsaga.diagnostic').navigate('next')") + (mkSetLuaBinding mappings.previousDiagnostic "require('lspsaga.diagnostic').navigate('prev')") + + (mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').code_action") + (mkIf (!cfg.lspSignature.enable) (mkSetLuaBinding mappings.signatureHelp "require('lspsaga.signaturehelp').signature_help")) + ]; }; - # Optional dependencies, pretty useful to enhance default functionality of - # Lspsaga. - treesitter.enable = mkDefault true; - visuals.nvim-web-devicons.enable = mkDefault true; + pluginRC.lspsaga = entryAnywhere '' + require('lspsaga').init_lsp_saga({ + ${optionalString config.vim.ui.borders.plugins.lspsaga.enable '' + border_style = '${config.vim.ui.borders.plugins.lspsaga.style}', + ''} + }) + ''; }; }; } diff --git a/modules/plugins/lsp/lspsaga/lspsaga.nix b/modules/plugins/lsp/lspsaga/lspsaga.nix index 39ce6298..f308aaaa 100644 --- a/modules/plugins/lsp/lspsaga/lspsaga.nix +++ b/modules/plugins/lsp/lspsaga/lspsaga.nix @@ -1,32 +1,29 @@ -{ - config, - lib, - ... -}: let - inherit (lib.modules) mkRemovedOptionModule; - inherit (lib.options) mkOption mkEnableOption; - inherit (lib.nvim.types) borderType mkPluginSetupOption; +{lib, ...}: let + inherit (lib.options) mkEnableOption; + inherit (lib.nvim.binds) mkMappingOption; in { - imports = [ - (mkRemovedOptionModule ["vim" "lsp" "lspsaga" "mappings"] '' - Lspsaga mappings have been removed from nvf, as the original author has made - very drastic changes to the API after taking back ownership, and the fork we - used is now archived. Please refer to Lspsaga documentation to add keybinds - for functionality you have used. - - - '') - ]; - options.vim.lsp.lspsaga = { enable = mkEnableOption "LSP Saga"; - setupOpts = mkPluginSetupOption "lspsaga" { - border_style = mkOption { - type = borderType; - default = config.vim.ui.borders.globalStyle; - description = "Border type, see {command}`:help nvim_open_win`"; - }; + mappings = { + lspFinder = mkMappingOption "LSP Finder [LSPSaga]" "lf"; + renderHoveredDoc = mkMappingOption "Rendered hovered docs [LSPSaga]" "lh"; + + smartScrollUp = mkMappingOption "Smart scroll up [LSPSaga]" ""; + smartScrollDown = mkMappingOption "Smart scroll up [LSPSaga]" ""; + + rename = mkMappingOption "Rename [LSPSaga]" "lr"; + previewDefinition = mkMappingOption "Preview definition [LSPSaga]" "ld"; + + showLineDiagnostics = mkMappingOption "Show line diagnostics [LSPSaga]" "ll"; + showCursorDiagnostics = mkMappingOption "Show cursor diagnostics [LSPSaga]" "lc"; + + nextDiagnostic = mkMappingOption "Next diagnostic [LSPSaga]" "ln"; + previousDiagnostic = mkMappingOption "Previous diagnostic [LSPSaga]" "lp"; + + codeAction = mkMappingOption "Code action [LSPSaga]" "ca"; + + signatureHelp = mkMappingOption "Signature help [LSPSaga]" "ls"; }; }; } diff --git a/modules/plugins/minimap/minimap-vim/config.nix b/modules/plugins/minimap/minimap-vim/config.nix index a39b9590..5276a426 100644 --- a/modules/plugins/minimap/minimap-vim/config.nix +++ b/modules/plugins/minimap/minimap-vim/config.nix @@ -10,13 +10,13 @@ cfg = config.vim.minimap.minimap-vim; in { config = mkIf cfg.enable { - vim = { - startPlugins = ["minimap-vim"]; - extraPackages = [pkgs.code-minimap]; + vim.startPlugins = [ + pkgs.code-minimap + "minimap-vim" + ]; - binds.whichKey.register = pushDownDefault { - "m" = "+Minimap"; - }; + vim.binds.whichKey.register = pushDownDefault { + "m" = "+Minimap"; }; }; } diff --git a/modules/plugins/ui/colorizer/colorizer.nix b/modules/plugins/ui/colorizer/colorizer.nix index 1cee089f..313097e7 100644 --- a/modules/plugins/ui/colorizer/colorizer.nix +++ b/modules/plugins/ui/colorizer/colorizer.nix @@ -102,7 +102,11 @@ in { setupOpts = mkPluginSetupOption "colorizer" { filetypes = mkOption { - type = attrsOf settingSubmodule; + description = '' + Filetypes to enable on and their option overrides. + + "*" means enable on all filetypes. Filetypes prefixed with "!" are disabled. + ''; default = {}; example = { "*" = {}; @@ -111,21 +115,13 @@ in { AARRGGBB = false; }; }; - description = '' - Filetypes to enable on and their option overrides. - - `"*"` means enable on all filetypes. Filetypes prefixed with `"!"` are disabled. - ''; + type = attrsOf settingSubmodule; }; user_default_options = mkOption { - type = settingSubmodule; + description = "Default options"; default = {}; - description = '' - `user_default_options` is the second parameter to nvim-colorizer's setup function. - - Anything set here is the inverse of the previous setup configuration. - ''; + type = settingSubmodule; }; }; }; diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix index cbe776cc..a1574b97 100644 --- a/modules/plugins/utility/default.nix +++ b/modules/plugins/utility/default.nix @@ -17,7 +17,6 @@ ./nix-develop ./outline ./preview - ./snacks-nvim ./surround ./telescope ./wakatime diff --git a/modules/plugins/utility/snacks-nvim/config.nix b/modules/plugins/utility/snacks-nvim/config.nix deleted file mode 100644 index e726e3e2..00000000 --- a/modules/plugins/utility/snacks-nvim/config.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.modules) mkIf; - inherit (lib.nvim.lua) toLuaObject; - inherit (lib.nvim.dag) entryAnywhere; - - cfg = config.vim.utility.snacks-nvim; -in { - config = mkIf cfg.enable { - vim = { - startPlugins = ["snacks-nvim"]; - pluginRC.snacks-nvim = entryAnywhere '' - require("snacks").setup(${toLuaObject cfg.setupOpts}); - ''; - }; - }; -} diff --git a/modules/plugins/utility/snacks-nvim/default.nix b/modules/plugins/utility/snacks-nvim/default.nix deleted file mode 100644 index 8a712baa..00000000 --- a/modules/plugins/utility/snacks-nvim/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./config.nix - ./snacks-nvim.nix - ]; -} diff --git a/modules/plugins/utility/snacks-nvim/snacks-nvim.nix b/modules/plugins/utility/snacks-nvim/snacks-nvim.nix deleted file mode 100644 index 30fd6f89..00000000 --- a/modules/plugins/utility/snacks-nvim/snacks-nvim.nix +++ /dev/null @@ -1,12 +0,0 @@ -{lib, ...}: let - inherit (lib.options) mkEnableOption; - inherit (lib.nvim.types) mkPluginSetupOption; -in { - options.vim.utility.snacks-nvim = { - enable = mkEnableOption '' - collection of QoL plugins for Neovim [snacks-nvim] - ''; - - setupOpts = mkPluginSetupOption "snacks-nvim" {}; - }; -} diff --git a/modules/plugins/utility/surround/config.nix b/modules/plugins/utility/surround/config.nix index 63a1f8d7..31b4033d 100644 --- a/modules/plugins/utility/surround/config.nix +++ b/modules/plugins/utility/surround/config.nix @@ -14,11 +14,10 @@ in { vim = { lazy.plugins.nvim-surround = { package = "nvim-surround"; + setupModule = "nvim-surround"; inherit (cfg) setupOpts; - event = ["BufReadPre" "BufNewFile"]; - keys = [ (mkLznKey "i" cfg.setupOpts.keymaps.insert) (mkLznKey "i" cfg.setupOpts.keymaps.insert_line) diff --git a/modules/plugins/utility/surround/surround.nix b/modules/plugins/utility/surround/surround.nix index 2819b6d6..96ff5efb 100644 --- a/modules/plugins/utility/surround/surround.nix +++ b/modules/plugins/utility/surround/surround.nix @@ -37,13 +37,9 @@ in { type = bool; default = false; description = '' - Whether to enable nvim-surround, Neovim plugin to add/change/delete - surrounding delimiter pairs with ease. - - ::: {.note} - The default mappings deviate from upstream to avoid conflicts with nvim-leap. - You may change those in your configuration if you do not use nvim-leap - ::: + nvim-surround: add/change/delete surrounding delimiter pairs with ease. + Note that the default mappings deviate from upstream to avoid conflicts + with nvim-leap. ''; }; setupOpts = mkPluginSetupOption "nvim-surround" { @@ -65,9 +61,7 @@ in { useVendoredKeybindings = mkOption { type = bool; default = true; - description = '' - Use alternative set of keybindings that avoids conflicts with other popular plugins, e.g. nvim-leap - ''; + description = "Use alternative set of keybindings that avoids conflicts with other popular plugins, e.g. nvim-leap"; }; }; } diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix index 3c778169..d145f798 100644 --- a/modules/wrapper/build/config.nix +++ b/modules/wrapper/build/config.nix @@ -6,8 +6,9 @@ ... }: let inherit (pkgs) vimPlugins; - inherit (lib.trivial) flip; - inherit (builtins) path filter isString; + inherit (lib.strings) isString; + inherit (lib.lists) filter map; + inherit (builtins) path; getPin = name: ((pkgs.callPackages ../../../npins/sources.nix {}) // config.vim.pluginOverrides).${name}; @@ -75,6 +76,13 @@ buildConfigPlugins config.vim.optPlugins ); + # additional Lua and Python3 packages, mapped to their respective functions + # to conform to the format mnw expects. end user should + # only ever need to pass a list of packages, which are modified + # here + extraLuaPackages = ps: map (x: ps.${x}) config.vim.luaPackages; + extraPython3Packages = ps: map (x: ps.${x}) config.vim.python3Packages; + # Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to # generate a wrapped Neovim package. neovim-wrapped = inputs.mnw.lib.wrap pkgs { @@ -84,17 +92,9 @@ extraBinPath = config.vim.extraPackages; initLua = config.vim.builtLuaConfigRC; luaFiles = config.vim.extraLuaFiles; - providers = { - python3 = { - enable = config.vim.withPython3; - extraPackages = ps: map (flip builtins.getAttr ps) config.vim.python3Packages; - }; - ruby.enable = config.vim.withRuby; - nodeJs.enable = config.vim.withNodeJs; - }; - aliases = lib.optional config.vim.viAlias "vi" ++ lib.optional config.vim.vimAlias "vim"; - extraLuaPackages = ps: map (flip builtins.getAttr ps) config.vim.luaPackages; + inherit (config.vim) viAlias vimAlias withRuby withNodeJs withPython3; + inherit extraLuaPackages extraPython3Packages; }; dummyInit = pkgs.writeText "nvf-init.lua" config.vim.builtLuaConfigRC; diff --git a/modules/wrapper/lazy/config.nix b/modules/wrapper/lazy/config.nix index c1bd8829..3468d5ec 100644 --- a/modules/wrapper/lazy/config.nix +++ b/modules/wrapper/lazy/config.nix @@ -134,15 +134,6 @@ in { startPlugins = ["lz-n" "lzn-auto-require"]; optPlugins = pluginPackages; - augroups = [{name = "nvf_lazy_file_hooks";}]; - autocmds = [ - { - event = ["BufReadPost" "BufNewFile" "BufWritePre"]; - group = "nvf_lazy_file_hooks"; - command = "doautocmd User LazyFile"; - once = true; - } - ]; lazy.builtLazyConfig = '' require('lz.n').load(${toLuaObject lznSpecs}) diff --git a/modules/wrapper/lazy/lazy.nix b/modules/wrapper/lazy/lazy.nix index eb1f5cdf..5d67aa59 100644 --- a/modules/wrapper/lazy/lazy.nix +++ b/modules/wrapper/lazy/lazy.nix @@ -126,7 +126,7 @@ }; event = mkOption { - type = nullOr (oneOf [str lznEvent (listOf (either str lznEvent))]); + type = nullOr (oneOf [str (listOf str) lznEvent]); default = null; description = "Lazy-load on event"; }; diff --git a/npins/sources.json b/npins/sources.json index 974d09c1..10b664f9 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -8,9 +8,9 @@ "repo": "aerial.nvim" }, "branch": "master", - "revision": "2204cf08791449a6a2fd2ef187a29112eeefd989", - "url": "https://github.com/stevearc/aerial.nvim/archive/2204cf08791449a6a2fd2ef187a29112eeefd989.tar.gz", - "hash": "1482md9kzyrr7mjkca3nnyqgy64q8clhi6xbvgql8qjw7ifz51mx" + "revision": "3284a2cb858ba009c79da87d5e010ccee3c99c4d", + "url": "https://github.com/stevearc/aerial.nvim/archive/3284a2cb858ba009c79da87d5e010ccee3c99c4d.tar.gz", + "hash": "0fsvd6ndkp3r8lzpyshqshapna5sh37nz6qabznpwpwax42ghakp" }, "alpha-nvim": { "type": "Git", @@ -46,10 +46,10 @@ "pre_releases": false, "version_upper_bound": null, "release_prefix": null, - "version": "v0.13.1", - "revision": "29861baf37bbb16f5dbf524a6edac5daaad6f4fc", - "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.13.1", - "hash": "1y5p7i6g884r65mhfsazx28g0qs37hc57jm37i7kch9kcf8m7sbq" + "version": "v0.12.4", + "revision": "a5625f1b14fb5c44b0f9256f5ec0714817f5e355", + "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.12.4", + "hash": "0jdifjifxjqa8r80wlqgkn5rm48wziap92340xz228nrgd0c9g69" }, "blink-cmp-spell": { "type": "Git", @@ -59,9 +59,9 @@ "repo": "blink-cmp-spell" }, "branch": "master", - "revision": "782bc76be09c0c5dd08e3edd04e4ec1054c3158e", - "url": "https://github.com/ribru17/blink-cmp-spell/archive/782bc76be09c0c5dd08e3edd04e4ec1054c3158e.tar.gz", - "hash": "13adgj9qxfmbwzvx348kpkm70h0jli9qv3bqhkwh8p6zkfajm607" + "revision": "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d", + "url": "https://github.com/ribru17/blink-cmp-spell/archive/38d6797dea6f72baa6e8b3bfca6da96d8fcac64d.tar.gz", + "hash": "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6" }, "blink-compat": { "type": "Git", @@ -95,9 +95,9 @@ "repo": "blink-ripgrep.nvim" }, "branch": "main", - "revision": "91aee73557237b0cc1313e4ed2b32f10de6cc65e", - "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/91aee73557237b0cc1313e4ed2b32f10de6cc65e.tar.gz", - "hash": "1jg4559946rzsvvny1r7jki1gmr70yjxr8qlnsjkjyxj8h0pjjwl" + "revision": "305e1ae5363f527abdfd71915a3fe1f42af52824", + "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/305e1ae5363f527abdfd71915a3fe1f42af52824.tar.gz", + "hash": "1hcfyicgf33dlr2hhgnhhzdcxxqw1v8v1yjfbnwvlcsgw0rhjl8w" }, "bufdelete-nvim": { "type": "Git", @@ -119,9 +119,9 @@ "repo": "nvim" }, "branch": "main", - "revision": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429", - "url": "https://github.com/catppuccin/nvim/archive/5b5e3aef9ad7af84f463d17b5479f06b87d5c429.tar.gz", - "hash": "0jmrwag2dx4b1g9x32xwxcr8y0l159hqks09z5miy99wav6dy7z2" + "revision": "4bb938bbba41d306db18bf0eb0633a5f28fd7ba0", + "url": "https://github.com/catppuccin/nvim/archive/4bb938bbba41d306db18bf0eb0633a5f28fd7ba0.tar.gz", + "hash": "112q9iqfp6ay13c1ca1s9svhxqfgnqfn0a1k2s7dy9ydswwmcxbk" }, "ccc-nvim": { "type": "Git", @@ -243,18 +243,6 @@ "url": "https://github.com/ray-x/cmp-treesitter/archive/958fcfa0d8ce46d215e19cc3992c542f576c4123.tar.gz", "hash": "05as01c2f7i20zkzpqbq9n8ji9bcwd678ixmxnrz9vmz5zsj8q7i" }, - "codecompanion-nvim": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "olimorris", - "repo": "codecompanion.nvim" - }, - "branch": "main", - "revision": "4f56b047f03bf5edc0d71bf0ca694243a49b912f", - "url": "https://github.com/olimorris/codecompanion.nvim/archive/4f56b047f03bf5edc0d71bf0ca694243a49b912f.tar.gz", - "hash": "1mrb8qxd6mz5dlly9bh30pcd599gfy173f6pd4p8lszs3xhp598k" - }, "codewindow-nvim": { "type": "Git", "repository": { @@ -287,9 +275,9 @@ "repo": "conform.nvim" }, "branch": "master", - "revision": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d", - "url": "https://github.com/stevearc/conform.nvim/archive/db8a4a9edb217067b1d7a2e0362c74bfe9cc944d.tar.gz", - "hash": "13vpizk8ani64d3a9yrm0g3bz8m6m6cxnpzr2xgslbhxnkmbxq7j" + "revision": "a6f5bdb78caa305496357d17e962bbc4c0b392e2", + "url": "https://github.com/stevearc/conform.nvim/archive/a6f5bdb78caa305496357d17e962bbc4c0b392e2.tar.gz", + "hash": "1jkm8pbfnp2s9y70cc67pj2fa25a4jl1y4lx6y1k5i323f4lplhz" }, "copilot-cmp": { "type": "Git", @@ -323,9 +311,9 @@ "repo": "crates.nvim" }, "branch": "main", - "revision": "403a0abef0e2aec12749a534dc468d6fd50c6741", - "url": "https://github.com/Saecki/crates.nvim/archive/403a0abef0e2aec12749a534dc468d6fd50c6741.tar.gz", - "hash": "19ix86nbww5vljinfwfpjkz806j7dzw4pgjyjya201jb0n22lrc6" + "revision": "1803c8b5516610ba7cdb759a4472a78414ee6cd4", + "url": "https://github.com/Saecki/crates.nvim/archive/1803c8b5516610ba7cdb759a4472a78414ee6cd4.tar.gz", + "hash": "0bqcdsbhs1ab51nmqd3cx7p6nlpmrjj0a53hax9scpqzr23nvr66" }, "csharpls-extended-lsp-nvim": { "type": "Git", @@ -335,9 +323,9 @@ "repo": "csharpls-extended-lsp.nvim" }, "branch": "master", - "revision": "991d2c43afd7c7be77edd27a2ae686f9779382da", - "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/991d2c43afd7c7be77edd27a2ae686f9779382da.tar.gz", - "hash": "10jj6x78k34yrarp5ydc7n1ylp2xxgxl7jqh1y4d133mgcygabak" + "revision": "7768c15fe901fd58bfd557034a3cad191a820cfb", + "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/7768c15fe901fd58bfd557034a3cad191a820cfb.tar.gz", + "hash": "0s2jpc22c6s9nnp47kia01bv95xipyn08d0s0pax11fddv2b951f" }, "dashboard-nvim": { "type": "Git", @@ -407,9 +395,9 @@ "repo": "elixir-tools.nvim" }, "branch": "main", - "revision": "6beae8194152e2d8b4a59de19a3e60c1f7ffcff5", - "url": "https://github.com/elixir-tools/elixir-tools.nvim/archive/6beae8194152e2d8b4a59de19a3e60c1f7ffcff5.tar.gz", - "hash": "0kncq60x3kvy4plszq4zygrsy6cyzf43g2xgzqwif88i85ki7zq6" + "revision": "f7e18753f5587b422aac628249fa46c66ed24af3", + "url": "https://github.com/elixir-tools/elixir-tools.nvim/archive/f7e18753f5587b422aac628249fa46c66ed24af3.tar.gz", + "hash": "06h1aqdkr3c5samz819j8c1cgnz636p6qbiavg504fd4kqz3ykzr" }, "fastaction-nvim": { "type": "Git", @@ -443,9 +431,9 @@ "repo": "flutter-tools.nvim" }, "branch": "main", - "revision": "70430c32d176f4a15c6e2c80586cd2791e3a664e", - "url": "https://github.com/akinsho/flutter-tools.nvim/archive/70430c32d176f4a15c6e2c80586cd2791e3a664e.tar.gz", - "hash": "01p721ca4as9b9nn4qibb6s775fn66j13zsx2d3flhkssii06v45" + "revision": "d135e1d02f6a3a8808efc2b58950ab1fdd49d000", + "url": "https://github.com/akinsho/flutter-tools.nvim/archive/d135e1d02f6a3a8808efc2b58950ab1fdd49d000.tar.gz", + "hash": "06hiiwzb00lc7qalq74lyydks8v007fnsbpkgpkfm7zki0dg22m7" }, "friendly-snippets": { "type": "Git", @@ -467,9 +455,9 @@ "repo": "fzf-lua" }, "branch": "main", - "revision": "03eed634a3b1f4a4dc53f928868566b0b697dabe", - "url": "https://github.com/ibhagwan/fzf-lua/archive/03eed634a3b1f4a4dc53f928868566b0b697dabe.tar.gz", - "hash": "007fz9rwhcfx8l6k6dfnm91dcc4gsazr3vqbv95z5l1h1j184v6c" + "revision": "9b84b53f3297d4912d7eb95b979e9b27e2e61281", + "url": "https://github.com/ibhagwan/fzf-lua/archive/9b84b53f3297d4912d7eb95b979e9b27e2e61281.tar.gz", + "hash": "1p3fb68h7x50b6m6aaxxqcylipa5rdg0yfz6jlrd5i2kmr5gxldq" }, "gesture-nvim": { "type": "Git", @@ -515,9 +503,9 @@ "repo": "gitsigns.nvim" }, "branch": "main", - "revision": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9", - "url": "https://github.com/lewis6991/gitsigns.nvim/archive/7010000889bfb6c26065e0b0f7f1e6aa9163edd9.tar.gz", - "hash": "0hl572j5l1bqg51rg545bavxs8kxya02ss3fj5fxvp9ylrnaqsx9" + "revision": "4c40357994f386e72be92a46f41fc1664c84c87d", + "url": "https://github.com/lewis6991/gitsigns.nvim/archive/4c40357994f386e72be92a46f41fc1664c84c87d.tar.gz", + "hash": "1d3i82g5barb9afk7ra3gmcwwjvaqp49sbdz0acki4a0yc80m31w" }, "glow-nvim": { "type": "Git", @@ -539,9 +527,9 @@ "repo": "gruvbox.nvim" }, "branch": "main", - "revision": "15958f5ee43e144856cd2084ce6c571bfdb44504", - "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/15958f5ee43e144856cd2084ce6c571bfdb44504.tar.gz", - "hash": "16nrxcpds3zacqmfw5jsd5d8qqbwllkw9xacjkglcnaynp4qghqq" + "revision": "089b60e92aa0a1c6fa76ff527837cd35b6f5ac81", + "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/089b60e92aa0a1c6fa76ff527837cd35b6f5ac81.tar.gz", + "hash": "0mr8q2xi4s2anibll8lhxax7q1akyg687bp5r58gckkhi04064q4" }, "harpoon": { "type": "Git", @@ -563,9 +551,9 @@ "repo": "haskell-tools.nvim" }, "branch": "master", - "revision": "52608d83b424de44e914711c0f505906816e7427", - "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/52608d83b424de44e914711c0f505906816e7427.tar.gz", - "hash": "1ngz8zzyni2wh0xhvrcl27am39kqaaabh5y9c4i8ym211ravzhv6" + "revision": "834d949f3911297fd657787c73f647be9675ae53", + "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/834d949f3911297fd657787c73f647be9675ae53.tar.gz", + "hash": "1l4jm6010mhjq8bvjc0sbqh0bfadyrq2wisdvsjrgjb0h0w1s8d4" }, "highlight-undo-nvim": { "type": "Git", @@ -662,9 +650,9 @@ "repo": "leap.nvim" }, "branch": "main", - "revision": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe", - "url": "https://github.com/ggandor/leap.nvim/archive/346a16ef942635a8ca5ff92e603d07e7e8be6cbe.tar.gz", - "hash": "0rq73f7sw1sf8dn6angwgns8jd811aiixmvrndgqz2939dlqaw2l" + "revision": "8b826a9fc766bffd14288aee01847cb0d6c6c383", + "url": "https://github.com/ggandor/leap.nvim/archive/8b826a9fc766bffd14288aee01847cb0d6c6c383.tar.gz", + "hash": "1biydwaky3104c1dys8m37yalrgcwyjyprlbk31j82y4mvmd1lmy" }, "leetcode-nvim": { "type": "Git", @@ -697,9 +685,9 @@ "repo": "lsp_signature.nvim" }, "branch": "master", - "revision": "8b681c86b0bd7f932cd91987983d91497e43d83f", - "url": "https://github.com/ray-x/lsp_signature.nvim/archive/8b681c86b0bd7f932cd91987983d91497e43d83f.tar.gz", - "hash": "1ap077hgl334klfyi2hv81hf6r9mqpkarrz0b3ky99aavz7bmn2j" + "revision": "693b75f1dc31f5af45ceb762966a6ab00af1850b", + "url": "https://github.com/ray-x/lsp_signature.nvim/archive/693b75f1dc31f5af45ceb762966a6ab00af1850b.tar.gz", + "hash": "0jfiips0ddbry91h52k671sll0zfqpz10dc8fw0w5np6lwiy7z34" }, "lspkind-nvim": { "type": "Git", @@ -717,13 +705,13 @@ "type": "Git", "repository": { "type": "GitHub", - "owner": "nvimdev", + "owner": "tami5", "repo": "lspsaga.nvim" }, "branch": "main", - "revision": "6063935cf68de9aa6dd79f8e1caf5df0a9385de3", - "url": "https://github.com/nvimdev/lspsaga.nvim/archive/6063935cf68de9aa6dd79f8e1caf5df0a9385de3.tar.gz", - "hash": "1pqasjg2f2yd3ci8hyxfqqs7xnkmwdc411dlm6qg1agiv1h8v205" + "revision": "5faeec9f2508d2d49a66c0ac0d191096b4e3fa81", + "url": "https://github.com/tami5/lspsaga.nvim/archive/5faeec9f2508d2d49a66c0ac0d191096b4e3fa81.tar.gz", + "hash": "1bw71db69na2sriv9q167z9bgkir4nwny1bdfv9z606bmng4hhzc" }, "lua-utils-nvim": { "type": "Git", @@ -745,9 +733,9 @@ "repo": "lualine.nvim" }, "branch": "master", - "revision": "b8b60c7f1d0d95ad74ee215b2291280b30482476", - "url": "https://github.com/hoob3rt/lualine.nvim/archive/b8b60c7f1d0d95ad74ee215b2291280b30482476.tar.gz", - "hash": "02xyjp446b2nypw3hh4k6b6g9f892kxmmdv23s7dypcws28v50m9" + "revision": "f4f791f67e70d378a754d02da068231d2352e5bc", + "url": "https://github.com/hoob3rt/lualine.nvim/archive/f4f791f67e70d378a754d02da068231d2352e5bc.tar.gz", + "hash": "12jm3vc3mi0p9kjw7g1cd6a9nkgws1mvq2h7lpfmflad8zfmw35q" }, "luasnip": { "type": "Git", @@ -769,9 +757,9 @@ "repo": "lz.n" }, "branch": "master", - "revision": "d5856041d60f9500804c872709b8d5f59505d92b", - "url": "https://github.com/nvim-neorocks/lz.n/archive/d5856041d60f9500804c872709b8d5f59505d92b.tar.gz", - "hash": "1dxsy8baq7zdc047ixxxa1qkfw48jgbng4vngwlg6gc2rv16rf36" + "revision": "eb94a39433518b26a0eeb117b937b21dc6b18713", + "url": "https://github.com/nvim-neorocks/lz.n/archive/eb94a39433518b26a0eeb117b937b21dc6b18713.tar.gz", + "hash": "1sarbbj53b5f4mcj6b1iqkbjacrh3w63vp8dpz6j802wqwvi51wc" }, "lzn-auto-require": { "type": "Git", @@ -841,9 +829,9 @@ "repo": "mini.base16" }, "branch": "main", - "revision": "44240f11871c15aba8fc49959ebd27c0b4768a40", - "url": "https://github.com/echasnovski/mini.base16/archive/44240f11871c15aba8fc49959ebd27c0b4768a40.tar.gz", - "hash": "0z4vvsm2hc1cab5qqd28x6jzyzh23cdijrrs1hkkkj0nj3si3zkn" + "revision": "d64302f57a692a2ff2c9a4556935780133f821f9", + "url": "https://github.com/echasnovski/mini.base16/archive/d64302f57a692a2ff2c9a4556935780133f821f9.tar.gz", + "hash": "1vkhhqb9785ypmp7bzqljxfdjg5gz5jxkxp0wl6iacjvwwf18dq7" }, "mini-basics": { "type": "Git", @@ -865,9 +853,9 @@ "repo": "mini.bracketed" }, "branch": "main", - "revision": "0ec65567ffde0ad4d94d794d55f3b627203b496a", - "url": "https://github.com/echasnovski/mini.bracketed/archive/0ec65567ffde0ad4d94d794d55f3b627203b496a.tar.gz", - "hash": "05xg63hw83n99al5sylysbq1xpschlj547s3j484jjs7wsbzzp6c" + "revision": "95e1023c1734c805ad3b9da364fc3518e0881c70", + "url": "https://github.com/echasnovski/mini.bracketed/archive/95e1023c1734c805ad3b9da364fc3518e0881c70.tar.gz", + "hash": "0is5mk998v3givmlfq5c09pdww7bm1nmrwm5iijhvjgc2rlxxlc4" }, "mini-bufremove": { "type": "Git", @@ -889,9 +877,9 @@ "repo": "mini.clue" }, "branch": "main", - "revision": "08901d2223797aa25611c33aaf9d8a1049a653bb", - "url": "https://github.com/echasnovski/mini.clue/archive/08901d2223797aa25611c33aaf9d8a1049a653bb.tar.gz", - "hash": "026d647acwxr0wrf43lffmzw4x84jm6v5lipbqqpicqgqs8b4rfv" + "revision": "3ba5f3ff9afbf8c962bf69a483a890e414ba4697", + "url": "https://github.com/echasnovski/mini.clue/archive/3ba5f3ff9afbf8c962bf69a483a890e414ba4697.tar.gz", + "hash": "0j9l26kzvsc0p7xssav97r28cnqbr5av6k64nz83n3xx5xlndnp0" }, "mini-colors": { "type": "Git", @@ -901,9 +889,9 @@ "repo": "mini.colors" }, "branch": "main", - "revision": "d49e0764821d40adbf3f9e92091dfba0b0590378", - "url": "https://github.com/echasnovski/mini.colors/archive/d49e0764821d40adbf3f9e92091dfba0b0590378.tar.gz", - "hash": "1kn5012q6x1hfpyjqhssydln3v6b25gvvjw1zhw93m8x9km2j524" + "revision": "60306b701f574c3f7111a7ef67de208d0c121bbd", + "url": "https://github.com/echasnovski/mini.colors/archive/60306b701f574c3f7111a7ef67de208d0c121bbd.tar.gz", + "hash": "1avblmv2alra43dlq94czmnd4rsjwng66yjg7xcn4bs358z13kzw" }, "mini-comment": { "type": "Git", @@ -925,9 +913,9 @@ "repo": "mini.completion" }, "branch": "main", - "revision": "8f439dfb5432f9a78fb172ec7e03ee31f18551c4", - "url": "https://github.com/echasnovski/mini.completion/archive/8f439dfb5432f9a78fb172ec7e03ee31f18551c4.tar.gz", - "hash": "0y4zzp4najk2bydwzx72nbn18n32v6ar0dc2qgialszivy0nnhgh" + "revision": "dd457bfecf68fb67107f8668b46f745a219c045a", + "url": "https://github.com/echasnovski/mini.completion/archive/dd457bfecf68fb67107f8668b46f745a219c045a.tar.gz", + "hash": "1aharapzl1ll2fpyhl88n47ni12p0mndgpgi34jn57k3mhj0pcgy" }, "mini-diff": { "type": "Git", @@ -973,9 +961,9 @@ "repo": "mini.files" }, "branch": "main", - "revision": "0a396f5ca5516a07959ae2c00667e1a26c20f0ea", - "url": "https://github.com/echasnovski/mini.files/archive/0a396f5ca5516a07959ae2c00667e1a26c20f0ea.tar.gz", - "hash": "1axjd6a6c02jllhi1l8c9xfplipvz4g82hnxjbsgx4kzc9b60zdq" + "revision": "5900f50608771af55c6cc4f0817152e5e89de820", + "url": "https://github.com/echasnovski/mini.files/archive/5900f50608771af55c6cc4f0817152e5e89de820.tar.gz", + "hash": "1xq2b3xacn5haamw5vmwzmjqqgacrwmfp0yci69kmgpxa8ac3dq0" }, "mini-fuzzy": { "type": "Git", @@ -985,9 +973,9 @@ "repo": "mini.fuzzy" }, "branch": "main", - "revision": "fb42763285075e316fd4250739af9b8c442503de", - "url": "https://github.com/echasnovski/mini.fuzzy/archive/fb42763285075e316fd4250739af9b8c442503de.tar.gz", - "hash": "0hl5ygzlf73g70j7pdd1x4975368sqpynpja1zx7bc5jln698vr4" + "revision": "345ff7f65f50177c5567c43ec2c79973cb1278fe", + "url": "https://github.com/echasnovski/mini.fuzzy/archive/345ff7f65f50177c5567c43ec2c79973cb1278fe.tar.gz", + "hash": "18ylb8v7g21r87qkl86hng3zvw9c2q163z535m5m85dxnrxzlgcm" }, "mini-git": { "type": "Git", @@ -1021,9 +1009,9 @@ "repo": "mini.hues" }, "branch": "main", - "revision": "7a88e67dfb953820718106d8fc83d0f97c4d9173", - "url": "https://github.com/echasnovski/mini.hues/archive/7a88e67dfb953820718106d8fc83d0f97c4d9173.tar.gz", - "hash": "1kgjkx9bqycmm077i4jk0fnyl47fkmmd2vv0qf6lqsnnliivqxqw" + "revision": "6b039a95f8fbc002ea79086b8617a1022a5aea5b", + "url": "https://github.com/echasnovski/mini.hues/archive/6b039a95f8fbc002ea79086b8617a1022a5aea5b.tar.gz", + "hash": "1cyk4abrkd6y5hkkh05cywvhg8116aiv7p8yihfcjwgrcjwkwsan" }, "mini-icons": { "type": "Git", @@ -1093,9 +1081,9 @@ "repo": "mini.misc" }, "branch": "main", - "revision": "a477a9d5790f6d899d3055c87f2e771118f91180", - "url": "https://github.com/echasnovski/mini.misc/archive/a477a9d5790f6d899d3055c87f2e771118f91180.tar.gz", - "hash": "1fp60lhv93jiygc0hvchzdzjgs8scczp7kv9cm3kzzimcfa84ky6" + "revision": "bfd8ee265d9cb1f9fcba7a8ae0899fbf84e33d5e", + "url": "https://github.com/echasnovski/mini.misc/archive/bfd8ee265d9cb1f9fcba7a8ae0899fbf84e33d5e.tar.gz", + "hash": "1fd3ah7gsm8zyagl3mk09aqrj8s2m0gxrx225nwbvb8i2pi0g1c1" }, "mini-move": { "type": "Git", @@ -1117,9 +1105,9 @@ "repo": "mini.notify" }, "branch": "main", - "revision": "e71f08013db6812d9ce95c2624ae405a4267f4f3", - "url": "https://github.com/echasnovski/mini.notify/archive/e71f08013db6812d9ce95c2624ae405a4267f4f3.tar.gz", - "hash": "0fmy3d62283j2cwlxk97fyylad2zkd5j2r7pg7fb3cq8k1021d0s" + "revision": "f8c84f89c8d981a979f915bd64a2f97bbad285d4", + "url": "https://github.com/echasnovski/mini.notify/archive/f8c84f89c8d981a979f915bd64a2f97bbad285d4.tar.gz", + "hash": "0raw9chqjgwxqdiqqk9xjxgkjf6rg14c7968pvfvfh9jkjdasxg8" }, "mini-operators": { "type": "Git", @@ -1129,9 +1117,9 @@ "repo": "mini.operators" }, "branch": "main", - "revision": "02cfac95919b945c19221f0fcebe883c6dce04f6", - "url": "https://github.com/echasnovski/mini.operators/archive/02cfac95919b945c19221f0fcebe883c6dce04f6.tar.gz", - "hash": "1b51b3d1qkbzh68yadx3fcx9dgk405cb2ghln999fl5czvc3crmd" + "revision": "81e5059268154f5a8b594c95748968febdd539e3", + "url": "https://github.com/echasnovski/mini.operators/archive/81e5059268154f5a8b594c95748968febdd539e3.tar.gz", + "hash": "066mh426wr9pb137d8b65cl5hkcgmal9mr8y94r3xya7649207mh" }, "mini-pairs": { "type": "Git", @@ -1153,9 +1141,9 @@ "repo": "mini.pick" }, "branch": "main", - "revision": "12ea14f8e285d1bcc909116685fdbb129a89d546", - "url": "https://github.com/echasnovski/mini.pick/archive/12ea14f8e285d1bcc909116685fdbb129a89d546.tar.gz", - "hash": "1ssa7ym6zxhazx551bjsnfdmvm1553kj6amvcczw9jrqbf4ynjqy" + "revision": "bdd189e6b7741177db53875cbc6071f1c8dc6fbd", + "url": "https://github.com/echasnovski/mini.pick/archive/bdd189e6b7741177db53875cbc6071f1c8dc6fbd.tar.gz", + "hash": "1cxifi4vlfknk4i2grdrx5nbzw9jzj6s0ybbmwrcvs1cj9dhzbzh" }, "mini-sessions": { "type": "Git", @@ -1201,9 +1189,9 @@ "repo": "mini.starter" }, "branch": "main", - "revision": "736c5177bd90cc852c05d903f662f0fc395a4b4b", - "url": "https://github.com/echasnovski/mini.starter/archive/736c5177bd90cc852c05d903f662f0fc395a4b4b.tar.gz", - "hash": "0w2awkcrabbsybvv2hlzjlqgcr53480pg5p3fhaaparrhd90c7na" + "revision": "4f46dc11e1dd9f62310794121405853be8d6b13f", + "url": "https://github.com/echasnovski/mini.starter/archive/4f46dc11e1dd9f62310794121405853be8d6b13f.tar.gz", + "hash": "1iic2f3d93fjiqrk0q1iq3sb6ycbw4vag4c01wk5wj1jc58k3iz5" }, "mini-statusline": { "type": "Git", @@ -1249,9 +1237,9 @@ "repo": "mini.test" }, "branch": "main", - "revision": "16a909c3ce39d9af9ec4dacca16205d36f85d823", - "url": "https://github.com/echasnovski/mini.test/archive/16a909c3ce39d9af9ec4dacca16205d36f85d823.tar.gz", - "hash": "1qf8ay763d011rvy9qwpv8q3mlxjlymvc4gx3bjfv0n56k5dzpg0" + "revision": "82ae4d87a23faa27e7e4119d4a5cf5897cbf1b70", + "url": "https://github.com/echasnovski/mini.test/archive/82ae4d87a23faa27e7e4119d4a5cf5897cbf1b70.tar.gz", + "hash": "0n3n7j8lkxp6mc0wf80ysnwxfw29zjqyfs3ghjl518xbsvjbgcz6" }, "mini-trailspace": { "type": "Git", @@ -1273,9 +1261,9 @@ "repo": "mini.visits" }, "branch": "main", - "revision": "46e7a4074032d0340308c3379bc3650626c85da8", - "url": "https://github.com/echasnovski/mini.visits/archive/46e7a4074032d0340308c3379bc3650626c85da8.tar.gz", - "hash": "1776i3xn9dpccjjamy5ys5acc3nxd3zph4a77sbw2dipfd8zpasi" + "revision": "8a2b551a86c556c8a26ce8d6402d03ded1cc7aec", + "url": "https://github.com/echasnovski/mini.visits/archive/8a2b551a86c556c8a26ce8d6402d03ded1cc7aec.tar.gz", + "hash": "1jwpvxlsr8wd5wakd22ah7h127hsxj6ds7jp5m99w2gnlymhsq41" }, "minimap-vim": { "type": "Git", @@ -1336,9 +1324,9 @@ "repo": "neo-tree.nvim" }, "branch": "main", - "revision": "d9544c74ec43cca0564fdc334c116fbe0be8a807", - "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/d9544c74ec43cca0564fdc334c116fbe0be8a807.tar.gz", - "hash": "0wiw4aipg3qmzw6k9vrljh4cg09kyqd28s6xpv2zhsg05mm38nhb" + "revision": "c2f12ba9dba917d53dba13121c15d7903e28c24d", + "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/c2f12ba9dba917d53dba13121c15d7903e28c24d.tar.gz", + "hash": "07hh7gjjp4zdhwdhrrd3mvndd6cqf0lydhsb5hn0aqagm65z2jm3" }, "neocord": { "type": "Git", @@ -1348,9 +1336,9 @@ "repo": "neocord" }, "branch": "main", - "revision": "41bacd44e9d36f5e36e0271672ac2c02f6fa355a", - "url": "https://github.com/IogaMaster/neocord/archive/41bacd44e9d36f5e36e0271672ac2c02f6fa355a.tar.gz", - "hash": "1n998zsv0bikscwpr75qq11xh559xzx6d7rs7fc21jj1rivkk4aw" + "revision": "4d55d8dab2d5f2f272192add7a2c21982039c699", + "url": "https://github.com/IogaMaster/neocord/archive/4d55d8dab2d5f2f272192add7a2c21982039c699.tar.gz", + "hash": "18d84bd5242a3khpsk0iya3i75bc65mc2xc9kjldpvb827m6myl3" }, "neorg": { "type": "Git", @@ -1360,9 +1348,9 @@ "repo": "neorg" }, "branch": "main", - "revision": "6f0b4eefa591fbc4c9344f110b0c0bac5b49078c", - "url": "https://github.com/nvim-neorg/neorg/archive/6f0b4eefa591fbc4c9344f110b0c0bac5b49078c.tar.gz", - "hash": "1x8h5hxzg06g1d849bna6rs4jzjf248g59v87zvlc4scmp9pzjga" + "revision": "b47b4d3138beef51ffbf59bcbd7d149150b4bd2e", + "url": "https://github.com/nvim-neorg/neorg/archive/b47b4d3138beef51ffbf59bcbd7d149150b4bd2e.tar.gz", + "hash": "1x9sk24i8gyxssc8qz99x3d5nh3m2pi3srmv1f3fbgpffcgvl1yv" }, "neorg-telescope": { "type": "Git", @@ -1384,9 +1372,9 @@ "repo": "neovim-session-manager" }, "branch": "master", - "revision": "3409dc920d40bec4c901c0a122a80bee03d6d1e1", - "url": "https://github.com/Shatur/neovim-session-manager/archive/3409dc920d40bec4c901c0a122a80bee03d6d1e1.tar.gz", - "hash": "1f7farfkr5ldpa7y7hz9sh8dp7538x1xvwr9n1zrra1szf7s8rlk" + "revision": "270e235b014f0c37bf362eb1e8913d66bba33a2e", + "url": "https://github.com/Shatur/neovim-session-manager/archive/270e235b014f0c37bf362eb1e8913d66bba33a2e.tar.gz", + "hash": "16455f05wj5qjdvspj0hjwa77hsdhj3443h57lck3px33bz7n86h" }, "new-file-template-nvim": { "type": "Git", @@ -1456,9 +1444,9 @@ "repo": "nui.nvim" }, "branch": "main", - "revision": "8d3bce9764e627b62b07424e0df77f680d47ffdb", - "url": "https://github.com/MunifTanjim/nui.nvim/archive/8d3bce9764e627b62b07424e0df77f680d47ffdb.tar.gz", - "hash": "0ia8q5d4xcss45vw6jlaanyr0migy03cjzq9g0kipfyqxkcxi105" + "revision": "53e907ffe5eedebdca1cd503b00aa8692068ca46", + "url": "https://github.com/MunifTanjim/nui.nvim/archive/53e907ffe5eedebdca1cd503b00aa8692068ca46.tar.gz", + "hash": "1m4vlf9qcs01a8qrq3salcz966sp8cpf01gbrg8dbf255vzc8kp9" }, "nvim-autopairs": { "type": "Git", @@ -1492,9 +1480,9 @@ "repo": "nvim-cmp" }, "branch": "main", - "revision": "1e1900b0769324a9675ef85b38f99cca29e203b3", - "url": "https://github.com/hrsh7th/nvim-cmp/archive/1e1900b0769324a9675ef85b38f99cca29e203b3.tar.gz", - "hash": "1yqg4gnzmlm9h5rcmzv7msjmqna0ffn7gllf5knfkps5ns0ynpyf" + "revision": "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3", + "url": "https://github.com/hrsh7th/nvim-cmp/archive/5a11682453ac6b13dbf32cd403da4ee9c07ef1c3.tar.gz", + "hash": "06n3barrl80i0y43q250l49q07f7hry9w5ggwlimv7jxvilih43l" }, "nvim-colorizer-lua": { "type": "Git", @@ -1504,9 +1492,9 @@ "repo": "nvim-colorizer.lua" }, "branch": "master", - "revision": "517df88cf2afb36652830df2c655df2da416a0ae", - "url": "https://github.com/NvChad/nvim-colorizer.lua/archive/517df88cf2afb36652830df2c655df2da416a0ae.tar.gz", - "hash": "0gaxkq30wvxq3d8x6l6r10vdxyizfi5g55xnvzw69lfyl61d9qy8" + "revision": "943be69156b94fbc96064f4913d653f0c7fb299f", + "url": "https://github.com/NvChad/nvim-colorizer.lua/archive/943be69156b94fbc96064f4913d653f0c7fb299f.tar.gz", + "hash": "0fb973i0h0dq02zr7c9ivm9vk64w6h3px9db2gqb6rzrm2inf0m1" }, "nvim-cursorline": { "type": "Git", @@ -1528,9 +1516,9 @@ "repo": "nvim-dap" }, "branch": "master", - "revision": "a720d4966f758ab22e8ec28812b6df90a53e0f02", - "url": "https://github.com/mfussenegger/nvim-dap/archive/a720d4966f758ab22e8ec28812b6df90a53e0f02.tar.gz", - "hash": "0b979dhl5jr3kx9j5zih39jbrv22d554ws6y8g1cgsm2i3412s4h" + "revision": "6e0e8ab4d8ed520076971465a4388dfe54a91d83", + "url": "https://github.com/mfussenegger/nvim-dap/archive/6e0e8ab4d8ed520076971465a4388dfe54a91d83.tar.gz", + "hash": "09skngq8caazmggdmqs7490i8icg6fxzwf1nxkc0hkg6ja82b0nb" }, "nvim-dap-go": { "type": "Git", @@ -1600,9 +1588,9 @@ "repo": "nvim-lspconfig" }, "branch": "master", - "revision": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0", - "url": "https://github.com/neovim/nvim-lspconfig/archive/8a1529e46eef5efc86c34c8d9bdd313abc2ecba0.tar.gz", - "hash": "0l9mns71hh0jssxblr1q286z8hmxwbgyq1nw6scki9ffn23jwnz0" + "revision": "9e932edb0af4e20880685ddb96a231669fbe8091", + "url": "https://github.com/neovim/nvim-lspconfig/archive/9e932edb0af4e20880685ddb96a231669fbe8091.tar.gz", + "hash": "08hwg32a9yj78w4mh2idcpaig9qbx48ak8aqkp88z4wm65299v4r" }, "nvim-metals": { "type": "Git", @@ -1612,9 +1600,9 @@ "repo": "nvim-metals" }, "branch": "main", - "revision": "fe6125f633c1b2f68d468a2041e81e2e5e8933d4", - "url": "https://github.com/scalameta/nvim-metals/archive/fe6125f633c1b2f68d468a2041e81e2e5e8933d4.tar.gz", - "hash": "1xpav9ykwk7kz61c6y33kyjxf0nf47risdj0q9gf5rnl88cln4by" + "revision": "5d27f4918ea954772725d6741f84a71cfaff932a", + "url": "https://github.com/scalameta/nvim-metals/archive/5d27f4918ea954772725d6741f84a71cfaff932a.tar.gz", + "hash": "17769ccpkkb53bikhfp2m809xs6p0mszb8d1hnssp1l0s3ip2j1f" }, "nvim-navbuddy": { "type": "Git", @@ -1696,9 +1684,9 @@ "repo": "nvim-surround" }, "branch": "main", - "revision": "6c54643ef42016b744888b06d2381abd23f9b7ea", - "url": "https://github.com/kylechui/nvim-surround/archive/6c54643ef42016b744888b06d2381abd23f9b7ea.tar.gz", - "hash": "1c5agqfffmjxc73bv8d4hmrnzx62ikqpv7pii19v5alfdcnh5j48" + "revision": "ae298105122c87bbe0a36b1ad20b06d417c0433e", + "url": "https://github.com/kylechui/nvim-surround/archive/ae298105122c87bbe0a36b1ad20b06d417c0433e.tar.gz", + "hash": "1xrkg4is4spjwkzr6l0qmn3axlrm52d2wm69g2db83jww756pz1h" }, "nvim-tree-lua": { "type": "Git", @@ -1708,9 +1696,9 @@ "repo": "nvim-tree.lua" }, "branch": "master", - "revision": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4", - "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/c09ff35de503a41fa62465c6b4ae72d96e7a7ce4.tar.gz", - "hash": "0bnc2fc9ipz9yp917l61vvcaqmbdg5fhqxrp7jfjxj5qmvadhai9" + "revision": "6709463b2d18e77f7a946027917aa00d4aaed6f4", + "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/6709463b2d18e77f7a946027917aa00d4aaed6f4.tar.gz", + "hash": "1m26fvvsj4lxlwdinvnz8nz968n6x59w8n7zj7vsqm5i8yi84fr6" }, "nvim-treesitter-context": { "type": "Git", @@ -1720,9 +1708,9 @@ "repo": "nvim-treesitter-context" }, "branch": "master", - "revision": "572e534c9f881bb9bf9f388e4c87f360446c72d4", - "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/572e534c9f881bb9bf9f388e4c87f360446c72d4.tar.gz", - "hash": "0bg3x75j8mwvpdhwd945lxbwmhw2j1qi135zn0yli78c9jn8g0ay" + "revision": "198720b4016af04c9590f375d714d5bf8afecc1a", + "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/198720b4016af04c9590f375d714d5bf8afecc1a.tar.gz", + "hash": "13msw9i509ncysbgkqbl2wr1c23iw3f4mxkw30sc1yk9x9nx49ri" }, "nvim-ts-autotag": { "type": "Git", @@ -1756,9 +1744,9 @@ "repo": "nvim-web-devicons" }, "branch": "master", - "revision": "d0cafff5c4347a604a07edf7bb9a91fda7eb577e", - "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/d0cafff5c4347a604a07edf7bb9a91fda7eb577e.tar.gz", - "hash": "1j5ccksn2lkd1f1fvhhjs2amhq17wxmgcqv6jk05jpdbngw2mv98" + "revision": "1020869742ecb191f260818234517f4a1515cfe8", + "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/1020869742ecb191f260818234517f4a1515cfe8.tar.gz", + "hash": "024c8c5d6lpakgf9jxzrbkxk3r8haxa7qhmp8i4zsg35ycg6vqaq" }, "obsidian-nvim": { "type": "Git", @@ -1804,9 +1792,9 @@ "repo": "orgmode" }, "branch": "master", - "revision": "abf8890a9b0612c51d738268c759c4331bc2109c", - "url": "https://github.com/nvim-orgmode/orgmode/archive/abf8890a9b0612c51d738268c759c4331bc2109c.tar.gz", - "hash": "0j4f2y47s5ymii1w0r9gk39z4vks5fc9cy0rvj1vzml4vf4wijsi" + "revision": "c0cdcbdced83ceb9b9f058b402a8bfc5f64ab3a6", + "url": "https://github.com/nvim-orgmode/orgmode/archive/c0cdcbdced83ceb9b9f058b402a8bfc5f64ab3a6.tar.gz", + "hash": "0qwv2pg4s9spmy5wvkvflhcb0a2drlygch6hmjanj3g2kkn3ph5f" }, "otter-nvim": { "type": "Git", @@ -1864,9 +1852,9 @@ "repo": "precognition.nvim" }, "branch": "main", - "revision": "4223fb903cbafc3bd8a87a314dac375bbd1c01ce", - "url": "https://github.com/tris203/precognition.nvim/archive/4223fb903cbafc3bd8a87a314dac375bbd1c01ce.tar.gz", - "hash": "11ng6p0xmrjky5xr9jdkrrav7is9r090qhs2fsnbg16124bgb0g5" + "revision": "24f2cc51dccecec4cf3de04bfbd14f5b9e79df0b", + "url": "https://github.com/tris203/precognition.nvim/archive/24f2cc51dccecec4cf3de04bfbd14f5b9e79df0b.tar.gz", + "hash": "0x7i2cim9jwc90v11wm61qbbq54m5581hsvj5jaash3gb5piacvw" }, "project-nvim": { "type": "Git", @@ -1900,9 +1888,9 @@ "repo": "rainbow-delimiters.nvim" }, "branch": "master", - "revision": "f1e5490e87478cf0b528250ebb51552f3d08436a", - "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/f1e5490e87478cf0b528250ebb51552f3d08436a.tar.gz", - "hash": "02265awjpkd8v6s22wx8qrk2wxq8b7c7h5lr9n7pi6d4lwyrkrxf" + "revision": "011d98eaa3a73b5a51d82ce5bc6b1397dde95562", + "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/011d98eaa3a73b5a51d82ce5bc6b1397dde95562.tar.gz", + "hash": "0b2hr4afdp9b30ckh772bg5wbscgdjvssn533988and27jassfaf" }, "registers-nvim": { "type": "Git", @@ -1924,9 +1912,9 @@ "repo": "render-markdown.nvim" }, "branch": "main", - "revision": "08e1fa4e281e48ee4aa892428de9fb91e66edca6", - "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/08e1fa4e281e48ee4aa892428de9fb91e66edca6.tar.gz", - "hash": "1kiwa88l2262ycfj6z70hdriml0y2wnji3l9w27jbky9zxwhazrs" + "revision": "57fa691b9e374c6539cc0340062dac8f42d4bd8b", + "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/57fa691b9e374c6539cc0340062dac8f42d4bd8b.tar.gz", + "hash": "1kfzj1sj1ljy3ihp7ic3n4cs82im61yh6xvr68m39jg5a1zmy9iv" }, "rose-pine": { "type": "Git", @@ -1936,9 +1924,9 @@ "repo": "neovim" }, "branch": "main", - "revision": "7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3", - "url": "https://github.com/rose-pine/neovim/archive/7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3.tar.gz", - "hash": "0iy9is76bhgb17v0l7mr95mkhd9b4ah917v9shx74jp1xsgc481q" + "revision": "3fe41d3959110139e03bcbc6c0c648be83d06b33", + "url": "https://github.com/rose-pine/neovim/archive/3fe41d3959110139e03bcbc6c0c648be83d06b33.tar.gz", + "hash": "105bdjw4phv5229yp0zyrkvf8v6l38rgcp83qy7ap9vlna57fk46" }, "rtp-nvim": { "type": "Git", @@ -1972,9 +1960,9 @@ "repo": "rustaceanvim" }, "branch": "master", - "revision": "c7cc0e00ec53cafaa38e258cba4a6507c180289b", - "url": "https://github.com/mrcjkb/rustaceanvim/archive/c7cc0e00ec53cafaa38e258cba4a6507c180289b.tar.gz", - "hash": "1514w2x5vpn790rz8wkah0chr7yz9sm5whaprnm1qc26fz4jwc17" + "revision": "2feffcf9aa0e160221caafd544c4dedf30414522", + "url": "https://github.com/mrcjkb/rustaceanvim/archive/2feffcf9aa0e160221caafd544c4dedf30414522.tar.gz", + "hash": "1x3fw90k78s3kx3hrhgk1zdv9wd2kbkhmip06q5s61p4zw6bns5r" }, "smartcolumn-nvim": { "type": "Git", @@ -1989,19 +1977,16 @@ "hash": "0k1xnyvblshn4fhbxgl0i34j22n55xlwr09sdmb23l57br5rb07q" }, "snacks-nvim": { - "type": "GitRelease", + "type": "Git", "repository": { "type": "GitHub", "owner": "folke", "repo": "snacks.nvim" }, - "pre_releases": false, - "version_upper_bound": null, - "release_prefix": null, - "version": "v2.22.0", - "revision": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed", - "url": "https://api.github.com/repos/folke/snacks.nvim/tarball/v2.22.0", - "hash": "1hbm4fnw51qdp0nz83fcxbvnxjq2k57a37w6dp0wz6wkcx7cwxw9" + "branch": "main", + "revision": "bc0630e43be5699bb94dadc302c0d21615421d93", + "url": "https://github.com/folke/snacks.nvim/archive/bc0630e43be5699bb94dadc302c0d21615421d93.tar.gz", + "hash": "0a5nw7xa33shag1h12gf930g3vcixbwk8dxv0ji4980ycskh238v" }, "sqls-nvim": { "type": "Git", @@ -2071,9 +2056,9 @@ "repo": "toggleterm.nvim" }, "branch": "main", - "revision": "9a88eae817ef395952e08650b3283726786fb5fb", - "url": "https://github.com/akinsho/toggleterm.nvim/archive/9a88eae817ef395952e08650b3283726786fb5fb.tar.gz", - "hash": "17plyvajwdhpiadsd80vph75qll8pv9571c2wnw35ngmw9gmnavz" + "revision": "e76134e682c1a866e3dfcdaeb691eb7b01068668", + "url": "https://github.com/akinsho/toggleterm.nvim/archive/e76134e682c1a866e3dfcdaeb691eb7b01068668.tar.gz", + "hash": "1jyg3nv54kssz2a4blpwhd718msf95zqz6sr2sqblc7b35gm73g1" }, "tokyonight": { "type": "Git", @@ -2119,9 +2104,9 @@ "repo": "typst-preview.nvim" }, "branch": "master", - "revision": "ddcc71126f910ec83037622bc8d506f91a290ade", - "url": "https://github.com/chomosuke/typst-preview.nvim/archive/ddcc71126f910ec83037622bc8d506f91a290ade.tar.gz", - "hash": "1iqcbpgk87gcgnqd5dv8n4h4hbildp5hbjhnlwjx5zlzcg5qv2my" + "revision": "df393b47c5bc35abe4d60bb479afd0c15802fda8", + "url": "https://github.com/chomosuke/typst-preview.nvim/archive/df393b47c5bc35abe4d60bb479afd0c15802fda8.tar.gz", + "hash": "1k4ir8ss25fm58xfy0588wjim8dxl6vjdl4va2br3knx6jcy2jd8" }, "vim-dirtytalk": { "type": "Git", @@ -2215,9 +2200,9 @@ "repo": "yanky.nvim" }, "branch": "main", - "revision": "80d9385dbebe7049fd1961d7909b835a58ce9dcc", - "url": "https://github.com/gbprod/yanky.nvim/archive/80d9385dbebe7049fd1961d7909b835a58ce9dcc.tar.gz", - "hash": "1lg9nxc01shkazqk5g3j0iskiqbwr9sxv07sqrwkwlh36jn59rcp" + "revision": "9543d4c6c537720419bccb3338c4ddd5bb6fbd44", + "url": "https://github.com/gbprod/yanky.nvim/archive/9543d4c6c537720419bccb3338c4ddd5bb6fbd44.tar.gz", + "hash": "017v0f082pfd79q2j1naapybsmismflwdscn58mhbqh7s7mq8qk8" } }, "version": 3