Switch back to COQ.nvim

config/nvim/init.lua

@@ -24,9 +24,9 @@ autocmd BufNewFile,BufRead *.sol set ft=solidity
 vim.o.number = true
 vim.o.relativenumber = true
 vim.o.timeoutlen = 700
-vim.o.guifont='Hasklug Nerd Font Mono,Hack Nerd Font,NotoEmoji Nerd Font:h11'
+vim.o.guifont = 'Hasklug Nerd Font Mono,Hack Nerd Font,NotoEmoji Nerd Font:h11'
 
-vim.o.undodir=vim.fn.stdpath('cache')..'/undodir'
+vim.o.undodir = vim.fn.stdpath('cache') .. '/undodir'
 vim.o.undofile = true
 
 vim.o.autoread = true
@@ -36,11 +36,11 @@ vim.o.showmode = false
 vim.o.showtabline = 2
 vim.o.autoindent = true
 
-vim.o.tabstop=4
+vim.o.tabstop = 4
-vim.o.softtabstop=4
+vim.o.softtabstop = 4
 
-vim.o.shiftwidth=4
+vim.o.shiftwidth = 4
-vim.bo.shiftwidth=4
+vim.bo.shiftwidth = 4
 
 vim.o.expandtab = true
 vim.o.hidden = true
@@ -48,7 +48,7 @@ vim.o.ignorecase = true
 vim.o.smartcase = true
 vim.o.termguicolors = true
 -- No clue why window scoped
-vim.wo.signcolumn='yes'
+vim.wo.signcolumn = 'yes'
 
 
 vim.o.wrap = false
@@ -68,14 +68,28 @@ vim.g.test = {
  comment = {},
  string = { complete_items = { 'path' } },
     },
-    rust = { { complete_items = {'ts'} } },
+    rust = { { complete_items = { 'ts' } } },
 }
 
 
 vim.o.completeopt = 'menuone,noselect'
 
 vim.g.coq_settings = {
-    auto_start = 'shut-up'
+    auto_start = 'shut-up',
+    weights = {
+        prefix_matches = 4
+    },
+    clients = {
+        lsp = {
+            weight_adjust = 1
+        },
+        buffers = {
+            weight_adjust = -0.5
+        },
+        snippets = {
+            weight_adjust = -0.1
+        }
+    }
 }
 vim.g.rooter_manual_only = 1
 
@@ -83,7 +97,7 @@ vim.g.rooter_manual_only = 1
 require('plugins')
 require('keymaps')
 
