This commit is contained in:
Danila Fedorin 2020-05-06 00:39:17 -07:00
commit 027413e926
4 changed files with 85 additions and 57 deletions

View File

@ -75,7 +75,7 @@ font:
use_thin_strokes: true use_thin_strokes: true
# Should display the render timer # Should display the render timer
render_timer: false # render_timer: false
# Colors (Pencil Dark) # Colors (Pencil Dark)
# colors: # colors:

View File

@ -96,7 +96,7 @@ let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
let s:plug_tab = get(s:, 'plug_tab', -1) let s:plug_tab = get(s:, 'plug_tab', -1)
let s:plug_buf = get(s:, 'plug_buf', -1) let s:plug_buf = get(s:, 'plug_buf', -1)
let s:mac_gui = has('gui_macvim') && has('gui_running') let s:mac_gui = has('gui_macvim') && has('gui_running')
let s:is_win = has('win32') || has('win64') let s:is_win = has('win32')
let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
let s:vim8 = has('patch-8.0.0039') && exists('*job_start') let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
let s:me = resolve(expand('<sfile>:p')) let s:me = resolve(expand('<sfile>:p'))
@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...)
endtry endtry
endfunction endfunction
function! s:lazy(plug, opt)
return has_key(a:plug, a:opt) &&
\ (empty(s:to_a(a:plug[a:opt])) ||
\ !isdirectory(a:plug.dir) ||
\ len(s:glob(s:rtp(a:plug), 'plugin')) ||
\ len(s:glob(s:rtp(a:plug), 'after/plugin')))
endfunction
function! plug#end() function! plug#end()
if !exists('g:plugs') if !exists('g:plugs')
return s:err('Call plug#begin() first') return s:err('Call plug#begin() first')
@ -214,7 +222,7 @@ function! plug#end()
continue continue
endif endif
let plug = g:plugs[name] let plug = g:plugs[name]
if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for') if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
let s:loaded[name] = 1 let s:loaded[name] = 1
continue continue
endif endif
@ -426,8 +434,8 @@ endfunction
function! s:dobufread(names) function! s:dobufread(names)
for name in a:names for name in a:names
let path = s:rtp(g:plugs[name]).'/**' let path = s:rtp(g:plugs[name])
for dir in ['ftdetect', 'ftplugin'] for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin']
if len(finddir(dir, path)) if len(finddir(dir, path))
if exists('#BufRead') if exists('#BufRead')
doautocmd BufRead doautocmd BufRead
@ -763,6 +771,9 @@ function! s:prepare(...)
execute 'silent! unmap <buffer>' k execute 'silent! unmap <buffer>' k
endfor endfor
setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
if exists('+colorcolumn')
setlocal colorcolumn=
endif
setf vim-plug setf vim-plug
if exists('g:syntax_on') if exists('g:syntax_on')
call s:syntax() call s:syntax()
@ -783,9 +794,7 @@ endfunction
function! s:chsh(swap) function! s:chsh(swap)
let prev = [&shell, &shellcmdflag, &shellredir] let prev = [&shell, &shellcmdflag, &shellredir]
if s:is_win if !s:is_win && a:swap
set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1
elseif a:swap
set shell=sh shellredir=>%s\ 2>&1 set shell=sh shellredir=>%s\ 2>&1
endif endif
return prev return prev
@ -799,8 +808,8 @@ function! s:bang(cmd, ...)
let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
if s:is_win if s:is_win
let batchfile = tempname().'.bat' let batchfile = tempname().'.bat'
call writefile(['@echo off', cmd], batchfile) call writefile(["@echo off\r", cmd . "\r"], batchfile)
let cmd = batchfile let cmd = s:shellesc(expand(batchfile))
endif endif
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
execute "normal! :execute g:_plug_bang\<cr>\<cr>" execute "normal! :execute g:_plug_bang\<cr>\<cr>"
@ -1008,6 +1017,8 @@ function! s:update_impl(pull, force, args) abort
let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input' let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
endif endif
let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
" Python version requirement (>= 2.7) " Python version requirement (>= 2.7)
if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
redir => pyv redir => pyv
@ -1099,7 +1110,7 @@ function! s:update_finish()
if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
\ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
call s:log4(name, 'Updating submodules. This may take a while.') call s:log4(name, 'Updating submodules. This may take a while.')
let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir) let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
endif endif
let msg = s:format_message(v:shell_error ? 'x': '-', name, out) let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
if v:shell_error if v:shell_error
@ -1196,8 +1207,8 @@ function! s:spawn(name, cmd, opts)
let s:jobs[a:name] = job let s:jobs[a:name] = job
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
if !empty(job.batchfile) if !empty(job.batchfile)
call writefile(['@echo off', cmd], job.batchfile) call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
let cmd = job.batchfile let cmd = s:shellesc(expand(job.batchfile))
endif endif
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd) let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
@ -1318,7 +1329,7 @@ while 1 " Without TCO, Vim stack is bound to explode
let name = keys(s:update.todo)[0] let name = keys(s:update.todo)[0]
let spec = remove(s:update.todo, name) let spec = remove(s:update.todo, name)
let new = !isdirectory(spec.dir) let new = empty(globpath(spec.dir, '.git', 1))
call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
redraw redraw
@ -2023,10 +2034,10 @@ function! s:system(cmd, ...)
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
if s:is_win if s:is_win
let batchfile = tempname().'.bat' let batchfile = tempname().'.bat'
call writefile(['@echo off', cmd], batchfile) call writefile(["@echo off\r", cmd . "\r"], batchfile)
let cmd = batchfile let cmd = s:shellesc(expand(batchfile))
endif endif
return system(s:is_win ? '('.cmd.')' : cmd) return system(cmd)
finally finally
let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
if s:is_win if s:is_win
@ -2211,7 +2222,7 @@ function! s:upgrade()
let new = tmp . '/plug.vim' let new = tmp . '/plug.vim'
try try
let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp)) let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(tmp)))
if v:shell_error if v:shell_error
return s:err('Error upgrading vim-plug: '. out) return s:err('Error upgrading vim-plug: '. out)
endif endif
@ -2357,8 +2368,8 @@ function! s:preview_commit()
let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
if s:is_win if s:is_win
let batchfile = tempname().'.bat' let batchfile = tempname().'.bat'
call writefile(['@echo off', cmd], batchfile) call writefile(["@echo off\r", cmd . "\r"], batchfile)
let cmd = batchfile let cmd = expand(batchfile)
endif endif
execute 'silent %!' cmd execute 'silent %!' cmd
finally finally
@ -2407,7 +2418,11 @@ function! s:diff()
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
for [k, v] in plugs for [k, v] in plugs
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..' let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir) let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
if has_key(v, 'rtp')
let cmd .= ' -- '.s:shellesc(v.rtp)
endif
let diff = s:system_chomp(cmd, v.dir)
if !empty(diff) if !empty(diff)
let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
@ -2426,8 +2441,13 @@ function! s:diff()
\ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
if cnts[0] || cnts[1] if cnts[0] || cnts[1]
nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr> nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr> if empty(maparg("\<cr>", 'n'))
nmap <buffer> <cr> <plug>(plug-preview)
endif
if empty(maparg('o', 'n'))
nmap <buffer> o <plug>(plug-preview)
endif
endif endif
if cnts[0] if cnts[0]
nnoremap <silent> <buffer> X :call <SID>revert()<cr> nnoremap <silent> <buffer> X :call <SID>revert()<cr>

