Add shared aliases for bash and zsh. Change nvim autocompletion plugin to CoC

template/bash/.bashrc

@@ -23,17 +23,8 @@ export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 # Keychain
 eval "$(keychain --eval --agents gpg,ssh --quiet)"
 
-# nvim
+# load Aliases
-alias vi=nvim
+[ -f "$HOME/.aliasrc" ] && source "$HOME/.aliasrc"
-alias vim=nvim
-
-alias ls='ls -hF --color=auto'
-alias dir='ls --color=auto --format=long'
-alias ll='ls -la'
-
-# Grep
-alias grep='grep -i --color=auto'
-alias Grep='grep --color=auto'
 
 # Add some colour to LESS/MAN pages
 export LESSOPEN="| /usr/bin/source-highlight-esc.sh %s"

template/nvim/.config/nvim/init.vim

@@ -35,24 +35,7 @@ Plug 'nathanaelkane/vim-indent-guides'
 " Plug 'donRaphaco/neotex', { 'for': 'tex' }
 Plug 'lervag/vimtex'
 
-Plug 'mhinz/neovim-remote'
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
-if has('nvim')
-  Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-else
-  Plug 'Shougo/deoplete.nvim'
-  Plug 'roxma/nvim-yarp'
-  Plug 'roxma/vim-hug-neovim-rpc'
-endif
-Plug 'Shougo/neco-syntax'
-Plug 'Shougo/neoinclude.vim'
-Plug 'Shougo/neopairs.vim'
-Plug 'Shougo/context_filetype.vim'
-Plug 'Shougo/neco-vim'
-Plug 'carlitux/deoplete-ternjs', { 'do': 'npm install -g tern' }
-Plug 'ternjs/tern_for_vim'
-
-Plug 'Shougo/neosnippet.vim'
-Plug 'Shougo/neosnippet-snippets'
 
 Plug 'w0rp/ale'
 
