From 71ebcf8a7db75fc920885c79b573178a97af0ed0 Mon Sep 17 00:00:00 2001 From: Holger Preu Date: Mon, 13 Apr 2026 20:59:15 +0200 Subject: [PATCH] added blink-cmp, removed neorg --- lua/holger/core/options.lua | 9 +++++ lua/holger/plugins/autopairs.lua | 30 -------------- lua/holger/plugins/blink-cmp.lua | 39 ++++++++++++++++++ lua/holger/plugins/dressing.lua | 4 -- lua/holger/plugins/lsp/lspconfig.lua | 19 --------- lua/holger/plugins/neorg.lua | 22 ---------- lua/holger/plugins/nvim-cmp.lua | 60 ---------------------------- 7 files changed, 48 insertions(+), 135 deletions(-) delete mode 100644 lua/holger/plugins/autopairs.lua create mode 100644 lua/holger/plugins/blink-cmp.lua delete mode 100644 lua/holger/plugins/dressing.lua delete mode 100644 lua/holger/plugins/lsp/lspconfig.lua delete mode 100644 lua/holger/plugins/neorg.lua delete mode 100644 lua/holger/plugins/nvim-cmp.lua diff --git a/lua/holger/core/options.lua b/lua/holger/core/options.lua index b213322..f01838f 100644 --- a/lua/holger/core/options.lua +++ b/lua/holger/core/options.lua @@ -36,3 +36,12 @@ opt.splitright = true -- split vertical window to the right opt.splitbelow = true -- split horiziontal window to the bottom opt.timeoutlen = 500 -- time to wait for a mapped sequence to complete (ms) + +-- session options: include localoptions so filetype/highlighting restore correctly +vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" + +-- disable unused providers to suppress checkhealth noise +vim.g.loaded_perl_provider = 0 +vim.g.loaded_python3_provider = 0 +vim.g.loaded_ruby_provider = 0 +vim.g.loaded_node_provider = 0 diff --git a/lua/holger/plugins/autopairs.lua b/lua/holger/plugins/autopairs.lua deleted file mode 100644 index 8ee54b3..0000000 --- a/lua/holger/plugins/autopairs.lua +++ /dev/null @@ -1,30 +0,0 @@ -return { - "windwp/nvim-autopairs", - event = { "InsertEnter" }, - dependencies = { - "hrsh7th/nvim-cmp", - }, - config = function() - -- import nvim-autopairs - local autopairs = require("nvim-autopairs") - - -- configure autopairs - autopairs.setup({ - check_ts = true, -- enable treesitter - ts_config = { - lua = { "string" }, -- don't add pairs in lua string treesitter nodes - javascript = { "template_string" }, -- don't add pairs in javscript template_string treesitter nodes - java = false, -- don't check treesitter on java - }, - }) - - -- import nvim-autopairs completion functionality - local cmp_autopairs = require("nvim-autopairs.completion.cmp") - - -- import nvim-cmp plugin (completions plugin) - local cmp = require("cmp") - - -- make autopairs and completion work together - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - end, -} diff --git a/lua/holger/plugins/blink-cmp.lua b/lua/holger/plugins/blink-cmp.lua new file mode 100644 index 0000000..d7ae6ee --- /dev/null +++ b/lua/holger/plugins/blink-cmp.lua @@ -0,0 +1,39 @@ +return { + "saghen/blink.cmp", + dependencies = "rafamadriz/friendly-snippets", + version = "*", + opts_extend = { "sources.default" }, + config = function(_, opts) + require("blink.cmp").setup(opts) + vim.lsp.config("*", { + capabilities = require("blink.cmp").get_lsp_capabilities(), + }) + end, + opts = { + keymap = { + preset = "none", + [""] = { "select_prev", "fallback" }, + [""] = { "select_next", "fallback" }, + [""] = { "scroll_documentation_up", "fallback" }, + [""] = { "scroll_documentation_down", "fallback" }, + [""] = { "show", "fallback" }, + [""] = { "hide", "fallback" }, + [""] = { "accept", "fallback" }, + }, + appearance = { + nerd_font_variant = "mono", + }, + completion = { + accept = { + auto_brackets = { enabled = true }, + }, + documentation = { + auto_show = true, + auto_show_delay_ms = 200, + }, + }, + sources = { + default = { "lsp", "path", "snippets", "buffer" }, + }, + }, +} diff --git a/lua/holger/plugins/dressing.lua b/lua/holger/plugins/dressing.lua deleted file mode 100644 index 105f7e5..0000000 --- a/lua/holger/plugins/dressing.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - "stevearc/dressing.nvim", - event = "VeryLazy", -} diff --git a/lua/holger/plugins/lsp/lspconfig.lua b/lua/holger/plugins/lsp/lspconfig.lua deleted file mode 100644 index cb06496..0000000 --- a/lua/holger/plugins/lsp/lspconfig.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - "hrsh7th/cmp-nvim-lsp", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - { "antosha417/nvim-lsp-file-operations", config = true }, - { "folke/lazydev.nvim", opts = {} }, - }, - config = function() - -- import cmp-nvim-lsp plugin - local cmp_nvim_lsp = require("cmp_nvim_lsp") - - -- used to enable autocompletion (assign to every lsp server config) - local capabilities = cmp_nvim_lsp.default_capabilities() - - vim.lsp.config("*", { - capabilities = capabilities, - }) - end, -} diff --git a/lua/holger/plugins/neorg.lua b/lua/holger/plugins/neorg.lua deleted file mode 100644 index b00d02b..0000000 --- a/lua/holger/plugins/neorg.lua +++ /dev/null @@ -1,22 +0,0 @@ -return { - "nvim-neorg/neorg", - ft = "norg", - version = "*", -- latest stable release - dependencies = { "nvim-lua/plenary.nvim" }, -- Neorg requires plenary - config = function() - require("neorg").setup({ - load = { - ["core.defaults"] = {}, -- default modules - ["core.concealer"] = {}, -- enable the concealer - ["core.dirman"] = { -- workspace management - config = { - workspaces = { - notes = "~/notes", - }, - default_workspace = "notes", - }, - }, - }, - }) - end, -} diff --git a/lua/holger/plugins/nvim-cmp.lua b/lua/holger/plugins/nvim-cmp.lua deleted file mode 100644 index 57081cd..0000000 --- a/lua/holger/plugins/nvim-cmp.lua +++ /dev/null @@ -1,60 +0,0 @@ -return { - "hrsh7th/nvim-cmp", - event = "InsertEnter", - dependencies = { - "hrsh7th/cmp-buffer", -- source for text in buffer - "hrsh7th/cmp-path", -- source for file system paths - { - "L3MON4D3/LuaSnip", - -- follow latest release. - version = "v2.*", -- Replace by the latest released major (first number of latest release) - -- install jsregexp (optional!). - build = "make install_jsregexp", - }, - "saadparwaiz1/cmp_luasnip", -- for autocompletion - "rafamadriz/friendly-snippets", -- useful snippets - "onsails/lspkind.nvim", -- vs-code like pictograms - }, - config = function() - local cmp = require("cmp") - - local luasnip = require("luasnip") - - local lspkind = require("lspkind") - - -- loads vscode style snippets from installed plugins (e.g. friendly-snippets) - require("luasnip.loaders.from_vscode").lazy_load() - - cmp.setup({ - snippet = { -- configure how nvim-cmp interacts with snippet engine - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.select_prev_item(), -- previous suggestion - [""] = cmp.mapping.select_next_item(), -- next suggestion - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), -- show completion suggestions - [""] = cmp.mapping.abort(), -- close completion window - [""] = cmp.mapping.confirm({ select = false }), - }), - -- sources for autocompletion - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" }, -- snippets - { name = "buffer" }, -- text within current buffer - { name = "path" }, -- file system paths - }), - - -- configure lspkind for vs-code like pictograms in completion menu - formatting = { - format = lspkind.cmp_format({ - maxwidth = 50, - ellipsis_char = "...", - }), - }, - }) - end, -}