From 50018aa0305bd2c5cf91431c128895fc0121d2fa Mon Sep 17 00:00:00 2001 From: triethyl Date: Sat, 19 Jul 2025 10:19:11 -0400 Subject: working on custom neovim --- .../custom-neovim/config/lua/plugins/lspconfig.lua | 40 ++++++++++------------ pkgs/custom-neovim/config/lua/plugins/lualine.lua | 2 +- .../custom-neovim/config/lua/plugins/mini/clue.lua | 9 +++++ pkgs/custom-neovim/config/lua/plugins/snacks.lua | 6 ++++ pkgs/custom-neovim/config/lua/plugins/tabby.lua | 2 +- 5 files changed, 36 insertions(+), 23 deletions(-) (limited to 'pkgs/custom-neovim/config/lua/plugins') diff --git a/pkgs/custom-neovim/config/lua/plugins/lspconfig.lua b/pkgs/custom-neovim/config/lua/plugins/lspconfig.lua index 445caee..850ebe5 100644 --- a/pkgs/custom-neovim/config/lua/plugins/lspconfig.lua +++ b/pkgs/custom-neovim/config/lua/plugins/lspconfig.lua @@ -21,33 +21,31 @@ vim.api.nvim_create_autocmd('LspAttach', { -- Buffer local mappings. -- See `:help vim.lsp.*` for documentation on any of the below functions - local keymap = function(mode, key, desc, action) - vim.keymap.set(mode, key, action, {noremap = true, silent = true, desc = desc}) - end + local mapkey = Utils.mapkey - keymap('n', 'gD', "Go to declaration", vim.lsp.buf.declaration) - keymap('n', 'gd', "Go to definition", vim.lsp.buf.definition) - keymap('n', 'gy', "Go to type definition", vim.lsp.buf.type_definition) - keymap('n', 'gi', "Go to implementation", vim.lsp.buf.implementation) - keymap('n', '', "Signature Help", vim.lsp.buf.signature_help) - keymap('i', '', "Signature Help", vim.lsp.buf.signature_help) - keymap('n', "o", "Manage LSP workspace", "") - keymap('n', 'oa', "Add Workspace Folder", vim.lsp.buf.add_workspace_folder) - keymap('n', 'or', "Remove Workspace Folder", vim.lsp.buf.remove_workspace_folder) - keymap('n', 'ol', "List Workspace Folders", function() + mapkey('n', 'gD', "Go to declaration", vim.lsp.buf.declaration) + mapkey('n', 'gd', "Go to definition", vim.lsp.buf.definition) + mapkey('n', 'gy', "Go to type definition", vim.lsp.buf.type_definition) + mapkey('n', 'gi', "Go to implementation", vim.lsp.buf.implementation) + mapkey('n', '', "Signature Help", vim.lsp.buf.signature_help) + mapkey('i', '', "Signature Help", vim.lsp.buf.signature_help) + mapkey('n', "o", "Manage LSP workspace", "") + mapkey('n', 'oa', "Add Workspace Folder", vim.lsp.buf.add_workspace_folder) + mapkey('n', 'or', "Remove Workspace Folder", vim.lsp.buf.remove_workspace_folder) + mapkey('n', 'ol', "List Workspace Folders", function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end) - keymap('n', 'r', "Rename Symbol", vim.lsp.buf.rename) - keymap("n", "s", "Open symbol picker", ":Telescope lsp_document_symbols") - keymap("n", "S", "Open workspace symbol picker", ":Telescope lsp_workspace_symbols") + mapkey('n', 'r', "Rename Symbol", vim.lsp.buf.rename) + mapkey("n", "s", "Open symbol picker", ":lua Snacks.picker.lsp_symbols()") + mapkey("n", "S", "Open workspace symbol picker", ":lua Snacks.picker.lsp_workspace_symbols()") -- LSP Pickers - keymap({'n', 'v'}, "a", "Perform code action", require("actions-preview").code_actions) - keymap("n", "D", "Open workspace diagnostic picker", ":Pick diagnostic") - keymap("n", "d", "Open diagnostic picker", [[:Pick diagnostic scope="current"]]) + mapkey({'n', 'v'}, "a", "Perform code action", require("actions-preview").code_actions) + mapkey("n", "D", "Open workspace diagnostic picker", ":lua Snacks.picker.diagnostics()") + mapkey("n", "d", "Open diagnostic picker", [[:lua Snacks.picker.diagnostics_buffer()]]) - keymap('n', 'gr', "Buffer References", vim.lsp.buf.references) - keymap('n', 'f', "Format Buffer", function() + mapkey('n', 'gr', "Buffer References", vim.lsp.buf.references) + mapkey('n', 'f', "Format Buffer", function() vim.lsp.buf.format { async = true } end) end, diff --git a/pkgs/custom-neovim/config/lua/plugins/lualine.lua b/pkgs/custom-neovim/config/lua/plugins/lualine.lua index b38d3ed..1726f67 100644 --- a/pkgs/custom-neovim/config/lua/plugins/lualine.lua +++ b/pkgs/custom-neovim/config/lua/plugins/lualine.lua @@ -1,5 +1,5 @@ local generate_lualine_theme = function() - local colors = utils.generate_theme_from_lualine() + local colors = Utils.generate_theme_from_highlight_groups() return { normal = { a = {bg = colors.modes.normal, fg = colors.text.dark, gui = 'bold'}, diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua b/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua index 3d213f9..12ce52d 100644 --- a/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua +++ b/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua @@ -34,6 +34,8 @@ miniclue.setup({ clues = { -- Enhance this by adding descriptions for mapping groups + { mode = 'n', keys = '' }, + { mode = 'x', keys = '' }, miniclue.gen_clues.builtin_completion(), miniclue.gen_clues.g(), miniclue.gen_clues.marks(), @@ -41,4 +43,11 @@ miniclue.setup({ miniclue.gen_clues.windows(), miniclue.gen_clues.z(), }, + + window = { + delay = 0, + + scroll_down = "", + scroll_up = "", + }, }) diff --git a/pkgs/custom-neovim/config/lua/plugins/snacks.lua b/pkgs/custom-neovim/config/lua/plugins/snacks.lua index 57c3bc9..9410544 100644 --- a/pkgs/custom-neovim/config/lua/plugins/snacks.lua +++ b/pkgs/custom-neovim/config/lua/plugins/snacks.lua @@ -1,4 +1,10 @@ require("snacks").setup { bigfile = { enabled = true }, picker = { enabled = true }, + lazygit = { + enabled = true, + config = { + quitOnTopLevelReturn = true, + }, + }, } diff --git a/pkgs/custom-neovim/config/lua/plugins/tabby.lua b/pkgs/custom-neovim/config/lua/plugins/tabby.lua index 211c0c0..c4533c7 100644 --- a/pkgs/custom-neovim/config/lua/plugins/tabby.lua +++ b/pkgs/custom-neovim/config/lua/plugins/tabby.lua @@ -1,4 +1,4 @@ -local general_theme = utils.generate_theme_from_lualine() +local general_theme = Utils.generate_theme_from_highlight_groups() local colors = { current = { fg = general_theme.modes.insert, bg = general_theme.background, style = 'bold'}, not_current = { fg = general_theme.text.light, bg = general_theme.background }; -- cgit v1.2.3