From 389c1ee2e28b332a4673fe85fec41dc9f44bc6a9 Mon Sep 17 00:00:00 2001 From: Robert Altner Date: Mon, 17 Mar 2025 12:12:44 +0100 Subject: [PATCH] replace coc with lspconfig --- init.vim | 20 +++++++++---------- lua/init.lua | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ lua/keymap.lua | 24 +++++++++++++---------- lua/plugins.lua | 19 ++++++++++++++++-- 4 files changed, 93 insertions(+), 22 deletions(-) diff --git a/init.vim b/init.vim index 16f1be1..4267b13 100644 --- a/init.vim +++ b/init.vim @@ -8,8 +8,8 @@ let g:startify_fortune_use_unicode = 1 "lua require("plugins") lua require("init") lua require("keymap") -lua require("coc") - +" lua require("coc") +" set number relativenumber set tabstop=4 set shiftwidth=4 @@ -42,24 +42,24 @@ let g:ale_fixers = { \ 'c': ['clang-format'] \} -inoremap coc#pum#visible() ? coc#pum#prev(1) : "" -inoremap coc#pum#visible() ? coc#pum#next(1) : "" +" inoremap coc#pum#visible() ? coc#pum#prev(1) : "" +" inoremap coc#pum#visible() ? coc#pum#next(1) : "" "Fix escape sending user to normal mode in fzf buffers autocmd FileType fzf tnoremap -inoremap - \ coc#pum#visible() ? coc#_select_confirm() : - \ coc#expandableOrJumpable() ? "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : - \ CheckBackspace() ? "\" : - \ "\" +" inoremap +" \ coc#pum#visible() ? coc#_select_confirm() : +" \ coc#expandableOrJumpable() ? "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : +" \ CheckBackspace() ? "\" : +" \ "\" function! CheckBackspace() abort let col = col('.') - 1 return !col || getline('.')[col - 1] =~# '\s' endfunction -let g:coc_snippet_next = '' +" let g:coc_snippet_next = '' "highlight LineNr guifg=#ff57d8 set noexpandtab diff --git a/lua/init.lua b/lua/init.lua index 5e4f327..20f74cc 100644 --- a/lua/init.lua +++ b/lua/init.lua @@ -30,6 +30,58 @@ local colors = require("tokyonight.colors").setup() require("editorconfig").properties.trim_trailing_whitespace = false require('neoscroll').setup() +require("mason").setup({ + ui = { + icons = { + package_installed = "✓", + package_pending = "➜", + package_uninstalled = "✗" + } + } +}) + +require("mason-lspconfig").setup() + +require("mason-lspconfig").setup_handlers { + -- The first entry (without a key) will be the default handler + -- and will be called for each installed server that doesn't have + -- a dedicated handler. + function (server_name) -- default handler (optional) + require("lspconfig")[server_name].setup {} + end +} + +vim.api.nvim_set_keymap("", "", "", {}) +vim.api.nvim_set_keymap("", "", "", {}) +vim.api.nvim_set_keymap("", "", "", {}) +vim.api.nvim_set_keymap("", "", "", {}) + +require('goto-preview').setup { + width = 120, -- Width of the floating window + height = 15, -- Height of the floating window + border = {"↖", "─" ,"┐", "│", "┘", "─", "└", "│"}, -- Border characters of the floating window + default_mappings = false, -- Bind default mappings + debug = false, -- Print debug information + opacity = nil, -- 0-100 opacity level of the floating window where 100 is fully transparent. + resizing_mappings = true, -- Binds arrow keys to resizing the floating window. + post_open_hook = nil, -- A function taking two arguments, a buffer and a window to be ran as a hook. + post_close_hook = nil, -- A function taking two arguments, a buffer and a window to be ran as a hook. + references = { -- Configure the telescope UI for slowing the references cycling window. + provider = "telescope", -- telescope|fzf_lua|snacks|mini_pick|default + telescope = require("telescope.themes").get_dropdown({ hide_preview = false }) + }, + -- These two configs can also be passed down to the goto-preview definition and implementation calls for one off "peak" functionality. + focus_on_open = true, -- Focus the floating window when opening it. + dismiss_on_move = false, -- Dismiss the floating window when moving the cursor. + force_close = true, -- passed into vim.api.nvim_win_close's second argument. See :h nvim_win_close + bufhidden = "wipe", -- the bufhidden option to set on the floating window. See :h bufhidden + stack_floating_preview_windows = true, -- Whether to nest floating windows + same_file_float_preview = true, -- Whether to open a new floating window for a reference within the current file + preview_window_title = { enable = true, position = "left" }, -- Whether to set the preview window title as the filename + zindex = 1, -- Starting zindex for the stack of floating windows + vim_ui_input = true, -- Whether to override vim.ui.input with a goto-preview floating window +} + require("nvim-tree").setup({ update_focused_file = { enable = true diff --git a/lua/keymap.lua b/lua/keymap.lua index ce83c8f..608b297 100644 --- a/lua/keymap.lua +++ b/lua/keymap.lua @@ -12,15 +12,19 @@ map("n", "", ":NvimTreeFindFileToggle") map("n", "", ":Buffers") map("n", "", ":Outline") -map("n", "e", ":CocList diagnostics") +-- map("n", "e", ":CocList diagnostics") map("n", "", ":Telescope find_files") map("n", "s", ":Telescope live_grep glob_pattern=*.{ts,html,c,cc,cpp,h,go,json,py,sh,lua,vim,rs,txt}") map("n", "sc", ":noh") -map("n", "gs", ":call CocAction('jumpDefinition', 'split')") -map("n", "gt", ":CocCommand clangd.switchSourceHeader") +-- map("n", "gs", ":call CocAction('jumpDefinition', 'split')") +-- map("n", "gt", ":CocCommand clangd.switchSourceHeader") +-- +map("n", "p", "lua require('goto-preview').goto_preview_definition()", {noremap=true}) +map("n", "q", "lua require('goto-preview').close_all_win()", {noremap=true}) +map("n", "r", "lua require('goto-preview').goto_preview_references()", {noremap=true}) map("n", "1", "1gt") map("n", "2", "2gt") @@ -35,13 +39,13 @@ map("n", "0", ":tablast") map("n", "", ":call vimspector#ToggleBreakpoint( input( \"Enter condition: \" ) )") -map("", "", "") -map("", "", "") -map("", "", "") -map("", "", "") - -map("i", "", "") -map("i", "", "") +-- map("", "", "") +-- map("", "", "") +-- map("", "", "") +-- map("", "", "") +-- +-- map("i", "", "") +-- map("i", "", "") map("n", "c", ":bo 15split +term") map("n", "t", ":TodoTelescope theme=ivy") diff --git a/lua/plugins.lua b/lua/plugins.lua index ba7b851..a52007a 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -27,9 +27,24 @@ return { "nvim-tree/nvim-tree.lua", dependencies = {"nvim-tree/nvim-web-devicons"} }, + -- { + -- "neoclide/coc.nvim", + -- branch = "release" + -- }, { - "neoclide/coc.nvim", - branch = "release" + "neovim/nvim-lspconfig" + }, + { + "williamboman/mason.nvim" + }, + { + "williamboman/mason-lspconfig.nvim" + }, + { + "rmagatti/goto-preview", + dependencies = { "rmagatti/logger.nvim" }, + event = "BufEnter", + config = true, -- necessary as per https://github.com/rmagatti/goto-preview/issues/88 }, { "nvim-telescope/telescope.nvim",