Update dotfiles with local settings.
This commit is contained in:
parent
6d20f5dae5
commit
94afdd3eae
|
|
@ -334,11 +334,11 @@ function! s:progress_opt(base)
|
|||
\ s:git_version_requirement(1, 7, 1) ? '--progress' : ''
|
||||
endfunction
|
||||
|
||||
if s:is_win
|
||||
function! s:rtp(spec)
|
||||
return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
|
||||
endfunction
|
||||
function! s:rtp(spec)
|
||||
return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
|
||||
endfunction
|
||||
|
||||
if s:is_win
|
||||
function! s:path(path)
|
||||
return s:trim(substitute(a:path, '/', '\', 'g'))
|
||||
endfunction
|
||||
|
|
@ -350,11 +350,32 @@ if s:is_win
|
|||
function! s:is_local_plug(repo)
|
||||
return a:repo =~? '^[a-z]:\|^[%~]'
|
||||
endfunction
|
||||
else
|
||||
function! s:rtp(spec)
|
||||
return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
|
||||
|
||||
" Copied from fzf
|
||||
function! s:wrap_cmds(cmds)
|
||||
let use_chcp = executable('sed')
|
||||
return map([
|
||||
\ '@echo off',
|
||||
\ 'setlocal enabledelayedexpansion']
|
||||
\ + (use_chcp ? [
|
||||
\ 'for /f "usebackq" %%a in (`chcp ^| sed "s/[^0-9]//gp"`) do set origchcp=%%a',
|
||||
\ 'chcp 65001 > nul'] : [])
|
||||
\ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds])
|
||||
\ + (use_chcp ? ['chcp !origchcp! > nul'] : [])
|
||||
\ + ['endlocal'],
|
||||
\ 'v:val."\r"')
|
||||
endfunction
|
||||
|
||||
function! s:batchfile(cmd)
|
||||
let batchfile = tempname().'.bat'
|
||||
call writefile(s:wrap_cmds(a:cmd), batchfile)
|
||||
let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 1})
|
||||
if &shell =~# 'powershell\.exe$'
|
||||
let cmd = '& ' . cmd
|
||||
endif
|
||||
return [batchfile, cmd]
|
||||
endfunction
|
||||
else
|
||||
function! s:path(path)
|
||||
return s:trim(a:path)
|
||||
endfunction
|
||||
|
|
@ -801,22 +822,21 @@ function! s:chsh(swap)
|
|||
endfunction
|
||||
|
||||
function! s:bang(cmd, ...)
|
||||
let batchfile = ''
|
||||
try
|
||||
let [sh, shellcmdflag, shrd] = s:chsh(a:0)
|
||||
" FIXME: Escaping is incomplete. We could use shellescape with eval,
|
||||
" but it won't work on Windows.
|
||||
let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
||||
if s:is_win
|
||||
let batchfile = tempname().'.bat'
|
||||
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||
let cmd = s:shellesc(expand(batchfile))
|
||||
let [batchfile, cmd] = s:batchfile(cmd)
|
||||
endif
|
||||
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
|
||||
execute "normal! :execute g:_plug_bang\<cr>\<cr>"
|
||||
finally
|
||||
unlet g:_plug_bang
|
||||
let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
|
||||
if s:is_win
|
||||
if s:is_win && filereadable(batchfile)
|
||||
call delete(batchfile)
|
||||
endif
|
||||
endtry
|
||||
|
|
@ -1013,7 +1033,7 @@ function! s:update_impl(pull, force, args) abort
|
|||
let s:clone_opt = get(g:, 'plug_shallow', 1) ?
|
||||
\ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : ''
|
||||
|
||||
if has('win32unix')
|
||||
if has('win32unix') || has('wsl')
|
||||
let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
|
||||
endif
|
||||
|
||||
|
|
@ -1092,7 +1112,7 @@ function! s:update_finish()
|
|||
elseif has_key(spec, 'tag')
|
||||
let tag = spec.tag
|
||||
if tag =~ '\*'
|
||||
let tags = s:lines(s:system('git tag --list '.s:shellesc(tag).' --sort -version:refname 2>&1', spec.dir))
|
||||
let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir))
|
||||
if !v:shell_error && !empty(tags)
|
||||
let tag = tags[0]
|
||||
call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag))
|
||||
|
|
@ -1149,7 +1169,7 @@ function! s:job_abort()
|
|||
silent! call job_stop(j.jobid)
|
||||
endif
|
||||
if j.new
|
||||
call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
|
||||
call s:system('rm -rf ' . plug#shellescape(g:plugs[name].dir))
|
||||
endif
|
||||
endfor
|
||||
let s:jobs = {}
|
||||
|
|
@ -1202,15 +1222,10 @@ endfunction
|
|||
|
||||
function! s:spawn(name, cmd, opts)
|
||||
let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
|
||||
\ 'batchfile': (s:is_win && (s:nvim || s:vim8)) ? tempname().'.bat' : '',
|
||||
\ 'new': get(a:opts, 'new', 0) }
|
||||
let s:jobs[a:name] = job
|
||||
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
|
||||
if !empty(job.batchfile)
|
||||
call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
|
||||
let cmd = s:shellesc(expand(job.batchfile))
|
||||
endif
|
||||
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
|
||||
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir, 0) : a:cmd
|
||||
let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd]
|
||||
|
||||
if s:nvim
|
||||
call extend(job, {
|
||||
|
|
@ -1260,9 +1275,6 @@ function! s:reap(name)
|
|||
call s:log(bullet, a:name, empty(result) ? 'OK' : result)
|
||||
call s:bar()
|
||||
|
||||
if has_key(job, 'batchfile') && !empty(job.batchfile)
|
||||
call delete(job.batchfile)
|
||||
endif
|
||||
call remove(s:jobs, a:name)
|
||||
endfunction
|
||||
|
||||
|
|
@ -1352,8 +1364,8 @@ while 1 " Without TCO, Vim stack is bound to explode
|
|||
\ printf('git clone %s %s %s %s 2>&1',
|
||||
\ has_tag ? '' : s:clone_opt,
|
||||
\ prog,
|
||||
\ s:shellesc(spec.uri),
|
||||
\ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
|
||||
\ plug#shellescape(spec.uri, {'script': 0}),
|
||||
\ plug#shellescape(s:trim(spec.dir), {'script': 0})), { 'new': 1 })
|
||||
endif
|
||||
|
||||
if !s:jobs[name].running
|
||||
|
|
@ -1980,17 +1992,23 @@ function! s:update_ruby()
|
|||
EOF
|
||||
endfunction
|
||||
|
||||
function! s:shellesc_cmd(arg)
|
||||
let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g')
|
||||
let escaped = substitute(escaped, '%', '%%', 'g')
|
||||
let escaped = substitute(escaped, '"', '\\^&', 'g')
|
||||
let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g')
|
||||
return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"'
|
||||
function! s:shellesc_cmd(arg, script)
|
||||
let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g')
|
||||
return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g')
|
||||
endfunction
|
||||
|
||||
function! s:shellesc(arg)
|
||||
if &shell =~# 'cmd.exe$'
|
||||
return s:shellesc_cmd(a:arg)
|
||||
function! s:shellesc_ps1(arg)
|
||||
return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'"
|
||||
endfunction
|
||||
|
||||
function! plug#shellescape(arg, ...)
|
||||
let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {}
|
||||
let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh')
|
||||
let script = get(opts, 'script', 1)
|
||||
if shell =~# 'cmd\.exe$'
|
||||
return s:shellesc_cmd(a:arg, script)
|
||||
elseif shell =~# 'powershell\.exe$' || shell =~# 'pwsh$'
|
||||
return s:shellesc_ps1(a:arg)
|
||||
endif
|
||||
return shellescape(a:arg)
|
||||
endfunction
|
||||
|
|
@ -2024,23 +2042,23 @@ function! s:format_message(bullet, name, message)
|
|||
endif
|
||||
endfunction
|
||||
|
||||
function! s:with_cd(cmd, dir)
|
||||
return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
|
||||
function! s:with_cd(cmd, dir, ...)
|
||||
let script = a:0 > 0 ? a:1 : 1
|
||||
return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd)
|
||||
endfunction
|
||||
|
||||
function! s:system(cmd, ...)
|
||||
let batchfile = ''
|
||||
try
|
||||
let [sh, shellcmdflag, shrd] = s:chsh(1)
|
||||
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
||||
if s:is_win
|
||||
let batchfile = tempname().'.bat'
|
||||
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||
let cmd = s:shellesc(expand(batchfile))
|
||||
let [batchfile, cmd] = s:batchfile(cmd)
|
||||
endif
|
||||
return system(cmd)
|
||||
finally
|
||||
let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
|
||||
if s:is_win
|
||||
if s:is_win && filereadable(batchfile)
|
||||
call delete(batchfile)
|
||||
endif
|
||||
endtry
|
||||
|
|
@ -2113,7 +2131,7 @@ endfunction
|
|||
|
||||
function! s:rm_rf(dir)
|
||||
if isdirectory(a:dir)
|
||||
call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir))
|
||||
call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . plug#shellescape(a:dir))
|
||||
endif
|
||||
endfunction
|
||||
|
||||
|
|
@ -2222,7 +2240,7 @@ function! s:upgrade()
|
|||
let new = tmp . '/plug.vim'
|
||||
|
||||
try
|
||||
let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(tmp)))
|
||||
let out = s:system(printf('git clone --depth 1 %s %s', plug#shellescape(s:plug_src), plug#shellescape(tmp)))
|
||||
if v:shell_error
|
||||
return s:err('Error upgrading vim-plug: '. out)
|
||||
endif
|
||||
|
|
@ -2363,18 +2381,17 @@ function! s:preview_commit()
|
|||
wincmd P
|
||||
endif
|
||||
setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
|
||||
let batchfile = ''
|
||||
try
|
||||
let [sh, shellcmdflag, shrd] = s:chsh(1)
|
||||
let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
|
||||
let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
|
||||
if s:is_win
|
||||
let batchfile = tempname().'.bat'
|
||||
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||
let cmd = expand(batchfile)
|
||||
let [batchfile, cmd] = s:batchfile(cmd)
|
||||
endif
|
||||
execute 'silent %!' cmd
|
||||
finally
|
||||
let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
|
||||
if s:is_win
|
||||
if s:is_win && filereadable(batchfile)
|
||||
call delete(batchfile)
|
||||
endif
|
||||
endtry
|
||||
|
|
@ -2418,9 +2435,9 @@ function! s:diff()
|
|||
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
|
||||
for [k, v] in plugs
|
||||
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
|
||||
let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
|
||||
let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 'plug#shellescape(v:val)'))
|
||||
if has_key(v, 'rtp')
|
||||
let cmd .= ' -- '.s:shellesc(v.rtp)
|
||||
let cmd .= ' -- '.plug#shellescape(v.rtp)
|
||||
endif
|
||||
let diff = s:system_chomp(cmd, v.dir)
|
||||
if !empty(diff)
|
||||
|
|
|
|||
|
|
@ -1,19 +1,25 @@
|
|||
call plug#begin('~/.config/nvim/plugged')
|
||||
Plug 'roxma/nvim-yarp'
|
||||
Plug 'ncm2/ncm2'
|
||||
" Language Tools
|
||||
Plug 'roxma/nvim-yarp' " For language client
|
||||
Plug 'ncm2/ncm2' " For language client
|
||||
Plug 'autozimu/LanguageClient-neovim', {'branch': 'next', 'do': 'bash install.sh' }
|
||||
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' }
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'enomsg/vim-haskellConcealPlus'
|
||||
|
||||
" Languages
|
||||
Plug 'https://framagit.org/tyreunom/coquille.git'
|
||||
Plug 'lervag/vimtex'
|
||||
Plug 'rhysd/vim-crystal'
|
||||
Plug 'elmcast/elm-vim'
|
||||
Plug 'ap/vim-css-color'
|
||||
Plug 'vim-scripts/avrasm.vim'
|
||||
Plug 'idris-hackers/idris-vim'
|
||||
|
||||
" Themes
|
||||
Plug 'arcticicestudio/nord-vim'
|
||||
|
||||
" Editing Tools
|
||||
Plug 'iamcco/markdown-preview.vim'
|
||||
call plug#end()
|
||||
|
||||
|
|
@ -23,6 +29,7 @@ set expandtab " Expand tabs into spaces
|
|||
set number " Set line numbers
|
||||
set mouse=a " Allow mouse
|
||||
set signcolumn=yes " Always show extra column
|
||||
set guifont=Iosevka
|
||||
|
||||
autocmd BufEnter * call ncm2#enable_for_buffer() " Enable ncm2 for all buffers
|
||||
autocmd BufRead,BufNewFile *.v set filetype=coq " Coq is not Verilog
|
||||
|
|
@ -30,8 +37,9 @@ autocmd FileType crystal setlocal shiftwidth=2 " Crystal likes 2-wide indent
|
|||
|
||||
set completeopt=noinsert,menuone
|
||||
|
||||
let g:LanguageClient_hasSnippetSupport = 0
|
||||
let g:LanguageClient_serverCommands = {
|
||||
\ 'haskell': ['hie-wrapper', '--lsp'],
|
||||
\ 'haskell': ['ghcide', '--lsp'],
|
||||
\ 'rust': ['rustup', 'run', 'stable', 'rls'],
|
||||
\ 'c': ['clangd'],
|
||||
\ 'crystal': ['scry'],
|
||||
|
|
@ -52,5 +60,9 @@ let g:LanguageClient_rootMarkers = {
|
|||
\ }
|
||||
|
||||
colorscheme nord
|
||||
nmap M :call LanguageClient#explainErrorAtPoint()<CR>
|
||||
nmap K :call LanguageClient_contextMenu()<CR>
|
||||
nmap ? :call LanguageClient_textDocument_hover()<CR>
|
||||
nmap ? :call LanguageClient#textDocument_hover()<CR>
|
||||
|
||||
hi default link CheckedByCoq Visual
|
||||
hi default link SentToCoq PmenuSel
|
||||
|
|
|
|||
Loading…
Reference in New Issue