add vim-dirvish and some other coc related things

This commit is contained in:
Mark Riedesel 2020-07-18 07:45:28 -05:00
parent 6bc6162abd
commit 52200bbba4
3 changed files with 36 additions and 35 deletions

View file

@ -154,5 +154,6 @@ client.unfocused $bgalt $bgalt $fg $bg $bgalt
# client.background $bg # client.background $bg
# autostart # autostart
exec_always --no-startup-id wal -q -t -i ~/wallpaper --saturate 0.8 exec --no-startup-id wal -q -t -i ~/wallpaper --saturate 0.8
exec_always --no-startup-id ~/.config/polybar/launch.sh exec_always ~/.config/polybar/launch.sh

View file

@ -25,7 +25,7 @@ set backspace=eol,start,indent " make backspace not be stupid
set whichwrap+=<,>,h,l set whichwrap+=<,>,h,l
set list set list
set listchars=trail,precedes,extends,eol:↲,tab:→\ set listchars=trail,precedes,extends,eol:↲,tab:→\
set ignorecase " ignore case when searching set ignorecase " ignore case when searching
set smartcase " be "smart" about case when searching set smartcase " be "smart" about case when searching
set hlsearch " highlight search results set hlsearch " highlight search results
@ -43,9 +43,10 @@ set spell " spell checking, woo
set foldcolumn=1 set foldcolumn=1
set ruler " always show current position set ruler " always show current position
set tabstop=4 " who the heck uses 8-space tabs? " set tabstop=4 " who the heck uses 8-space tabs?
set shiftwidth=4 " set shiftwidth=4
set smarttab " set smarttab
set shiftwidth=2
" auto-install vim-plug " auto-install vim-plug
if empty(glob('~/.vim/autoload/plug.vim')) if empty(glob('~/.vim/autoload/plug.vim'))
@ -63,7 +64,6 @@ Plug 'dylanaraps/wal.vim'
" syntax " syntax
Plug 'cakebaker/scss-syntax.vim' Plug 'cakebaker/scss-syntax.vim'
Plug 'calviken/vim-gdscript3' Plug 'calviken/vim-gdscript3'
"Plug 'ianks/vim-tsx'
Plug 'leafgarland/typescript-vim' Plug 'leafgarland/typescript-vim'
Plug 'lepture/vim-jinja' Plug 'lepture/vim-jinja'
Plug 'posva/vim-vue' Plug 'posva/vim-vue'
@ -89,24 +89,37 @@ map \b :Gblame<CR>
map \l :Glog<CR> map \l :Glog<CR>
map \gs :Gstatus<CR> map \gs :Gstatus<CR>
"}}} "}}}
Plug 'justinmk/vim-dirvish', "{{{
nmap \e <Plug>(dirvish_up)
augroup dirvish_mapping
autocmd!
autocmd! FileType dirvish call DirvishMapping()
augroup END
function! DirvishMapping()
nmap <buffer> \e gq>
endfunction
"}}}
Plug 'kristijanhusak/vim-dirvish-git'
Plug 'mattn/webapi-vim'
Plug 'mattn/vim-gist'
Plug 'airblade/vim-gitgutter' Plug 'airblade/vim-gitgutter'
Plug 'easymotion/vim-easymotion', "{{{ Plug 'easymotion/vim-easymotion', "{{{
map <leader><leader> <plug>(easymotion-prefix) map <leader><leader> <plug>(easymotion-prefix)
"}}} "}}}
Plug 'sheerun/vim-polyglot' Plug 'sheerun/vim-polyglot'
Plug 'neoclide/coc.nvim', {'branch': 'release'}, "{{{ Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}, "{{{
let g:coc_global_extensions = [ " let g:coc_global_extensions = [
\ 'coc-css', " \ 'coc-css',
\ 'coc-emoji', " \ 'coc-emoji',
\ 'coc-eslint', " \ 'coc-eslint',
\ 'coc-json', " \ 'coc-json',
\ 'coc-prettier', " \ 'coc-prettier',
\ 'coc-rls', " \ 'coc-rls',
\ 'coc-tslint', " \ 'coc-tslint',
\ 'coc-tslint-plugin', " \ 'coc-tslint-plugin',
\ 'coc-tsserver', " \ 'coc-tsserver',
\ 'coc-yaml', " \ 'coc-yaml',
\ ] " \ ]
set signcolumn=yes set signcolumn=yes
set updatetime=300 set updatetime=300
set shortmess+=c set shortmess+=c
@ -216,7 +229,7 @@ nnoremap <leader>/ :Rg<CR>
call plug#end() call plug#end()
"--- Visuals "--- Visuals
highlight ExtraWhitespace ctermbg=20 highlight ExtraWhitespace ctermbg=20 ctermfg=1
match ExtraWhitespace /\s\+$/ match ExtraWhitespace /\s\+$/
autocmd BufWinEnter * match ExtraWhitespace /\s\+$/ autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/ autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
@ -232,9 +245,6 @@ endtry
hi clear SpellBad hi clear SpellBad
hi SpellBad gui=underline cterm=italic hi SpellBad gui=underline cterm=italic
" Highlight trailing space as error
match ErrorMsg '\s\+$'
" List items are always weird distracting colors " List items are always weird distracting colors
hi SpecialKey ctermfg=238 hi SpecialKey ctermfg=238
@ -281,7 +291,7 @@ if filereadable(expand('~/.vimlocal'))
endif endif
" netrw " netrw
nnoremap \e :Lexplore!<CR> " nnoremap <buffer> \e <Plug>VinegarUp
let g:netrw_banner = 0 let g:netrw_banner = 0
let g:netrw_liststyle = 3 let g:netrw_liststyle = 3
let g:netrw_altv = 1 let g:netrw_altv = 1

10
zshrc
View file

@ -32,13 +32,3 @@ done
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
[ -f ~/.zshrc.local ] && source ~/.zshrc.local [ -f ~/.zshrc.local ] && source ~/.zshrc.local
[ -f ~/.aliases ] && source ~/.aliases [ -f ~/.aliases ] && source ~/.aliases
# tabtab source for serverless package
# uninstall by removing these lines or running `tabtab uninstall serverless`
[[ -f /home/mark/code/ereloom.io/node_modules/tabtab/.completions/serverless.zsh ]] && . /home/mark/code/ereloom.io/node_modules/tabtab/.completions/serverless.zsh
# tabtab source for sls package
# uninstall by removing these lines or running `tabtab uninstall sls`
[[ -f /home/mark/code/ereloom.io/node_modules/tabtab/.completions/sls.zsh ]] && . /home/mark/code/ereloom.io/node_modules/tabtab/.completions/sls.zsh
# tabtab source for slss package
# uninstall by removing these lines or running `tabtab uninstall slss`
[[ -f /home/mark/code/ereloom.io/node_modules/tabtab/.completions/slss.zsh ]] && . /home/mark/code/ereloom.io/node_modules/tabtab/.completions/slss.zsh