From 756cebca4082b321967447390cea1dd079c15510 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 6 Oct 2021 19:08:11 +0300
Subject: [PATCH] Neovim: switch completion plugin to coq.nvim

---
 home/.config/nvim/init.lua                    |  1 -
 home/.config/nvim/lua/autocmd.lua             |  3 +++
 .../nvim/lua/pluginconf/completion.lua        |  4 ----
 home/.config/nvim/lua/pluginmanager.lua       | 23 +++++++++----------
 4 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 home/.config/nvim/lua/pluginconf/completion.lua

diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua
index 586b178..37c7a23 100644
--- a/home/.config/nvim/init.lua
+++ b/home/.config/nvim/init.lua
@@ -6,7 +6,6 @@ require 'settings'
 -- Plugin configurations
 require 'pluginconf.lualine'
 require 'pluginconf.bufferline'
-require 'pluginconf.completion'
 require 'pluginconf.lsp'
 require 'pluginconf.treesitter'
 require 'pluginconf.telescope'
diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/autocmd.lua
index 00a0940..8182a21 100644
--- a/home/.config/nvim/lua/autocmd.lua
+++ b/home/.config/nvim/lua/autocmd.lua
@@ -5,3 +5,6 @@ cmd('au TermOpen * tnoremap <buffer> <Esc> <c-\\><c-n>')
 
 -- Fix YAML indentation
 cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab')
+
+-- Run coq.nvim on startup
+cmd('au VimEnter * COQnow --shut-up')
diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua
deleted file mode 100644
index a4e3454..0000000
--- a/home/.config/nvim/lua/pluginconf/completion.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-vim.o.completeopt = 'menuone,noinsert,noselect'
-
--- Enable for all buffers (for now)
-vim.api.nvim_command('autocmd BufEnter * lua require\'completion\'.on_attach()')
diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua
index fc91530..bd53975 100644
--- a/home/.config/nvim/lua/pluginmanager.lua
+++ b/home/.config/nvim/lua/pluginmanager.lua
@@ -64,28 +64,27 @@ require('packer').startup(function()
     -- Install LSP executables
     use 'kabouzeid/nvim-lspinstall'
 
-    -- Completion framework
-    use 'nvim-lua/completion-nvim'
+    -- Completion
+    use {'ms-jpq/coq_nvim', branch = 'coq'}
+
+    -- Snippets for coq_nvim
+    use {'ms-jpq/coq.artifacts', branch = 'artifacts'}
 
     -- treesitter syntax highlight
-    use {
-        'nvim-treesitter/nvim-treesitter',
-        branch = '0.5-compat',
-        run = ':TSUpdate'
-    }
+    use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
 
     -- treesitter plugin for commentstring
     use 'JoosepAlviste/nvim-ts-context-commentstring'
 
-	-- Additional plugins for formats not supported
-	-- by treesitter
-	use 'jamespeapen/swayconfig.vim'
+    -- Additional plugins for formats not supported
+    -- by treesitter
+    use 'jamespeapen/swayconfig.vim'
 
     -- mappings for commenting in code
     use 'tpope/vim-commentary'
 
-	-- we all know this one
-	use 'tpope/vim-surround'
+    -- we all know this one
+    use 'tpope/vim-surround'
 
     -- Formatter plugin
     use 'sbdchd/neoformat'