Replace pathogen with vim-plug; Give neovim a chance;

Add keyboard shortcuts for goyo
This commit is contained in:
mitchell 2020-02-24 10:15:50 -05:00
parent a369136647
commit 3ac866096d
33 changed files with 2638 additions and 398 deletions

View File

@ -1,4 +1,4 @@
function v
vim (fzf)
nvim (fzf)
end

5
.config/nvim/init.vim Normal file
View File

@ -0,0 +1,5 @@
set runtimepath^=~/.vim runtimepath+=~/.vim/after
let &packpath = &runtimepath
source ~/.vimrc
tnoremap <Esc> <C-\><C-n>

81
.gitmodules vendored
View File

@ -1,81 +0,0 @@
[submodule ".vim/bundle/ack.vim"]
path = .vim/bundle/ack.vim
url = https://github.com/mileszs/ack.vim.git
[submodule ".vim/bundle/ale"]
path = .vim/bundle/ale
url = https://github.com/w0rp/ale.git
[submodule ".vim/bundle/dart-vim-plugin"]
path = .vim/bundle/dart-vim-plugin
url = https://github.com/dart-lang/dart-vim-plugin.git
[submodule ".vim/bundle/gruvbox"]
path = .vim/bundle/gruvbox
url = https://github.com/morhetz/gruvbox.git
[submodule ".vim/bundle/lightline.vim"]
path = .vim/bundle/lightline.vim
url = https://github.com/itchyny/lightline.vim.git
[submodule ".vim/bundle/nerdtree"]
path = .vim/bundle/nerdtree
url = https://github.com/scrooloose/nerdtree.git
[submodule ".vim/bundle/tmuxline.vim"]
path = .vim/bundle/tmuxline.vim
url = https://github.com/edkolev/tmuxline.vim.git
[submodule ".vim/bundle/typescript-vim"]
path = .vim/bundle/typescript-vim
url = https://github.com/leafgarland/typescript-vim.git
[submodule ".vim/bundle/vim-elixir"]
path = .vim/bundle/vim-elixir
url = https://github.com/elixir-editors/vim-elixir.git
[submodule ".vim/bundle/vim-endwise"]
path = .vim/bundle/vim-endwise
url = git://github.com/tpope/vim-endwise.git
[submodule ".vim/bundle/vim-fish"]
path = .vim/bundle/vim-fish
url = https://github.com/dag/vim-fish.git
[submodule ".vim/bundle/vim-gitgutter"]
path = .vim/bundle/vim-gitgutter
url = https://github.com/airblade/vim-gitgutter
[submodule ".vim/bundle/vim-go"]
path = .vim/bundle/vim-go
url = https://github.com/fatih/vim-go
[submodule ".vim/bundle/vim-graphql"]
path = .vim/bundle/vim-graphql
url = https://github.com/jparise/vim-graphql.git
[submodule ".vim/bundle/vim-javascript"]
path = .vim/bundle/vim-javascript
url = https://github.com/pangloss/vim-javascript
[submodule ".vim/bundle/vim-pencil"]
path = .vim/bundle/vim-pencil
url = https://github.com/reedes/vim-pencil.git
[submodule ".vim/bundle/vim-ruby"]
path = .vim/bundle/vim-ruby
url = git://github.com/vim-ruby/vim-ruby.git
[submodule ".vim/bundle/vim-surround"]
path = .vim/bundle/vim-surround
url = https://github.com/tpope/vim-surround
[submodule ".vim/bundle/vim-toml"]
path = .vim/bundle/vim-toml
url = https://github.com/cespare/vim-toml.git
[submodule ".vim/bundle/omnisharp-vim"]
path = .vim/bundle/omnisharp-vim
url = https://github.com/OmniSharp/omnisharp-vim.git
[submodule ".vim/bundle/yats.vim"]
path = .vim/bundle/yats.vim
url = https://github.com/HerringtonDarkholme/yats.vim.git
[submodule ".vim/bundle/vim-jsx-pretty"]
path = .vim/bundle/vim-jsx-pretty
url = https://github.com/MaxMEllon/vim-jsx-pretty.git
[submodule ".vim/bundle/goyo.vim"]
path = .vim/bundle/goyo.vim
url = https://github.com/junegunn/goyo.vim.git
[submodule ".vim/bundle/limelight.vim"]
path = .vim/bundle/limelight.vim
url = https://github.com/junegunn/limelight.vim.git
[submodule ".vim/bundle/vimwiki"]
path = .vim/bundle/vimwiki
url = https://github.com/vimwiki/vimwiki.git
[submodule ".vim/bundle/vim-fsharp"]
path = .vim/bundle/vim-fsharp
url = https://github.com/fsharp/vim-fsharp.git
[submodule ".vim/bundle/vim-terraform"]
path = .vim/bundle/vim-terraform
url = https://github.com/hashivim/vim-terraform.git

