From 6e40a452d708cbf3f96dcab3ff72dd47e754b018 Mon Sep 17 00:00:00 2001
From: Mark Riedesel <mark@klowner.com>
Date: Sun, 28 Feb 2021 09:13:47 -0500
Subject: [PATCH] who knows

---
 _config/i3/config                       |  6 +++---
 _config/kitty/kitty.conf                |  2 +-
 _config/nvim/coc-settings.json          |  2 +-
 _config/nvim/init.vim                   | 22 +++++++++++++++++++---
 _config/zsh/configs/default/aliases.zsh |  9 +++++----
 vim/vimrc                               |  4 ++--
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/_config/i3/config b/_config/i3/config
index 7c26244..93abd16 100644
--- a/_config/i3/config
+++ b/_config/i3/config
@@ -130,10 +130,10 @@ bindsym $mod+Shift+e mode "$mode_system"
 
 # appearance
 font xft:artwiz lime 7
-new_window pixel 2
+new_window pixel 5
 font xft:Roboto 13
-gaps inner 8
-gaps outer 0
+# gaps inner 8
+# gaps outer 0
 
 # app specific launch flags
 for_window [class="Peek"] floating enable
diff --git a/_config/kitty/kitty.conf b/_config/kitty/kitty.conf
index b3ddbd5..67b7e29 100644
--- a/_config/kitty/kitty.conf
+++ b/_config/kitty/kitty.conf
@@ -4,7 +4,7 @@ italic_font Envy Code R Italic
 
 font_size 10.0
 
-window_padding_width 10.0
+window_padding_width 2.0
 term xterm-256color
 enable_audio_bell no
 sync_to_monitor yes
diff --git a/_config/nvim/coc-settings.json b/_config/nvim/coc-settings.json
index da5a158..b672cec 100644
--- a/_config/nvim/coc-settings.json
+++ b/_config/nvim/coc-settings.json
@@ -25,5 +25,5 @@
 			"port": 6008
 		}
 	},
-	"tsserver.log": "off"
+	"tsserver.log": "true"
 }
diff --git a/_config/nvim/init.vim b/_config/nvim/init.vim
index 26eb37f..d18cca7 100644
--- a/_config/nvim/init.vim
+++ b/_config/nvim/init.vim
@@ -40,6 +40,7 @@ set shiftwidth=4
 set softtabstop=4
 set spell
 set tabstop=4
+set termguicolors
 
 " install vim-plug
 if !filereadable(expand('~/.local/share/nvim/site/autoload/plug.vim'))
@@ -51,7 +52,17 @@ call plug#begin('~/.local/share/nvim/plugged')
 
 " color schemes
 Plug 'dylanaraps/wal.vim'
-Plug 'sickill/vim-monokai'
+Plug 'crusoexia/vim-monokai', "{{{
+  let g:monokai_term_italic = 1
+  let g:monokai_gui_italic = 1
+"}}}
+Plug 'sainnhe/sonokai', "{{{
+  " let g:sonokai_style = "andromeda"
+  let g:sonokai_style = "atlantis"
+  " let g:sonokai_style = "default"
+  " let g:sonokai_style = "maia"
+  " let g:sonokai_style = "shusia"
+"}}}
 
 " syntax
 Plug 'cakebaker/scss-syntax.vim'
@@ -85,6 +96,10 @@ Plug 'tpope/vim-fugitive', "{{{
     map \gs :Gstatus<CR>
 "}}}
 
+" Plug 'sheerun/vim-polyglot'
+Plug 'preservim/tagbar', "{{{
+  map \t :TagbarToggle<CR>
+"}}}
 Plug 'neoclide/coc.nvim', {'branch': 'release'}, "{{{
   inoremap <silent><expr> <TAB>
       \ pumvisible() ? "\<C-n>" :
@@ -137,7 +152,7 @@ Plug 'vim-airline/vim-airline', "{{{
     let g:airline_symbols.readonly = '⭤'
     let g:airline_symbols.linenr = '⭡'
     let g:airline#extensions#tabline#enabled = 1
-    let g:airline_theme = 'wal'
+    let g:airline_theme = 'sonokai'
 "}}}
 Plug 'mattn/webapi-vim'
 Plug 'mattn/gist-vim'
@@ -202,7 +217,8 @@ call plug#end()
 " theme / visual
 try
 	" colorscheme wal
-        colorscheme monokai
+    " colorscheme monokai
+    colorscheme sonokai
 catch
 endtry
 hi clear SpellBad                   " italicize misspellings
diff --git a/_config/zsh/configs/default/aliases.zsh b/_config/zsh/configs/default/aliases.zsh
index b4659cc..5dea84f 100644
--- a/_config/zsh/configs/default/aliases.zsh
+++ b/_config/zsh/configs/default/aliases.zsh
@@ -32,7 +32,8 @@ alias egrep='egrep --color=auto'
 # Default editor alias
 alias edit='${EDITOR}:-vim}'
 
-# Prefer neovim if available
-# if (( $+commands[nvim] )) then
-# 	alias vim='nvim'
-# fi
+#Prefer neovim if available
+if (( $+commands[nvim] )) then
+	alias vim='nvim'
+	alias vimdiff='nvim -d'
+fi
diff --git a/vim/vimrc b/vim/vimrc
index bf60a9d..2f5f412 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -108,8 +108,7 @@ Plug 'easymotion/vim-easymotion', "{{{
   map <leader><leader> <plug>(easymotion-prefix)
 "}}}
 Plug 'habamax/vim-godot'
-"Plug 'sheerun/vim-polyglot'
-Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}, "{{{
+Plug 'neoclide/coc.nvim', {'branch': 'release'}, "{{{
 " let g:coc_global_extensions = [
 "       \ 'coc-css',
 "       \ 'coc-emoji',
@@ -122,6 +121,7 @@ Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}, "{{{
 "       \ 'coc-tsserver',
 "       \ 'coc-yaml',
 "       \ ]
+Plug 'pappasam/coc-jedi', {'do': 'yarn install --frozen-lockfile'}
 set signcolumn=yes
 set updatetime=750
 set shortmess+=c