updates

8 files changed, 34 insertions, 20 deletions

diff --git a/coc-settings.json b/coc-settings.json
index c0f877ed..be9be018 100644
--- a/coc-settings.json
+++ b/coc-settings.json
@@ -68,15 +68,6 @@
     "v": "open:vsplit"
   },
 
-  "languageserver": {
-    "bash": {
-      "command": "bash-language-server",
-      "args": ["start"],
-      "filetypes": ["sh"],
-      "ignoredRootPaths": ["~"]
-    }
-  },
-
   //coc-emoji
   "coc.source.emoji.filetypes": ["markdown"]
 
diff --git a/init.vim b/init.vim
index 39e73099..c65ef1ef 100644
--- a/init.vim
+++ b/init.vim
@@ -19,6 +19,7 @@ source $HOME/.config/nvim/themes/airline.vim
 
 " Plugin Configuration
 source $HOME/.config/nvim/plug-config/rnvimr.vim
+source $HOME/.config/nvim/plug-config/better-whitespace.vim
 source $HOME/.config/nvim/plug-config/fzf.vim
 source $HOME/.config/nvim/plug-config/vim-commentary.vim
 source $HOME/.config/nvim/plug-config/rainbow.vim
@@ -43,6 +44,7 @@ source $HOME/.config/nvim/plug-config/bracey.vim
 source $HOME/.config/nvim/plug-config/asynctask.vim
 source $HOME/.config/nvim/plug-config/window-swap.vim
 source $HOME/.config/nvim/plug-config/markdown-preview.vim
+" source $HOME/.config/nvim/plug-config/vimspector.vim " Uncomment if you want to use Vimspector
 luafile $HOME/.config/nvim/lua/plug-colorizer.lua
 
 " Add paths to node and python here
@@ -50,6 +52,3 @@ if !empty(glob("~/.config/nvim/paths.vim"))
   source $HOME/.config/nvim/paths.vim
 endif
 
-" Experimental
-let g:vimspector_base_dir=expand( '$HOME/.config/nvim/vimspector-config' )
-" let g:vimspector_enable_mappings='HUMAN'
diff --git a/keys/which-key.vim b/keys/which-key.vim
index 79a9f2b1..8805437e 100644
--- a/keys/which-key.vim
+++ b/keys/which-key.vim
@@ -34,7 +34,6 @@ let g:which_key_map['/'] = [ ':call Comment()'                    , 'comment' ]
 let g:which_key_map['.'] = [ ':e $MYVIMRC'                        , 'open init' ]
 let g:which_key_map[';'] = [ ':Commands'                          , 'commands' ]
 let g:which_key_map['='] = [ '<C-W>='                             , 'balance windows' ]
-let g:which_key_map[','] = [ 'Startify'                           , 'start screen' ]
 let g:which_key_map['d'] = [ ':bd'                                , 'delete buffer']
 let g:which_key_map['e'] = [ ':CocCommand explorer'               , 'explorer' ]
 let g:which_key_map['f'] = [ ':Farr'                              , 'find and replace' ]