View File

@ -1,289 +0,0 @@
" pathogen.vim - path option manipulation
" Maintainer: Tim Pope <http://tpo.pe/>
" Version: 2.4
" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
"
" For management of individually installed plugins in ~/.vim/bundle (or
" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
" .vimrc is the only other setup necessary.
"
" The API is documented inline below.
if exists("g:loaded_pathogen") || &cp
finish
endif
let g:loaded_pathogen = 1
" Point of entry for basic default usage. Give a relative path to invoke
" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke
" pathogen#surround(). Curly braces are expanded with pathogen#expand():
" "bundle/{}" finds all subdirectories inside "bundle" inside all directories
" in the runtime path.
function! pathogen#infect(...) abort
for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
call pathogen#surround(path)
elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
call pathogen#surround(path . '/{}')
elseif path =~# '[{}*]'
call pathogen#interpose(path)
else
call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
call pathogen#interpose(path . '/{}')
endif
endfor
call pathogen#cycle_filetype()
if pathogen#is_disabled($MYVIMRC)
return 'finish'
endif
return ''
endfunction
" Split a path into a list.
function! pathogen#split(path) abort
if type(a:path) == type([]) | return a:path | endif
if empty(a:path) | return [] | endif
let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
endfunction
" Convert a list to a path.
function! pathogen#join(...) abort
if type(a:1) == type(1) && a:1
let i = 1
let space = ' '
else
let i = 0
let space = ''
endif
let path = ""
while i < a:0
if type(a:000[i]) == type([])
let list = a:000[i]
let j = 0
while j < len(list)
let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
let path .= ',' . escaped
let j += 1
endwhile
else
let path .= "," . a:000[i]
endif
let i += 1
endwhile
return substitute(path,'^,','','')
endfunction
" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
function! pathogen#legacyjoin(...) abort
return call('pathogen#join',[1] + a:000)
endfunction
" Turn filetype detection off and back on again if it was already enabled.
function! pathogen#cycle_filetype() abort
if exists('g:did_load_filetypes')
filetype off
filetype on
endif
endfunction
" Check if a bundle is disabled. A bundle is considered disabled if its
" basename or full name is included in the list g:pathogen_blacklist or the
" comma delimited environment variable $VIMBLACKLIST.
function! pathogen#is_disabled(path) abort
if a:path =~# '\~$'
return 1
endif
let sep = pathogen#slash()
let blacklist =
\ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
\ pathogen#split($VIMBLACKLIST)
if !empty(blacklist)
call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
endif
return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
endfunction
" Prepend the given directory to the runtime path and append its corresponding
" after directory. Curly braces are expanded with pathogen#expand().
function! pathogen#surround(path) abort
let sep = pathogen#slash()
let rtp = pathogen#split(&rtp)
let path = fnamemodify(a:path, ':s?[\\/]\=$??')
let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
call filter(rtp, 'index(before + after, v:val) == -1')
let &rtp = pathogen#join(before, rtp, after)
return &rtp
endfunction
" For each directory in the runtime path, add a second entry with the given
" argument appended. Curly braces are expanded with pathogen#expand().
function! pathogen#interpose(name) abort
let sep = pathogen#slash()
let name = a:name
if has_key(s:done_bundles, name)
return ""
endif
let s:done_bundles[name] = 1
let list = []
for dir in pathogen#split(&rtp)
if dir =~# '\<after$'
let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
else
let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
endif
endfor
let &rtp = pathogen#join(pathogen#uniq(list))
return 1
endfunction
let s:done_bundles = {}
" Invoke :helptags on all non-$VIM doc directories in runtimepath.
function! pathogen#helptags() abort
let sep = pathogen#slash()
for glob in pathogen#split(&rtp)
for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
silent! execute 'helptags' pathogen#fnameescape(dir)
endif
endfor
endfor
endfunction
command! -bar Helptags :call pathogen#helptags()
" Execute the given command. This is basically a backdoor for --remote-expr.
function! pathogen#execute(...) abort
for command in a:000
execute command
endfor
return ''
endfunction
" Section: Unofficial
function! pathogen#is_absolute(path) abort
return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
endfunction
" Given a string, returns all possible permutations of comma delimited braced
" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields
" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard
" and globbed. Actual globs are preserved.
function! pathogen#expand(pattern, ...) abort
let after = a:0 ? a:1 : ''
if a:pattern =~# '{[^{}]\+}'
let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
let found = map(split(pat, ',', 1), 'pre.v:val.post')
let results = []
for pattern in found
call extend(results, pathogen#expand(pattern))
endfor
elseif a:pattern =~# '{}'
let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
let post = a:pattern[strlen(pat) : -1]
let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
else
let results = [a:pattern]
endif
let vf = pathogen#slash() . 'vimfiles'
call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
return filter(results, '!empty(v:val)')
endfunction
" \ on Windows unless shellslash is set, / everywhere else.
function! pathogen#slash() abort
return !exists("+shellslash") || &shellslash ? '/' : '\'
endfunction
function! pathogen#separator() abort
return pathogen#slash()
endfunction
" Convenience wrapper around glob() which returns a list.
function! pathogen#glob(pattern) abort
let files = split(glob(a:pattern),"\n")
return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
endfunction
" Like pathogen#glob(), only limit the results to directories.
function! pathogen#glob_directories(pattern) abort
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
endfunction
" Remove duplicates from a list.
function! pathogen#uniq(list) abort
let i = 0
let seen = {}
while i < len(a:list)
if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
call remove(a:list,i)
elseif a:list[i] ==# ''
let i += 1
let empty = 1
else
let seen[a:list[i]] = 1
let i += 1
endif
endwhile
return a:list
endfunction
" Backport of fnameescape().
function! pathogen#fnameescape(string) abort
if exists('*fnameescape')
return fnameescape(a:string)
elseif a:string ==# '-'
return '\-'
else
return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
endif
endfunction
" Like findfile(), but hardcoded to use the runtimepath.
function! pathogen#runtime_findfile(file,count) abort
let rtp = pathogen#join(1,pathogen#split(&rtp))
let file = findfile(a:file,rtp,a:count)
if file ==# ''
return ''
else
return fnamemodify(file,':p')
endif
endfunction
" Section: Deprecated
function! s:warn(msg) abort
echohl WarningMsg
echomsg a:msg
echohl NONE
endfunction
" Prepend all subdirectories of path to the rtp, and append all 'after'
" directories in those subdirectories. Deprecated.
function! pathogen#runtime_prepend_subdirectories(path) abort
call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
return pathogen#surround(a:path . pathogen#slash() . '{}')
endfunction
function! pathogen#incubate(...) abort
let name = a:0 ? a:1 : 'bundle/{}'
call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
return pathogen#interpose(name)
endfunction
" Deprecated alias for pathogen#interpose().
function! pathogen#runtime_append_all_bundles(...) abort
if a:0
call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
else
call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
endif
return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
endfunction
" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':

2597
.vim/autoload/plug.vim Normal file

File diff suppressed because it is too large Load Diff

@ -1 +0,0 @@
Subproject commit 36e40f9ec91bdbf6f1adf408522a73a6925c3042

@ -1 +0,0 @@
Subproject commit 67d0ccc398ca7650bb2c774a94d098bee3049169

@ -1 +0,0 @@
Subproject commit f8486e58fb02351689ae247cebf28b5fee326c33

@ -1 +0,0 @@
Subproject commit 6b6ed2734084fdbb6315357ddcaecf9c8e6f143d

@ -1 +0,0 @@
Subproject commit cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86

@ -1 +0,0 @@
Subproject commit d7fd8d7a7465194e8eb67ce759c9fe392035f939

@ -1 +0,0 @@
Subproject commit 26e913a2e061195245bc62d24009ab67143a3c32

@ -1 +0,0 @@
Subproject commit fec3e57ad23e4c268d07181d6afb858925b647a1

@ -1 +0,0 @@
Subproject commit bc8ce839cb8365df852aad1682f254adf25d6846

@ -1 +0,0 @@
Subproject commit 6386ac13a2f6360cf3cf34f22772a82e7e45843e

@ -1 +0,0 @@
Subproject commit e8d59d115c8153a7de9872b3c4419f2354c0f14b

@ -1 +0,0 @@
Subproject commit 9b04cdca8c1ae4ac5a0874b934af94d033102247

@ -1 +0,0 @@
Subproject commit 50b95cbbcd09c046121367d49039710e9dc9c15f

@ -1 +0,0 @@
Subproject commit 012d98c981139976551a4d9779f5cce7f8d84d5c

@ -1 +0,0 @@
Subproject commit 5c73edb3c2fd8794661d7c7ac72eed1fc9d36761

@ -1 +0,0 @@
Subproject commit 2aa7c9d00af14ae71fdfe46f6a52b0a4f0fac774

@ -1 +0,0 @@
Subproject commit 61e342c4facd5cbc645104262e866882ea1cf5c3

@ -1 +0,0 @@
Subproject commit b6c8c8419240bdd29b5eb51a47d488fd390deed5

@ -1 +0,0 @@
Subproject commit 8f8c9edba37310d17e59a625b177ec6a37c07035

@ -1 +0,0 @@
Subproject commit 4e0f08de173fcde5f3cb93da2c8129b1588e469a

@ -1 +0,0 @@
Subproject commit 1c70532339889b7794a52b956f389b4f9ab9b3eb

@ -1 +0,0 @@
Subproject commit fab8621670f71637e9960003af28365129b1dfd0

@ -1 +0,0 @@
Subproject commit c8c9bbd70da65e2c0bcba2947c4061a7c3e24e69

@ -1 +0,0 @@
Subproject commit a4ec206052aa347d7df90dc4b6697b7f2b7929bc

@ -1 +0,0 @@
Subproject commit 64c9f3d36d632b1657616c06ea8f08f14cf6438d

@ -1 +0,0 @@
Subproject commit 7ea1a4da5ab0d3ae73ea6af80b7252ae960e126f

35
.vimrc
View File

@ -4,7 +4,38 @@ endif
filetype plugin on
syntax on
execute pathogen#infect()
call plug#begin('~/.vim/plugged')
Plug 'mileszs/ack.vim'
Plug 'w0rp/ale'
Plug 'dart-lang/dart-vim-plugin'
Plug 'morhetz/gruvbox'
Plug 'itchyny/lightline.vim'
Plug 'scrooloose/nerdtree'
Plug 'edkolev/tmuxline.vim'
Plug 'leafgarland/typescript-vim'
Plug 'elixir-editors/vim-elixir'
Plug 'tpope/vim-endwise'
Plug 'dag/vim-fish'
Plug 'airblade/vim-gitgutter'
Plug 'fatih/vim-go'
Plug 'jparise/vim-graphql'
Plug 'pangloss/vim-javascript'
Plug 'reedes/vim-pencil'
Plug 'vim-ruby/vim-ruby'
Plug 'tpope/vim-surround'
Plug 'cespare/vim-toml'
Plug 'OmniSharp/omnisharp-vim'
Plug 'HerringtonDarkholme/yats.vim'
Plug 'MaxMEllon/vim-jsx-pretty'
Plug 'junegunn/goyo.vim'
Plug 'junegunn/limelight.vim'
Plug 'vimwiki/vimwiki'
Plug 'fsharp/vim-fsharp'
Plug 'hashivim/vim-terraform'
call plug#end()
set t_Co=256
set colorcolumn=100
@ -51,6 +82,8 @@ nnoremap <leader>d :ALEDetail<cr>
nnoremap <leader>h :ALEHover<cr>
nnoremap <leader>a :Ack<cr>
nnoremap <leader>we :VimwikiAll2HTML<cr>
nnoremap <leader>z :Goyo 110x100%<cr>
nnoremap <leader>Z :Goyo<cr>
" next line is necessary to prevent background rendering bug with kitty term
let &t_ut=''

1
sync
View File

@ -18,6 +18,7 @@ if ! test -e ~/.config; mkdir ~/.config; end
rsync -aP ./.config/fish ~/.config/
rsync -aP ./.config/kitty ~/.config/
rsync -aP ./.config/nvim ~/.config/
rsync -aP ./.gitconfig ~/
rsync -aP ./.tmux* ~/
rsync -aP ./.vim* ~/