From fd8e97a2ff4088fd428056eaceaafab799e7aeda Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 11 Feb 2025 22:04:59 +0300 Subject: [PATCH 1/8] visuals/cellular-automaton: fix npins name incompat --- modules/plugins/visuals/cellular-automaton/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/visuals/cellular-automaton/config.nix b/modules/plugins/visuals/cellular-automaton/config.nix index 2c0c4669f..10c305b38 100644 --- a/modules/plugins/visuals/cellular-automaton/config.nix +++ b/modules/plugins/visuals/cellular-automaton/config.nix @@ -13,7 +13,7 @@ in { config = mkIf cfg.enable { vim = { - startPlugins = ["cellular-automaton"]; + startPlugins = ["cellular-automaton-nvim"]; maps.normal = mkBinding cfg.mappings.makeItRain "CellularAutomaton make_it_rain" "Make it rain"; From dad18b322618310c1c62e9411fced2e20d11de7d Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 11 Feb 2025 22:06:10 +0300 Subject: [PATCH 2/8] assistant/chatgpt: fix npins name incompat --- modules/plugins/assistant/chatgpt/config.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/plugins/assistant/chatgpt/config.nix b/modules/plugins/assistant/chatgpt/config.nix index 3caa221f7..95a36acfe 100644 --- a/modules/plugins/assistant/chatgpt/config.nix +++ b/modules/plugins/assistant/chatgpt/config.nix @@ -30,17 +30,19 @@ in { config = mkIf cfg.enable { vim = { - startPlugins = [ - "chatgpt" - ]; + startPlugins = ["chatgpt-nvim"]; + pluginRC.chagpt = entryAnywhere '' require("chatgpt").setup(${toLuaObject cfg.setupOpts}) ''; - maps.normal = mkMerge [ - (mkSetBinding mappings.chatGpt "ChatGPT") - maps - ]; - maps.visual = maps; + + maps = { + visual = maps; + normal = mkMerge [ + (mkSetBinding mappings.chatGpt "ChatGPT") + maps + ]; + }; }; }; } From f62de17141c251a6c055c8d3160e9ae0547314ed Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 11 Feb 2025 22:07:47 +0300 Subject: [PATCH 3/8] languages/csharp: fix npins name incompat --- modules/plugins/languages/csharp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/plugins/languages/csharp.nix b/modules/plugins/languages/csharp.nix index 5011c5cc9..af7f36e01 100644 --- a/modules/plugins/languages/csharp.nix +++ b/modules/plugins/languages/csharp.nix @@ -75,8 +75,8 @@ }; extraServerPlugins = { - omnisharp = ["omnisharp-extended"]; - csharp_ls = ["csharpls-extended"]; + omnisharp = ["omnisharp-extended-lsp-nvim"]; + csharp_ls = ["csharpls-extended-lsp-nvim"]; }; cfg = config.vim.languages.csharp; From 6538fadb655dee5f4d78faf5b3f83a384bebd093 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 11 Feb 2025 22:08:29 +0300 Subject: [PATCH 4/8] languages/elixir: fix npins name incompat --- modules/plugins/languages/elixir.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix index 145746a70..f8f338b13 100644 --- a/modules/plugins/languages/elixir.nix +++ b/modules/plugins/languages/elixir.nix @@ -112,7 +112,7 @@ in { }) (mkIf cfg.elixir-tools.enable { - vim.startPlugins = ["elixir-tools"]; + vim.startPlugins = ["elixir-tools-nvim"]; vim.pluginRC.elixir-tools = entryAnywhere '' local elixir = require("elixir") local elixirls = require("elixir.elixirls") From d221c4b49a86df8b057c85831fe972d1f3c9532c Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 11 Feb 2025 22:13:58 +0300 Subject: [PATCH 5/8] session/nvim-session-manager: fix npins name incompat --- modules/plugins/session/nvim-session-manager/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/session/nvim-session-manager/config.nix b/modules/plugins/session/nvim-session-manager/config.nix index 5d345c710..3585b7152 100644 --- a/modules/plugins/session/nvim-session-manager/config.nix +++ b/modules/plugins/session/nvim-session-manager/config.nix @@ -15,7 +15,7 @@ in { vim = { startPlugins = [ - "nvim-session-manager" + "neovim-session-manager" "plenary-nvim" ] ++ optionals cfg.usePicker ["dressing-nvim"]; From 678598167ca8ef169fac31d52b4b1f2b001d5646 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 11 Feb 2025 22:17:12 +0300 Subject: [PATCH 6/8] notes/orgmode: fix npins name incompat --- modules/plugins/notes/orgmode/config.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/plugins/notes/orgmode/config.nix b/modules/plugins/notes/orgmode/config.nix index 36e080880..3f1b7eaf6 100644 --- a/modules/plugins/notes/orgmode/config.nix +++ b/modules/plugins/notes/orgmode/config.nix @@ -13,9 +13,7 @@ in { config = mkIf cfg.enable (mkMerge [ { vim = { - startPlugins = [ - "orgmode-nvim" - ]; + startPlugins = ["orgmode"]; binds.whichKey.register = pushDownDefault { "o" = "+Notes"; From 033a47a7d619fcb403a1f045c5a8abeff5fdf661 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 11 Feb 2025 22:17:27 +0300 Subject: [PATCH 7/8] visuals/tiny-deviocns-auto-colors: fix npins name incompat --- modules/plugins/visuals/tiny-devicons-auto-colors/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix b/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix index a7fd37521..5b2102ce8 100644 --- a/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix +++ b/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix @@ -11,7 +11,7 @@ in { config = mkIf cfg.enable { vim = { - startPlugins = ["tiny-devicons-auto-colors" "nvim-web-devicons"]; + startPlugins = ["tiny-devicons-auto-colors-nvim" "nvim-web-devicons"]; pluginRC.tiny-devicons-auto-colors = entryAnywhere '' require("tiny-devicons-auto-colors").setup(${toLuaObject cfg.setupOpts}) From c96f5f0d8c1c1a96a442319f468857f1bc6b75e6 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 11 Feb 2025 22:18:38 +0300 Subject: [PATCH 8/8] languages/ts: fix npins name incompat --- modules/plugins/languages/ts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix index 50e6d91c0..c90705543 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/ts.nix @@ -230,7 +230,7 @@ in { # Extensions (mkIf cfg.extensions."ts-error-translator".enable { - vim.startPlugins = ["ts-error-translator"]; + vim.startPlugins = ["ts-error-translator-nvim"]; vim.pluginRC.ts-error-translator = entryAnywhere '' require("ts-error-translator").setup(${toLuaObject cfg.extensions.ts-error-translator.setupOpts}) '';