From 706fe9b17f5c869f195f459d7a5925244a0aed8d Mon Sep 17 00:00:00 2001
From: Mark Riedesel <mark@klowner.com>
Date: Tue, 22 Dec 2020 15:20:12 -0500
Subject: [PATCH] add godot stuff to vim config, fix polybar config

---
 _config/polybar/config                | 2 +-
 _config/zsh/configs/default/paths.zsh | 4 ++++
 vim/after/ftplugin/gdscript.vim       | 6 ++++++
 vim/coc-settings.json                 | 5 +++++
 vim/vimrc                             | 9 +++++++--
 xinitrc                               | 2 --
 6 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 vim/after/ftplugin/gdscript.vim

diff --git a/_config/polybar/config b/_config/polybar/config
index acf5cbf..0ecca77 100644
--- a/_config/polybar/config
+++ b/_config/polybar/config
@@ -52,7 +52,7 @@
 	modules-right = wired-network filesystem memory date pulseaudio
 
 	tray-position = right
-	tray-background: ${bar.background}
+	tray-background = ${bar.background}
 	tray-maxsize = 24444
 
 [bar/secondary]
diff --git a/_config/zsh/configs/default/paths.zsh b/_config/zsh/configs/default/paths.zsh
index 30a236a..ad7f4ef 100644
--- a/_config/zsh/configs/default/paths.zsh
+++ b/_config/zsh/configs/default/paths.zsh
@@ -25,3 +25,7 @@ if (( $+commands[ccache] )); then
 fi
 
 export VIRSH_DEFAULT_CONNECT_URI="qemu:///system"
+
+#/// Android SDK
+export ANDROID_NDK_ROOT=/opt/android-ndk
+export ANDROID_HOME=/opt/android-sdk
diff --git a/vim/after/ftplugin/gdscript.vim b/vim/after/ftplugin/gdscript.vim
new file mode 100644
index 0000000..948c1a1
--- /dev/null
+++ b/vim/after/ftplugin/gdscript.vim
@@ -0,0 +1,6 @@
+setlocal tabstop=4
+nnoremap <buffer> <F4> :GodotRunLast<CR>
+nnoremap <buffer> <F5> :GodotRun<CR>
+nnoremap <buffer> <F6> :GodotRunCurrent<CR>
+nnoremap <buffer> <F7> :GodotRunFZF<CR>
+
diff --git a/vim/coc-settings.json b/vim/coc-settings.json
index 7bb83e2..da5a158 100644
--- a/vim/coc-settings.json
+++ b/vim/coc-settings.json
@@ -18,6 +18,11 @@
 					"directory": "/tmp/ccls"
 				}
 			}
+		},
+		"godot": {
+			"host": "127.0.0.1",
+			"filetypes": ["gdscript"],
+			"port": 6008
 		}
 	},
 	"tsserver.log": "off"
diff --git a/vim/vimrc b/vim/vimrc
index 84414e2..bf60a9d 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -107,7 +107,8 @@ Plug 'airblade/vim-gitgutter'
 Plug 'easymotion/vim-easymotion', "{{{
   map <leader><leader> <plug>(easymotion-prefix)
 "}}}
-Plug 'sheerun/vim-polyglot'
+Plug 'habamax/vim-godot'
+"Plug 'sheerun/vim-polyglot'
 Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}, "{{{
 " let g:coc_global_extensions = [
 "       \ 'coc-css',
@@ -122,7 +123,7 @@ Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}, "{{{
 "       \ 'coc-yaml',
 "       \ ]
 set signcolumn=yes
-set updatetime=300
+set updatetime=750
 set shortmess+=c
 inoremap <silent><expr> <TAB>
     \ pumvisible() ? "\<C-n>" :
@@ -141,6 +142,9 @@ nmap <silent> gy <Plug>(coc-type-definition)
 nmap <silent> gi <Plug>(coc-implementation)
 nmap <silent> gr <Plug>(coc-references)
 
+nmap <silent> ]p :<C-u>CocPrev<CR>
+nmap <silent> [p :<C-u>CocNext<CR>
+
 nmap <leader>f <Plug>(coc-fix-current)
 
 " Use <c-space> to trigger completion.
@@ -245,6 +249,7 @@ endtry
 " Display mispellings as italicised
 hi clear SpellBad
 hi SpellBad gui=underline cterm=italic
+hi Pmenu ctermbg=16
 
 " List items are always weird distracting colors
 hi SpecialKey ctermfg=238
diff --git a/xinitrc b/xinitrc
index 4edb2f0..6917ee8 100644
--- a/xinitrc
+++ b/xinitrc
@@ -14,8 +14,6 @@ fi
 eval $(systemctl --user show-environment | grep SSH_AUTH_SOCK)
 export SSH_AUTH_SOCK
 
-setxkbmap -option caps:swapescape &
-
 # Per-host init
 filepath=$(dirname $(readlink -f $0))
 for f in "all" "$(hostname)"; do