diff --git a/configuration.nix b/configuration.nix index 48bcc3e6..6f82985b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -23,7 +23,7 @@ isMaximal: { lightbulb.enable = true; lspsaga.enable = false; trouble.enable = true; - lspSignature.enable = !isMaximal; # conflicts with blink in maximal + lspSignature.enable = true; otter-nvim.enable = isMaximal; nvim-docs-view.enable = isMaximal; }; @@ -125,15 +125,7 @@ isMaximal: { autopairs.nvim-autopairs.enable = true; - # nvf provides various autocomplete options. The tried and tested nvim-cmp - # is enabled in default package, because it does not trigger a build. We - # enable blink-cmp in maximal because it needs to build its rust fuzzy - # matcher library. - autocomplete = { - nvim-cmp.enable = !isMaximal; - blink-cmp.enable = isMaximal; - }; - + autocomplete.nvim-cmp.enable = true; snippets.luasnip.enable = true; filetree = { @@ -151,7 +143,6 @@ isMaximal: { binds = { whichKey.enable = true; cheatsheet.enable = true; - hardtime-nvim.enable = isMaximal; }; telescope.enable = true; diff --git a/docs/manual/configuring/custom-plugins.md b/docs/manual/configuring/custom-plugins.md index c621e03c..79a691e2 100644 --- a/docs/manual/configuring/custom-plugins.md +++ b/docs/manual/configuring/custom-plugins.md @@ -15,7 +15,7 @@ plugin to the runtime, you need to add it to the [](#opt-vim.startPlugins) list in your configuration. Adding a plugin to `startPlugins` will not allow you to configure the plugin -that you have added, but **nvf** provides multiple ways of configuring any custom +that you have added, but **nvf** provides multiple way of configuring any custom plugins that you might have added to your configuration. ```{=include=} sections diff --git a/docs/manual/installation/custom-configuration.md b/docs/manual/installation/custom-configuration.md index 52f81573..940f35a3 100644 --- a/docs/manual/installation/custom-configuration.md +++ b/docs/manual/installation/custom-configuration.md @@ -39,7 +39,7 @@ An example flake that exposes your custom Neovim configuration might look like theme.enable = true; # Enable Treesitter - treesitter.enable = true; + tree-sitter.enable = true; # Other options will go here. Refer to the config # reference in Appendix B of the nvf manual. diff --git a/docs/release-notes/rl-0.5.md b/docs/release-notes/rl-0.5.md index 910c93d5..0ca02164 100644 --- a/docs/release-notes/rl-0.5.md +++ b/docs/release-notes/rl-0.5.md @@ -91,7 +91,7 @@ Release notes for release 0.5 - Updated indent-blankine.nvim to v3 - this comes with a few option changes, which will be migrated with `renamedOptionModule` -[poz](https://poz.pet): +[jacekpoz](https://jacekpoz.pl): - Fixed scrollOffset not being used diff --git a/docs/release-notes/rl-0.6.md b/docs/release-notes/rl-0.6.md index 309d6b16..1807a3e9 100644 --- a/docs/release-notes/rl-0.6.md +++ b/docs/release-notes/rl-0.6.md @@ -69,7 +69,7 @@ vim.api.nvim_set_keymap('n', 'a', ':lua camelToSnake()', { noremap = - Added rose-pine theme. -[poz](https://poz.pet): +[jacekpoz](https://jacekpoz.pl): - Added `vim.autocomplete.alwaysComplete`. Allows users to have the autocomplete window popup only when manually activated. diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md index ed9d2d81..d62e3619 100644 --- a/docs/release-notes/rl-0.7.md +++ b/docs/release-notes/rl-0.7.md @@ -162,7 +162,7 @@ The changes are, in no particular order: - Add [lz.n] support and lazy-load some builtin plugins. - Add simpler helper functions for making keymaps -[poz](https://poz.pet): +[jacekpoz](https://jacekpoz.pl): [ocaml-lsp]: https://github.com/ocaml/ocaml-lsp [new-file-template.nvim]: https://github.com/otavioschwanck/new-file-template.nvim diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 8efc447b..c28a115e 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -107,8 +107,6 @@ - Add `LazyFile` user event. - Migrate language modules from none-ls to conform/nvim-lint - Add tsx support in conform and lint -- Moved code setting `additionalRuntimePaths` and `enableLuaLoader` out of - `luaConfigPre`'s default to prevent being overridden [diniamo](https://github.com/diniamo): @@ -291,11 +289,7 @@ [rice-cracker-dev](https://github.com/rice-cracker-dev): - `eslint_d` now checks for configuration files to load. -- Fix an error where `eslint_d` fails to load. -- Add required files support for linters under - `vim.diagnostics.nvim-lint.linters.*.required_files`. -- Add global function `nvf_lint` under - `vim.diagnostics.nvim-lint.lint_function`. +- Fixed an error where `eslint_d` fails to load. [Sc3l3t0n](https://github.com/Sc3l3t0n): @@ -306,12 +300,12 @@ - Add lint (luacheck) and formatting (stylua) support for Lua. - Add lint (markdownlint-cli2) support for Markdown. - Add catppuccin integration for Bufferline, Lspsaga. -- Add `neo-tree`, `snacks.explorer` integrations to `bufferline`. +- Add neo-tree integration for Bufferline. - Add more applicable filetypes to illuminate denylist. - Disable mini.indentscope for applicable filetypes. - Fix fzf-lua having a hard dependency on fzf. - Enable inlay hints support - `config.vim.lsp.inlayHints`. -- Add `neo-tree`, `snacks.picker` extensions to `lualine`. +- Add `neo-tree` extension to `lualine`. [tebuevd](https://github.com/tebuevd): @@ -335,34 +329,12 @@ - Fix namespace of python-lsp-server by changing it to python3Packages -[Noah765](https://github.com/Noah765): - -[vim-sleuth]: https://github.com/tpope/vim-sleuth - -- Add missing `flutter-tools.nvim` dependency `plenary.nvim`. -- Add necessary dependency of `flutter-tools.nvim` on lsp. -- Add the `vim.languages.dart.flutter-tools.flutterPackage` option. -- Fix the type of the `highlight` color options. -- Add [vim-sleuth] plugin under `vim.utility.sleuth`. - -[howird](https://github.com/howird): - -- Change python dap adapter name from `python` to commonly expected `debugpy`. - -[aionoid](https://github.com/aionoid): - -- Fix [render-markdown.nvim] file_types option type to list, to accept merging. - -[poz](https://poz.pet): - -- Fix gitsigns null-ls issue. - -[Haskex](https://github.com/haskex): - -[Hardtime.nvim]: https://github.com/m4xshen/hardtime.nvim - -- Add Plugin [Hardtime.nvim] under `vim.binds.hardtime-nvim` with `enable` and `setupOpts` options [dmitriiStepanidenko](https://github.com/dmitriiStepanidenko): - Add graphql LSP and formatter suport via prettier. + +[Noah765](https://github.com/Noah765): + +- Add missing `flutter-tools.nvim` dependency `plenary.nvim`. + diff --git a/flake.lock b/flake.lock index 307d3d7a..540715e9 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ }, "mnw": { "locked": { - "lastModified": 1746230955, - "narHash": "sha256-X32sM3RQ3X2y6PzfNnX3rhUAlhuITdDOdfSrwZXjlsQ=", + "lastModified": 1744592022, + "narHash": "sha256-QuWrCRiF3CUM99sgj3gXbIzB1IAVWS5IEfFHadbMA2g=", "owner": "Gerg-L", "repo": "mnw", - "rev": "2a1678ba8e4807bd855dd0da94ea2bef5bca733d", + "rev": "cf9e19413b6c2d995b55565cd99facf9c751b653", "type": "github" }, "original": { @@ -77,11 +77,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746152631, - "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", + "lastModified": 1744473229, + "narHash": "sha256-rGXvIsD/Hn+bJRFb7hqSx7UUZUIlxXs0fM6ix5+iT5w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", + "rev": "52d0eded529af34e91df6b2a2bc32eb636637cd2", "type": "github" }, "original": { diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix index 60dce9de..435cb290 100644 --- a/flake/legacyPackages/blink-cmp.nix +++ b/flake/legacyPackages/blink-cmp.nix @@ -14,7 +14,7 @@ env.RUSTC_BOOTSTRAP = true; useFetchCargoVendor = true; - cargoHash = "sha256-IDoDugtNWQovfSstbVMkKHLBXKa06lxRWmywu4zyS3M="; + cargoHash = "sha256-MWElqh7ENJ6CbLOnvz0DsP5YYu+e+y12GSUOfW1IKGU="; nativeBuildInputs = [gitMinimal]; }; diff --git a/lib/languages.nix b/lib/languages.nix index c4074144..a202ff14 100644 --- a/lib/languages.nix +++ b/lib/languages.nix @@ -1,11 +1,10 @@ +# From home-manager: https://github.com/nix-community/home-manager/blob/master/modules/lib/booleans.nix {lib}: let inherit (builtins) isString getAttr; inherit (lib.options) mkOption; - inherit (lib.types) listOf bool str submodule attrsOf anything either nullOr; + inherit (lib.types) bool; inherit (lib.nvim.attrsets) mapListToAttrs; - inherit (lib.nvim.types) luaInline; in { - # TODO: remove diagnosticsToLua = { lang, config, @@ -33,48 +32,4 @@ in { type = bool; description = "Turn on ${desc} for enabled languages by default"; }; - - lspOptions = submodule { - freeformType = attrsOf anything; - options = { - enable = mkOption { - type = bool; - default = true; - description = "Whether to enable this LSP server."; - }; - - capabilities = mkOption { - type = nullOr (either luaInline (attrsOf anything)); - default = null; - description = "LSP capabilitiess to pass to lspconfig"; - }; - - on_attach = mkOption { - type = nullOr luaInline; - default = null; - description = "Function to execute when an LSP server attaches to a buffer"; - }; - - filetypes = mkOption { - type = nullOr (listOf str); - default = null; - description = "Filetypes to auto-attach LSP in"; - }; - - cmd = mkOption { - type = nullOr (listOf str); - default = null; - description = "Command used to start the LSP server"; - }; - - root_markers = mkOption { - type = nullOr (listOf str); - default = null; - description = '' - "root markers" used to determine the root directory of the workspace, and - the filetypes associated with this LSP server. - ''; - }; - }; - }; } diff --git a/modules/neovim/init/autocmds.nix b/modules/neovim/init/autocmds.nix index 81580e6b..5da7bc55 100644 --- a/modules/neovim/init/autocmds.nix +++ b/modules/neovim/init/autocmds.nix @@ -17,7 +17,7 @@ mkEnableOption "" // { default = true; - description = "Whether to enable this autocommand."; + description = "Whether to enable this autocommand"; }; event = mkOption { @@ -31,7 +31,7 @@ type = nullOr (listOf str); default = null; example = ["*.lua" "*.vim"]; - description = "The file pattern(s) that determine when the autocommand applies."; + description = "The file pattern(s) that determine when the autocommand applies)."; }; callback = mkOption { @@ -44,16 +44,13 @@ end '''' ''; - description = "Lua function to be called when the event(s) are triggered."; + description = "The file pattern(s) that determine when the autocommand applies."; }; command = mkOption { type = nullOr str; default = null; - description = '' - Vim command to be executed when the event(s) are triggered. - Cannot be defined if the `callback` option is already defined. - ''; + description = "Vim command string instead of a Lua function."; }; group = mkOption { @@ -73,7 +70,7 @@ once = mkOption { type = bool; default = false; - description = "Whether to run the autocommand only once."; + description = "Whether autocommand run only once."; }; nested = mkOption { @@ -90,7 +87,7 @@ mkEnableOption "" // { default = true; - description = "Whether to enable this autocommand group."; + description = "Whether to enable this autogroup"; }; name = mkOption { @@ -121,8 +118,8 @@ in { autocommands together. Groups allow multiple autocommands to be cleared or redefined collectively, preventing duplicate definitions. - Each autogroup consists of a name and a boolean indicating whether to clear - existing autocommands. + Each autogroup consists of a name, a boolean indicating whether to clear + existing autocommands, and a list of associated autocommands. ''; }; @@ -132,8 +129,8 @@ in { description = '' A list of Neovim autocommands to be registered. - Each entry defines an autocommand, specifying events, patterns, a callback or Vim - command, an optional group, a description, and execution settings. + Each entry defines an autocommand, specifying events, patterns, optional + callbacks, commands, groups, and execution settings. ''; }; }; diff --git a/modules/neovim/init/default.nix b/modules/neovim/init/default.nix index 7db6f2ef..0e7a4c6b 100644 --- a/modules/neovim/init/default.nix +++ b/modules/neovim/init/default.nix @@ -5,7 +5,6 @@ ./debug.nix ./diagnostics.nix ./highlight.nix - ./lsp.nix ./spellcheck.nix ]; } diff --git a/modules/neovim/init/highlight.nix b/modules/neovim/init/highlight.nix index 9c6b7214..7e992fd1 100644 --- a/modules/neovim/init/highlight.nix +++ b/modules/neovim/init/highlight.nix @@ -5,14 +5,15 @@ }: let inherit (lib.options) mkOption; inherit (lib.types) nullOr attrsOf listOf submodule bool ints str enum; - inherit (lib.strings) concatLines; + inherit (lib.strings) hasPrefix concatLines; inherit (lib.attrsets) mapAttrsToList; inherit (lib.nvim.dag) entryBetween; inherit (lib.nvim.lua) toLuaObject; + inherit (lib.nvim.types) hexColor; mkColorOption = target: mkOption { - type = nullOr str; + type = nullOr hexColor; default = null; example = "#ebdbb2"; description = '' diff --git a/modules/neovim/init/lsp.nix b/modules/neovim/init/lsp.nix deleted file mode 100644 index faef0f93..00000000 --- a/modules/neovim/init/lsp.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (builtins) filter; - inherit (lib.modules) mkIf mkMerge mkDefault; - inherit (lib.options) mkOption; - inherit (lib.types) attrsOf; - inherit (lib.strings) concatLines; - inherit (lib.attrsets) mapAttrsToList attrNames filterAttrs; - inherit (lib.generators) mkLuaInline; - inherit (lib.nvim.languages) lspOptions; - inherit (lib.nvim.dag) entryAnywhere; - inherit (lib.nvim.lua) toLuaObject; - - cfg = config.vim.lsp; - - lspConfigurations = - mapAttrsToList ( - name: value: '' - vim.lsp.config["${name}"] = ${toLuaObject value} - '' - ) - cfg.servers; - - enabledServers = filterAttrs (_: u: u.enable) cfg.servers; -in { - options = { - vim.lsp.servers = mkOption { - type = attrsOf lspOptions; - default = {}; - example = '' - { - "*" = { - root_markers = [".git"]; - capabilities = { - textDocument = { - semanticTokens = { - multilineTokenSupport = true; - }; - }; - }; - }; - - "clangd" = { - filetypes = ["c"]; - }; - } - ''; - description = '' - LSP configurations that will be managed using `vim.lsp.config()` and - related utilities added in Neovim 0.11. LSPs defined here will be - added to the resulting {file}`init.lua` using `vim.lsp.config` and - enabled through `vim.lsp.enable` below the configuration table. - - You may review the generated configuration by running {command}`nvf-print-config` - in a shell. Please see {command}`:help lsp-config` for more details - on the underlying API. - ''; - }; - }; - - config = mkMerge [ - { - vim.lsp.servers."*" = { - capabilities = mkDefault (mkLuaInline "capabilities"); - on_attach = mkDefault (mkLuaInline "default_on_attach"); - }; - } - - (mkIf (cfg.servers != {}) { - vim.luaConfigRC.lsp-servers = entryAnywhere '' - -- Individual LSP configurations managed by nvf. - ${concatLines lspConfigurations} - - -- Enable configured LSPs explicitly - vim.lsp.enable(${toLuaObject (filter (name: name != "*") (attrNames enabledServers))}) - ''; - }) - ]; -} diff --git a/modules/plugins/assistant/chatgpt/config.nix b/modules/plugins/assistant/chatgpt/config.nix index b1066e5a..95a36acf 100644 --- a/modules/plugins/assistant/chatgpt/config.nix +++ b/modules/plugins/assistant/chatgpt/config.nix @@ -30,16 +30,7 @@ in { config = mkIf cfg.enable { vim = { - startPlugins = [ - "chatgpt-nvim" - - # Dependencies - "nui-nvim" - "plenary-nvim" - ]; - - # ChatGPT.nvim explicitly depends on Telescope. - telescope.enable = true; + startPlugins = ["chatgpt-nvim"]; pluginRC.chagpt = entryAnywhere '' require("chatgpt").setup(${toLuaObject cfg.setupOpts}) diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix index 488bd70f..b284270b 100644 --- a/modules/plugins/diagnostics/nvim-lint/config.nix +++ b/modules/plugins/diagnostics/nvim-lint/config.nix @@ -28,8 +28,6 @@ in { end end end - - nvf_lint = ${toLuaObject cfg.lint_function} ''; }; }) @@ -40,8 +38,8 @@ in { { event = ["BufWritePost"]; callback = mkLuaInline '' - function(args) - nvf_lint(args.buf) + function() + require("lint").try_lint() end ''; } diff --git a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix index 956bd76e..20f14f0b 100644 --- a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix +++ b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix @@ -1,8 +1,7 @@ {lib, ...}: let - inherit (lib.options) mkOption mkEnableOption literalExpression; + inherit (lib.options) mkOption mkEnableOption; inherit (lib.types) nullOr attrsOf listOf str either submodule bool enum; inherit (lib.nvim.types) luaInline; - inherit (lib.generators) mkLuaInline; linterType = submodule { options = { @@ -70,23 +69,6 @@ default = null; description = "Parser function"; }; - - required_files = mkOption { - type = nullOr (listOf str); - default = null; - example = ["eslint.config.js"]; - description = '' - Required files to lint. These files must exist relative to the cwd - of the linter or else this linter will be skipped - - ::: {.note} - This option is an nvf extension that only takes effect if you - use the `nvf_lint()` lua function. - - See {option}`vim.diagnostics.nvim-lint.lint_function`. - ::: - ''; - }; }; }; in { @@ -135,53 +117,5 @@ in { }; lint_after_save = mkEnableOption "autocmd to lint after each save" // {default = true;}; - - lint_function = mkOption { - type = luaInline; - default = mkLuaInline '' - function(buf) - local ft = vim.api.nvim_get_option_value("filetype", { buf = buf }) - local linters = require("lint").linters - local linters_from_ft = require("lint").linters_by_ft[ft] - - -- if no linter is configured for this filetype, stops linting - if linters_from_ft == nil then return end - - for _, name in ipairs(linters_from_ft) do - local linter = linters[name] - assert(linter, 'Linter with name `' .. name .. '` not available') - - if type(linter) == "function" then - linter = linter() - end - -- for require("lint").lint() to work, linter.name must be set - linter.name = linter.name or name - local cwd = linter.required_files - - -- if no configuration files are configured, lint - if cwd == nil then - require("lint").lint(linter) - else - -- if configuration files are configured and present in the project, lint - for _, fn in ipairs(cwd) do - local path = vim.fs.joinpath(linter.cwd or vim.fn.getcwd(), fn); - if vim.uv.fs_stat(path) then - require("lint").lint(linter) - break - end - end - end - end - end - ''; - example = literalExpression '' - mkLuaInline ''' - function(buf) - require("lint").try_lint() - end - ''' - ''; - description = "Define the global function nvf_lint which is used by nvf to lint."; - }; }; } diff --git a/modules/plugins/git/gitsigns/config.nix b/modules/plugins/git/gitsigns/config.nix index f5d9f910..99927546 100644 --- a/modules/plugins/git/gitsigns/config.nix +++ b/modules/plugins/git/gitsigns/config.nix @@ -81,11 +81,9 @@ in { (mkIf cfg.codeActions.enable { vim.lsp.null-ls = { enable = true; - setupOpts.sources = [ - (mkLuaInline '' - require("null-ls").builtins.code_actions.gitsigns - '') - ]; + setupOpts.sources.gitsigns-ca = mkLuaInline '' + require("null-ls").builtins.code_actions.gitsigns + ''; }; }) ]); diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix index 2ecbbe47..c12f6ada 100644 --- a/modules/plugins/languages/astro.nix +++ b/modules/plugins/languages/astro.nix @@ -53,20 +53,24 @@ # TODO: specify packages defaultDiagnosticsProvider = ["eslint_d"]; diagnosticsProviders = { - eslint_d = let - pkg = pkgs.eslint_d; - in { - package = pkg; + eslint_d = { + package = pkgs.eslint_d; config = { - cmd = getExe pkg; - required_files = [ - "eslint.config.js" - "eslint.config.mjs" - ".eslintrc" - ".eslintrc.json" - ".eslintrc.js" - ".eslintrc.yml" - ]; + # HACK: change if nvim-lint gets a dynamic enable thing + parser = mkLuaInline '' + function(output, bufnr, cwd) + local markers = { "eslint.config.js", "eslint.config.mjs", + ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", } + for _, filename in ipairs(markers) do + local path = vim.fs.joinpath(cwd, filename) + if vim.loop.fs_stat(path) then + return require("lint.linters.eslint_d").parser(output, bufnr, cwd) + end + end + + return {} + end + ''; }; }; }; @@ -149,9 +153,16 @@ in { vim.diagnostics.nvim-lint = { enable = true; linters_by_ft.astro = cfg.extraDiagnostics.types; - linters = - mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;}) - cfg.extraDiagnostics.types); + linters = mkMerge (map ( + name: { + ${name} = + diagnosticsProviders.${name}.config + // { + cmd = getExe diagnosticsProviders.${name}.package; + }; + } + ) + cfg.extraDiagnostics.types); }; }) ]); diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix index 7b9584b9..77d92d3b 100644 --- a/modules/plugins/languages/dart.nix +++ b/modules/plugins/languages/dart.nix @@ -13,7 +13,7 @@ inherit (lib.strings) optionalString; inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.types) mkGrammarOption; - inherit (lib.nvim.dag) entryAfter; + inherit (lib.nvim.dag) entryAnywhere; cfg = config.vim.languages.dart; ftcfg = cfg.flutter-tools; @@ -81,25 +81,16 @@ in { description = "Enable flutter-tools for flutter support"; }; - flutterPackage = mkOption { - type = nullOr package; - default = pkgs.flutter; - description = "Flutter package, or null to detect the flutter path at runtime instead."; - }; - enableNoResolvePatch = mkOption { type = bool; - default = false; + default = true; description = '' Whether to patch flutter-tools so that it doesn't resolve symlinks when detecting flutter path. - ::: {.note} - This is required if `flutterPackage` is set to null and the flutter - package in your `PATH` was built with Nix. If you are using a flutter - SDK installed from a different source and encounter the error "`dart` - missing from `PATH`", leave this option disabled. - ::: + This is required if you want to use a flutter package built with nix. + If you are using a flutter SDK installed from a different source + and encounter the error "`dart` missing from PATH", disable this option. ''; }; @@ -131,21 +122,19 @@ in { }; }; - config.vim = mkIf cfg.enable (mkMerge [ + config = mkIf cfg.enable (mkMerge [ (mkIf cfg.treesitter.enable { - treesitter.enable = true; - treesitter.grammars = [cfg.treesitter.package]; + vim.treesitter.enable = true; + vim.treesitter.grammars = [cfg.treesitter.package]; }) (mkIf cfg.lsp.enable { - lsp.lspconfig.enable = true; - lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig; + vim.lsp.lspconfig.enable = true; + vim.lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig; }) (mkIf ftcfg.enable { - lsp.enable = true; - - startPlugins = [ + vim.startPlugins = [ ( if ftcfg.enableNoResolvePatch then "flutter-tools-patched" @@ -154,9 +143,8 @@ in { "plenary-nvim" ]; - pluginRC.flutter-tools = entryAfter ["lsp-setup"] '' + vim.pluginRC.flutter-tools = entryAnywhere '' require('flutter-tools').setup { - ${optionalString (ftcfg.flutterPackage != null) "flutter_path = \"${ftcfg.flutterPackage}/bin/flutter\","} lsp = { color = { -- show the derived colours for dart variables enabled = ${boolToString ftcfg.color.enable}, -- whether or not to highlight color variables at all, only supported on flutter >= 2.10 @@ -168,6 +156,7 @@ in { capabilities = capabilities, on_attach = default_on_attach; + flags = lsp_flags, }, ${optionalString cfg.dap.enable '' debugger = { diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 92277410..e18a6d87 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: let +{lib, ...}: let inherit (lib.nvim.languages) mkEnable; in { imports = [ @@ -52,11 +48,7 @@ in { ]; options.vim.languages = { - # LSPs are now built into Neovim, and we should enable them by default - # if `vim.lsp.enable` is true. - enableLSP = mkEnable "LSP" // {default = config.vim.lsp.enable;}; - - # Those are still managed by plugins, and should be enabled here. + enableLSP = mkEnable "LSP"; enableDAP = mkEnable "Debug Adapter"; enableTreesitter = mkEnable "Treesitter"; enableFormat = mkEnable "Formatting"; diff --git a/modules/plugins/languages/go.nix b/modules/plugins/languages/go.nix index 3f232669..9f8bca3c 100644 --- a/modules/plugins/languages/go.nix +++ b/modules/plugins/languages/go.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalMD; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.lists) isList; @@ -84,14 +84,7 @@ in { }; format = { - enable = - mkEnableOption "Go formatting" - // { - default = !cfg.lsp.enable && config.vim.languages.enableFormat; - defaultText = literalMD '' - disabled if Go LSP is enabled, otherwise follows {option}`vim.languages.enableFormat` - ''; - }; + enable = mkEnableOption "Go formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { description = "Go formatter to use"; diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix index 4563bc44..62081549 100644 --- a/modules/plugins/languages/markdown.nix +++ b/modules/plugins/languages/markdown.nix @@ -9,7 +9,7 @@ inherit (lib.modules) mkIf mkMerge; inherit (lib.options) mkEnableOption mkOption; inherit (lib.lists) isList; - inherit (lib.types) bool enum either package listOf str nullOr; + inherit (lib.types) bool enum either package listOf str; inherit (lib.nvim.lua) expToLua toLuaObject; inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption; inherit (lib.nvim.dag) entryAnywhere; @@ -117,18 +117,7 @@ in { ''; }; - setupOpts = mkPluginSetupOption "render-markdown" { - file_types = lib.mkOption { - type = nullOr (listOf str); - default = null; - description = '' - List of buffer filetypes to enable this plugin in. - - This will cause the plugin to attach to new buffers who - have any of these filetypes. - ''; - }; - }; + setupOpts = mkPluginSetupOption "render-markdown" {}; }; }; diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix index 9905716e..476b56ef 100644 --- a/modules/plugins/languages/python.nix +++ b/modules/plugins/languages/python.nix @@ -99,7 +99,7 @@ # idk if this is the best way to install/run debugpy package = pkgs.python3.withPackages (ps: with ps; [debugpy]); dapConfig = '' - dap.adapters.debugpy = function(cb, config) + dap.adapters.python = function(cb, config) if config.request == 'attach' then ---@diagnostic disable-next-line: undefined-field local port = (config.connect or config).port @@ -128,7 +128,7 @@ dap.configurations.python = { { -- The first three options are required by nvim-dap - type = 'debugpy'; -- the type here established the link to the adapter definition: `dap.adapters.debugpy` + type = 'python'; -- the type here established the link to the adapter definition: `dap.adapters.python` request = 'launch'; name = "Launch file"; diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix index 536ff2c1..e01ec427 100644 --- a/modules/plugins/languages/svelte.nix +++ b/modules/plugins/languages/svelte.nix @@ -55,14 +55,21 @@ package = pkg; config = { cmd = getExe pkg; - required_files = [ - "eslint.config.js" - "eslint.config.mjs" - ".eslintrc" - ".eslintrc.json" - ".eslintrc.js" - ".eslintrc.yml" - ]; + # HACK: change if nvim-lint gets a dynamic enable thing + parser = mkLuaInline '' + function(output, bufnr, cwd) + local markers = { "eslint.config.js", "eslint.config.mjs", + ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", } + for _, filename in ipairs(markers) do + local path = vim.fs.joinpath(cwd, filename) + if vim.loop.fs_stat(path) then + return require("lint.linters.eslint_d").parser(output, bufnr, cwd) + end + end + + return {} + end + ''; }; }; }; diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix index df1353ab..ffab265b 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/ts.nix @@ -91,20 +91,27 @@ # TODO: specify packages defaultDiagnosticsProvider = ["eslint_d"]; diagnosticsProviders = { - eslint_d = let - pkg = pkgs.eslint_d; - in { - package = pkg; - config = { + eslint_d = { + package = pkgs.eslint_d; + config = let + pkg = pkgs.eslint_d; + in { cmd = getExe pkg; - required_files = [ - "eslint.config.js" - "eslint.config.mjs" - ".eslintrc" - ".eslintrc.json" - ".eslintrc.js" - ".eslintrc.yml" - ]; + # HACK: change if nvim-lint gets a dynamic enable thing + parser = mkLuaInline '' + function(output, bufnr, cwd) + local markers = { "eslint.config.js", "eslint.config.mjs", + ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", } + for _, filename in ipairs(markers) do + local path = vim.fs.joinpath(cwd, filename) + if vim.loop.fs_stat(path) then + return require("lint.linters.eslint_d").parser(output, bufnr, cwd) + end + end + + return {} + end + ''; }; }; }; @@ -214,9 +221,10 @@ in { linters_by_ft.typescript = cfg.extraDiagnostics.types; linters_by_ft.typescriptreact = cfg.extraDiagnostics.types; - linters = - mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;}) - cfg.extraDiagnostics.types); + linters = mkMerge (map (name: { + ${name}.cmd = getExe diagnosticsProviders.${name}.package; + }) + cfg.extraDiagnostics.types); }; }) diff --git a/modules/plugins/lsp/null-ls/null-ls.nix b/modules/plugins/lsp/null-ls/null-ls.nix index ba02df9c..3a10bac7 100644 --- a/modules/plugins/lsp/null-ls/null-ls.nix +++ b/modules/plugins/lsp/null-ls/null-ls.nix @@ -1,6 +1,6 @@ {lib, ...}: let inherit (lib.options) mkOption mkEnableOption; - inherit (lib.types) listOf str int nullOr; + inherit (lib.types) attrsOf str int nullOr; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.types) luaInline mkPluginSetupOption; inherit (lib.nvim.config) batchRenameOptions; @@ -70,7 +70,7 @@ in { }; sources = mkOption { - type = nullOr (listOf luaInline); + type = nullOr (attrsOf luaInline); default = null; description = "Sources for null-ls to register"; }; diff --git a/modules/plugins/mini/cursorword/config.nix b/modules/plugins/mini/cursorword/config.nix deleted file mode 100644 index bc5ab2cb..00000000 --- a/modules/plugins/mini/cursorword/config.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.modules) mkIf; - inherit (lib.nvim.dag) entryAnywhere; - inherit (lib.nvim.lua) toLuaObject; - - cfg = config.vim.mini.cursorword; -in { - vim = mkIf cfg.enable { - startPlugins = ["mini-cursorword"]; - - pluginRC.mini-ai = entryAnywhere '' - require("mini.cursorword").setup(${toLuaObject cfg.setupOpts}) - ''; - }; -} diff --git a/modules/plugins/mini/cursorword/cursorword.nix b/modules/plugins/mini/cursorword/cursorword.nix deleted file mode 100644 index f2b8903a..00000000 --- a/modules/plugins/mini/cursorword/cursorword.nix +++ /dev/null @@ -1,9 +0,0 @@ -{lib, ...}: let - inherit (lib.options) mkEnableOption; - inherit (lib.nvim.types) mkPluginSetupOption; -in { - options.vim.mini.cursorword = { - enable = mkEnableOption "mini.cursorword"; - setupOpts = mkPluginSetupOption "mini.cursorword" {}; - }; -} diff --git a/modules/plugins/mini/cursorword/default.nix b/modules/plugins/mini/cursorword/default.nix deleted file mode 100644 index f0aae6c8..00000000 --- a/modules/plugins/mini/cursorword/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./cursorword.nix - ./config.nix - ]; -} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index f066b172..8f035285 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -11,7 +11,6 @@ ./colors ./comment ./completion - ./cursorword ./diff ./doc ./extra diff --git a/modules/plugins/statusline/lualine/config.nix b/modules/plugins/statusline/lualine/config.nix index 89dcbbe5..b8334bfd 100644 --- a/modules/plugins/statusline/lualine/config.nix +++ b/modules/plugins/statusline/lualine/config.nix @@ -14,28 +14,17 @@ bCfg = config.vim.ui.breadcrumbs; in { config = mkMerge [ - { - vim.statusline.lualine.setupOpts.extensions = - (lib.optionals config.vim.filetree.nvimTree.enable ["nvim-tree"]) - ++ (lib.optionals config.vim.filetree.neo-tree.enable ["neo-tree"]) - ++ (lib.optionals config.vim.utility.snacks-nvim.enable [ - { - # same extensions as nerdtree / neo-tree - # https://github.com/nvim-lualine/lualine.nvim/blob/master/lua/lualine/extensions/nerdtree.lua - # https://github.com/nvim-lualine/lualine.nvim/blob/master/lua/lualine/extensions/neo-tree.lua - sections = { - lualine_a = mkLuaInline '' - { - function() - return vim.fn.fnamemodify(vim.fn.getcwd(), ":~") - end, - } - ''; - }; - filetypes = ["snacks_picker_list" "snacks_picker_input"]; - } - ]); - } + (mkIf config.vim.filetree.nvimTree.enable { + vim.statusline.lualine.setupOpts = { + extensions = ["nvim-tree"]; + }; + }) + + (mkIf config.vim.filetree.neo-tree.enable { + vim.statusline.lualine.setupOpts = { + extensions = ["neo-tree"]; + }; + }) (mkIf (bCfg.enable && bCfg.lualine.winbar.enable && bCfg.source == "nvim-navic") { vim.statusline.lualine.setupOpts = { diff --git a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix index 14243670..997c9ba3 100644 --- a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix +++ b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix @@ -272,12 +272,20 @@ in { offsets = mkOption { type = listOf attrs; - default = map (filetype: { - inherit filetype; - text = "File Explorer"; - highlight = "Directory"; - separator = true; - }) ["NvimTree" "neo-tree" "snacks_layout_box"]; + default = [ + { + filetype = "NvimTree"; + text = "File Explorer"; + highlight = "Directory"; + separator = true; + } + { + filetype = "neo-tree"; + text = "File Explorer"; + highlight = "Directory"; + separator = true; + } + ]; description = "The windows to offset bufferline above, see `:help bufferline-offset`"; }; diff --git a/modules/plugins/utility/binds/default.nix b/modules/plugins/utility/binds/default.nix index 43666cc9..229423b8 100644 --- a/modules/plugins/utility/binds/default.nix +++ b/modules/plugins/utility/binds/default.nix @@ -2,6 +2,5 @@ _: { imports = [ ./which-key ./cheatsheet - ./hardtime ]; } diff --git a/modules/plugins/utility/binds/hardtime/config.nix b/modules/plugins/utility/binds/hardtime/config.nix deleted file mode 100644 index e8c315ef..00000000 --- a/modules/plugins/utility/binds/hardtime/config.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.modules) mkIf; - inherit (lib.nvim.lua) toLuaObject; - inherit (lib.nvim.dag) entryAnywhere; - - cfg = config.vim.binds.hardtime-nvim; -in { - config = mkIf cfg.enable { - vim = { - startPlugins = ["hardtime-nvim"]; - - pluginRC.hardtime = entryAnywhere '' - require("hardtime").setup (${toLuaObject cfg.setupOpts}) - ''; - }; - }; -} diff --git a/modules/plugins/utility/binds/hardtime/default.nix b/modules/plugins/utility/binds/hardtime/default.nix deleted file mode 100644 index 89aa11d3..00000000 --- a/modules/plugins/utility/binds/hardtime/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./hardtime.nix - ./config.nix - ]; -} diff --git a/modules/plugins/utility/binds/hardtime/hardtime.nix b/modules/plugins/utility/binds/hardtime/hardtime.nix deleted file mode 100644 index b671ddcd..00000000 --- a/modules/plugins/utility/binds/hardtime/hardtime.nix +++ /dev/null @@ -1,10 +0,0 @@ -{lib, ...}: let - inherit (lib.options) mkEnableOption; - inherit (lib.nvim.types) mkPluginSetupOption; -in { - options.vim.binds.hardtime-nvim = { - enable = mkEnableOption "hardtime helper for no repeat keybinds"; - - setupOpts = mkPluginSetupOption "hardtime-nvim" {}; - }; -} diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix index e3ae7c5e..62b07574 100644 --- a/modules/plugins/utility/default.nix +++ b/modules/plugins/utility/default.nix @@ -18,7 +18,6 @@ ./oil-nvim ./outline ./preview - ./sleuth ./snacks-nvim ./surround ./telescope diff --git a/modules/plugins/utility/sleuth/config.nix b/modules/plugins/utility/sleuth/config.nix deleted file mode 100644 index d25cc140..00000000 --- a/modules/plugins/utility/sleuth/config.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.modules) mkIf; - cfg = config.vim.utility.sleuth; -in { - vim.startPlugins = mkIf cfg.enable ["vim-sleuth"]; -} diff --git a/modules/plugins/utility/sleuth/default.nix b/modules/plugins/utility/sleuth/default.nix deleted file mode 100644 index 04cb4158..00000000 --- a/modules/plugins/utility/sleuth/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./config.nix - ./sleuth.nix - ]; -} diff --git a/modules/plugins/utility/sleuth/sleuth.nix b/modules/plugins/utility/sleuth/sleuth.nix deleted file mode 100644 index a86d414d..00000000 --- a/modules/plugins/utility/sleuth/sleuth.nix +++ /dev/null @@ -1,7 +0,0 @@ -{lib, ...}: let - inherit (lib.options) mkEnableOption; -in { - options.vim.utility.sleuth.enable = mkEnableOption '' - automatically adjusting options such as `shiftwidth` or `expandtab`, using `vim-sleuth` - ''; -} diff --git a/modules/wrapper/rc/config.nix b/modules/wrapper/rc/config.nix index 77a62d58..ff8a4585 100644 --- a/modules/wrapper/rc/config.nix +++ b/modules/wrapper/rc/config.nix @@ -5,7 +5,7 @@ }: let inherit (builtins) map mapAttrs filter; inherit (lib.attrsets) mapAttrsToList; - inherit (lib.strings) concatLines concatMapStringsSep optionalString; + inherit (lib.strings) concatLines concatMapStringsSep; inherit (lib.trivial) showWarnings; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.dag) entryAfter mkLuarcSection resolveDag entryAnywhere; @@ -72,14 +72,6 @@ in { dag = cfg.luaConfigRC; mapResult = result: concatLines [ - (optionalString (cfg.additionalRuntimePaths != []) '' - vim.opt.runtimepath:append(${toLuaObject cfg.additionalRuntimePaths}) - '') - (optionalString cfg.enableLuaLoader '' - if vim.loader then - vim.loader.enable() - end - '') cfg.luaConfigPre (concatMapStringsSep "\n" mkLuarcSection result) cfg.luaConfigPost diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix index 02729401..4cd3026f 100644 --- a/modules/wrapper/rc/options.nix +++ b/modules/wrapper/rc/options.nix @@ -1,7 +1,15 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkOption literalMD literalExpression; + inherit (lib.strings) optionalString; inherit (lib.types) str bool int enum attrsOf lines listOf either path submodule anything; inherit (lib.nvim.types) dagOf; + inherit (lib.nvim.lua) listToLuaTable; + + cfg = config.vim; in { options.vim = { enableLuaLoader = mkOption { @@ -11,14 +19,13 @@ in { description = '' [official documentation]: https://neovim.io/doc/user/lua.html#vim.loader.enable() - Whethere to enable the experimental Lua module loader to speed up the start - up process. If `true`, this will enable the experimental Lua module loader - which: + the experimental Lua module loader to speed up the start up process - * overrides loadfile - * adds the lua loader using the byte-compilation cache - * adds the libs loader - * removes the default Neovim loader + If `true`, this will enable the experimental Lua module loader which: + - overrides loadfile + - adds the lua loader using the byte-compilation cache + - adds the libs loader + - removes the default Neovim loader ::: {.note} The Lua module loader is *disabled* by default. Before setting this option, please @@ -279,7 +286,21 @@ in { luaConfigPre = mkOption { type = str; - default = ""; + default = '' + ${optionalString (cfg.additionalRuntimePaths != []) '' + -- The following list is generated from `vim.additionalRuntimePaths` + -- and is used to append additional runtime paths to the + -- `runtimepath` option. + vim.opt.runtimepath:append(${listToLuaTable cfg.additionalRuntimePaths}) + ''} + + ${optionalString cfg.enableLuaLoader '' + if vim.loader then + vim.loader.enable() + end + ''} + ''; + defaultText = literalMD '' By default, this option will **append** paths in [](#opt-vim.additionalRuntimePaths) diff --git a/npins/sources.json b/npins/sources.json index a2122460..d11d16c4 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -9,9 +9,9 @@ }, "branch": "master", "submodules": false, - "revision": "2e00d1d4248f08dddfceacb8d2996e51e13e00f6", - "url": "https://github.com/stevearc/aerial.nvim/archive/2e00d1d4248f08dddfceacb8d2996e51e13e00f6.tar.gz", - "hash": "18rhmpqs8440hn4g5786znj37fzb01wa3zws33rlq9vm6sfb0grw" + "revision": "44684bf429dc40e97a6d00ffa09043ac3f692186", + "url": "https://github.com/stevearc/aerial.nvim/archive/44684bf429dc40e97a6d00ffa09043ac3f692186.tar.gz", + "hash": "02zd23np2pn7hivi8sl63lcdn85cfbvsapkyghkwh9prxg8a81zn" }, "alpha-nvim": { "type": "Git", @@ -35,9 +35,9 @@ }, "branch": "master", "submodules": false, - "revision": "965160025d0facbe9caa863e5beef2a7a488e9d1", - "url": "https://github.com/rrethy/base16-nvim/archive/965160025d0facbe9caa863e5beef2a7a488e9d1.tar.gz", - "hash": "02w1mn15gydma9canvqrlwf4l5z76s1vs01zanipwwflvwclsb8f" + "revision": "3f13e15c53ea2aaf79c24ceab725309d87f0619c", + "url": "https://github.com/rrethy/base16-nvim/archive/3f13e15c53ea2aaf79c24ceab725309d87f0619c.tar.gz", + "hash": "1z6pdf707r2rpmzi057dhcmd045695v03215asn1hdn8r294zcmg" }, "blink-cmp": { "type": "GitRelease", @@ -50,10 +50,10 @@ "version_upper_bound": null, "release_prefix": null, "submodules": false, - "version": "v1.2.0", - "revision": "d72a826e1961e14f91d8867d10a27a89c5cfe748", - "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v1.2.0", - "hash": "01phyx7y26p2123xpdp0zfp45rc8f014a8myxn2ga71m514vr9vc" + "version": "v1.1.1", + "revision": "fe2e1d3e4498d60c5ce7440ff60f79f0920e34bf", + "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v1.1.1", + "hash": "0l2m4162vk6xqrx5v0zh1b5p6wrr1jailq1995f101isyjygikan" }, "blink-cmp-spell": { "type": "Git", @@ -77,9 +77,9 @@ }, "branch": "main", "submodules": false, - "revision": "f1836ed7a07f8d082ff6c3fbae1e476ba2adee84", - "url": "https://github.com/saghen/blink.compat/archive/f1836ed7a07f8d082ff6c3fbae1e476ba2adee84.tar.gz", - "hash": "0b22c943vbxn8cgfc3m0wmmia9rja6x766ywa798nx7s7x0sd53x" + "revision": "2ed6d9a28b07fa6f3bface818470605f8896408c", + "url": "https://github.com/saghen/blink.compat/archive/2ed6d9a28b07fa6f3bface818470605f8896408c.tar.gz", + "hash": "009475xy41l4dpayswhx65q6a7djzw7rz2ycbrbpyg041y0qynqs" }, "blink-emoji-nvim": { "type": "Git", @@ -103,9 +103,9 @@ }, "branch": "main", "submodules": false, - "revision": "0a2c3c1ce8c3c56e7490cae835a981d5dbeb472c", - "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/0a2c3c1ce8c3c56e7490cae835a981d5dbeb472c.tar.gz", - "hash": "11wc0qdalz7fb6zpdvrdib1bx3qyvcbn3hr0h57plspln55rjhl5" + "revision": "56084d1f45c8621d23d4bac724c2dc50b1eb75db", + "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/56084d1f45c8621d23d4bac724c2dc50b1eb75db.tar.gz", + "hash": "1lyczjvwpi5f1mjgw059yzkxxjrk48vcvhdjzkjgakhsq76s125x" }, "bufdelete-nvim": { "type": "Git", @@ -129,9 +129,9 @@ }, "branch": "main", "submodules": false, - "revision": "b7bbdf93b42866f166af98d39a2563eedb7cabac", - "url": "https://github.com/catppuccin/nvim/archive/b7bbdf93b42866f166af98d39a2563eedb7cabac.tar.gz", - "hash": "0f8wcpig84kihbz31w0hap4qs5gsdvch4sk2krn29v3k5bh3kcv0" + "revision": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429", + "url": "https://github.com/catppuccin/nvim/archive/5b5e3aef9ad7af84f463d17b5479f06b87d5c429.tar.gz", + "hash": "0jmrwag2dx4b1g9x32xwxcr8y0l159hqks09z5miy99wav6dy7z2" }, "ccc-nvim": { "type": "Git", @@ -272,9 +272,9 @@ }, "branch": "main", "submodules": false, - "revision": "e55bbf5f6969ab41414d3fd68011366d3b80d024", - "url": "https://github.com/olimorris/codecompanion.nvim/archive/e55bbf5f6969ab41414d3fd68011366d3b80d024.tar.gz", - "hash": "12jas52gh1dl33ir0bkxpqnfxjdkwh7h03qvfk1b3qk2fmr0abqn" + "revision": "9654cb31f10c9eda3e777d03d32b29df606ab0fe", + "url": "https://github.com/olimorris/codecompanion.nvim/archive/9654cb31f10c9eda3e777d03d32b29df606ab0fe.tar.gz", + "hash": "0ff4mbfim0kj5prv9xfqp8gsk1fw0y2d0kmazfivkhg04my8m89l" }, "codewindow-nvim": { "type": "Git", @@ -311,9 +311,9 @@ }, "branch": "master", "submodules": false, - "revision": "372fc521f8421b7830ea6db4d6ea3bae1c77548c", - "url": "https://github.com/stevearc/conform.nvim/archive/372fc521f8421b7830ea6db4d6ea3bae1c77548c.tar.gz", - "hash": "0b6qbwyb6ashpia7pk0r5kp82pdrblhmhmx1fprgy7lmgnm8mw97" + "revision": "eebc724d12c5579d733d1f801386e0ceb909d001", + "url": "https://github.com/stevearc/conform.nvim/archive/eebc724d12c5579d733d1f801386e0ceb909d001.tar.gz", + "hash": "122v0svrsss8g4gzy9fz2ppzm2lxf85l4m8wincxsy75x9v3ywgn" }, "copilot-cmp": { "type": "Git", @@ -337,9 +337,9 @@ }, "branch": "master", "submodules": false, - "revision": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0", - "url": "https://github.com/zbirenbaum/copilot.lua/archive/a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0.tar.gz", - "hash": "1pk6mh40kbja49xlsqv70wl3j89i6p996gf8z95b9b50pd2dsdgk" + "revision": "c62a2a7616a9789a7676b6b7a8d9263b1082cdc8", + "url": "https://github.com/zbirenbaum/copilot.lua/archive/c62a2a7616a9789a7676b6b7a8d9263b1082cdc8.tar.gz", + "hash": "1agbxzq43wsga9szgaz45s638my8d7cxqwg2aa3rizyf7g8f7szy" }, "crates-nvim": { "type": "Git", @@ -350,9 +350,9 @@ }, "branch": "main", "submodules": false, - "revision": "2c8f4fab02e3e9ea42c6ad9b547e4207a914a397", - "url": "https://github.com/Saecki/crates.nvim/archive/2c8f4fab02e3e9ea42c6ad9b547e4207a914a397.tar.gz", - "hash": "0ddlm94v3gh1znacghvfpfmkgv6js9i62gf7mlqcrpz8snpf879s" + "revision": "73d2c590c74a0c582144987a4decb4a642755859", + "url": "https://github.com/Saecki/crates.nvim/archive/73d2c590c74a0c582144987a4decb4a642755859.tar.gz", + "hash": "08dyl4blgi0lb3s0jbl4jcpr4j1ncyrdvxjkrqmhqcg6bmwl7iqy" }, "csharpls-extended-lsp-nvim": { "type": "Git", @@ -363,9 +363,9 @@ }, "branch": "master", "submodules": false, - "revision": "c1edd1eaad2e649d3de8121337e3c515ac6db46e", - "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/c1edd1eaad2e649d3de8121337e3c515ac6db46e.tar.gz", - "hash": "03sjrkay6c6ivd9zpm7isa9izxsvspkvbvy7f61nl020splhbl9m" + "revision": "53c6dfc9790d262edd3d6a4483294bedf53d70f5", + "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/53c6dfc9790d262edd3d6a4483294bedf53d70f5.tar.gz", + "hash": "0hy3jaq5lq72yfvy77hijp8wzpbad7a1xfwrdljzbpm4w5j59dm2" }, "dashboard-nvim": { "type": "Git", @@ -376,9 +376,9 @@ }, "branch": "master", "submodules": false, - "revision": "591b5b29e2f17b97496ec3179f6ecd08bb8502cc", - "url": "https://github.com/glepnir/dashboard-nvim/archive/591b5b29e2f17b97496ec3179f6ecd08bb8502cc.tar.gz", - "hash": "1f9ii3scd3zh4fch6h0mfmnfjx2fk6y4v3qc0cijk1vnyp2fm9qc" + "revision": "000448d837f6e7a47f8f342f29526c4d7e49e9ce", + "url": "https://github.com/glepnir/dashboard-nvim/archive/000448d837f6e7a47f8f342f29526c4d7e49e9ce.tar.gz", + "hash": "11kh15qp819dhr2r3q78dv9pzxrswzzpjqmdpa5nlba9mvgjzzy3" }, "diffview-nvim": { "type": "Git", @@ -454,9 +454,9 @@ }, "branch": "main", "submodules": false, - "revision": "41545d9d02a53d03b5f4da5881e8f30a7dc16031", - "url": "https://github.com/Chaitanyabsprip/fastaction.nvim/archive/41545d9d02a53d03b5f4da5881e8f30a7dc16031.tar.gz", - "hash": "1is587xa1b2fim4s3qc13ggwgpm02y4dmh64l4xjh6gyilh3fmkb" + "revision": "c43684448470e732387beccaff12e6667a534800", + "url": "https://github.com/Chaitanyabsprip/fastaction.nvim/archive/c43684448470e732387beccaff12e6667a534800.tar.gz", + "hash": "1ihh07j9q4089m4iw7sb33zg106g1m84bd2nk81gixfl76vg3vbi" }, "fidget-nvim": { "type": "Git", @@ -506,9 +506,9 @@ }, "branch": "main", "submodules": false, - "revision": "572f5660cf05f8cd8834e096d7b4c921ba18e175", - "url": "https://github.com/rafamadriz/friendly-snippets/archive/572f5660cf05f8cd8834e096d7b4c921ba18e175.tar.gz", - "hash": "08q7vs7p4grav819b6hl5y9zla8bbb461b6m1w0mjz6n6rqjjc0p" + "revision": "efff286dd74c22f731cdec26a70b46e5b203c619", + "url": "https://github.com/rafamadriz/friendly-snippets/archive/efff286dd74c22f731cdec26a70b46e5b203c619.tar.gz", + "hash": "1vb5l8ipfjwsrqffbq8v2z5p1cpg035b3gk57692wd7835kr3i13" }, "fzf-lua": { "type": "Git", @@ -519,9 +519,9 @@ }, "branch": "main", "submodules": false, - "revision": "1cc70fb29e63ff26acba1e0cbca04705f8a485f1", - "url": "https://github.com/ibhagwan/fzf-lua/archive/1cc70fb29e63ff26acba1e0cbca04705f8a485f1.tar.gz", - "hash": "032y3djil7bsb2h0sv5a0a1qg805j5p2jxxp01jcpmn870b6mcjd" + "revision": "dc693475c4463463d84a0c7c43d463b8a8cd3aea", + "url": "https://github.com/ibhagwan/fzf-lua/archive/dc693475c4463463d84a0c7c43d463b8a8cd3aea.tar.gz", + "hash": "1his2nwjrb9xbjmz5i6nln7v5mk2f85dla10qn5xwji9zgnfy24l" }, "gesture-nvim": { "type": "Git", @@ -584,9 +584,9 @@ }, "branch": "main", "submodules": false, - "revision": "1796c7cedfe7e5dd20096c5d7b8b753d8f8d22eb", - "url": "https://github.com/lewis6991/gitsigns.nvim/archive/1796c7cedfe7e5dd20096c5d7b8b753d8f8d22eb.tar.gz", - "hash": "0xzmj3z3rd1zxv5hc87ncmnrzm6653ffaif9xkpvnc3n8l81ybsn" + "revision": "fcfa7a989cd6fed10abf02d9880dc76d7a38167d", + "url": "https://github.com/lewis6991/gitsigns.nvim/archive/fcfa7a989cd6fed10abf02d9880dc76d7a38167d.tar.gz", + "hash": "1grkw8x1fycw1hbppy0zakwwkk7h2f8x5qy4wh34yj5f5g9jn3vj" }, "glow-nvim": { "type": "Git", @@ -610,22 +610,9 @@ }, "branch": "main", "submodules": false, - "revision": "91a0f8e460197a521d42a2e84a7a2a4010be4bbb", - "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/91a0f8e460197a521d42a2e84a7a2a4010be4bbb.tar.gz", - "hash": "1bmxps0wawyvwyzcwzdxbf1wcqx6v7h6afj3yzgb38gz649wr8q7" - }, - "hardtime-nvim": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "m4xshen", - "repo": "hardtime.nvim" - }, - "branch": "main", - "submodules": false, - "revision": "9aaec65de041bddfc4c0af66919030d2950bcea8", - "url": "https://github.com/m4xshen/hardtime.nvim/archive/9aaec65de041bddfc4c0af66919030d2950bcea8.tar.gz", - "hash": "1rmcl200a4m3ip3xjzhh7ghhh2961xj2mw7yf0w44jpvs98gqb18" + "revision": "12b5420b665e8053d74eb075d8a589477333f67d", + "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/12b5420b665e8053d74eb075d8a589477333f67d.tar.gz", + "hash": "16fa841cv0dbn7pkcs44r5ch241vhax8jfxgcxwwd0z4srlbj6gy" }, "harpoon": { "type": "Git", @@ -649,9 +636,9 @@ }, "branch": "master", "submodules": false, - "revision": "3bec28d8b0006be596497a5e1a03bda6ef6131cf", - "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/3bec28d8b0006be596497a5e1a03bda6ef6131cf.tar.gz", - "hash": "1kf3w7x8awa4iiw7ab8xfjh6fq47yvv6h2rmfw0jf8s99fvgarj2" + "revision": "18fef08cba01de6b5022e85ac4468f74edc45259", + "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/18fef08cba01de6b5022e85ac4468f74edc45259.tar.gz", + "hash": "1bhr9w58hy63zilbqdwfvwzca6sk667yagjbzf13acl306nvgnhd" }, "highlight-undo-nvim": { "type": "Git", @@ -717,9 +704,9 @@ }, "branch": "master", "submodules": false, - "revision": "4c51d6202628b3b51e368152c053c3fb5c5f76f2", - "url": "https://github.com/3rd/image.nvim/archive/4c51d6202628b3b51e368152c053c3fb5c5f76f2.tar.gz", - "hash": "16s1wsy9k72qiqzvwij67j2jzwgi6ggl6lhx9p6lfw8dpps3ayxg" + "revision": "2e2d28b7734b5efdfc1219f4da8a46c761587bc2", + "url": "https://github.com/3rd/image.nvim/archive/2e2d28b7734b5efdfc1219f4da8a46c761587bc2.tar.gz", + "hash": "1k2bch2l9bvy4ian6l3jymddcy7p4mvblpmbq0qvn8rzxdi65fy1" }, "indent-blankline-nvim": { "type": "Git", @@ -756,9 +743,9 @@ }, "branch": "main", "submodules": false, - "revision": "2b68ddc0802bd295e64c9e2e75f18f755e50dbcc", - "url": "https://github.com/ggandor/leap.nvim/archive/2b68ddc0802bd295e64c9e2e75f18f755e50dbcc.tar.gz", - "hash": "07bdhfsig70qblvk2x0n35i5apz3mjdr05ba3082mh438ikgfmvx" + "revision": "03eaa2e0c0ec9436dea0e954bc47564ff3ca9196", + "url": "https://github.com/ggandor/leap.nvim/archive/03eaa2e0c0ec9436dea0e954bc47564ff3ca9196.tar.gz", + "hash": "1lskih4hvf1c57d0f6gibc36c926lqky0y2h6ypmkgh8gmcdazdw" }, "leetcode-nvim": { "type": "Git", @@ -782,9 +769,9 @@ }, "branch": "master", "submodules": false, - "revision": "a793d02b6a5e639fa9d3f2a89a839fa688ab2d0a", - "url": "https://github.com/ray-x/lsp_signature.nvim/archive/a793d02b6a5e639fa9d3f2a89a839fa688ab2d0a.tar.gz", - "hash": "0y5ffzj613kf0mq74yj248176fywn4vrsnn1fhip7j5yni1cyhzy" + "revision": "15bb33cdb47e85278e168cad11acb1b6fa9c6488", + "url": "https://github.com/ray-x/lsp_signature.nvim/archive/15bb33cdb47e85278e168cad11acb1b6fa9c6488.tar.gz", + "hash": "0acynlgd7vg3cn08136ky1j2qayq1f7x6fl1562cby6hl47rsnck" }, "lspkind-nvim": { "type": "Git", @@ -808,9 +795,9 @@ }, "branch": "main", "submodules": false, - "revision": "920b1253e1a26732e53fac78412f6da7f674671d", - "url": "https://github.com/nvimdev/lspsaga.nvim/archive/920b1253e1a26732e53fac78412f6da7f674671d.tar.gz", - "hash": "0wkcgy2x119sd9xn6k9vs83pvrj0m4ali1ac72pah8pnlzfvkw7i" + "revision": "778d56ff9b387dacd14ae648ed5604394b486f51", + "url": "https://github.com/nvimdev/lspsaga.nvim/archive/778d56ff9b387dacd14ae648ed5604394b486f51.tar.gz", + "hash": "1rm8ww8krxliwli9m2j6j37xgwgjsrgapvgrcdr6nd4mi6hgmczm" }, "lua-utils-nvim": { "type": "Git", @@ -834,9 +821,9 @@ }, "branch": "master", "submodules": false, - "revision": "15884cee63a8c205334ab13ab1c891cd4d27101a", - "url": "https://github.com/hoob3rt/lualine.nvim/archive/15884cee63a8c205334ab13ab1c891cd4d27101a.tar.gz", - "hash": "0c251ywx5gsqwafgn2pb7qrv43cimrxp4wwqhlxccizf3l6l9wy1" + "revision": "86fe39534b7da729a1ac56c0466e76f2c663dc42", + "url": "https://github.com/hoob3rt/lualine.nvim/archive/86fe39534b7da729a1ac56c0466e76f2c663dc42.tar.gz", + "hash": "1kqdckylsjl1ibk4wm87y1yxxzxnjz87vwziaw4k6nw61rg0bq2x" }, "luasnip": { "type": "Git", @@ -847,9 +834,9 @@ }, "branch": "master", "submodules": false, - "revision": "7351d673f430e89f11962dc45b7360d6a0a26d2d", - "url": "https://github.com/L3MON4D3/LuaSnip/archive/7351d673f430e89f11962dc45b7360d6a0a26d2d.tar.gz", - "hash": "0dd42ss93cppq3cp27336gail955lckqqc6bafkmawplxh93qn1q" + "revision": "c9b9a22904c97d0eb69ccb9bab76037838326817", + "url": "https://github.com/L3MON4D3/LuaSnip/archive/c9b9a22904c97d0eb69ccb9bab76037838326817.tar.gz", + "hash": "03anxdspqz7ylq4239jyr9y51mw5qw1lkccyvfhj6wfk43jjdryx" }, "lz-n": { "type": "Git", @@ -860,9 +847,9 @@ }, "branch": "master", "submodules": false, - "revision": "a10519ab5940a5364560043df9dc3db328e27f98", - "url": "https://github.com/nvim-neorocks/lz.n/archive/a10519ab5940a5364560043df9dc3db328e27f98.tar.gz", - "hash": "18q0hai33qrb950lg8w9nk83smqpp1ahiyrn6pv9dqyakbqhx1k1" + "revision": "2ef8dfbef6f8f97873da4c5820067343690d114c", + "url": "https://github.com/nvim-neorocks/lz.n/archive/2ef8dfbef6f8f97873da4c5820067343690d114c.tar.gz", + "hash": "11i6ayqvyamh8i2scq7qbf6rrxrq9v0hax9gxmdxhdxd18djyq8n" }, "lzn-auto-require": { "type": "Git", @@ -1003,9 +990,9 @@ }, "branch": "main", "submodules": false, - "revision": "c45b8ee96f0347134e34ba3f0adaf08a9a8826d3", - "url": "https://github.com/echasnovski/mini.colors/archive/c45b8ee96f0347134e34ba3f0adaf08a9a8826d3.tar.gz", - "hash": "1px2x50h613f3jahhr24bmkkwxpwnf68c5acz51r89rmj5dl5v9r" + "revision": "1c88ba8c79e5717acc82bf596f5722c724af570e", + "url": "https://github.com/echasnovski/mini.colors/archive/1c88ba8c79e5717acc82bf596f5722c724af570e.tar.gz", + "hash": "0dcv6z4z5gq73d2s2hbcg8l5y1jzxvdsq7wy6a2rxbjmjhg5j7is" }, "mini-comment": { "type": "Git", @@ -1029,25 +1016,9 @@ }, "branch": "main", "submodules": false, - "revision": "f0c324ff2142b02871cfb43049461e4f3f022a11", - "url": "https://github.com/echasnovski/mini.completion/archive/f0c324ff2142b02871cfb43049461e4f3f022a11.tar.gz", - "hash": "0q8w733i3428gzz6bk4ldc57smj55916imnpzx33arhfdvmzp8l0" - }, - "mini-cursorword": { - "type": "GitRelease", - "repository": { - "type": "GitHub", - "owner": "echasnovski", - "repo": "mini.cursorword" - }, - "pre_releases": false, - "version_upper_bound": null, - "release_prefix": null, - "submodules": false, - "version": "v0.15.0", - "revision": "6683f04509c380e3147cca368f90bbdb99641775", - "url": "https://api.github.com/repos/echasnovski/mini.cursorword/tarball/v0.15.0", - "hash": "0vqr4hkzq13ap6giyyp8asn5g6nnm406piq1a07a5nmkfxiskp9v" + "revision": "cf3625d2c4a437f5edf7e61382e0fe522fc76fb7", + "url": "https://github.com/echasnovski/mini.completion/archive/cf3625d2c4a437f5edf7e61382e0fe522fc76fb7.tar.gz", + "hash": "0lpvl1kd7vmyy00p97am9ghj6gdmnk1dbw93wjmnvin057w9sysw" }, "mini-diff": { "type": "Git", @@ -1227,9 +1198,9 @@ }, "branch": "main", "submodules": false, - "revision": "f7252c5b8ff27d0856b91a410efe8e528370d919", - "url": "https://github.com/echasnovski/mini.misc/archive/f7252c5b8ff27d0856b91a410efe8e528370d919.tar.gz", - "hash": "02jrwcmbi74512240p8grlc9awivyihl6s71d60s46nslgqlnsqf" + "revision": "52bf20e952a26820c25776c7b594f64b7a6dcb66", + "url": "https://github.com/echasnovski/mini.misc/archive/52bf20e952a26820c25776c7b594f64b7a6dcb66.tar.gz", + "hash": "0r2xmxlsq8ifq4ps54l7yjljczlp7ldxp8b30gjdkkrbbi1rkbvg" }, "mini-move": { "type": "Git", @@ -1253,9 +1224,9 @@ }, "branch": "main", "submodules": false, - "revision": "3a06b21dd0b335b95d125eae813276113b5e9ce7", - "url": "https://github.com/echasnovski/mini.notify/archive/3a06b21dd0b335b95d125eae813276113b5e9ce7.tar.gz", - "hash": "13pa82zmz6w8is4gfh33fqcd2yx3f1bmd5r3q4sp1kfgf2c68c30" + "revision": "f4e892533c8821bc5e0f373b353022a42bd465f7", + "url": "https://github.com/echasnovski/mini.notify/archive/f4e892533c8821bc5e0f373b353022a42bd465f7.tar.gz", + "hash": "0ziqqd8zz2d28x7801g9h45jgcv5vxqx25wcyh3574zrd5aay5s7" }, "mini-operators": { "type": "Git", @@ -1292,9 +1263,9 @@ }, "branch": "main", "submodules": false, - "revision": "417c273861971b451687e847383e61687463b06e", - "url": "https://github.com/echasnovski/mini.pick/archive/417c273861971b451687e847383e61687463b06e.tar.gz", - "hash": "0xyw2wns9fpv1yxzflb18mmfajihy45g163q4bka0vylj77858xa" + "revision": "6cad781797f3a9b0e69f2e9a2d63de8b1c1824f5", + "url": "https://github.com/echasnovski/mini.pick/archive/6cad781797f3a9b0e69f2e9a2d63de8b1c1824f5.tar.gz", + "hash": "1nsnz9dys2nsjrpzm4d3dc4qjms5f7pqsxbgnvglibi9vizrkahx" }, "mini-sessions": { "type": "Git", @@ -1318,9 +1289,9 @@ }, "branch": "main", "submodules": false, - "revision": "d005684e620e76eb2a5fbbbd211a1eba7212b4aa", - "url": "https://github.com/echasnovski/mini.snippets/archive/d005684e620e76eb2a5fbbbd211a1eba7212b4aa.tar.gz", - "hash": "19xmqzgx0lv6m6lp6dn4pcr53clgjyrlnh45j795cy9szizw4y0x" + "revision": "e05106957fc178285dbc510ff833985da59d3e5a", + "url": "https://github.com/echasnovski/mini.snippets/archive/e05106957fc178285dbc510ff833985da59d3e5a.tar.gz", + "hash": "0pn9i6sfh3fxkjzh9yyyc05lgcgm8wsanvl7axmy4p7a9spnfa2q" }, "mini-splitjoin": { "type": "Git", @@ -1490,9 +1461,9 @@ }, "branch": "main", "submodules": false, - "revision": "71bfdeddc90225e281ce34c378dc1b5914f5018d", - "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/71bfdeddc90225e281ce34c378dc1b5914f5018d.tar.gz", - "hash": "0cm4y2idpmf7i6daa4wl5b6n5ldzqr3pqmh29rc645c1xk2y0b80" + "revision": "5224467c6a49a6c77b8a8333f4d9af0abc788e10", + "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/5224467c6a49a6c77b8a8333f4d9af0abc788e10.tar.gz", + "hash": "0dzppxi4w38s3pqsgwd3z0xr1r14bd0v4qpakxw3kjn9wr2d8y7n" }, "neocord": { "type": "Git", @@ -1516,9 +1487,9 @@ }, "branch": "main", "submodules": false, - "revision": "8fdd9b2986acfb4ce310bebfc338111793862f00", - "url": "https://github.com/nvim-neorg/neorg/archive/8fdd9b2986acfb4ce310bebfc338111793862f00.tar.gz", - "hash": "0xv3aasbhambywp6idhz44nlsh3hlarw3j7wwx7wn1whm6xbwvf6" + "revision": "a1e19618c012a712c5ed7cd5ebd01b48ad9f4b5b", + "url": "https://github.com/nvim-neorg/neorg/archive/a1e19618c012a712c5ed7cd5ebd01b48ad9f4b5b.tar.gz", + "hash": "1lp1chm788rnzqjndw64rnjn299889fx66lm01lvfgail0509dw0" }, "neorg-telescope": { "type": "Git", @@ -1529,9 +1500,9 @@ }, "branch": "main", "submodules": false, - "revision": "7fb6ca6a632c3c095601d379a664c0c1f802dc6c", - "url": "https://github.com/nvim-neorg/neorg-telescope/archive/7fb6ca6a632c3c095601d379a664c0c1f802dc6c.tar.gz", - "hash": "12pbixkb7175qb9wblq01mbpkccm9h0si7b2jjaf7yip8j8frxmn" + "revision": "ddb2556644cae922699a239bbb0fe16e25b084b7", + "url": "https://github.com/nvim-neorg/neorg-telescope/archive/ddb2556644cae922699a239bbb0fe16e25b084b7.tar.gz", + "hash": "0p2s3n22fy1vkqc9n55x6kssqs4n0znwlszfrs532hj8m992wbks" }, "neovim-session-manager": { "type": "Git", @@ -1594,9 +1565,9 @@ }, "branch": "main", "submodules": false, - "revision": "a49f5a79cdb76e0dc1a98899c8598f4db014c5e7", - "url": "https://github.com/nvimtools/none-ls.nvim/archive/a49f5a79cdb76e0dc1a98899c8598f4db014c5e7.tar.gz", - "hash": "0x16saxsr3w3ivqpdjg05bkyfxzsiyfpsiwhyzsvqxg1qnkda3b2" + "revision": "8d99472fcccffd73d7501e54e9018bab5cb0c4ad", + "url": "https://github.com/nvimtools/none-ls.nvim/archive/8d99472fcccffd73d7501e54e9018bab5cb0c4ad.tar.gz", + "hash": "1x1fmpy65j8smn5lfl9bknmfnan33gd5dila49gyblgcgfvpd7ph" }, "nord": { "type": "Git", @@ -1620,9 +1591,9 @@ }, "branch": "main", "submodules": false, - "revision": "8d5b0b568517935d3c84f257f272ef004d9f5a59", - "url": "https://github.com/MunifTanjim/nui.nvim/archive/8d5b0b568517935d3c84f257f272ef004d9f5a59.tar.gz", - "hash": "0z5md64qly2dzm9pq46ldid45l44mfwqk3r1hirk8lj6djyrxv9m" + "revision": "8d3bce9764e627b62b07424e0df77f680d47ffdb", + "url": "https://github.com/MunifTanjim/nui.nvim/archive/8d3bce9764e627b62b07424e0df77f680d47ffdb.tar.gz", + "hash": "0ia8q5d4xcss45vw6jlaanyr0migy03cjzq9g0kipfyqxkcxi105" }, "nvim-autopairs": { "type": "Git", @@ -1633,9 +1604,9 @@ }, "branch": "master", "submodules": false, - "revision": "4d74e75913832866aa7de35e4202463ddf6efd1b", - "url": "https://github.com/windwp/nvim-autopairs/archive/4d74e75913832866aa7de35e4202463ddf6efd1b.tar.gz", - "hash": "0q6pv89x05l71nfg2chqf9p0d2ha72agmll2svimq0npp84ymfxz" + "revision": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8", + "url": "https://github.com/windwp/nvim-autopairs/archive/2a406cdd8c373ae7fe378a9e062a5424472bd8d8.tar.gz", + "hash": "06i7bdq4msy2gia6mczxaj2y7chhrmw9xwjj8q4dix0pk58hjfp1" }, "nvim-bufferline-lua": { "type": "Git", @@ -1659,9 +1630,9 @@ }, "branch": "main", "submodules": false, - "revision": "b5311ab3ed9c846b585c0c15b7559be131ec4be9", - "url": "https://github.com/hrsh7th/nvim-cmp/archive/b5311ab3ed9c846b585c0c15b7559be131ec4be9.tar.gz", - "hash": "07674djcyac9wlj08y9p5gsmdpsm8zxjfgk3fwyvvx8j7qyzx74p" + "revision": "059e89495b3ec09395262f16b1ad441a38081d04", + "url": "https://github.com/hrsh7th/nvim-cmp/archive/059e89495b3ec09395262f16b1ad441a38081d04.tar.gz", + "hash": "0yfxjkascn45svvzx727kz20bm6lkflkx4jc8nrx3rxv0j39wbb0" }, "nvim-colorizer-lua": { "type": "Git", @@ -1698,9 +1669,9 @@ }, "branch": "master", "submodules": false, - "revision": "8df427aeba0a06c6577dc3ab82de3076964e3b8d", - "url": "https://github.com/mfussenegger/nvim-dap/archive/8df427aeba0a06c6577dc3ab82de3076964e3b8d.tar.gz", - "hash": "13d04z1dnkrhslq6s1xba5myqkgxar3i3p2lhqvpawicbba8yp22" + "revision": "7aade9e99bef5f0735cf966e715b3ce45515d786", + "url": "https://github.com/mfussenegger/nvim-dap/archive/7aade9e99bef5f0735cf966e715b3ce45515d786.tar.gz", + "hash": "0cr2y3lkr6ffxxd9b2pj8hr3fzb5dlj003fcknswqwsdhws75l22" }, "nvim-dap-go": { "type": "Git", @@ -1724,9 +1695,9 @@ }, "branch": "master", "submodules": false, - "revision": "73a26abf4941aa27da59820fd6b028ebcdbcf932", - "url": "https://github.com/rcarriga/nvim-dap-ui/archive/73a26abf4941aa27da59820fd6b028ebcdbcf932.tar.gz", - "hash": "1h71y3pjbbgh8kgghs0sb721bl9pd7l7ak3mj1j27fv6x6kbmgar" + "revision": "bc81f8d3440aede116f821114547a476b082b319", + "url": "https://github.com/rcarriga/nvim-dap-ui/archive/bc81f8d3440aede116f821114547a476b082b319.tar.gz", + "hash": "0hk34mfjxqiq82faf3q75ixpxd822vh8zbl1i5pvx6akn4v3mxk7" }, "nvim-docs-view": { "type": "Git", @@ -1763,9 +1734,9 @@ }, "branch": "master", "submodules": false, - "revision": "9dfb77ef6c5092a19502883c02dc5a02ec648729", - "url": "https://github.com/mfussenegger/nvim-lint/archive/9dfb77ef6c5092a19502883c02dc5a02ec648729.tar.gz", - "hash": "0772bgl09jcrvvhvpic2b07qb21kf2pr479g792jlwbr5jfa1pa0" + "revision": "5b1bdf306bd3e565908145279e8bbfc594dac3b3", + "url": "https://github.com/mfussenegger/nvim-lint/archive/5b1bdf306bd3e565908145279e8bbfc594dac3b3.tar.gz", + "hash": "0kwdb9wggkgzg9msrvnf15njqm9a8acljdak9fxnfh9al1ks8cav" }, "nvim-lspconfig": { "type": "Git", @@ -1776,9 +1747,9 @@ }, "branch": "master", "submodules": false, - "revision": "46434074f188e6bfccf9d9153dd8be6b1381498b", - "url": "https://github.com/neovim/nvim-lspconfig/archive/46434074f188e6bfccf9d9153dd8be6b1381498b.tar.gz", - "hash": "0h13n1vjw6v8gp41yfc6qffbwwrxw81vcilkmxx9sim6671w5pzp" + "revision": "6ac17e69a353fea377b30a35a672a30f04e887a1", + "url": "https://github.com/neovim/nvim-lspconfig/archive/6ac17e69a353fea377b30a35a672a30f04e887a1.tar.gz", + "hash": "0s1hb7fkjvccycwdzq10lrycs8xmdlk9n4pjafgwgmnhnmgb3sfr" }, "nvim-metals": { "type": "Git", @@ -1789,9 +1760,9 @@ }, "branch": "main", "submodules": false, - "revision": "04d8ce24638412a2c93dd79fecca4b2c7b9c07f9", - "url": "https://github.com/scalameta/nvim-metals/archive/04d8ce24638412a2c93dd79fecca4b2c7b9c07f9.tar.gz", - "hash": "19mdfn5ni35ldjmwdg25cwiy9cvkg2cxrdhcjr9xplx7ln6zsld9" + "revision": "bc896458ac639dea568e8dc06862074f8cba7fa3", + "url": "https://github.com/scalameta/nvim-metals/archive/bc896458ac639dea568e8dc06862074f8cba7fa3.tar.gz", + "hash": "0k7c300rf62f50vqzxxdgh7pqpb61im6xbz230fysvdjdx1ddglh" }, "nvim-navbuddy": { "type": "Git", @@ -1802,9 +1773,9 @@ }, "branch": "master", "submodules": false, - "revision": "a34786c77a528519f6b8a142db7609f6e387842d", - "url": "https://github.com/SmiteshP/nvim-navbuddy/archive/a34786c77a528519f6b8a142db7609f6e387842d.tar.gz", - "hash": "0b6bazh531bixskpmmpkidqii4n3m7n2cp9bmzml5wb0wibazcac" + "revision": "f22bac988f2dd073601d75ba39ea5636ab6e38cb", + "url": "https://github.com/SmiteshP/nvim-navbuddy/archive/f22bac988f2dd073601d75ba39ea5636ab6e38cb.tar.gz", + "hash": "034pmg403y0y1fxnb1jv291mr016bx1vn68y543v6v4dpbdlr7di" }, "nvim-navic": { "type": "Git", @@ -1815,9 +1786,9 @@ }, "branch": "master", "submodules": false, - "revision": "d0a8c17c4dc721b00bc2ac305c6ffbb036beeb74", - "url": "https://github.com/SmiteshP/nvim-navic/archive/d0a8c17c4dc721b00bc2ac305c6ffbb036beeb74.tar.gz", - "hash": "0mxsnwvrjirpy2ichsilx6207z55xi42syg5d3fdgs2r1p1npggc" + "revision": "8649f694d3e76ee10c19255dece6411c29206a54", + "url": "https://github.com/SmiteshP/nvim-navic/archive/8649f694d3e76ee10c19255dece6411c29206a54.tar.gz", + "hash": "0964wgwh6i4nm637vx36bshkpd5i63ipwzqmrdbkz5h9bzyng7nj" }, "nvim-neoclip-lua": { "type": "Git", @@ -1854,9 +1825,9 @@ }, "branch": "master", "submodules": false, - "revision": "b5825cf9ee881dd8e43309c93374ed5b87b7a896", - "url": "https://github.com/rcarriga/nvim-notify/archive/b5825cf9ee881dd8e43309c93374ed5b87b7a896.tar.gz", - "hash": "13qlkncpmjvmkpcx5sv366i7scsh90wjvcqy8qlv31ccmgq511wv" + "revision": "22f29093eae7785773ee9d543f8750348b1a195c", + "url": "https://github.com/rcarriga/nvim-notify/archive/22f29093eae7785773ee9d543f8750348b1a195c.tar.gz", + "hash": "0nnxmi65ppmn8dzwh38vx2w7w6piq0i28mw0s32wa31xn5rmzwza" }, "nvim-scrollbar": { "type": "Git", @@ -1880,9 +1851,9 @@ }, "branch": "main", "submodules": false, - "revision": "0e62500b98f4513feaaf7425c135472457ea5b7d", - "url": "https://github.com/kylechui/nvim-surround/archive/0e62500b98f4513feaaf7425c135472457ea5b7d.tar.gz", - "hash": "0rwzz98n8gyx2bffxg7ga7vxxxcc4crbwimvglx6bxkdg2abwyrn" + "revision": "caf6f633d4d77a29b6e265b560c5a035d171a913", + "url": "https://github.com/kylechui/nvim-surround/archive/caf6f633d4d77a29b6e265b560c5a035d171a913.tar.gz", + "hash": "130y0b2f69y5rzm64ss34a9zyqkpkybr2d1s4p0pcvvaq1ngq0r0" }, "nvim-tree-lua": { "type": "Git", @@ -1893,9 +1864,9 @@ }, "branch": "master", "submodules": false, - "revision": "582ae48c9e43d2bcd55dfcc8e2e7a1f29065d924", - "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/582ae48c9e43d2bcd55dfcc8e2e7a1f29065d924.tar.gz", - "hash": "1xpal45q4mvplvgz06z4wzsq1ml5awv8v4m0k9jh9s4xlnc0va24" + "revision": "5bea2b37523a31288e0fcab42f3be5c1bd4516bb", + "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/5bea2b37523a31288e0fcab42f3be5c1bd4516bb.tar.gz", + "hash": "1mizgknbbjqv7a8fqc0n7glgabl0fq660nrqwq6w04qqynp0z1ax" }, "nvim-treesitter-context": { "type": "Git", @@ -1906,9 +1877,9 @@ }, "branch": "master", "submodules": false, - "revision": "6daca3ad780f045550b820f262002f35175a6c04", - "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/6daca3ad780f045550b820f262002f35175a6c04.tar.gz", - "hash": "0qprwd44hw9sz0vh14p6lpvs9vxrick462pfkradmal6ak1kfwn3" + "revision": "439789a9a8df9639ecd749bb3286b77117024a6f", + "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/439789a9a8df9639ecd749bb3286b77117024a6f.tar.gz", + "hash": "04x9nza48d2vz262myhhfnmjzcc2fkdjb21mdqvlmnzkhh7ysyz2" }, "nvim-ts-autotag": { "type": "Git", @@ -1932,9 +1903,9 @@ }, "branch": "main", "submodules": false, - "revision": "cac999ec9f6302d2fd4ad8a846bf8f731af6e7cf", - "url": "https://github.com/kevinhwang91/nvim-ufo/archive/cac999ec9f6302d2fd4ad8a846bf8f731af6e7cf.tar.gz", - "hash": "14lvlv1wmbpw0dpyfz3gq7k760ip1903w5ibajqiaflw06afv4pn" + "revision": "a026364df62e88037b26d37c9f14c17c006fd577", + "url": "https://github.com/kevinhwang91/nvim-ufo/archive/a026364df62e88037b26d37c9f14c17c006fd577.tar.gz", + "hash": "02mqjwc4h29i9s9l8lsfwrx4ac69n3mpr9hw2vg7ji3c20mbh413" }, "nvim-web-devicons": { "type": "Git", @@ -1945,9 +1916,9 @@ }, "branch": "master", "submodules": false, - "revision": "2c2b4eafce6cdd0cb165036faa17396eff18f847", - "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/2c2b4eafce6cdd0cb165036faa17396eff18f847.tar.gz", - "hash": "11yp02zg60gdmqa6rdk3rjn704k2kvjcs41w85y01b68k36w7pw2" + "revision": "c90dee4e930ab9f49fa6d77f289bff335b49e972", + "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/c90dee4e930ab9f49fa6d77f289bff335b49e972.tar.gz", + "hash": "0i41df2cafrpc49cfbimajwbiyhd31q95d1s3rh40g6zgz0gm8sc" }, "obsidian-nvim": { "type": "Git", @@ -1971,9 +1942,9 @@ }, "branch": "master", "submodules": false, - "revision": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a", - "url": "https://github.com/stevearc/oil.nvim/archive/685cdb4ffa74473d75a1b97451f8654ceeab0f4a.tar.gz", - "hash": "1wqbsfh274wkyyx8nf5gbcnsk92y4bwsrwq2vl85x3cx73kkzlhv" + "revision": "302bbaceeafc690e6419e0c8296e804d60cb9446", + "url": "https://github.com/stevearc/oil.nvim/archive/302bbaceeafc690e6419e0c8296e804d60cb9446.tar.gz", + "hash": "155v10myfpahyf9hf2x3dmp8ljjqavmqg1958x255i9l5swqcp5g" }, "omnisharp-extended-lsp-nvim": { "type": "Git", @@ -1997,9 +1968,9 @@ }, "branch": "master", "submodules": false, - "revision": "0e5512d1bebd1f08954710086f87a5caa173a924", - "url": "https://github.com/navarasu/onedark.nvim/archive/0e5512d1bebd1f08954710086f87a5caa173a924.tar.gz", - "hash": "14ixrvcp3h06kngq5ji54lf2l10k33vrmzs609xf7sqdy6rflm4j" + "revision": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6", + "url": "https://github.com/navarasu/onedark.nvim/archive/67a74c275d1116d575ab25485d1bfa6b2a9c38a6.tar.gz", + "hash": "1pfyz3ascxs3sxl878qcirp9jsz77kpl2ks3wxkcv8ql4psymc9l" }, "orgmode": { "type": "Git", @@ -2010,9 +1981,9 @@ }, "branch": "master", "submodules": false, - "revision": "15d66ead1285d99f8a21c4ef4874ac62e9320fe6", - "url": "https://github.com/nvim-orgmode/orgmode/archive/15d66ead1285d99f8a21c4ef4874ac62e9320fe6.tar.gz", - "hash": "05h766qj1vid5rs1mv8aiv6rsfrp0md9605sfr9vycip1rd8csgy" + "revision": "e66a64183e211842c195f34fd6dcb97d7b534812", + "url": "https://github.com/nvim-orgmode/orgmode/archive/e66a64183e211842c195f34fd6dcb97d7b534812.tar.gz", + "hash": "0cm3xiqjxxxcrrmjnpfrr7k6xy94ixz55wcrfxgsa8cm2xjzx52m" }, "otter-nvim": { "type": "Git", @@ -2114,9 +2085,9 @@ }, "branch": "master", "submodules": false, - "revision": "55ad4fb76ab68460f700599b7449385f0c4e858e", - "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/55ad4fb76ab68460f700599b7449385f0c4e858e.tar.gz", - "hash": "1wb18hp5yz4vhw9ajm50006n4d1mp1krri6kidxh8rkhs0d6zqhi" + "revision": "351e449683070a2bb946bbd603555faf5a195e9a", + "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/351e449683070a2bb946bbd603555faf5a195e9a.tar.gz", + "hash": "12qj32zfyjbxs3qjp283fnc8sfa8w4blfx3skgvhkifv0vi7r3bf" }, "registers-nvim": { "type": "Git", @@ -2140,9 +2111,9 @@ }, "branch": "main", "submodules": false, - "revision": "57c7f33f276876c994898683680da9e3a3590d0d", - "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/57c7f33f276876c994898683680da9e3a3590d0d.tar.gz", - "hash": "1lfypdqyka5idrkr3w62vx7j6p75r3ld7sz5i40y41svglnxyrsj" + "revision": "8bb0d4725cc4909a603158d44ff28b6158ad9278", + "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/8bb0d4725cc4909a603158d44ff28b6158ad9278.tar.gz", + "hash": "18yqhy2y36rydyqs9z3s1h6rghd02bd9kb3rkxs88spm18wvq41z" }, "rose-pine": { "type": "Git", @@ -2153,9 +2124,9 @@ }, "branch": "main", "submodules": false, - "revision": "614892e32e94378d976a238f287532cfe790c1fe", - "url": "https://github.com/rose-pine/neovim/archive/614892e32e94378d976a238f287532cfe790c1fe.tar.gz", - "hash": "1pi5z81xkgkx8yyfjfjj0hg66v2zcj04gxxbf5q2lqz70xcs3cgk" + "revision": "96ff3993a67356ee85d1cdab9be652cdc1c5d1ac", + "url": "https://github.com/rose-pine/neovim/archive/96ff3993a67356ee85d1cdab9be652cdc1c5d1ac.tar.gz", + "hash": "0p712rivi5i3zlrigm86p8vrn1nvg4qils86snlw717cq3scj9gj" }, "rtp-nvim": { "type": "Git", @@ -2192,9 +2163,9 @@ }, "branch": "master", "submodules": false, - "revision": "4b8c2edb55f548ed9c683f88dde2ffb235413b03", - "url": "https://github.com/mrcjkb/rustaceanvim/archive/4b8c2edb55f548ed9c683f88dde2ffb235413b03.tar.gz", - "hash": "0d3kwvwj5cppwypvg8iasn5f8rviqyskkgh1wafs7chjm32dm4gb" + "revision": "3f327d15a3c1ed48b1e1087e16873a28a39768c2", + "url": "https://github.com/mrcjkb/rustaceanvim/archive/3f327d15a3c1ed48b1e1087e16873a28a39768c2.tar.gz", + "hash": "09wrfmzbk81xax5p4wzczsvv1x28nv54mayi12fvzv6c3bmcsbvj" }, "smartcolumn-nvim": { "type": "Git", @@ -2351,9 +2322,9 @@ }, "branch": "master", "submodules": false, - "revision": "dea4525d5420b7c32eebda7de15a6beb9d6574fa", - "url": "https://github.com/chomosuke/typst-preview.nvim/archive/dea4525d5420b7c32eebda7de15a6beb9d6574fa.tar.gz", - "hash": "0y658l2ibq0x4cwa4rl3lab7aw4ba68xcrdnxp81p2rsk0d60qq4" + "revision": "2503b188cd2a17ce44fdd21a944a93335e935215", + "url": "https://github.com/chomosuke/typst-preview.nvim/archive/2503b188cd2a17ce44fdd21a944a93335e935215.tar.gz", + "hash": "0l981pjiz2ycn6rw1xwvmhdjpml7nrrlymwfyc942inw173k1jsg" }, "vim-dirtytalk": { "type": "Git", @@ -2390,9 +2361,9 @@ }, "branch": "master", "submodules": false, - "revision": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf", - "url": "https://github.com/RRethy/vim-illuminate/archive/fbc16dee336d8cc0d3d2382ea4a53f4a29725abf.tar.gz", - "hash": "072kgd7h7cjq4hskczxl60nsx3jpww9l7ypafcwk833ypahz899i" + "revision": "08aa184f1bd508f6a59371b52cba26be07bc016d", + "url": "https://github.com/RRethy/vim-illuminate/archive/08aa184f1bd508f6a59371b52cba26be07bc016d.tar.gz", + "hash": "0sqs4q2qk9hfkh5vn08y664568pl15b88yyvb9za0f5k7v3z1bcw" }, "vim-markdown": { "type": "Git", @@ -2420,19 +2391,6 @@ "url": "https://github.com/tpope/vim-repeat/archive/65846025c15494983dafe5e3b46c8f88ab2e9635.tar.gz", "hash": "0n8sx6s2sbjb21dv9j6y5lyqda9vvxraffg2jz423daamn96dxqv" }, - "vim-sleuth": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "tpope", - "repo": "vim-sleuth" - }, - "branch": "master", - "submodules": false, - "revision": "be69bff86754b1aa5adcbb527d7fcd1635a84080", - "url": "https://github.com/tpope/vim-sleuth/archive/be69bff86754b1aa5adcbb527d7fcd1635a84080.tar.gz", - "hash": "0wqxdjgplf04nq428ialw1w03f8nh5vb629a17vl5gc9gf3zfanq" - }, "vim-startify": { "type": "Git", "repository": { @@ -2468,9 +2426,9 @@ }, "branch": "main", "submodules": false, - "revision": "04775cc6e10ef038c397c407bc17f00a2f52b378", - "url": "https://github.com/gbprod/yanky.nvim/archive/04775cc6e10ef038c397c407bc17f00a2f52b378.tar.gz", - "hash": "024dw52ji4691ndkaz3k12fx6qyvhdpd2r69r9d2isy81fbs2fjm" + "revision": "98b9c21d3c06d79f68fd9d471dcc28fc6d2d72ef", + "url": "https://github.com/gbprod/yanky.nvim/archive/98b9c21d3c06d79f68fd9d471dcc28fc6d2d72ef.tar.gz", + "hash": "1bdplxlhsc72kmbzmi7x4p378f3dyjdm3ncikkjs3qwxkvjl1bxw" } }, "version": 5