From d4ef219b735c815af9e046de52d1e2e7120ac465 Mon Sep 17 00:00:00 2001
From: psox <psox(at)st8l.com>
Date: Wed, 7 Jul 2021 10:41:36 +0100
Subject: [PATCH] get latest from develop

---
 vimrc | 24 ++++++------------------
 zshrc | 10 ++++------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/vimrc b/vimrc
index 961db45..741144e 100644
--- a/vimrc
+++ b/vimrc
@@ -26,10 +26,6 @@ function! EditVimRcFiles()
   endfor
 endfunction
 
-let mapleader = ","
-let g:my_color_scheme = "rainbow-contrast"
-let g:coc_global_extensions=[ 'coc-highlight', 'coc-fzf-preview', 'coc-java', 'coc-sh', 'coc-sql', 'coc-xml' ]
-
 call SourceIfExists(g:rc_files['early'])
 
 " set preferred color scheme if not set
@@ -102,9 +98,6 @@ let useNeomake = has('nvim') || v:version > 800
 
 call SourceIfExists(g:rc_files['pre'])
 call plug#begin("$VIMHOME/plugged")
-  Plug 'rainglow/vim'
-  Plug 'thaerkh/vim-workspace'
-  Plug 'thaerkh/vim-indentguides'
   Plug 'junegunn/vim-easy-align'
   Plug 'tmsvg/pear-tree'
   Plug 'tpope/vim-sensible'
@@ -267,8 +260,12 @@ if has_key(plugs, 'coc.nvim')
     let g:coc_global_extensions+=[ 'coc-markdownlint' ]
     let g:coc_global_extensions+=[ 'coc-yaml' ]
 
-    " Do action on current object
-    nmap <silent> <leader>. :CocAction<CR>
+    " Do action on current word
+    nmap <silent> <leader>. <Plug>(coc-codeaction-selected)w
+
+    " Do action on a selection
+    nmap <silent> <leader>/ <Plug>(coc-codeaction-selected)
+    xmap <silent> <leader>/ <Plug>(coc-codeaction-selected)
 
     " Use tab for trigger completion with characters ahead and navigate.
     " NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
@@ -381,15 +378,6 @@ let g:one_allow_italics=1
 execute "colorscheme " . g:my_color_scheme
 highlight Comment term=italic cterm=italic gui=italic
 
-let g:airline_theme = 'base16color'
-let g:indentguides_spacechar = "\u250a"
-let g:indentguides_tabchar = "\u2506"
-
-map <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
-\ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
-\ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
-
-set nofoldenable
 set exrc
 set secure
 set modeline
diff --git a/zshrc b/zshrc
index 3a67504..15ef60b 100755
--- a/zshrc
+++ b/zshrc
@@ -13,7 +13,6 @@
 # remove duplicates
 typeset -U PATH path fpath
 path=( /bin /sbin /usr/bin /usr/sbin $path )
-[[ -d ~/.local/bin ]] && path=( ~/.local/bin $path)
 [[ -d ~/bin ]] && path=( ~/bin $path )
 
 # sdkman support
@@ -225,11 +224,10 @@ fi
 # For a full list of active aliases, run `alias`.
 #
 # Example aliases
-alias zshconfig="$EDITOR $PSOXIZSH/zshrc"
-alias ohmyzsh="$EDITOR $PSOXIZSH/oh-my-zsh"
+alias zshconfig="vim $PSOXIZSH/zshrc"
+alias ohmyzsh="vim $PSOXIZSH/oh-my-zsh"
 alias curlj="curl -H 'Content-Type: application/json' "
-which nvim &>/dev/null && alias vi="$(which nvim)"
-which nvim &>/dev/null && alias vim="$(which nvim)"
+which nvim >/dev/null 2>&1 && alias vim="$(which nvim)"
 alias v=vim
 [[ -x /usr/bin/yay ]] && [[ "$(whoami)" != "pacman" ]] && alias yay='sudo -iupacman /usr/bin/yay'
 
@@ -285,7 +283,7 @@ precmd() {
 
 # Remove unwanted aliases
 
-( where fd | grep -q -E '\/s?bin\/fd' ) && alias fd &>/dev/null && unalias fd
+( where fd | grep -E '\/s?bin\/fd' ) && alias fd &>/dev/null && unalias fd
 
 # Clean up global aliases
 source <(alias -g | awk -F= '/^[A-Za-z]+/{print $1}' | xargs -I{} -n1 echo unalias "'{}'")