From c8e4b090d5a384b8fa467f94e5f2506bc1c11ce9 Mon Sep 17 00:00:00 2001 From: nicknase27 Date: Sat, 3 Oct 2026 21:04:34 +0200 Subject: [PATCH] fix completions --- init.lua | 2 ++ lua/lspconf.lua | 17 ++++++++++++++- lua/mini.lua | 53 +++++++++++++++++++++++++++++++++++---------- lua/settings.lua | 1 + lua/ui.lua | 5 +++-- nvim-pack-lock.json | 8 +++++++ 6 files changed, 71 insertions(+), 15 deletions(-) diff --git a/init.lua b/init.lua index b06bf1a..a7f5039 100644 --- a/init.lua +++ b/init.lua @@ -9,6 +9,8 @@ vim.pack.add({ { src = "https://github.com/nvim-lualine/lualine.nvim" }, { src = "https://github.com/nvim-mini/mini.nvim" }, { src = "https://github.com/rafamadriz/friendly-snippets" }, + { src = "https://github.com/iamcco/markdown-preview.nvim" }, + { src = "https://github.com/kepano/flexoki-neovim" }, }) require('lualineconf') diff --git a/lua/lspconf.lua b/lua/lspconf.lua index 127ab67..765ed4b 100644 --- a/lua/lspconf.lua +++ b/lua/lspconf.lua @@ -1,9 +1,24 @@ -vim.lsp.enable({ "lua_ls", "nixd", "clang", "rust-analyzer"}) +vim.lsp.enable({ "lua_ls", "nixd", "clang", "rust-analyzer" }) -- RUST vim.lsp.config('rust-analyzer', { cmd = { 'rust-analyzer' }, filetypes = { 'rust' }, + settings = { + ["rust_analyzer"] = { + completion = { + callable = { + snippets = "fill_arguments", + }, + postfix = { + enable = false, + }, + autoimport = { + enable = true, + }, + }, + }, + }, }) -- NIX diff --git a/lua/mini.lua b/lua/mini.lua index b616ff1..0f461c3 100644 --- a/lua/mini.lua +++ b/lua/mini.lua @@ -5,12 +5,12 @@ require('mini.icons').setup() -- Notifications require('mini.notify').setup({ - -- only show messages - content = { - format = function(notif) - return notif.msg - end, - }, + -- only show messages + content = { + format = function(notif) + return notif.msg + end, + }, }) -- Commandline @@ -20,22 +20,51 @@ require('mini.cmdline').setup({ -- Autocompletion local MiniCompletion = require('mini.completion') + +-- Priority +local kind_priority = { + [5] = 1, -- Field (Struct fields) + [10] = 1, -- Property + [2] = 2, -- Method + [3] = 3, -- Function + [6] = 4, -- Variable +} + MiniCompletion.setup({ lsp_completion = { auto_setup = true, process_items = function(items, base) - return MiniCompletion.default_process_items(items, base, { + -- 1. Apply standard fuzzy matching and basic sorting first + items = MiniCompletion.default_process_items(items, base, { filtersort = "fuzzy", }) + + -- 2. Sort by custom kind priority (Fields -> Methods -> Functions -> Others -> Snippets/Text) + table.sort(items, function(a, b) + local prio_a = kind_priority[a.kind] or 100 + local prio_b = kind_priority[b.kind] or 100 + + -- Push Snippets (15) and Text (1) to the absolute bottom + if a.kind == 15 or a.kind == 1 then prio_a = 999 end + if b.kind == 15 or b.kind == 1 then prio_b = 999 end + + if prio_a ~= prio_b then + return prio_a < prio_b + end + + -- Fallback to default sortText or label when kinds match + return (a.sortText or a.label) < (b.sortText or b.label) + end) + + return items end, } }) -local MiniSnipets = require('mini.snippets') -MiniSnipets.setup({ +local MiniSnippets = require('mini.snippets') +MiniSnippets.setup({ snippets = { - MiniSnipets.gen_loader.from_lang(), + MiniSnippets.gen_loader.from_lang(), }, }) -MiniSnipets.start_lsp_server({ match = false }) - +MiniSnippets.start_lsp_server({ match = MiniSnippets.default_match }) diff --git a/lua/settings.lua b/lua/settings.lua index df3a713..0e32ff0 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -38,4 +38,5 @@ vim.api.nvim_create_autocmd('LspAttach', { end end, }) + vim.cmd("syntax enable") diff --git a/lua/ui.lua b/lua/ui.lua index 814db57..569bf65 100644 --- a/lua/ui.lua +++ b/lua/ui.lua @@ -53,6 +53,7 @@ require("oil").setup({ view_options = { show_hidden = true }, }) -vim.cmd("colorscheme habamax") -vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) +-- vim.cmd("colorscheme habamax") +vim.cmd("colorscheme flexoki-dark") +-- vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json index 7a29059..cf472b1 100644 --- a/nvim-pack-lock.json +++ b/nvim-pack-lock.json @@ -16,6 +16,10 @@ "rev": "d1e7c7c45d45c6b6a25427bf62db4db73b03ff3d", "src": "https://github.com/Saghen/blink.nvim" }, + "flexoki-neovim": { + "rev": "c3e2251e813d29d885a7cbbe9808a7af234d845d", + "src": "https://github.com/kepano/flexoki-neovim" + }, "friendly-snippets": { "rev": "6cd7280adead7f586db6fccbd15d2cac7e2188b9", "src": "https://github.com/rafamadriz/friendly-snippets" @@ -28,6 +32,10 @@ "rev": "221ce6b2d999187044529f49da6554a92f740a96", "src": "https://github.com/nvim-lualine/lualine.nvim" }, + "markdown-preview.nvim": { + "rev": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee", + "src": "https://github.com/iamcco/markdown-preview.nvim" + }, "mini.nvim": { "rev": "946ae64e0ee807ae3c41f382f0114b4ed4915b2c", "src": "https://github.com/nvim-mini/mini.nvim"