From 47bdc2f6937b0759659342e10a7b42b4cbca2858 Mon Sep 17 00:00:00 2001 From: dnscio Date: Wed, 29 Jan 2025 18:23:11 +0000 Subject: [PATCH 1/5] Delete home/modules/nvim/config/lua/plugins/avante.lua --- .../nvim/config/lua/plugins/avante.lua | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 home/modules/nvim/config/lua/plugins/avante.lua diff --git a/home/modules/nvim/config/lua/plugins/avante.lua b/home/modules/nvim/config/lua/plugins/avante.lua deleted file mode 100644 index 7683d20..0000000 --- a/home/modules/nvim/config/lua/plugins/avante.lua +++ /dev/null @@ -1,29 +0,0 @@ -return { - "yetone/avante.nvim", - event = "VeryLazy", - lazy = false, - version = false, -- Set this to "*" to always pull the latest release version, or set it to false to update to the latest code changes. - opts = { - provider = "claude", - }, - -- if you want to build from source then do `make BUILD_FROM_SOURCE=true` - build = "make", - -- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows - dependencies = { - "stevearc/dressing.nvim", - "nvim-lua/plenary.nvim", - "MunifTanjim/nui.nvim", - --- The below dependencies are optional, - "nvim-telescope/telescope.nvim", -- for file_selector provider telescope - "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions - "nvim-tree/nvim-web-devicons", - { - -- Make sure to set this up properly if you have lazy=true - "MeanderingProgrammer/render-markdown.nvim", - opts = { - file_types = { "markdown", "Avante" }, - }, - ft = { "markdown", "Avante" }, - }, - }, -} From 40d87113ec1153d8c821a6ed844dd7ecbd38e556 Mon Sep 17 00:00:00 2001 From: dnscio Date: Thu, 30 Jan 2025 13:32:24 +0000 Subject: [PATCH 2/5] Add home/modules/nvim/config/lua/plugins/fzf-lua.lua --- home/modules/nvim/config/lua/plugins/fzf-lua.lua | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 home/modules/nvim/config/lua/plugins/fzf-lua.lua diff --git a/home/modules/nvim/config/lua/plugins/fzf-lua.lua b/home/modules/nvim/config/lua/plugins/fzf-lua.lua new file mode 100644 index 0000000..b69b881 --- /dev/null +++ b/home/modules/nvim/config/lua/plugins/fzf-lua.lua @@ -0,0 +1,5 @@ +return { + "ibhagwan/fzf-lua", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = {}, +} \ No newline at end of file From 4b43c09dee95c81a24776d1a67fa81074ff1d84c Mon Sep 17 00:00:00 2001 From: dnscio Date: Thu, 30 Jan 2025 13:32:56 +0000 Subject: [PATCH 3/5] Update home/modules/nvim/config/lua/plugins/which-key.lua --- .../nvim/config/lua/plugins/which-key.lua | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/home/modules/nvim/config/lua/plugins/which-key.lua b/home/modules/nvim/config/lua/plugins/which-key.lua index 71ccc53..242d77c 100644 --- a/home/modules/nvim/config/lua/plugins/which-key.lua +++ b/home/modules/nvim/config/lua/plugins/which-key.lua @@ -5,9 +5,9 @@ return { icons = { mappings = false }, }, keys = { - { ".", "Telescope find_files", desc = "Find file in dir", mode = "n" }, - { "", "Telescope git_files", desc = "Find git file", mode = "n" }, - { "B", "Telescope buffers", desc = "Opens buffers", mode = "n" }, + { ".", "FzfLua files", desc = "Find file in dir", mode = "n" }, + { "", "FzfLua git_files", desc = "Find git file", mode = "n" }, + { "B", "FzfLua buffers", desc = "Opens buffers", mode = "n" }, { "b", group = "buffer", mode = "n" }, { "b,", "BufferMovePrevious", desc = "Move buffer back", mode = "n" }, { @@ -48,11 +48,11 @@ return { mode = "n", }, { "c", group = "code", mode = "n" }, - { "ca", ":lua vim.lsp.buf.code_action()", desc = "Code actions", mode = "n" }, - { "cd", ":lua require'telescope.builtin'.diagnostics{}", desc = "Show diagnostics", mode = "n" }, + { "ca", "FzfLua lsp_code_actions", desc = "Code actions", mode = "n" }, + { "cd", "FzfLua lsp_diagnostics_document", desc = "Show diagnostics", mode = "n" }, { "cf", - ":lua require'telescope.builtin'.builtin.lsp_references{}", + "FzfLua lsp_references", desc = "Show references", mode = "n", }, @@ -69,7 +69,7 @@ return { desc = "Create a new file", mode = "n", }, - { "fr", "Telescope oldfiles", desc = "Open Recent File", mode = "n" }, + { "fr", "FzfLua oldfiles", desc = "Open Recent File", mode = "n" }, { "fs", "w", @@ -99,23 +99,22 @@ return { }, { "q", "qa!", desc = "Leave neovim", mode = "n" }, { "s", group = "search", mode = "n" }, - { "sb", ":lua require'telescope.builtin'.buffers{}", desc = "Find buffer", mode = "n" }, - { "ss", "Telescope live_grep", desc = "Live Grep", mode = "n" }, + { "ss", "FzfLua live_grep_native", desc = "Live Grep", mode = "n" }, + { "sp", "FzfLua grep_project", desc = "Grep in project", mode = "n" }, { "sw", - "Telescope grep_string", + "FzfLua grep_cword", desc = "Search current word", mode = "n", }, { "t", group = "diagnostics (lsp)", mode = "n" }, { "td", - "Telescope diagnostics", + "FzfLua lsp_diagnostics_document", desc = "Show LSP diagnostics", mode = "n", }, { "ta", "TodoQuickFix", desc = "Show all todo comments", mode = "n" }, - { "tt", "TodoTelescope", desc = "Show all todo comments (Telescope)", mode = "n" }, { "w", group = "window", mode = "n" }, { "w+", @@ -179,5 +178,7 @@ return { mode = "n", }, { "xr", "source $MYVIMRC", desc = "Reload config", mode = "n" }, + { "do", "DiffviewOpen", desc = "Open diff view", mode = "n" }, + { "dh", "DiffviewFileHistory", desc = "Open file history diff", mode = "n" }, }, } From 0ede35800cdd4575c77c3a3ecd8af4226082bcc4 Mon Sep 17 00:00:00 2001 From: dnscio Date: Thu, 30 Jan 2025 13:33:14 +0000 Subject: [PATCH 4/5] Delete home/modules/nvim/config/lua/plugins/telescope.lua --- .../nvim/config/lua/plugins/telescope.lua | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 home/modules/nvim/config/lua/plugins/telescope.lua diff --git a/home/modules/nvim/config/lua/plugins/telescope.lua b/home/modules/nvim/config/lua/plugins/telescope.lua deleted file mode 100644 index 4f30506..0000000 --- a/home/modules/nvim/config/lua/plugins/telescope.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - "nvim-telescope/telescope.nvim", - tag = "0.1.8", - dependencies = { - "nvim-lua/plenary.nvim", - { - "nvim-telescope/telescope-fzf-native.nvim", - build = "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build", - }, - }, - opts = { - pickers = {}, - extensions = { - fzf = {}, - }, - }, - init = function() - require("telescope").load_extension("fzf") - end, -} From f3e1f608c771d6d7f636c16b888f180c0f7ada0e Mon Sep 17 00:00:00 2001 From: dnscio Date: Thu, 30 Jan 2025 13:42:01 +0000 Subject: [PATCH 5/5] Add home/modules/nvim/config/lua/plugins/neogit.lua --- home/modules/nvim/config/lua/plugins/neogit.lua | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 home/modules/nvim/config/lua/plugins/neogit.lua diff --git a/home/modules/nvim/config/lua/plugins/neogit.lua b/home/modules/nvim/config/lua/plugins/neogit.lua new file mode 100644 index 0000000..f835722 --- /dev/null +++ b/home/modules/nvim/config/lua/plugins/neogit.lua @@ -0,0 +1,9 @@ +return { + "NeogitOrg/neogit", + dependencies = { + "nvim-lua/plenary.nvim", + "sindrets/diffview.nvim", + "ibhagwan/fzf-lua", + }, + config = true, +} \ No newline at end of file