@@ -113,7 +96,10 @@ set wildignore+=*/tmp/*,*.so,*.swp,*.zip        " MacOSX/Linux
 "set wildignore+=*\\tmp\\*,*.swp,*.zip,*.exe    " Windows
 set timeoutlen=1000 ttimeoutlen=0               " No timeout before keypresses
 set scrolloff=10
-
+set cmdheight=2
+set updatetime=300
+set shortmess+=c
+set signcolumn=yes
 set lazyredraw          " Redraw only when we need to.
 set showmatch           " Highlight matching [{()}]
 
@@ -151,9 +137,6 @@ set writebackup
 " Leader
 let mapleader=","       
 
-" Fold toggle
-nnoremap <space> za     
-
 " Movement
 nnoremap j gj
 nnoremap k gk
@@ -164,16 +147,9 @@ nnoremap <leader><space> :nohlsearch<CR>
 " Session save
 nnoremap <leader>s :mksession<CR>
 
-" Make p in Visual mode replace the selected text with the yank register
-vnoremap p <Esc>:let current_reg = @"<CR>gvdi<C-R>=current_reg<CR><Esc>
-
 " :W sudo saves the file
 command W w !sudo tee % > /dev/null
 
-" Completion with tab
-inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
-inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
-
 " NERD Tree
 map <C-n> :NERDTreeToggle<CR>
 
@@ -217,25 +193,15 @@ let g:lightline = {
 " ###########
 
 " Indent guides
+"
 hi IndentGuidesOdd  ctermbg=8
 hi IndentGuidesEven ctermbg=8
 let g:indent_guides_start_level = 2
 let g:indent_guides_guide_size = 1
 let g:indent_guides_enable_on_vim_startup = 1
 
-" Deoplete
+" ALE
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#num_processes = 1
-
-"call deoplete#custom#option('sources', {
-"		\ '_': ['buffer'],
-"		\ 'cpp': ['buffer', 'tag'],
-"		\})
-
-let g:tern#command = ["tern"]
-let g:tern#arguments = ["--persistent"]
 
-" ale
 let g:ale_completion_enabled = 0
 let g:ale_linters_explicit = 1
 let g:ale_linters = {
@@ -248,43 +214,115 @@ let b:ale_fixers = {
       \ 'javascript': ['eslint']
       \}
 
-" neotex
-let g:neotex_enabled	= 1
-let g:tex_flavor = 'latex'
-let g:neotex_pdflatex_alternative	= 'xelatex'
 
-" neopairs
+" CoC
-let g:neopairs#enable = 1
 
-" neco-vim
+" Use tab for trigger completion with characters ahead and navigate.
-if !exists('g:necovim#complete_functions')
+" Use command ':verbose imap <tab>' to make sure tab is not mapped by other plugin.
-		  let g:necovim#complete_functions = {}
+inoremap <silent><expr> <TAB>
-		endif
+      \ pumvisible() ? "\<C-n>" :
-		let g:necovim#complete_functions.Ref =
+      \ <SID>check_back_space() ? "\<TAB>" :
-		\ 'ref#complete'
+      \ coc#refresh()
+inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
 
+function! s:check_back_space() abort
+  let col = col('.') - 1
+  return !col || getline('.')[col - 1]  =~# '\s'
+endfunction
 
-" neosnippet
+" Use <c-space> to trigger completion.
+inoremap <silent><expr> <c-space> coc#refresh()
 
-" Plugin key-mappings.
+" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current position.
-" Note: It must be "imap" and "smap".  It uses <Plug> mappings.
+" Coc only does snippet and additional edit on confirm.
-imap <C-k>     <Plug>(neosnippet_expand_or_jump)
+inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
-smap <C-k>     <Plug>(neosnippet_expand_or_jump)
+" Or use `complete_info` if your vim support it, like:
-xmap <C-k>     <Plug>(neosnippet_expand_target)
+" inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
 
-" SuperTab like snippets behavior.
+" Use `[g` and `]g` to navigate diagnostics
-" Note: It must be "imap" and "smap".  It uses <Plug> mappings.
+nmap <silent> [g <Plug>(coc-diagnostic-prev)
-"imap <expr><TAB>
+nmap <silent> ]g <Plug>(coc-diagnostic-next)
-" \ pumvisible() ? "\<C-n>" :
-" \ neosnippet#expandable_or_jumpable() ?
-" \    "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
-smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
-\ "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
 
+" Remap keys for gotos
+nmap <silent> gd <Plug>(coc-definition)
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)
 
-" For conceal markers.
+" Use K to show documentation in preview window
-"if has('conceal')
+nnoremap <silent> K :call <SID>show_documentation()<CR>
-"  set conceallevel=2 concealcursor=niv
-"endif
 
-let g:neosnippet#snippets_directory='~/.config/nvim/snippets'
+function! s:show_documentation()
+  if (index(['vim','help'], &filetype) >= 0)
+    execute 'h '.expand('<cword>')
+  else
+    call CocAction('doHover')
+  endif
+endfunction
+
+" Highlight symbol under cursor on CursorHold
+autocmd CursorHold * silent call CocActionAsync('highlight')
+
+" Remap for rename current word
+nmap <leader>rn <Plug>(coc-rename)
+
+" Remap for format selected region
+xmap <leader>f  <Plug>(coc-format-selected)
+nmap <leader>f  <Plug>(coc-format-selected)
+
+augroup mygroup
+  autocmd!
+  " Setup formatexpr specified filetype(s).
+  autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
+  " Update signature help on jump placeholder
+  autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
+augroup end
+
+" Remap for do codeAction of selected region, ex: `<leader>aap` for current paragraph
+xmap <leader>a  <Plug>(coc-codeaction-selected)
+nmap <leader>a  <Plug>(coc-codeaction-selected)
+
+" Remap for do codeAction of current line
+nmap <leader>ac  <Plug>(coc-codeaction)
+" Fix autofix problem of current line
+nmap <leader>qf  <Plug>(coc-fix-current)
+
+" Create mappings for function text object, requires document symbols feature of languageserver.
+xmap if <Plug>(coc-funcobj-i)
+xmap af <Plug>(coc-funcobj-a)
+omap if <Plug>(coc-funcobj-i)
+omap af <Plug>(coc-funcobj-a)
+
+" Use <C-d> for select selections ranges, needs server support, like: coc-tsserver, coc-python
+" nmap <silent> <C-d> <Plug>(coc-range-select)
+" xmap <silent> <C-d> <Plug>(coc-range-select)
+
+" Use `:Format` to format current buffer
+command! -nargs=0 Format :call CocAction('format')
+
+" Use `:Fold` to fold current buffer
+command! -nargs=? Fold :call     CocAction('fold', <f-args>)
+
+" use `:OR` for organize import of current buffer
+command! -nargs=0 OR   :call     CocAction('runCommand', 'editor.action.organizeImport')
+
+" Add status line support, for integration with other plugin, checkout `:h coc-status`
+set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
+
+" Using CocList
+" Show all diagnostics
+nnoremap <silent> <space>a  :<C-u>CocList diagnostics<cr>
+" Manage extensions
+nnoremap <silent> <space>e  :<C-u>CocList extensions<cr>
+" Show commands
+nnoremap <silent> <space>c  :<C-u>CocList commands<cr>
+" Find symbol of current document
+nnoremap <silent> <space>o  :<C-u>CocList outline<cr>
+" Search workspace symbols
+nnoremap <silent> <space>s  :<C-u>CocList -I symbols<cr>
+" Do default action for next item.
+nnoremap <silent> <space>j  :<C-u>CocNext<CR>
+" Do default action for previous item.
+nnoremap <silent> <space>k  :<C-u>CocPrev<CR>
+" Resume latest coc list
+nnoremap <silent> <space>p  :<C-u>CocListResume<CR>

template/shell/.aliasrc

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Vim a
+command -v vim >/dev/null && alias vi="vi" vim="vim" vimdiff="vimdiff"
+command -v nvim >/dev/null && alias vi="nvim" vim="nvim" vimdiff="nvim -d"
+
+# Verbose
+alias \
+	cp="cp -iv" \
+	mv="mv -iv" \
+	rm="rm -v" \
+	mkdir="mkdir -pv" \
+	dmesg="dmesg --ctime" 
+
+# Color
+alias \
+	ls="ls -hN --group-directories-first --color=auto" \
+	ll="ls -lahN --group-directories-first --color=auto" \
+	grep="grep -i --color=auto" \
+	Grep="grep --color=auto" \
+	diff="diff --color=auto" \

template/zsh/.zshrc

@@ -1,6 +1,9 @@
 # Skip all this for non-interactive shells
 [[ -z "$PS1" ]] && return
 
+# Load aliases
+[ -f "$HOME/.aliasrc" ] && source "$HOME/.aliasrc"
+
 #########
 # zplug #
 #########
@@ -87,14 +90,6 @@ setopt NOCLOBBER
 LS_COLORS='rs=0:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:';
 export LS_COLORS
 
-# Aliases
-alias s="sudo"
-alias ls="ls --color -F"
-alias ll="ls --color -lh"
-alias mkdir='mkdir -p'
-alias dmesg='dmesg --ctime'
-alias cd..='cd ..'
-
 # Completion
 zmodload zsh/complist 
 autoload -Uz compinit

themes/dina

@@ -0,0 +1,32 @@
+#!/bin/bash 
+
+FONT="Dina"
+ICONFONT="Siji"
+FONTSIZE="8"
+
+declare -A POLYBAR
+POLYBAR=(\
+  [modulesleft]="i3" \
+  [modulescenter]="cpu memory" \
+  [modulesright]="eth wifi volume battery time date xkeyboard" \
+  [textoffset]="2" \
+  [iconfontscale]="1" \
+  [antialias]="false" \
+  [bottom]="true" \
+  [height]="28" \
+  [i3label]="%icon%" \
+  [wifidev]="wlp3s0" \
+  [wifiicon]="" \
+  [ethdev]="enp2s0" \
+  [ethicon]="" \
+  [cpuicon]="CPU:" \
+  [ramicon]="RAM:" \
+  [dateicon]="" \
+  [timeicon]="" \
+  [volumeicon]="" \
+  [muteicon]="" \
+  [layouticon]="" \
+  [chargingicon]="" \
+  [fullicon]="" \
+  [dischargingicon]="" \
+)

themes/tamsyn

@@ -1,7 +1,7 @@
 #!/bin/bash 
 
 FONT="Misc Tamsyn"
-ICONFONT="Wuncon Siji"
+ICONFONT="Siji"
 FONTSIZE="10.5"
 
 declare -A POLYBAR