feat: should mostly be fixed nowmaster

1 files changed, 28 insertions, 25 deletions

diff --git a/applications/nvim/init.vim b/applications/nvim/init.vim
index 6cb3f44..454fa4f 100644
--- a/applications/nvim/init.vim
+++ b/applications/nvim/init.vim
@@ -4,7 +4,6 @@ set spell spelllang=en_ca
 syntax on
 filetype plugin indent on
 call plug#begin()
-Plug 'deoplete-plugins/deoplete-clang'
 Plug 'dense-analysis/ale'
 Plug 'rust-lang/rust.vim'
 Plug 'neovim/nvim-lspconfig'
@@ -21,7 +20,7 @@ Plug 'CRAG666/code_runner.nvim'
 Plug 'CRAG666/betterTerm.nvim'
 Plug 'rmagatti/auto-session'
 " Plug 'f-person/git-blame.nvim'
-Plug 'lewis6991/gitsigns.nvim'
+"Plug 'lewis6991/gitsigns.nvim'
 Plug 'sakhnik/nvim-gdb'
 Plug 'vim-airline/vim-airline'
 Plug 'tpope/vim-surround'
@@ -33,9 +32,11 @@ Plug 'eeei3/latex_wordcount'
 Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
 Plug 'preservim/nerdtree'
 Plug 'sirver/ultisnips'
+Plug 'petertriho/cmp-git'
 call plug#end()
-set completeopt=menu,menuone,noselect,noinsert
-let g:ale_completion_enabled = 1
+set completeopt=menu,menuone,noselect
+let g:ale_disable_lsp = 1
+let b:ale_fixers = {'latex': ['vimtex']}
 let g:neoformat_cpp_clangformat = {
     \ 'exe': 'clang-format',
     \ 'args': ['--style="{IndentWidth: 4}"']
@@ -59,6 +60,7 @@ let g:UltiSnipsExpandTrigger = '<tab>'
 let g:UltiSnipsJumpForwardTrigger = '<tab>'
 let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
 let g:UltiSnipsSnippetDirectories = [$HOME.'/latexsnips']
+
 colorscheme tokyonight-night
 " colorscheme ~/.config/alacritty/themes/themes/blood_moon.toml
 lua <<EOF
@@ -85,6 +87,12 @@ lua <<EOF
       ['<C-Space>'] = cmp.mapping.complete(),
       ['<C-e>'] = cmp.mapping.abort(),
       ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+      ['<Tab>'] = cmp.mapping(function(fallback)
+	if cmp.visible() then cmp.select_next_item() else fallback() end
+      end, { 'i', 's' }),
+      ['<S-Tab>'] = cmp.mapping(function(fallback)
+        if cmp.visible() then cmp.select_prev_item() else fallback() end
+      end, { 'i', 's' }),
     }),
     sources = cmp.config.sources({
       { name = 'nvim_lsp' },
@@ -136,28 +144,23 @@ lua <<EOF
   --require('lspconfig')['clangd'].setup {
   --  capabilities = capabilities,
   --  }
-  vim.lsp.config(
-    'clangd', {
-    setup = {
-        capabilities = capabilities,
-    }
-    }
-  )
+  vim.lsp.config('clangd', {})
 
-  vim.lsp.config('rust_analyzer', {
-  -- Server-specific settings. See :help lsp-quickstart
-    settings = {
-        ['rust-analyzer'] = {
-            check = {
-            command = "UtilSnips";
-            },
-            diagnostics = {
-            enable = true;
-            }
-        }
-        }
-
-    })
+  vim.lsp.config('rust-analyzer', {
+      -- Server-specific settings. See :help lsp-quickstart
+      settings = {
+	    ['rust-analyzer'] = {
+		    check = {
+			command = "ultisnips";
+		    },
+		    diagnostics = {
+			enable = true;
+		    }
+		}
+	    }
+      }
+  )
+  vim.lsp.enable({'clangd', 'rust-analyzer'})
 
 -- require'nvim-treesitter.configs'.setup {
     --ensure_installed = {"java", "javascript" },