From 5a00f34441622a965515e40c82795aad51553b99 Mon Sep 17 00:00:00 2001
From: Buddy Sandidge <git@buddy.wtf>
Date: Thu, 21 Jan 2021 21:24:50 -0800
Subject: [PATCH] vim config updates

---
 fzf/.config/vim/plug.d/fzf.vim                  | 3 +++
 vim-fancy/.config/vim/plug.d/vim-fancy.vim      | 2 +-
 vim-fancy/.config/vim/plugin/lint.vim           | 3 ++-
 vim-fancy/.config/vim/snips/javascript.snippets | 8 +++++++-
 vim/.config/profile/env.d/vim.env               | 2 +-
 vim/.config/vim/plugin/theme.vim                | 2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/fzf/.config/vim/plug.d/fzf.vim b/fzf/.config/vim/plug.d/fzf.vim
index 95ebb75..4852016 100644
--- a/fzf/.config/vim/plug.d/fzf.vim
+++ b/fzf/.config/vim/plug.d/fzf.vim
@@ -1,2 +1,5 @@
 Plug 'junegunn/fzf', { 'tag': '0.24.4' }
 Plug 'junegunn/fzf.vim'
+
+map <leader>fz :GFiles<CR>
+map <leader>rg :Rg<CR>
diff --git a/vim-fancy/.config/vim/plug.d/vim-fancy.vim b/vim-fancy/.config/vim/plug.d/vim-fancy.vim
index f4e70a8..17dfc2d 100644
--- a/vim-fancy/.config/vim/plug.d/vim-fancy.vim
+++ b/vim-fancy/.config/vim/plug.d/vim-fancy.vim
@@ -1,4 +1,4 @@
-Plug 'neoclide/coc.nvim', { 'branch': 'release' }
+"Plug 'neoclide/coc.nvim', { 'branch': 'release' }
 
 Plug 'SirVer/ultisnips', { 'tag': '3.2' }
 let g:UltiSnipsSnippetDirectories = [ 'UltiSnips', 'snips' ]
diff --git a/vim-fancy/.config/vim/plugin/lint.vim b/vim-fancy/.config/vim/plugin/lint.vim
index 1bdc696..25f8e6c 100644
--- a/vim-fancy/.config/vim/plugin/lint.vim
+++ b/vim-fancy/.config/vim/plugin/lint.vim
@@ -4,7 +4,8 @@ let g:ale_echo_msg_format = '%s [%severity%] [%linter%]'
 let g:ale_set_loclist = 0
 let g:ale_set_quickfix = 1
 
-augroup jslint
+augroup linters
     autocmd!
     autocmd FileType javascript let g:ale_linters['javascript'] = ['eslint']
+    autocmd FileType go let g:ale_linters['go'] = ['golint', 'govet', 'gopls', 'gofmt']
 augroup END
diff --git a/vim-fancy/.config/vim/snips/javascript.snippets b/vim-fancy/.config/vim/snips/javascript.snippets
index 9ed520a..5556598 100644
--- a/vim-fancy/.config/vim/snips/javascript.snippets
+++ b/vim-fancy/.config/vim/snips/javascript.snippets
@@ -1,5 +1,11 @@
 snippet f "function" !
-function ${1:function_name} (${2:argument}) {
+function ${1:func} (${2}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet if "if" !
+if (${1:true}) {
 	${VISUAL}$0
 }
 endsnippet
diff --git a/vim/.config/profile/env.d/vim.env b/vim/.config/profile/env.d/vim.env
index 2b02fb7..f2f1d82 100644
--- a/vim/.config/profile/env.d/vim.env
+++ b/vim/.config/profile/env.d/vim.env
@@ -1,3 +1,3 @@
 # shellcheck disable=SC2016,SC2034
-VIMINIT='if !has("nvim") | source $XDG_CONFIG_HOME/vim/vimrc | endif'
+VIMINIT='source $XDG_CONFIG_HOME/vim/vimrc'
 MYVIMRC='$XDG_CONFIG_HOME/vim/vimrc'
diff --git a/vim/.config/vim/plugin/theme.vim b/vim/.config/vim/plugin/theme.vim
index 4ee708e..febae93 100644
--- a/vim/.config/vim/plugin/theme.vim
+++ b/vim/.config/vim/plugin/theme.vim
@@ -15,5 +15,5 @@ if (has("termguicolors"))
   set termguicolors
 endif
 
-colorscheme gruvbox
+colorscheme wombat
 set background=dark