From eedcb569a06adf352834a944a6490b589046b7c3 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Sun, 22 Feb 2026 23:03:39 -0500 Subject: [PATCH] some stuff --- config/nvim/after/plugin/lsp.lua | 10 ---------- config/nvim/lazy-lock.json | 8 +++----- config/nvim/lua/config/{blink/init.lua => blink.lua} | 0 config/nvim/lua/plugins/{blink.lua => cmp.lua} | 3 ++- config/nvim/lua/plugins/git.lua | 3 +-- config/nvim/lua/plugins/nvim.lua | 6 +++++- 6 files changed, 11 insertions(+), 19 deletions(-) rename config/nvim/lua/config/{blink/init.lua => blink.lua} (100%) rename config/nvim/lua/plugins/{blink.lua => cmp.lua} (97%) diff --git a/config/nvim/after/plugin/lsp.lua b/config/nvim/after/plugin/lsp.lua index 55dabdf..9746213 100644 --- a/config/nvim/after/plugin/lsp.lua +++ b/config/nvim/after/plugin/lsp.lua @@ -12,18 +12,8 @@ vim.diagnostic.config({ jump = { float = true }, }) -local function prepare_capabilities() - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities.textDocument.completion.completionItem.snippetSupport = false - - local ok, blink = pcall(require, 'blink.cmp') - - return ok and blink.get_lsp_capabilities(capabilities) or capabilities -end - vim.lsp.config('*', { on_attach = lsp.on_attach, - capabilities = prepare_capabilities(), flags = { debounce_text_changes = 0 }, }) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 7897717..c151831 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,8 +1,7 @@ { "blink-cmp-env": { "branch": "main", "commit": "99af62c1f9aa46005e8f50ad4ccee581946546ca" }, "blink-cmp-git": { "branch": "master", "commit": "10783593af764424018a95e75df6ad5a8b66fe07" }, - "blink-cmp-sshconfig": { "branch": "main", "commit": "91bf9bd80d53d2b6521cffb01da138ef6403d625" }, - "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, + "blink.cmp": { "branch": "main", "commit": "b4d379393882561f9055abe780342ee00f02c573" }, "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" }, "fzf-lua": { "branch": "main", "commit": "9004cbb4c065a32b690e909c49903967b45301eb" }, "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" }, @@ -14,13 +13,12 @@ "mini.bufremove": { "branch": "main", "commit": "ee69f823f84508c556127a5882760d9783692023" }, "mini.misc": { "branch": "main", "commit": "de8947231c29012271722651aa07f6749c41d1ed" }, "mini.pairs": { "branch": "main", "commit": "b7fde3719340946feb75017ef9d75edebdeb0566" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "338409dd8a6ed74767bad3eb5269f1b903ffb3cf" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "fe9eed4d48f530fc9ffe4d785a936a49fa344e1a" }, "nvim-lspconfig": { "branch": "master", "commit": "5a855bcfec7973767a1a472335684bbd71d2fa2b" }, - "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, + "nvim-surround": { "branch": "main", "commit": "2800277e75eda268df2bfab6ebc53e2635455318" }, "nvim-treesitter": { "branch": "main", "commit": "dc42c209f3820bdfaae0956f15de29689aa6b451" }, "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" }, "nvim-vtsls": { "branch": "main", "commit": "0b5f73c9e50ce95842ea07bb3f05c7d66d87d14a" }, - "oil-git.nvim": { "branch": "main", "commit": "c99db7b1dd8dd500c3ec530dc07000dfbeb6e080" }, "overseer.nvim": { "branch": "master", "commit": "392093e610333c0aea89bf43de7362e25783eada" }, "treesj": { "branch": "main", "commit": "186084dee5e9c8eec40f6e39481c723dd567cb05" }, "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" }, diff --git a/config/nvim/lua/config/blink/init.lua b/config/nvim/lua/config/blink.lua similarity index 100% rename from config/nvim/lua/config/blink/init.lua rename to config/nvim/lua/config/blink.lua diff --git a/config/nvim/lua/plugins/blink.lua b/config/nvim/lua/plugins/cmp.lua similarity index 97% rename from config/nvim/lua/plugins/blink.lua rename to config/nvim/lua/plugins/cmp.lua index c62e6cf..7500e37 100644 --- a/config/nvim/lua/plugins/blink.lua +++ b/config/nvim/lua/plugins/cmp.lua @@ -1,6 +1,6 @@ return { 'saghen/blink.cmp', - version = '1.*', + build = 'nix run .#build-plugin', dependencies = { 'Kaiser-Yang/blink-cmp-git', 'folke/lazydev.nvim', @@ -20,6 +20,7 @@ return { require('blink.cmp').setup(opts) end, opts = { + fuzzy = { implementation = 'prefer_rust_with_warning' }, keymap = { [''] = { 'select_prev' }, [''] = { 'show', 'select_next' }, diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua index c12189d..1718b8f 100644 --- a/config/nvim/lua/plugins/git.lua +++ b/config/nvim/lua/plugins/git.lua @@ -228,10 +228,9 @@ return { { 'malewicz1337/oil-git.nvim', dir = '~/dev/oil-git.nvim', - ft = 'oil', opts = { symbol_position = 'signcolumn', - can_use_signcolumn = function() return 'yes' end, + can_use_signcolumn = function() return 'auto' end, show_file_highlights = false, show_directory_highlights = false, symbols = { diff --git a/config/nvim/lua/plugins/nvim.lua b/config/nvim/lua/plugins/nvim.lua index 02b0427..e9b9739 100644 --- a/config/nvim/lua/plugins/nvim.lua +++ b/config/nvim/lua/plugins/nvim.lua @@ -44,10 +44,11 @@ return { }, { 'barrettruth/nonicons.nvim', + dir = '~/dev/nonicons.nvim', enabled = false, lazy = false, dependencies = { - { 'nvim-tree/nvim-web-devicons', enabled = false, }, + 'nvim-tree/nvim-web-devicons', }, }, { @@ -294,6 +295,9 @@ return { skip_confirm_for_simple_edits = true, prompt_save_on_select_new_entry = false, float = { border = 'single' }, + win_options = { + signcolumn = 'auto', + }, view_options = { is_hidden_file = function(name, bufnr) local dir = require("oil").get_current_dir(bufnr)