Merge branch 'pr-1' of anthonycicc/dotfiles into master

playbooks/roles/anyenv/tasks/main.yml

@@ -49,7 +49,12 @@
   args:
     creates: ~/.anyenv/plugins
 
-- name: anyenv plugin
+- name: anyenv update plugin
   shell: git clone https://github.com/znz/anyenv-update.git ~/.anyenv/plugins/anyenv-update
   args:
     creates: ~/.anyenv/plugins/anyenv-update
+
+- name: pyenv virtualenv plugin
+  shell: git clone https://github.com/pyenv/pyenv-virtualenv.git ~/.anyenv/envs/pyenv/plugins/pyenv-virtualenv
+  args:
+    creates: ~/.anyenv/envs/pyenv/plugins/pyenv-virtualenv

playbooks/roles/macos/tasks/main.yml

@@ -4,15 +4,10 @@
     update_homebrew: yes
     upgrade_all: yes
 
-- name: Homebrew - install neovim
+- name: Homebrew - install most packages
   homebrew:
     update_homebrew: yes
-    name: neovim
+    name: neovim,git,gnu-tar,zstd
-
-- name: Homebrew - Install git
-  homebrew:
-    update_homebrew: yes
-    name: git
 
 - name: Homebrew - Install zsh
   homebrew:
@@ -20,7 +15,3 @@
     name: zsh
     install_options: with-gdbm with-pcre with-unicode9
 
-- name: Homebrew - Install gnu-tar and zstd
-  homebrew:
-    update_homebrew: yes
-    name: gnu-tar,zstd

tmux/tmux.conf

@@ -1,6 +1,7 @@
 # set default terminal
 #set -ga terminal-overrides ",xterm-kitty:Tc,alacritty:Tc,xterm-termite:Tc"
 set-option -g default-terminal "tmux-256color"
+set-option -sa terminal-overrides ',xterm-256color:RGB,alacritty:RGB'
 # set mouse/history stuff
 set -g mouse on
 set -g history-limit 20000

vim/vimrc

@@ -4,6 +4,8 @@ if empty(glob('~/.config/nvim/autoload/plug.vim'))
   autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
 endif
 
+let g:pyxversion = 'python3'
+
 set number
 set relativenumber
 set tabstop=4
@@ -33,17 +35,10 @@ if has("persistent_undo")
     set undofile
 endif
 
-let g:ale_set_baloons = 1
-let g:ale_completion_enabled = 1
-
 call plug#begin('~/.config/nvim/plugged')
 
 "LSP Stuff
-Plug 'w0rp/ale'
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
-Plug 'ryanolsonx/vim-lsp-python'
-Plug 'ryanolsonx/vim-lsp-typescript'
-Plug 'prabirshrestha/asyncomplete.vim'
-Plug 'prabirshrestha/asyncomplete-lsp.vim'
 
 Plug 'junegunn/rainbow_parentheses.vim'
 
@@ -59,16 +54,108 @@ Plug 'mbbill/undotree'
 Plug 'elmcast/elm-vim'
 Plug 'liuchengxu/vim-which-key'
 
+"async.vim
+Plug 'prabirshrestha/async.vim'
+
 "https://github.com/baverman/vial-http/blob/master/doc/tutorial.rst
 "Plug 'baverman/vial'
 "Plug 'baverman/vial-http'
 
 call plug#end()
 
