From 43d54f77f5969f67ea38d6737b8d8e8a7b518554 Mon Sep 17 00:00:00 2001 From: Laszlo Bacsi Date: Wed, 16 Jul 2025 09:40:06 +0200 Subject: [PATCH 1/9] avante-nvim: upgrade plugin --- flake/avante-nvim/default.nix | 2 +- npins/sources.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake/avante-nvim/default.nix b/flake/avante-nvim/default.nix index 3991d16b..e5d9692c 100644 --- a/flake/avante-nvim/default.nix +++ b/flake/avante-nvim/default.nix @@ -16,7 +16,7 @@ inherit version src; useFetchCargoVendor = true; - cargoHash = "sha256-pmnMoNdaIR0i+4kwW3cf01vDQo39QakTCEG9AXA86ck="; + cargoHash = "sha256-8mBpzndz34RrmhJYezd4hLrJyhVL4S4IHK3plaue1k8="; nativeBuildInputs = [ pkg-config diff --git a/npins/sources.json b/npins/sources.json index 5a962940..a5161090 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -35,9 +35,9 @@ }, "branch": "main", "submodules": false, - "revision": "2dd4c040880b271861369b361489a2d418d42648", - "url": "https://github.com/yetone/avante.nvim/archive/2dd4c040880b271861369b361489a2d418d42648.tar.gz", - "hash": "01j92m0qhd5g6m92rp0qnr4vqqgfrhbx91jbrrcjj1npizynxjm1" + "revision": "154e5f578f8925135a9dd23764d4c33a10c7ae36", + "url": "https://github.com/yetone/avante.nvim/archive/154e5f578f8925135a9dd23764d4c33a10c7ae36.tar.gz", + "hash": "0hx5ccfkn7ljnprzl6qwvb9ba86zrkqysh18zvnaq360g95d4ca1" }, "base16": { "type": "Git", From fae1e527fc03008c920c36f615fbff3afb0a1f14 Mon Sep 17 00:00:00 2001 From: Laszlo Bacsi Date: Wed, 16 Jul 2025 12:02:52 +0200 Subject: [PATCH 2/9] avante-nvim: useFetchCargoVendor now defaults to true in unstable --- flake/avante-nvim/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake/avante-nvim/default.nix b/flake/avante-nvim/default.nix index e5d9692c..0d128bae 100644 --- a/flake/avante-nvim/default.nix +++ b/flake/avante-nvim/default.nix @@ -15,7 +15,6 @@ pname = "avante-nvim-lib"; inherit version src; - useFetchCargoVendor = true; cargoHash = "sha256-8mBpzndz34RrmhJYezd4hLrJyhVL4S4IHK3plaue1k8="; nativeBuildInputs = [ From 28f4237e4faf664fd9b1170f4dc515fffd0aa16a Mon Sep 17 00:00:00 2001 From: Francesco Prem Solidoro Date: Thu, 22 May 2025 01:30:46 +0200 Subject: [PATCH 3/9] notes/norg: fix broken grammars and add norg-meta --- modules/plugins/notes/neorg/config.nix | 2 +- modules/plugins/notes/neorg/neorg.nix | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/plugins/notes/neorg/config.nix b/modules/plugins/notes/neorg/config.nix index fab5079d..f8c18ea9 100644 --- a/modules/plugins/notes/neorg/config.nix +++ b/modules/plugins/notes/neorg/config.nix @@ -35,7 +35,7 @@ in { (mkIf cfg.treesitter.enable { vim.treesitter.enable = true; - vim.treesitter.grammars = [cfg.treesitter.norgPackage]; + vim.treesitter.grammars = [cfg.treesitter.norgPackage cfg.treesitter.norgMetaPackage]; }) ]); } diff --git a/modules/plugins/notes/neorg/neorg.nix b/modules/plugins/notes/neorg/neorg.nix index 6b5cf18e..34b4687e 100644 --- a/modules/plugins/notes/neorg/neorg.nix +++ b/modules/plugins/notes/neorg/neorg.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkPackageOption mkEnableOption mkOption; inherit (lib.types) submodule listOf str; - inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption; + inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.notes.neorg = { enable = mkEnableOption '' @@ -44,7 +44,12 @@ in { treesitter = { enable = mkEnableOption "Neorg treesitter" // {default = config.vim.languages.enableTreesitter;}; - norgPackage = mkGrammarOption pkgs "norg"; + norgPackage= mkPackageOption pkgs ["norg-meta treesitter"] { + default = ["tree-sitter-grammars" "tree-sitter-norg"]; + }; + norgMetaPackage = mkPackageOption pkgs ["norg-meta treesitter"] { + default = ["tree-sitter-grammars" "tree-sitter-norg-meta"]; + }; }; }; } From 4e0e8206c3da8af52a0f1c721c3b86818738993b Mon Sep 17 00:00:00 2001 From: Francesco Prem Solidoro Date: Wed, 16 Jul 2025 16:47:49 +0200 Subject: [PATCH 4/9] notes/neorg: fix formatting --- modules/plugins/notes/neorg/neorg.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/notes/neorg/neorg.nix b/modules/plugins/notes/neorg/neorg.nix index 34b4687e..684519c9 100644 --- a/modules/plugins/notes/neorg/neorg.nix +++ b/modules/plugins/notes/neorg/neorg.nix @@ -44,7 +44,7 @@ in { treesitter = { enable = mkEnableOption "Neorg treesitter" // {default = config.vim.languages.enableTreesitter;}; - norgPackage= mkPackageOption pkgs ["norg-meta treesitter"] { + norgPackage = mkPackageOption pkgs ["norg-meta treesitter"] { default = ["tree-sitter-grammars" "tree-sitter-norg"]; }; norgMetaPackage = mkPackageOption pkgs ["norg-meta treesitter"] { From e20d673d6e648fefb91c7df43099bf26016504db Mon Sep 17 00:00:00 2001 From: Francesco Prem Solidoro Date: Wed, 16 Jul 2025 19:32:58 +0200 Subject: [PATCH 5/9] docs/rl-0.8: add neorg fix entry --- docs/release-notes/rl-0.8.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 8c88cd56..87561a9d 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -463,3 +463,6 @@ leverage the pattern introduced in commit [fc8206e7a61d ("flake: utilize nix-systems for overridable flake systems")]( https://github.com/NotAShelf/nvf/commit/fc8206e7a61d7eb02006f9010e62ebdb3336d0d2). + +[soliprem](https://github.com/soliprem): +- fix broken `neorg` grammars From 0d394c9db0fee303c4f3a9a29923923b1d85ed8c Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Wed, 16 Jul 2025 19:22:19 +0800 Subject: [PATCH 6/9] fix(snippets/luasnip): enable vscode snippet loader nvim-cmp and friendly-snippets depend on the vscode luasnip loader. previously we only set snipmate --- modules/plugins/snippets/luasnip/config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/plugins/snippets/luasnip/config.nix b/modules/plugins/snippets/luasnip/config.nix index 5f2abdf0..48b1f40d 100644 --- a/modules/plugins/snippets/luasnip/config.nix +++ b/modules/plugins/snippets/luasnip/config.nix @@ -65,6 +65,9 @@ in { ${optionalString ( cfg.customSnippets.snipmate != {} ) "require('luasnip.loaders.from_snipmate').lazy_load()"} + ${optionalString ( + config.vim.autocomplete.nvim-cmp.enable || config.vim.autocomplete.blink-cmp.friendly-snippets.enable + ) "require('luasnip.loaders.from_vscode').lazy_load()"} ''; }; }; From 47dcff9d563c12333cbc8ccc378d8355be6f7dfb Mon Sep 17 00:00:00 2001 From: midischwarz12 Date: Thu, 17 Jul 2025 10:43:46 -0500 Subject: [PATCH 7/9] feat: vim.loop -> vim.uv --- modules/plugins/treesitter/treesitter.nix | 2 +- modules/plugins/utility/harpoon/harpoon.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/plugins/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix index d88cc1a9..80a30a5a 100644 --- a/modules/plugins/treesitter/treesitter.nix +++ b/modules/plugins/treesitter/treesitter.nix @@ -106,7 +106,7 @@ in { -- Disable slow treesitter highlight for large files function(lang, buf) local max_filesize = 1000 * 1024 -- 1MB - local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) + local ok, stats = pcall(vim.uv.fs_stat, vim.api.nvim_buf_get_name(buf)) if ok and stats and stats.size > max_filesize then return true end diff --git a/modules/plugins/utility/harpoon/harpoon.nix b/modules/plugins/utility/harpoon/harpoon.nix index 4478c938..6f5b8d0a 100644 --- a/modules/plugins/utility/harpoon/harpoon.nix +++ b/modules/plugins/utility/harpoon/harpoon.nix @@ -39,7 +39,7 @@ in { type = luaInline; default = mkLuaInline '' function() - return vim.loop.cwd() + return vim.uv.cwd() end ''; description = '' From dd815ece184397605153b57dc68ab7b61e95d9ac Mon Sep 17 00:00:00 2001 From: Semyon <52384223+thecakeisfalse@users.noreply.github.com> Date: Fri, 18 Jul 2025 20:26:49 +0300 Subject: [PATCH 8/9] fixed typo docs: `diagostics` -> `diagnostics` --- modules/neovim/init/diagnostics.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/neovim/init/diagnostics.nix b/modules/neovim/init/diagnostics.nix index 8a8e7b38..27f46efc 100644 --- a/modules/neovim/init/diagnostics.nix +++ b/modules/neovim/init/diagnostics.nix @@ -88,7 +88,7 @@ in { options.vim = { diagnostics = { - enable = mkEnableOption "diagostics module for Neovim"; + enable = mkEnableOption "diagnostics module for Neovim"; config = mkOption { type = diagnosticsSubmodule; default = {}; From 5592bcff64f9db3d9b2ea2e8b2c529a6e8980ded Mon Sep 17 00:00:00 2001 From: poz Date: Sat, 19 Jul 2025 00:08:43 +0200 Subject: [PATCH 9/9] treewide: remove deprecated `isNull` --- modules/plugins/theme/supported-themes.nix | 6 +++--- modules/plugins/utility/binds/which-key/config.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix index 1d1f2397..ad1f8a3d 100644 --- a/modules/plugins/theme/supported-themes.nix +++ b/modules/plugins/theme/supported-themes.nix @@ -246,10 +246,10 @@ in { transparent = { enabled = ${boolToString transparent}, }, - ${optionalString (!isNull palette) ''palette = "${palette}",''} - ${optionalString (!isNull variant) ''variant = "${variant}",''} + ${optionalString (palette != null) ''palette = "${palette}",''} + ${optionalString (variant != null) ''variant = "${variant}",''} } - ${optionalString (!isNull background) ''vim.opt.background = "${background}"''} + ${optionalString (background != null) ''vim.opt.background = "${background}"''} vim.cmd.colorscheme "solarized" ''; styles = let diff --git a/modules/plugins/utility/binds/which-key/config.nix b/modules/plugins/utility/binds/which-key/config.nix index 625a6215..7d5ef6c1 100644 --- a/modules/plugins/utility/binds/which-key/config.nix +++ b/modules/plugins/utility/binds/which-key/config.nix @@ -10,7 +10,7 @@ inherit (lib.nvim.dag) entryAnywhere; cfg = config.vim.binds.whichKey; - register = mapAttrsToList (n: v: lib.lists.optional (! isNull v) (mkLuaInline "{ '${n}', desc = '${v}' }")) cfg.register; + register = mapAttrsToList (n: v: lib.lists.optional (v != null) (mkLuaInline "{ '${n}', desc = '${v}' }")) cfg.register; in { config = mkIf cfg.enable { vim = {