From c7deca5a68d3c3b185a91058fd465f07e28d4c0e Mon Sep 17 00:00:00 2001 From: thek4n Date: Tue, 2 Jul 2024 10:02:01 +0300 Subject: [PATCH] ref(nvim): plugins --- .../nvim/lua/core/mappings/mappings.lua | 35 +++--------- home/user/.config/nvim/lua/plugins/coding.lua | 53 +++++++++++++++++++ .../.config/nvim/lua/plugins/gitsigns.lua | 17 ------ home/user/.config/nvim/lua/plugins/mason.lua | 4 +- home/user/.config/nvim/lua/plugins/misc.lua | 7 --- 5 files changed, 62 insertions(+), 54 deletions(-) delete mode 100644 home/user/.config/nvim/lua/plugins/gitsigns.lua diff --git a/home/user/.config/nvim/lua/core/mappings/mappings.lua b/home/user/.config/nvim/lua/core/mappings/mappings.lua index 5e9666a..240bf17 100644 --- a/home/user/.config/nvim/lua/core/mappings/mappings.lua +++ b/home/user/.config/nvim/lua/core/mappings/mappings.lua @@ -91,6 +91,13 @@ map("n", 'he', 'set list!', vim.opt.listchars=[[tab:→\ ,eol:↵,trail:·,extends:↷,precedes:↶]] +map("n", "pl", "Lazy", + {desc = "Package manager"}) + +map("n", "pm", "Mason", + {desc = "LSP Manager"}) + + -- Tab to go prev buffer map("n", "", ":b#", {silent = true}) @@ -127,34 +134,6 @@ function toggle_number_style() end -local function set_trouble_keymap(key, cmd) - map("n", string.format("x%s", key), string.format("TroubleToggle %s", cmd)) -end - -set_trouble_keymap("x", "") -set_trouble_keymap("w", "workspace_diagnostics") -- lsp diagnostic of workspace -set_trouble_keymap("d", "document_diagnostics") -- diagnostic of current file - - -local function set_gitsigns_keymap(key, cmd) - map("n", string.format("g%s", key), string.format("Gitsigns %s", cmd)) -end - -set_gitsigns_keymap('p', 'preview_hunk') -- show diff -set_gitsigns_keymap('b', 'blame_line') -- show author, hash, date and message of current line commit -set_gitsigns_keymap('n', 'next_hunk') -- go to next unstaged changes -set_gitsigns_keymap('N', 'prev_hunk') -- go to prev unstaged changes -set_gitsigns_keymap('r', 'reset_hunk') -- reset hunk under cursor -set_gitsigns_keymap('h', 'toggle_linehl') -- line highlighting - - -map("n", "pl", "Lazy", - {desc = "Package manager"}) - -map("n", "pm", "Mason", - {desc = "LSP Manager"}) - - local function reload_config() vim.cmd.source(vim.env.MYVIMRC) vim.notify('Config reloaded...', vim.log.levels.INFO) diff --git a/home/user/.config/nvim/lua/plugins/coding.lua b/home/user/.config/nvim/lua/plugins/coding.lua index 845a705..f2eb9cb 100644 --- a/home/user/.config/nvim/lua/plugins/coding.lua +++ b/home/user/.config/nvim/lua/plugins/coding.lua @@ -98,4 +98,57 @@ return { }) end }, + { + 'folke/trouble.nvim', + dependencies = { 'kyazdani42/nvim-web-devicons' }, + config = function() + require("trouble").setup() + + local function set_trouble_keymap(key, cmd) + vim.keymap.set( + "n", + string.format("x%s", key), + string.format("Trouble %s", cmd) + ) + end + + set_trouble_keymap("x", "diagnostics toggle") + set_trouble_keymap("X", "diagnostics toggle filter.buf=0") + set_trouble_keymap("Q", "qflist toggle") + set_trouble_keymap("l", "lsp toggle focus=false win.position=right") + + end + }, + { + 'lewis6991/gitsigns.nvim', + event = "BufReadPost", + enabled = vim.fn.executable "git" == 1, + config = function() + require("gitsigns").setup({ + signs = { + add = { text = "+" }, + change = { text = "|" }, + delete = { text = "-" }, + topdelete = { text = "^" }, + changedelete = { text = "~" }, + untracked = { text = "0" }, + } + }) + + local function set_gitsigns_keymap(key, cmd) + vim.keymap.set( + "n", + string.format("g%s", key), + string.format("Gitsigns %s", cmd) + ) + end + + set_gitsigns_keymap('p', 'preview_hunk') -- show diff + set_gitsigns_keymap('b', 'blame_line') -- show author, hash, date and message of current line commit + set_gitsigns_keymap('n', 'next_hunk') -- go to next unstaged changes + set_gitsigns_keymap('N', 'prev_hunk') -- go to prev unstaged changes + set_gitsigns_keymap('r', 'reset_hunk') -- reset hunk under cursor + set_gitsigns_keymap('h', 'toggle_linehl') -- line highlighting + end + } } \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/gitsigns.lua b/home/user/.config/nvim/lua/plugins/gitsigns.lua deleted file mode 100644 index 04bd568..0000000 --- a/home/user/.config/nvim/lua/plugins/gitsigns.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - 'lewis6991/gitsigns.nvim', - event = "BufReadPost", - enabled = vim.fn.executable "git" == 1, - config = function() - require("gitsigns").setup({ - signs = { - add = { text = "+" }, - change = { text = "|" }, - delete = { text = "-" }, - topdelete = { text = "^" }, - changedelete = { text = "~" }, - untracked = { text = "0" }, - } - }) - end -} \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/mason.lua b/home/user/.config/nvim/lua/plugins/mason.lua index eeaf53e..ad9d6eb 100644 --- a/home/user/.config/nvim/lua/plugins/mason.lua +++ b/home/user/.config/nvim/lua/plugins/mason.lua @@ -1,9 +1,9 @@ local on_attach = function(_, bufnr) local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end - local function buf_set_option(...) vim.api.nvim_get_option_value(bufnr, ...) end + local function buf_set_option(...) vim.api.nvim_set_option_value(...) end -- Enable completion triggered by - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') + buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc', {}) -- Mappings. local opts = { noremap=true, silent=true } diff --git a/home/user/.config/nvim/lua/plugins/misc.lua b/home/user/.config/nvim/lua/plugins/misc.lua index 27faf97..ff1154a 100644 --- a/home/user/.config/nvim/lua/plugins/misc.lua +++ b/home/user/.config/nvim/lua/plugins/misc.lua @@ -44,13 +44,6 @@ return { }) end }, - { - 'folke/trouble.nvim', - dependencies = { 'kyazdani42/nvim-web-devicons' }, - config = function() - require("trouble").setup() - end - }, { "thek4n/mdimage.nvim", config = function()