vim: misc changes

Though mostly on emacs now, thought I should merge these at least.

vimrc

@@ -24,7 +24,7 @@ call plug#begin('~/.vim/plugged')
 
     Plug 'NLKNguyen/papercolor-theme'
     Plug 'vim-airline/vim-airline'
-    Plug 'vim-airline/vim-airline-themes'
+    " Plug 'vim-airline/vim-airline-themes'
     Plug 'dracula/vim', { 'as': 'dracula' }
     Plug 'lifepillar/vim-solarized8'
 
@@ -69,17 +69,33 @@ call plug#begin('~/.vim/plugged')
     Plug 'rust-lang/rust.vim'
     Plug 'delphinus/vim-firestore'
     Plug 'sebdah/vim-delve'
+    Plug 'guns/vim-clojure-static'
 
     Plug 'regedarek/ZoomWin'
 call plug#end()
 
 let g:coc_disable_startup_warning = 1
 
-if has('macunix')
+" set guifont="Inconsolata-dz Medium 12"
-	set guifont=FiraCode-Retina:h14
+if has("gui_running")
-else
+  if has("gui_gtk3")
-	set guifont="Inconsolata-dz Medium 12"
+    :set guifont="Fira Code Medium 11"
+  elseif has('macunix')
+  	set guifont="FiraCode-Retina:h14,Fira Code Medium,Inconsolata-dz:h12"
+  elseif has("x11")
+    " Also for GTK 1
+    :set guifont=*-lucidatypewriter-medium-r-normal-*-*-180-*-*-m-*-*
+  elseif has("gui_win32")
+    :set guifont=Fira\ Code\ Medium\ 11;Luxi_Mono:h12:cANSI
   endif
+endif
+
+" set guifont="Fira Code Medium"
+" if has('macunix')
+" 	set guifont="Fira Code Medium 11,Inconsolata-dz:h12"
+" else
+" 	set guifont="Inconsolata-dz Medium 12"
+" endif
 let mapleader       = ' '
 let maplocalleader  = ','
 
@@ -146,10 +162,10 @@ nnoremap ,yt :!yarn test<CR>
 
 nnoremap ,m  :Make<CR>
 
-colorscheme PaperColor
+" colorscheme PaperColor
 set background=dark
 " colorscheme dracula
-" colorscheme solarized8
+colorscheme solarized8
 
 set ignorecase smartcase
 set incsearch
@@ -268,6 +284,7 @@ augroup END
 " Automatic typo fixing
 iab compomemt component
 iab seahores  seahorse
+iab KREN_EMERG KERN_EMERG
 
 " Disable the command 'K' (keyword lookup) 
 " map K <NUL>
@@ -343,7 +360,6 @@ noremap <C-G> 2<C-G>
 " Re-source and edit vimrc, respectively
 nnoremap  ,u :source $MYVIMRC<CR>
 nnoremap  ,v :edit   $MYVIMRC<CR>
-nnoremap ,v :vsplit $MYVIMRC<CR>
 nnoremap ,i :PlugInstall<CR>