@@ -43,7 +42,6 @@ let g:which_key_map['m'] = [ ':call WindowSwap#EasyWindowSwap()'  , 'move window
 let g:which_key_map['p'] = [ ':Files'                             , 'search files' ]
 let g:which_key_map['q'] = [ 'q'                                  , 'quit' ]
 let g:which_key_map['r'] = [ ':RnvimrToggle'                      , 'ranger' ]
-let g:which_key_map['S'] = [ ':SSave'                             , 'save session' ]
 let g:which_key_map['u'] = [ ':UndotreeToggle'                    , 'undo tree']
 let g:which_key_map['v'] = [ '<C-W>v'                             , 'split right']
 let g:which_key_map['W'] = [ 'w'                                  , 'write' ]
@@ -131,6 +129,15 @@ let g:which_key_map.s = {
       \ }
       " \ 's' : [':Snippets'     , 'snippets'],
 
+let g:which_key_map.S = {
+      \ 'name' : '+Session' ,
+      \ 'c' : [':SClose'          , 'Close Session']  ,
+      \ 'd' : [':SDelete'         , 'Delete Session'] ,
+      \ 'l' : [':SLoad'           , 'Load Session']     ,
+      \ 's' : [':Startify'        , 'Start Page']     ,
+      \ 'S' : [':SSave'           , 'Save Session']   ,
+      \ }
+
 " g is for git
 let g:which_key_map.g = {
       \ 'name' : '+git' ,
diff --git a/plug-config/better-whitespace.vim b/plug-config/better-whitespace.vim
new file mode 100644
index 00000000..b12f34e1
--- /dev/null
+++ b/plug-config/better-whitespace.vim
@@ -0,0 +1,2 @@
+let g:better_whitespace_enabled=0
+" let g:strip_whitespace_on_save=1
diff --git a/plug-config/coc.vim b/plug-config/coc.vim
index b96ee154..546ead0f 100644
--- a/plug-config/coc.vim
+++ b/plug-config/coc.vim
@@ -1,6 +1,9 @@
   let g:coc_global_extensions = [
     \ 'coc-snippets',
     \ 'coc-actions',
+    \ 'coc-sh',
+    \ 'coc-java-debug',
+    \ 'coc-java',
     \ 'coc-lists',
     \ 'coc-emmet',
     \ 'coc-tasks',
diff --git a/plug-config/vimspector.vim b/plug-config/vimspector.vim
new file mode 100644
index 00000000..97c639ff
--- /dev/null
+++ b/plug-config/vimspector.vim
@@ -0,0 +1,3 @@
+" Experimental
+let g:vimspector_base_dir=expand( '$HOME/.config/nvim/vimspector-config' )
+let g:vimspector_enable_mappings='HUMAN'
diff --git a/plug-config/xtabline.vim b/plug-config/xtabline.vim
index 37927939..1eaa9252 100644
--- a/plug-config/xtabline.vim
+++ b/plug-config/xtabline.vim
@@ -1,13 +1,22 @@
 let g:xtabline_settings = {}
+
 let g:xtabline_settings.enable_mappings = 0
+
 let g:xtabline_settings.tabline_modes = ['buffers', 'tabs']
+
 let g:xtabline_settings.enable_persistance = 0
+
 " let g:xtabline_settings.last_open_first = 1
+let g:xtabline_lazy = 1
 
+let g:xtabline_settings.indicators = {
+      \ 'modified': '+',
+      \ 'pinned': '[📌]',
+      \}
 
 let g:xtabline_settings.icons = {
       \'pin': '📌',
-      \'star': '',
+      \'star': '*',
       \'book': '📖',
       \'lock': '🔒',
       \'hammer': '🔨',
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
index c95d6ee0..81972355 100644
--- a/vim-plug/plugins.vim
+++ b/vim-plug/plugins.vim
@@ -96,20 +96,20 @@ call plug#begin('~/.config/nvim/autoload/plugged')
   " Easily Create Gists
   Plug 'mattn/vim-gist'
   Plug 'mattn/webapi-vim'
+  " Async Linting Engine
+  " TODO make sure to add ale config before plugin
+  Plug 'dense-analysis/ale'
+  " Better Whitespace
+  Plug 'ntpeters/vim-better-whitespace'
 
   " Plugin Graveyard
 
-  " Better Whitespace
-  " Plug 'ntpeters/vim-better-whitespace'
   " jsx syntax support
   " Plug 'maxmellon/vim-jsx-pretty'
   " Typescript syntax
   " Plug 'HerringtonDarkholme/yats.vim'
   " Multiple Cursors
   " Plug 'terryma/vim-multiple-cursors'
-  " Async Linting Engine
-  " TODO make sure to add ale config before plugin
-  " Plug 'dense-analysis/ale'
   " Plug 'kaicataldo/material.vim'
   " Plug 'NLKNguyen/papercolor-theme'
   " Plug 'tomasiser/vim-code-dark'