-require'nvim-treesitter.configs'.setup {
+require 'nvim-treesitter.configs'.setup {
   ensure_installed = "maintained", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
   highlight = {
     enable = true, -- false will disable the whole extension

config/nvim/lua/lsp/lua-language-server.lua

@@ -1,21 +1,24 @@
-local lspconfig = require'lspconfig'
+local lspconfig = require 'lspconfig'
 local lspstatus = require('lsp-status')
--- local coq = require'coq'
+local coq = require 'coq'
 
-lspconfig.sumneko_lua.setup{
+lspconfig.sumneko_lua.setup {
     cmd = { "lua-language-server" },
-    on_attach=function(client) lspstatus.on_attach(client)  return end,
+    on_attach = function(client) lspstatus.on_attach(client) end,
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
+    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
     filetypes = { "lua" },
     log_level = 2,
     settings = {
       Lua = {
         diagnostics = {
-            globals = {'vim'},
+            globals = { 'vim' },
         },
         telemetry = {
             enable = false,
-        }
+        },
+        formatting = {
+            end_of_line = 'lf',
+        },
       }
     }
 }

config/nvim/lua/lsp/rust-analyzer.lua

@@ -1,10 +1,10 @@
 local lspconfig = require'lspconfig'
 local lspstatus = require'lsp-status'
--- local coq = require'coq'
+local coq = require'coq'
 
 lspconfig.rust_analyzer.setup{
     on_attach=function(client) lspstatus.on_attach(client) end,
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
+    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
     cmd = { "rust-analyzer" },
     filetypes = { "rust" },
     root_dir = lspconfig.util.root_pattern("Cargo.toml"),

config/nvim/lua/plugins.lua

@@ -2,10 +2,10 @@ local vim = vim
 local execute = vim.api.nvim_command
 local fn = vim.fn
 
-local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
+local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim'
 
 if fn.empty(fn.glob(install_path)) > 0 then
-    fn.system({'git', 'clone', 'https://github.com/wbthomason/packer.nvim', install_path})
+    fn.system({ 'git', 'clone', 'https://github.com/wbthomason/packer.nvim', install_path })
     execute 'packadd packer.nvim'
 end
 
@@ -50,7 +50,7 @@ return require('packer').startup(function()
         'tpope/vim-fugitive',
     }
 
-    use { 'norcalli/nvim-colorizer.lua', config = function() require'colorizer'.setup() end, }
+    use { 'norcalli/nvim-colorizer.lua', config = function() require 'colorizer'.setup() end, }
 
     -- lsp
     -- use { 'onsails/lspkind-nvim', config = function() require'lspkind'.init() end, }
@@ -62,53 +62,54 @@ return require('packer').startup(function()
 
 
 
-    use { 'ray-x/cmp-treesitter' }
+    -- use { 'ray-x/cmp-treesitter' }
-    use { 'andersevenrud/cmp-tmux' }
+    -- use { 'andersevenrud/cmp-tmux' }
-    use { 'hrsh7th/cmp-vsnip' }
+    -- use { 'hrsh7th/cmp-vsnip' }
-    use { 'hrsh7th/vim-vsnip' }
+    -- use { 'hrsh7th/vim-vsnip' }
-    use { 'hrsh7th/cmp-nvim-lsp' }
+    -- use { 'hrsh7th/cmp-nvim-lsp' }
-    use { 'hrsh7th/cmp-buffer' }
+    -- use { 'hrsh7th/cmp-buffer' }
-    use { 'hrsh7th/cmp-path' }
+    -- use { 'hrsh7th/cmp-path' }
-    use { 'hrsh7th/cmp-cmdline' }
+    -- use { 'hrsh7th/cmp-cmdline' }
-    use { 'hrsh7th/nvim-cmp',
+    -- use { 'hrsh7th/nvim-cmp',
-        config = function() 
+    --       config = function()
-            local cmp = require("cmp")
+    --           local cmp = require("cmp")
-            cmp.setup({
+    --           cmp.setup({
-            snippet = {
+    --         snippet = {
-              -- REQUIRED - you must specify a snippet engine
+    --           -- REQUIRED - you must specify a snippet engine
-              expand = function(args)
+    --           expand = function(args)
-                vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+    --               vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
-                -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+    --               -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-                -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+    --               -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
-                -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+    --               -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-              end,
+    --           end,
-            },
+    --         },
-            mapping = {
+    --         mapping = {
-              ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
+    --           ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
-              ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
+    --           ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
-              ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
+    --           ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
-              ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
+    --           ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
-              ['<C-e>'] = cmp.mapping({
+    --           ['<C-e>'] = cmp.mapping({
-                i = cmp.mapping.abort(),
+    --             i = cmp.mapping.abort(),
-                c = cmp.mapping.close(),
+    --             c = cmp.mapping.close(),
-              }),
+    --           }),
-              ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+    --           ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-            },
+    --         },
-            sources = cmp.config.sources({
+    --         sources = cmp.config.sources({
-              { name = 'nvim_lsp' },
+    --           { name = 'nvim_lsp' },
-              { name = 'vsnip' }, -- For vsnip users.
+    --           { name = 'vsnip' }, -- For vsnip users.
-            }, {
+    --         }, {
-              { name = 'buffer' },
+    --           { name = 'buffer' },
-              { name = 'tmux' },
+    --           { name = 'tmux' },
-              { name = 'treesitter' },
+    --           { name = 'treesitter' },
-              -- { name = 'snippy' }, -- For snippy users.
+    --           -- { name = 'snippy' }, -- For snippy users.
-            })
+    --         })
-        }) end,
+    --           })
-    }
+    --       end,
+    -- }
 
 
 
-    -- use { 'ms-jpq/coq_nvim', requires =  { 'ms-jpq/coq.artifacts' } }
+    use { 'ms-jpq/coq_nvim', requires = { 'ms-jpq/coq.artifacts' } }
 
     -- use { 'folke/lsp-colors.nvim',
     --     config = function() require("lsp-colors").setup({
@@ -126,7 +127,7 @@ return require('packer').startup(function()
     -- use { 'justinmk/vim-sneak' }
     use {
         'akinsho/nvim-toggleterm.lua',
-        config = function() require'setup.toggleterm' end,
+        config = function() require 'setup.toggleterm' end,
     }
 
     -- use 'airblade/vim-rooter'
@@ -149,4 +150,3 @@ return require('packer').startup(function()
     use 'ellisonleao/glow.nvim'
 
 end);
-