-"Gruvbox config
+function! s:writebuffer(bufname, text) 
-" colorscheme gruvbox
+    let l:bufnum = bufwinnr(a:bufname)
+    if l:bufnum == -1
+        execute "vsplit" a:bufname
+        setlocal buftype=nofile
+    else
+        execute l:bufnum . 'wincmd w'
+    endif
+
+    call append(0, a:text)
+endfunction
+
+function! s:handlegeneric(cmd, tech, job_id, data, event_type)
+    if a:event_type == 'exit'
+        echo a:cmd . ' completed successfully'
+    elseif a:event_type == 'stdout' && len(a:data) > 1
+        call s:writebuffer('__STDOUT_' . a:tech . '__', a:data)
+    elseif a:event_type == 'stderr' && len(a:data) > 1
+        call s:writebuffer('__STDERR_' . a:tech . '__', a:data)
+    endif
+endfunction
+
+"Setting up coc-tools
+function! s:handlepython(job_id, data, event_type)
+    call s:handlegeneric('pip install python-language-server pynvim', 'PYTHON', a:job_id, a:data, a:event_type)
+endfunction
+
+function! s:handleruby(job_id, data, event_type)
+    call s:handlegeneric('gem install solargraph neovim', 'RUBY', a:job_id, a:data, a:event_type)
+endfunction
+
+function! s:handlenode(job_id, data, event_type)
+    call s:handlegeneric('yarn global add neovim', 'NODE', a:job_id, a:data, a:event_type)
+endfunction
+
+function! s:cmdexitcode(cmd)
+    let l:output = system(a:cmd)
+    return v:shell_error
+endfunction
+
+function! s:asyncFunc(cmd, callbackfunc)
+    return async#job#start(a:cmd, {
+            \ 'on_stdout': function(a:callbackfunc),
+            \ 'on_stderr': function(a:callbackfunc),
+            \ 'on_exit': function(a:callbackfunc)
+      \ })
+endfunction
+
+
+function! s:ensurePython()
+    if (s:cmdexitcode('pyls -h') || s:cmdexitcode('python -c "import neovim"'))
+        let l:jobid = s:asyncFunc('pip install python-language-server pynvim', 's:handlepython')
+        au VimEnter * CocInstall coc-python
+    endif
+endfunction
+
+function! s:ensureRuby()
+    if (s:cmdexitcode('solargraph -v') || s:cmdexitcode('ruby -e "require \"neovim\""'))
+        let l:jobid = s:asyncFunc('gem install solargraph neovim', 's:handleruby')
+        au VimEnter * CocInstall coc-solargraph
+    endif
+endfunction
+
+function! s:ensureNode()
+    if (s:cmdexitcode('neovim-node-host --version'))
+        let l:jobid = s:asyncFunc('yarn global add neovim', 's:ensureNode')
+        au VimEnter * CocInstall coc-tsserver
+    endif
+endfunction
+
+call s:ensurePython()
+call s:ensureRuby()
+call s:ensureNode()
+
+inoremap <silent><expr> <TAB>
+      \ pumvisible() ? "\<C-n>" :
+      \ <SID>check_back_space() ? "\<TAB>" :
+      \ coc#refresh()
+inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
+inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+
+function! s:check_back_space() abort
+  let col = col('.') - 1
+  return !col || getline('.')[col - 1]  =~# '\s'
+endfunction
+
+inoremap <silent><expr> <c-space> coc#refresh()
+
+autocmd CursorHold * silent call CocActionAsync('highlight')
+
+command! -nargs=0 Format :call CocAction('format')
+
 set background=dark
-let g:gruvbox_contrast_dark = 'soft'
 colorscheme corvine
 
 "Airline settings
@@ -82,26 +169,21 @@ nnoremap <leader>h <C-W><C-H>
 nnoremap <leader>j <C-W><C-J>
 nnoremap <leader>k <C-W><C-K>
 nnoremap <leader>l <C-W><C-L>
+nnoremap <leader>n :nohl<cr>
 nnoremap <C-k> <C-u>
 nnoremap <C-j> <C-d>
 
-"ALE Keymaps and options
+"Coc Keymaps and options
-nnoremap <silent> <leader><Space>a a<C-X><C-O>
+nnoremap <silent> <leader><Space>d <Plug>(coc-definition)
-nnoremap <silent> <leader><Space>g :ALEGoToDefinition<CR>
+nnoremap <silent> <leader><Space>g <Plug>(coc-type-definition)
-nnoremap <silent> <leader><Space>f :ALEFix<CR>
-
-let g:ale_fixers = {
-            \ 'python': ['add_blank_lines_for_python_control_statements', 'yapf']
-            \ }
 
 "which-key
 let g:which_key_map = {}
 autocmd! User vim-which-key call which_key#register('<Space>', 'g:which_key_map')
 let g:which_key_map[' '] =  {
-  \ 'name' : '+ale'                ,
+  \ 'name' : '+CoC'                ,
-  \ 'a'    : 'completions'         , 
+  \ 'd'    : 'definition'         , 
   \ 'g'    : 'go-to-definition'    ,
-  \ 'f'    : 'fix'                 ,
   \ }
 call which_key#register('<Space>', "g:which_key_map")
 nnoremap <silent> <leader>      :<c-u>WhichKey '<Space>'<CR>

zsh/zsh_plugins.txt

@@ -11,4 +11,5 @@ zsh-users/zsh-syntax-highlighting
 zsh-users/zsh-completions
 ress997/zsh-completions-anyenv
 Tarrasch/zsh-bd
+agkozak/zsh-z