From: Ruben Beltran del Rio Date: Mon, 29 Jan 2024 16:40:55 +0000 (+0000) Subject: Restore tab completion and diff colors X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/fd61b7b4d8f39738dfe019a4f757606e28f3a4d7 Restore tab completion and diff colors --- diff --git a/config/nvim/colors/rbdr.vim b/config/nvim/colors/rbdr.vim index fc7da96..138eb5e 100644 --- a/config/nvim/colors/rbdr.vim +++ b/config/nvim/colors/rbdr.vim @@ -46,6 +46,9 @@ hi DiffDelete guifg=#FF00FF guibg=#232323 hi DiffChange guifg=#AAAAAA guibg=#555555 hi DiffText guibg=#555555 gui=italic,bold cterm=italic,bold +hi link @text.diff.add DiffAdd +hi link @text.diff.delete DiffDelete + hi Directory guifg=#00FF00 gui=bold hi Error guifg=#FFFFFF guibg=#FF0000 hi ErrorMsg guifg=#FFFFFF guibg=#FF0000 gui=bold cterm=bold diff --git a/config/nvim/init.lua b/config/nvim/init.lua index e3e6427..f705d37 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -84,6 +84,9 @@ vim.keymap.set("n", "", -- Svelte Config vim.g.vim_svelte_plugin_use_typescript = true +-- Coq +vim.g.coq_settings = { auto_start = 'shut-up' } + -- Plugins require('plugins') require('treesitter_config') diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index ee889af..f88cdf4 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,5 +1,6 @@ { "LargeFile": { "branch": "master", "commit": "3941a37b2b0288524300348a39521a46539bf9f6" }, + "coq_nvim": { "branch": "coq", "commit": "792a5547052561d1089d523d68cad5859e9c78d9" }, "fzf-lua": { "branch": "main", "commit": "2fca0f2ae6064aa106feef6b527a7dbefb825724" }, "gemini.vim": { "branch": "master", "commit": "c9efb59c97b71c28d4678c79fd21fbdd3a69d196" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, diff --git a/config/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua index dc90a7b..8f7edbd 100644 --- a/config/nvim/lua/lsp.lua +++ b/config/nvim/lua/lsp.lua @@ -1,19 +1,20 @@ local lspconfig = require('lspconfig') +local coq = require('coq') local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true -lspconfig.tsserver.setup {} -lspconfig.eslint.setup{} -lspconfig.svelte.setup{} -lspconfig.pyright.setup {} -lspconfig.dartls.setup{} -lspconfig.rust_analyzer.setup { +lspconfig.tsserver.setup(coq.lsp_ensure_capabilities({})) +lspconfig.eslint.setup(coq.lsp_ensure_capabilities({})) +lspconfig.svelte.setup(coq.lsp_ensure_capabilities({})) +lspconfig.pyright.setup(coq.lsp_ensure_capabilities({})) +lspconfig.dartls.setup(coq.lsp_ensure_capabilities({})) +lspconfig.rust_analyzer.setup(coq.lsp_ensure_capabilities({ -- Server-specific settings. See `:help lspconfig-setup` settings = { ['rust-analyzer'] = {}, }, -} -lspconfig.lua_ls.setup{} +})) +lspconfig.lua_ls.setup(coq.lsp_ensure_capabilities({})) -- Global mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 7946aea..17f2fb4 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -52,6 +52,7 @@ require('lazy').setup({ 'rcarriga/nvim-dap-ui', -- Editing + 'ms-jpq/coq_nvim', 'tpope/vim-endwise', 'rstacruz/vim-closer', 'michaeljsmith/vim-indent-object',