From fde61aa4e8de7bfbb4df43eae56fd8aa6eb19109 Mon Sep 17 00:00:00 2001 From: AeroGlory Date: Wed, 22 Jul 2026 21:27:25 -0400 Subject: [PATCH] Replaced coq (FINALLY) --- lazy-lock.json | 5 ++- lua/plugins/lsp/lsp.lua | 73 +++++++++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 27 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 2f67dda..ad94eb9 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,11 +1,10 @@ { "barbar.nvim": { "branch": "master", "commit": "337ecfadb8bf005050990bf2f624dc4fc828dabd" }, + "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "catppuccin": { "branch": "main", "commit": "c7c692a0ad3080710893abbae100171819a3e4be" }, - "coq.artifacts": { "branch": "artifacts", "commit": "d545035d06408f2d68cd03bc401425e42c298fc4" }, - "coq.thirdparty": { "branch": "3p", "commit": "a021e24f1ff538d339aece0de80d621b68862701" }, - "coq_nvim": { "branch": "coq", "commit": "83580b587f6fc50568ec61ae79e18762fcf35c17" }, "cord.nvim": { "branch": "master", "commit": "8f081613c1314a0d6f38839c2788216621efb4d9" }, "crates.nvim": { "branch": "main", "commit": "afcd1cc3eeceb5783676fc8464389b9216a29d05" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "gitsigns.nvim": { "branch": "main", "commit": "31d6fb2d618bca1482b9f274751ead5f03461408" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, diff --git a/lua/plugins/lsp/lsp.lua b/lua/plugins/lsp/lsp.lua index b182bbe..deffd0f 100644 --- a/lua/plugins/lsp/lsp.lua +++ b/lua/plugins/lsp/lsp.lua @@ -1,29 +1,54 @@ return { - "neovim/nvim-lspconfig", -- REQUIRED: for native Neovim LSP integration - lazy = false, -- REQUIRED: tell lazy.nvim to start this plugin at startup - dependencies = { - -- main one - { "ms-jpq/coq_nvim", branch = "coq" }, + 'saghen/blink.cmp', + -- optional: provides snippets for the snippet source + dependencies = { 'rafamadriz/friendly-snippets' }, - -- 9000+ Snippets - { "ms-jpq/coq.artifacts", branch = "artifacts" }, + -- use a release tag to download pre-built binaries + version = '1.*', + -- AND/OR build from source + -- build = 'cargo build --release', + -- If you use nix, you can build from source with: + -- build = 'nix run .#build-plugin', - -- lua & third party sources -- See https://github.com/ms-jpq/coq.thirdparty - -- Need to **configure separately** - { 'ms-jpq/coq.thirdparty', branch = "3p" } - -- - shell repl - -- - nvim lua api - -- - scientific calculator - -- - comment banner - -- - etc + ---@module 'blink.cmp' + ---@type blink.cmp.Config + opts = { + -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept) + -- 'super-tab' for mappings similar to vscode (tab to accept) + -- 'enter' for enter to accept + -- 'none' for no mappings + -- + -- All presets have the following mappings: + -- C-space: Open menu or open docs if already open + -- C-n/C-p or Up/Down: Select next/previous item + -- C-e: Hide menu + -- C-k: Toggle signature help (if signature.enabled = true) + -- + -- See :h blink-cmp-config-keymap for defining your own keymap + keymap = { preset = 'enter' }, + + appearance = { + -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- Adjusts spacing to ensure icons are aligned + nerd_font_variant = 'mono' + }, + + -- (Default) Only show the documentation popup when manually triggered + completion = { documentation = { auto_show = false } }, + + -- Default list of enabled providers defined so that you can extend it + -- elsewhere in your config, without redefining it, due to `opts_extend` + sources = { + default = { 'lsp', 'path', 'snippets', 'buffer' }, + }, + + -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance + -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation, + -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"` + -- + -- See the fuzzy documentation for more information + fuzzy = { implementation = "prefer_rust_with_warning" } }, - init = function() - vim.g.coq_settings = { - --auto_start = 'shut-up', -- if you want to start COQ at startup - -- Your COQ settings here - } - end, - config = function() - -- Your LSP settings here - end, + opts_extend = { "sources.default" } } +