Updates

3 files changed, 36 insertions, 8 deletions

diff --git a/vim/pack/downloads/opt/lsp b/vim/pack/downloads/opt/lsp
deleted file mode 160000
-Subproject dfc001ab109cb16ef4379d3d74554158bbebdcc
diff --git a/vim/pack/downloads/opt/vim-colors-plain b/vim/pack/downloads/opt/vim-colors-plain
deleted file mode 160000
-Subproject 908ed31ad398c18b47a3f4f71c97313754484ff
diff --git a/vimrc b/vimrc
index 7a47e75..966bfdf 100644
--- a/vimrc
+++ b/vimrc
@@ -1,36 +1,64 @@
-packadd lsp
-packadd vim-colors-plain
-set tabstop=2
-set expandtab
-set shiftwidth=2 
+packadd snippets
+
+" Indentation
+set tabstop=8
 set shiftround
 set nobackup 
 set autoindent
 set smartindent
 set cindent
-let mapleader=" "
+
+" Theme
 syntax on
-colorscheme plain-cterm
+set background=light
+colorscheme quiet
+hi Normal ctermfg=black ctermbg=white
+hi SpellBad term=reverse cterm=underline ctermfg=124 ctermbg=white  
+hi SpellCap term=reverse cterm=underline ctermfg=25 ctermbg=white  
+hi SpellRare term=reverse cterm=underline ctermfg=30 ctermbg=white  
+hi SpellLocal term=reverse cterm=underline ctermfg=90 ctermbg=white  
+
+" Cursor - switch between line and full
+let &t_SI = "\<Esc>[6 q"
+let &t_SR = "\<Esc>[4 q"
+let &t_EI = "\<Esc>[2 q"
+
+" LSP
+packadd lsp
 
 call LspAddServer([#{
 	\    name: 'caml',
 	\    filetype: ['ocaml'],
-	\    path: '/home/mccd/.opam/default/bin/ocamllsp',
+	\    path: '/home/mccd/.opam/5.2.0/bin/ocamllsp',
 	\    args: [],
 	\    syncInit: v:true
 	\  }])
 
+call LspAddServer([#{
+	\    name: 'golang',
+	\    filetype: ['go', 'gomod'],
+	\    path: '/usr/bin/gopls',
+	\    args: ['serve'],
+	\    syncInit: v:true
+	\  }])
 
+" Keybindings
+let mapleader=" "
 noremap , :
 noremap <leader>e :e **/
 noremap gd mB:LspGotoDefinition<Enter>
 noremap <leader>ca :LspCodeAction<Enter>
 noremap <leader>k :LspDiagCurrent<Enter>
 nnoremap <leader>l :ls<CR>:b<space>
+nnoremap <leader>= :LspFormat<Enter>
 
+" Spell
 au BufEnter *.org set spell
 
+" Wildmenu
 set wildmenu
 set wildmode=longest:full,lastused
 set wildignore=_build/**,release/**
 set grepprg=git\ grep\ -nH 
+
+