From 86bc70fb4a062793db9ea482c1ccf31f1b5ce94b Mon Sep 17 00:00:00 2001 From: Robert Altner Date: Sun, 13 Apr 2025 13:04:40 +0200 Subject: [PATCH] i dont know| --- init.vim | 1 + lua/init.lua | 43 +++++++++++++++++++++++++++++++++++++++---- lua/keymap.lua | 3 ++- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/init.vim b/init.vim index 4267b13..ad8b0d3 100644 --- a/init.vim +++ b/init.vim @@ -28,6 +28,7 @@ au ColorSchemePre kanagawa highlight! link RainbowDelimiterGreen MiniIconsGreen au ColorSchemePre kanagawa highlight! link RainbowDelimiterViolet MiniIconsPurple au ColorSchemePre kanagawa highlight! link RainbowDelimiterCyan MiniIconsCyan au ColorScheme kanagawa highlight! LineNr guifg=#fcc35a +au ColorScheme kanagawa highlight! LspInlayHint guifg=#727296 "colorscheme tokyonight-storm diff --git a/lua/init.lua b/lua/init.lua index 237bb17..a887344 100644 --- a/lua/init.lua +++ b/lua/init.lua @@ -21,7 +21,8 @@ vim.opt.termguicolors = true vim.filetype.add({ extension = { - pl = 'prolog' + pl = 'prolog', + slint = 'slint' } }) @@ -46,6 +47,7 @@ vim.api.nvim_set_keymap("", "", "", {}) vim.api.nvim_set_keymap("", "", "", {}) vim.api.nvim_set_keymap("", "", "", {}) vim.api.nvim_set_keymap("", "", "", {}) +vim.lsp.inlay_hint.enable() require('goto-preview').setup { width = 120, -- Width of the floating window @@ -94,6 +96,9 @@ cmp.setup({ completion = cmp.config.window.bordered(), documentation = cmp.config.window.bordered() }, + experimental = { + -- ghost_text = true + }, mapping = cmp.mapping.preset.insert({ [''] = cmp.mapping.scroll_docs(-4), [''] = cmp.mapping.scroll_docs(4), @@ -101,19 +106,25 @@ cmp.setup({ [''] = cmp.mapping.abort(), [''] = cmp.mapping(function(fallback) if cmp.visible() then - cmp.confirm({ behaviour = cmp.ConfirmBehavior.Insert, select = true }) + cmp.confirm({ behaviour = cmp.ConfirmBehavior.Replace, select = true }) elseif vim.fn["vsnip#available"](1) == 1 then feedkey("(vsnip-expand-or-jump)", "") else fallback() end - end, { "i", "s" }) + end, { "i", "s" }), + [''] = cmp.mapping(function(fallback) + if vim.fn["vsnip#available"](1) == 1 then + feedkey("(vsnip-jump-prev)", "") + end + end, { "i", "s" }) }), sources = cmp.config.sources({ { name = "nvim_lsp" }, { name = "vsnip" }, + { name = "path" } }, { - { name = "buffer" } + { name = "file" } }) }) @@ -126,6 +137,21 @@ require("mason-lspconfig").setup_handlers { require("lspconfig")[server_name].setup { capabilities = capabilities } + end, + + ["clangd"] = function() + require("lspconfig").clangd.setup { + capabilities = { + textDocument = { + completion = { + completionItem = { + snippetSupport = true + } + } + } + }, + filetyped = { "c", "cpp", "cc", "h", "hpp", "hh" } + } end } @@ -236,6 +262,15 @@ vim.api.nvim_create_autocmd("TermClose", { end }) +vim.api.nvim_create_autocmd("BufWritePre", { + buffer = buffer, + callback = function() + if vim.bo.filetype == "go" then + vim.lsp.buf.format { async = false } + end + end +}) + require("ibl").setup() vim.g.barbar_auto_setup = false diff --git a/lua/keymap.lua b/lua/keymap.lua index 608b297..80a0f38 100644 --- a/lua/keymap.lua +++ b/lua/keymap.lua @@ -20,11 +20,12 @@ map("n", "s", ":Telescope live_grep glob_pattern=*.{ts,html,c,cc,cpp,h,g map("n", "sc", ":noh") -- map("n", "gs", ":call CocAction('jumpDefinition', 'split')") --- map("n", "gt", ":CocCommand clangd.switchSourceHeader") +map("n", "gt", ":ClangdSwitchSourceHeader") -- 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", "rn", "lua vim.lsp.buf.rename()", {noremap=true}) map("n", "1", "1gt") map("n", "2", "2gt")