From e64ca8d10d9e80a198847b74b267ae4748fbde20 Mon Sep 17 00:00:00 2001 From: lukajankovic Date: Wed, 17 Sep 2025 16:48:07 +0200 Subject: [PATCH] Apply patch --- nvim/lazy-lock.json | 15 +---- nvim/lua/plugins_base/codecompanion.lua | 30 --------- nvim/lua/plugins_base/lspsaga.lua | 26 ------- nvim/lua/plugins_base/oil.lua | 6 -- nvim/lua/plugins_base/telescope.lua | 90 ++++++++++++++++++------- nvim/lua/plugins_base/windsurf.lua | 16 ----- 6 files changed, 68 insertions(+), 115 deletions(-) delete mode 100644 nvim/lua/plugins_base/codecompanion.lua delete mode 100644 nvim/lua/plugins_base/lspsaga.lua delete mode 100644 nvim/lua/plugins_base/oil.lua delete mode 100644 nvim/lua/plugins_base/windsurf.lua diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 4acac55..ea23043 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,32 +1,21 @@ { - "codecompanion.nvim": { "branch": "main", "commit": "17f7cbb6cabdc12195f164acf4c59c7c7c205b64" }, "codeium.nvim": { "branch": "main", "commit": "821b570b526dbb05b57aa4ded578b709a704a38a" }, - "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "deadcolumn.nvim": { "branch": "master", "commit": "6a144a32fd847a998095d2494f152e405c6ae7cb" }, "git-messenger.vim": { "branch": "master", "commit": "fd124457378a295a5d1036af4954b35d6b807385" }, "gitsigns.nvim": { "branch": "main", "commit": "362fe61f9f19e9bceff178792780df5cce118a7d" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lsp_signature.nvim": { "branch": "master", "commit": "d9c39937e4e0977357530e988aa8940078bb231f" }, - "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7815740f4d0afb74ada00956c36e18ad695ed9e3" }, - "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, - "mini.diff": { "branch": "main", "commit": "63a7ce537ced356b8180892d9586826b0afb519c" }, "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" }, "nord.nvim": { "branch": "main", "commit": "57fb474a1d628bdf9d1e7964719464ed5675d7c7" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "592916db3f4ecdf062962b3aa83583aebe3c4a14" }, "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" }, "nvim-tree.lua": { "branch": "master", "commit": "b0b49552c9462900a882fe772993b01d780445fe" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "a1366758b3a232036dc97be8ca41184aa3f50506" }, - "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "refactoring.nvim": { "branch": "master", "commit": "74b608dfee827c2372250519d433cc21cb083407" }, "stcursorword": { "branch": "main", "commit": "f6810ed5001eeee6061fdce77b292a5565823ded" }, + "telescope-hierarchy.nvim": { "branch": "main", "commit": "2ba4840d8ba9288ca85dc34b01cf946aee0b8fca" }, "telescope-menufacture": { "branch": "main", "commit": "751aca3f022039874790024b3cf25d643e335612" }, - "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } + "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" } } diff --git a/nvim/lua/plugins_base/codecompanion.lua b/nvim/lua/plugins_base/codecompanion.lua deleted file mode 100644 index 23e0b17..0000000 --- a/nvim/lua/plugins_base/codecompanion.lua +++ /dev/null @@ -1,30 +0,0 @@ -return { - { - "olimorris/codecompanion.nvim", - opts = { - strategies = { - chat = {adapter = 'ollama'}, - inline = {adapter = 'ollama'}, - cmd = {adapter = 'ollama'} - } - }, - dependencies = { - "nvim-lua/plenary.nvim", "nvim-treesitter/nvim-treesitter" - }, - keys = { - { - "cc", "CodeCompanionActions", - "[C]ode [C]ompanion" - } - } - }, { - "echasnovski/mini.diff", - config = function() - local diff = require("mini.diff") - diff.setup({ - -- Disabled by default - source = diff.gen_source.none() - }) - end - } -} diff --git a/nvim/lua/plugins_base/lspsaga.lua b/nvim/lua/plugins_base/lspsaga.lua deleted file mode 100644 index da37ff7..0000000 --- a/nvim/lua/plugins_base/lspsaga.lua +++ /dev/null @@ -1,26 +0,0 @@ -return { - 'nvimdev/lspsaga.nvim', - config = function() - require("lspsaga").setup({ - ui = { - code_action = '⋯', - expand = '+', - collapse = '-' - }, - }) - end, - dependencies = { - { 'nvim-tree/nvim-web-devicons' }, - { 'nvim-treesitter/nvim-treesitter' }, - }, - event = "LspAttach", - keys = { - { "fi", "Lspsaga finder", desc = "LSP Find References" }, - { "ci", "Lspsaga incoming_calls", desc = "Incoming Calls" }, - { "co", "Lspsaga outgoing_calls", desc = "Outgoing Calls" }, - { "ca", "Lspsaga code_action", desc = "[C]ode [A]ction" }, - { "cd", "Lspsaga diagnostic_jump_next", desc = "[C]ode [D]iagnostics Next" }, - { "cD", "Lspsaga diagnostic_jump_prev", desc = "[C]ode [D]iagnostics Prev" }, - { "cr", "Lspsaga finder", desc = "[C]ode [R]eferences" }, - } -} diff --git a/nvim/lua/plugins_base/oil.lua b/nvim/lua/plugins_base/oil.lua deleted file mode 100644 index ef7ec5a..0000000 --- a/nvim/lua/plugins_base/oil.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "stevearc/oil.nvim", - config = function() - require("oil").setup() - end, -} diff --git a/nvim/lua/plugins_base/telescope.lua b/nvim/lua/plugins_base/telescope.lua index ba1f4ee..72c145d 100644 --- a/nvim/lua/plugins_base/telescope.lua +++ b/nvim/lua/plugins_base/telescope.lua @@ -1,28 +1,70 @@ return { - 'molecule-man/telescope-menufacture', - { - "nvim-telescope/telescope.nvim", - tag = "0.1.8", - dependencies = { "nvim-lua/plenary.nvim" }, - event = "VimEnter", - config = function() - require("telescope").load_extension 'menufacture' - local builtin = require("telescope.builtin") - vim.keymap.set("n", "sf", require('telescope').extensions.menufacture.find_files, { desc = "[S]earch [F]iles" }) - vim.keymap.set("n", "sg", require('telescope').extensions.menufacture.live_grep, { desc = "[S]earch [G]rep" }) - vim.keymap.set("n", "sw", require('telescope').extensions.menufacture.grep_string, { desc = "[S]earch [W]ord under cursor" }) + "molecule-man/telescope-menufacture", + { + "nvim-telescope/telescope.nvim", + tag = "0.1.8", + dependencies = { "nvim-lua/plenary.nvim" }, + event = "VimEnter", + config = function() + require("telescope").load_extension("menufacture") + local builtin = require("telescope.builtin") + vim.keymap.set( + "n", + "sf", + require("telescope").extensions.menufacture.find_files, + { desc = "[S]earch [F]iles" } + ) + vim.keymap.set( + "n", + "sg", + require("telescope").extensions.menufacture.live_grep, + { desc = "[S]earch [G]rep" } + ) + vim.keymap.set( + "n", + "sw", + require("telescope").extensions.menufacture.grep_string, + { desc = "[S]earch [W]ord under cursor" } + ) - vim.keymap.set("n", "/", function() - -- You can pass additional configuration to Telescope to change the theme, layout, etc. - builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({ - winblend = 20, - previewer = false, - })) - end, { desc = "[/] Fuzzily search in current buffer" }) + vim.keymap.set("n", "/", function() + -- You can pass additional configuration to Telescope to change the theme, layout, etc. + builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({ + winblend = 20, + previewer = false, + })) + end, { desc = "[/] Fuzzily search in current buffer" }) - vim.keymap.set("n", "ff", function() - require("telescope.builtin").lsp_document_symbols({ symbols = "function" }) - end, { desc = "[F]ind [F]unction" }) - end, - } + vim.keymap.set("n", "ff", function() + require("telescope.builtin").lsp_document_symbols({ symbols = "function" }) + end, { desc = "[F]ind [F]unction" }) + end, + }, + { + "jmacadie/telescope-hierarchy.nvim", + dependencies = { + { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + }, + }, + keys = { + { -- lazy style key map + -- Choose your own keys, this works for me + "si", + "Telescope hierarchy incoming_calls", + desc = "LSP: [S]earch [I]ncoming Calls", + }, + { + "so", + "Telescope hierarchy outgoing_calls", + desc = "LSP: [S]earch [O]utgoing Calls", + }, + }, + opts = {}, + config = function(_, opts) + require("telescope").setup(opts) + require("telescope").load_extension("hierarchy") + end, + }, } diff --git a/nvim/lua/plugins_base/windsurf.lua b/nvim/lua/plugins_base/windsurf.lua deleted file mode 100644 index 0c385b1..0000000 --- a/nvim/lua/plugins_base/windsurf.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "Exafunction/codeium.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "hrsh7th/nvim-cmp", - }, - opts = { - enable_cmp_source = false, - virtual_text = { - enabled = true, - }, - api = { - host = "codingbuddy.onprem.gic.ericsson.se", - }, - }, -}