View File

@ -5,6 +5,7 @@ Plug 'autozimu/LanguageClient-neovim', {'branch': 'next', 'do': 'bash install.sh
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' }
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
Plug 'SirVer/ultisnips' Plug 'SirVer/ultisnips'
Plug 'enomsg/vim-haskellConcealPlus'
Plug 'lervag/vimtex' Plug 'lervag/vimtex'
Plug 'idris-hackers/idris-vim' Plug 'idris-hackers/idris-vim'
@ -32,13 +33,14 @@ autocmd FileType crystal setlocal shiftwidth=2 " Crystal likes 2-wide indent
set completeopt=noinsert,menuone set completeopt=noinsert,menuone
let g:LanguageClient_serverCommands = { let g:LanguageClient_serverCommands = {
\ 'haskell': ['hie', '--lsp'], \ 'haskell': ['hie-wrapper', '--lsp'],
\ 'rust': ['rustup', 'run', 'stable', 'rls'], \ 'rust': ['rustup', 'run', 'stable', 'rls'],
\ 'c': ['clangd'], \ 'c': ['clangd'],
\ 'crystal': ['scry'], \ 'crystal': ['scry'],
\ 'cpp': ['clangd'], \ 'cpp': ['clangd'],
\ 'javascript': ['javascript-typescript-stdio'], \ 'javascript': ['javascript-typescript-stdio'],
\ 'elm': ['elm-language-server', '--stdio'] \ 'elm': ['elm-language-server', '--stdio'],
\ 'python': ['python', '-m', 'pyls']
\ } \ }
let g:deoplete#enable_at_startup = 1 let g:deoplete#enable_at_startup = 1
let g:LanguageClient_diagnosticsDisplay = { let g:LanguageClient_diagnosticsDisplay = {
@ -50,7 +52,11 @@ let g:LanguageClient_rootMarkers = {
\ 'haskell': ['.git'], \ 'haskell': ['.git'],
\ 'elm': ['elm.json'], \ 'elm': ['elm.json'],
\ } \ }
let g:UltiSnipsExpandTrigger="<tab>" let g:UltiSnipsExpandTrigger="<tab>"
let g:UltiSnipsJumpForwardTrigger="<c-k>" let g:UltiSnipsJumpForwardTrigger="<c-k>"
let g:UltiSnipsJumpBackwardTrigger="<c-j>" let g:UltiSnipsJumpBackwardTrigger="<c-j>"
colorscheme nord colorscheme nord
nmap K :call LanguageClient_contextMenu()<CR>
nmap ? :call LanguageClient_textDocument_hover()<CR>

View File

@ -14,23 +14,26 @@ background-alt = #3b4252
;foreground = ${xrdb:color7:#222} ;foreground = ${xrdb:color7:#222}
foreground = #d8dee9 foreground = #d8dee9
foreground-alt = #e5e9f0 foreground-alt = #e5e9f0
primary = #b48ead primary = #cf5fb4
secondary = #a3be8c secondary = #a3be8c
alert = #bf616a alert = #bf616a
[bar/example] [bar/example]
dpi-x = 220
dpi-y = 200
;monitor = ${env:MONITOR:HDMI-1} ;monitor = ${env:MONITOR:HDMI-1}
width = 100% width = 100%
height = 27 height = 3%
;offset-x = 1% ;offset-x = 1%
;offset-y = 1% ;offset-y = 1%
radius = 6.0 radius = 20%
fixed-center = false fixed-center = false
background = ${colors.background} background = ${colors.background}
foreground = ${colors.foreground} foreground = ${colors.foreground}
line-size = 3 line-size = 5%
line-color = #f00 line-color = #f00
border-size = 4 border-size = 4
@ -42,8 +45,10 @@ padding-right = 2
module-margin-left = 1 module-margin-left = 1
module-margin-right = 2 module-margin-right = 2
font-0 = fixed:pixelsize=10;1 font-0 = Iosevka:pixelsize=9;1
font-1 = Wuncon Siji:pixelsize=12;1 font-1 = Ionicons:pixelsize=9;1
; font-0 = fixed:pixelsize=10;1
; font-1 = Wuncon Siji:pixelsize=12;1
;font-1 = unifont:fontformat=truetype:size=8:antialias=false;0 ;font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
;font-2 = siji:pixelsize=10;1 ;font-2 = siji:pixelsize=10;1
@ -96,7 +101,7 @@ interval = 25
mount-0 = / mount-0 = /
label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%% label-mounted = %{F#cf5fb4}%mountpoint%%{F-}: %percentage_used%%
label-unmounted = %mountpoint% not mounted label-unmounted = %mountpoint% not mounted
label-unmounted-foreground = ${colors.foreground-alt} label-unmounted-foreground = ${colors.foreground-alt}
@ -133,7 +138,7 @@ label-mode-foreground = #000
label-mode-background = ${colors.primary} label-mode-background = ${colors.primary}
; focused = Active workspace on focused monitor ; focused = Active workspace on focused monitor
label-focused = %index% label-focused = %index%!
label-focused-background = ${module/bspwm.label-focused-background} label-focused-background = ${module/bspwm.label-focused-background}
label-focused-underline = ${module/bspwm.label-focused-underline} label-focused-underline = ${module/bspwm.label-focused-underline}
label-focused-padding = ${module/bspwm.label-focused-padding} label-focused-padding = ${module/bspwm.label-focused-padding}
@ -191,17 +196,17 @@ card = intel_backlight
[module/cpu] [module/cpu]
type = internal/cpu type = internal/cpu
interval = 2 interval = 2
format-prefix = " " format-prefix = " "
format-prefix-foreground = ${colors.foreground-alt} format-prefix-foreground = ${colors.foreground-alt}
format-underline = #f90000 format-underline = ${colors.primary}
label = %percentage:2%% label = %percentage:2%%
[module/memory] [module/memory]
type = internal/memory type = internal/memory
interval = 2 interval = 2
format-prefix = " " format-prefix = " "
format-prefix-foreground = ${colors.foreground-alt} format-prefix-foreground = ${colors.foreground-alt}
format-underline = #4bffdc format-underline = ${colors.primary}
label = %percentage_used%% label = %percentage_used%%
[module/wlan] [module/wlan]
@ -249,12 +254,12 @@ interval = 5
date = date =
date-alt = " %Y-%m-%d" date-alt = " %Y-%m-%d"
time = %H:%M time = %H:%M
time-alt = %H:%M:%S time-alt = %H:%M:%S
format-prefix =  format-prefix = 
format-prefix-foreground = ${colors.foreground-alt} format-prefix-foreground = ${colors.foreground-alt}
format-underline = #0a6cf5 format-underline = ${colors.primary}
label = %date% %time% label = %date% %time%
@ -270,13 +275,13 @@ format-muted-foreground = ${colors.foreground-alt}
label-muted = sound muted label-muted = sound muted
bar-volume-width = 10 bar-volume-width = 10
bar-volume-foreground-0 = #55aa55 bar-volume-foreground-0 = ${colors.primary}
bar-volume-foreground-1 = #55aa55 bar-volume-foreground-1 = ${colors.primary}
bar-volume-foreground-2 = #55aa55 bar-volume-foreground-2 = ${colors.primary}
bar-volume-foreground-3 = #55aa55 bar-volume-foreground-3 = ${colors.primary}
bar-volume-foreground-4 = #55aa55 bar-volume-foreground-4 = ${colors.primary}
bar-volume-foreground-5 = #f5a70a bar-volume-foreground-5 = ${colors.primary}
bar-volume-foreground-6 = #ff5555 bar-volume-foreground-6 = ${colors.primary}
bar-volume-gradient = false bar-volume-gradient = false
bar-volume-indicator = | bar-volume-indicator = |
bar-volume-indicator-font = 2 bar-volume-indicator-font = 2
@ -293,7 +298,7 @@ adapter = ADP1
full-at = 98 full-at = 98
format-charging = <animation-charging> <label-charging> format-charging = <animation-charging> <label-charging>
format-charging-underline = #ffb52a format-charging-underline = ${colors.primary}
format-discharging = <ramp-capacity> <label-discharging> format-discharging = <ramp-capacity> <label-discharging>
format-discharging-underline = ${self.format-charging-underline} format-discharging-underline = ${self.format-charging-underline}
@ -302,14 +307,11 @@ format-full-prefix = " "
format-full-prefix-foreground = ${colors.foreground-alt} format-full-prefix-foreground = ${colors.foreground-alt}
format-full-underline = ${self.format-charging-underline} format-full-underline = ${self.format-charging-underline}
ramp-capacity-0 =  ramp-capacity-0 = 
ramp-capacity-1 =  ramp-capacity-1 = 
ramp-capacity-2 = 
ramp-capacity-foreground = ${colors.foreground-alt} ramp-capacity-foreground = ${colors.foreground-alt}
animation-charging-0 =  animation-charging-0 = 
animation-charging-1 = 
animation-charging-2 = 
animation-charging-foreground = ${colors.foreground-alt} animation-charging-foreground = ${colors.foreground-alt}
animation-charging-framerate = 750 animation-charging-framerate = 750
@ -319,7 +321,7 @@ thermal-zone = 0
warn-temperature = 60 warn-temperature = 60
format = <ramp> <label> format = <ramp> <label>
format-underline = #f50a4d format-underline = ${colors.primary}
format-warn = <ramp> <label-warn> format-warn = <ramp> <label-warn>
format-warn-underline = ${self.format-underline} format-warn-underline = ${self.format-underline}
@ -327,9 +329,9 @@ label = %temperature%
label-warn = %temperature% label-warn = %temperature%
label-warn-foreground = ${colors.secondary} label-warn-foreground = ${colors.secondary}
ramp-0 = ramp-0 =
ramp-1 = ramp-1 =
ramp-2 = ramp-2 =
ramp-foreground = ${colors.foreground-alt} ramp-foreground = ${colors.foreground-alt}
[module/powermenu] [module/powermenu]