diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index 0865e28..3f2343a 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -75,7 +75,7 @@ font: use_thin_strokes: true # Should display the render timer -render_timer: false +# render_timer: false # Colors (Pencil Dark) # colors: diff --git a/nvim/.config/nvim/autoload/plug.vim b/nvim/.config/nvim/autoload/plug.vim index 9ebcf53..afb1772 100644 --- a/nvim/.config/nvim/autoload/plug.vim +++ b/nvim/.config/nvim/autoload/plug.vim @@ -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_buf = get(s:, 'plug_buf', -1) 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:vim8 = has('patch-8.0.0039') && exists('*job_start') let s:me = resolve(expand(':p')) @@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...) endtry 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() if !exists('g:plugs') return s:err('Call plug#begin() first') @@ -214,7 +222,7 @@ function! plug#end() continue endif 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 continue endif @@ -426,8 +434,8 @@ endfunction function! s:dobufread(names) for name in a:names - let path = s:rtp(g:plugs[name]).'/**' - for dir in ['ftdetect', 'ftplugin'] + let path = s:rtp(g:plugs[name]) + for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin'] if len(finddir(dir, path)) if exists('#BufRead') doautocmd BufRead @@ -763,6 +771,9 @@ function! s:prepare(...) execute 'silent! unmap ' k endfor setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell + if exists('+colorcolumn') + setlocal colorcolumn= + endif setf vim-plug if exists('g:syntax_on') call s:syntax() @@ -783,9 +794,7 @@ endfunction function! s:chsh(swap) let prev = [&shell, &shellcmdflag, &shellredir] - if s:is_win - set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1 - elseif a:swap + if !s:is_win && a:swap set shell=sh shellredir=>%s\ 2>&1 endif return prev @@ -799,8 +808,8 @@ function! s:bang(cmd, ...) 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', cmd], batchfile) - let cmd = batchfile + call writefile(["@echo off\r", cmd . "\r"], batchfile) + let cmd = s:shellesc(expand(batchfile)) endif let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') execute "normal! :execute g:_plug_bang\\" @@ -1008,6 +1017,8 @@ function! s:update_impl(pull, force, args) abort let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input' endif + let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' + " Python version requirement (>= 2.7) if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 redir => pyv @@ -1099,7 +1110,7 @@ function! s:update_finish() if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && \ (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.') - 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 let msg = s:format_message(v:shell_error ? 'x': '-', name, out) if v:shell_error @@ -1196,8 +1207,8 @@ function! s:spawn(name, cmd, opts) 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', cmd], job.batchfile) - let cmd = 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) @@ -1318,7 +1329,7 @@ while 1 " Without TCO, Vim stack is bound to explode let name = keys(s:update.todo)[0] 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 ...') redraw @@ -2023,10 +2034,10 @@ function! s:system(cmd, ...) 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', cmd], batchfile) - let cmd = batchfile + call writefile(["@echo off\r", cmd . "\r"], batchfile) + let cmd = s:shellesc(expand(batchfile)) endif - return system(s:is_win ? '('.cmd.')' : cmd) + return system(cmd) finally let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] if s:is_win @@ -2211,7 +2222,7 @@ function! s:upgrade() let new = tmp . '/plug.vim' 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 return s:err('Error upgrading vim-plug: '. out) 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 if s:is_win let batchfile = tempname().'.bat' - call writefile(['@echo off', cmd], batchfile) - let cmd = batchfile + call writefile(["@echo off\r", cmd . "\r"], batchfile) + let cmd = expand(batchfile) endif execute 'silent %!' cmd finally @@ -2407,7 +2418,11 @@ 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 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) 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)'))) @@ -2426,8 +2441,13 @@ function! s:diff() \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) if cnts[0] || cnts[1] - nnoremap :silent! call preview_commit() - nnoremap o :silent! call preview_commit() + nnoremap (plug-preview) :silent! call preview_commit() + if empty(maparg("\", 'n')) + nmap (plug-preview) + endif + if empty(maparg('o', 'n')) + nmap o (plug-preview) + endif endif if cnts[0] nnoremap X :call revert() diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 07956a8..63ec7da 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -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.vim' Plug 'SirVer/ultisnips' +Plug 'enomsg/vim-haskellConcealPlus' Plug 'lervag/vimtex' Plug 'idris-hackers/idris-vim' @@ -32,13 +33,14 @@ autocmd FileType crystal setlocal shiftwidth=2 " Crystal likes 2-wide indent set completeopt=noinsert,menuone let g:LanguageClient_serverCommands = { - \ 'haskell': ['hie', '--lsp'], + \ 'haskell': ['hie-wrapper', '--lsp'], \ 'rust': ['rustup', 'run', 'stable', 'rls'], \ 'c': ['clangd'], \ 'crystal': ['scry'], \ 'cpp': ['clangd'], \ '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:LanguageClient_diagnosticsDisplay = { @@ -50,7 +52,11 @@ let g:LanguageClient_rootMarkers = { \ 'haskell': ['.git'], \ 'elm': ['elm.json'], \ } + let g:UltiSnipsExpandTrigger="" let g:UltiSnipsJumpForwardTrigger="" let g:UltiSnipsJumpBackwardTrigger="" + colorscheme nord +nmap K :call LanguageClient_contextMenu() +nmap ? :call LanguageClient_textDocument_hover() diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config index 144a19b..c9e300e 100644 --- a/polybar/.config/polybar/config +++ b/polybar/.config/polybar/config @@ -14,23 +14,26 @@ background-alt = #3b4252 ;foreground = ${xrdb:color7:#222} foreground = #d8dee9 foreground-alt = #e5e9f0 -primary = #b48ead +primary = #cf5fb4 secondary = #a3be8c alert = #bf616a [bar/example] +dpi-x = 220 +dpi-y = 200 + ;monitor = ${env:MONITOR:HDMI-1} width = 100% -height = 27 +height = 3% ;offset-x = 1% ;offset-y = 1% -radius = 6.0 +radius = 20% fixed-center = false background = ${colors.background} foreground = ${colors.foreground} -line-size = 3 +line-size = 5% line-color = #f00 border-size = 4 @@ -42,8 +45,10 @@ padding-right = 2 module-margin-left = 1 module-margin-right = 2 -font-0 = fixed:pixelsize=10;1 -font-1 = Wuncon Siji:pixelsize=12;1 +font-0 = Iosevka:pixelsize=9;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-2 = siji:pixelsize=10;1 @@ -96,7 +101,7 @@ interval = 25 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-foreground = ${colors.foreground-alt} @@ -133,7 +138,7 @@ label-mode-foreground = #000 label-mode-background = ${colors.primary} ; focused = Active workspace on focused monitor -label-focused = %index% +label-focused = %index%! label-focused-background = ${module/bspwm.label-focused-background} label-focused-underline = ${module/bspwm.label-focused-underline} label-focused-padding = ${module/bspwm.label-focused-padding} @@ -191,17 +196,17 @@ card = intel_backlight [module/cpu] type = internal/cpu interval = 2 -format-prefix = " " +format-prefix = " " format-prefix-foreground = ${colors.foreground-alt} -format-underline = #f90000 +format-underline = ${colors.primary} label = %percentage:2%% [module/memory] type = internal/memory interval = 2 -format-prefix = " " +format-prefix = " " format-prefix-foreground = ${colors.foreground-alt} -format-underline = #4bffdc +format-underline = ${colors.primary} label = %percentage_used%% [module/wlan] @@ -249,12 +254,12 @@ interval = 5 date = date-alt = " %Y-%m-%d" -time = %H:%M +time =  %H:%M time-alt = %H:%M:%S format-prefix =  format-prefix-foreground = ${colors.foreground-alt} -format-underline = #0a6cf5 +format-underline = ${colors.primary} label = %date% %time% @@ -270,13 +275,13 @@ format-muted-foreground = ${colors.foreground-alt} label-muted = sound muted bar-volume-width = 10 -bar-volume-foreground-0 = #55aa55 -bar-volume-foreground-1 = #55aa55 -bar-volume-foreground-2 = #55aa55 -bar-volume-foreground-3 = #55aa55 -bar-volume-foreground-4 = #55aa55 -bar-volume-foreground-5 = #f5a70a -bar-volume-foreground-6 = #ff5555 +bar-volume-foreground-0 = ${colors.primary} +bar-volume-foreground-1 = ${colors.primary} +bar-volume-foreground-2 = ${colors.primary} +bar-volume-foreground-3 = ${colors.primary} +bar-volume-foreground-4 = ${colors.primary} +bar-volume-foreground-5 = ${colors.primary} +bar-volume-foreground-6 = ${colors.primary} bar-volume-gradient = false bar-volume-indicator = | bar-volume-indicator-font = 2 @@ -293,7 +298,7 @@ adapter = ADP1 full-at = 98 format-charging = -format-charging-underline = #ffb52a +format-charging-underline = ${colors.primary} format-discharging = format-discharging-underline = ${self.format-charging-underline} @@ -302,14 +307,11 @@ format-full-prefix = " " format-full-prefix-foreground = ${colors.foreground-alt} format-full-underline = ${self.format-charging-underline} -ramp-capacity-0 =  -ramp-capacity-1 =  -ramp-capacity-2 =  +ramp-capacity-0 =  +ramp-capacity-1 =  ramp-capacity-foreground = ${colors.foreground-alt} -animation-charging-0 =  -animation-charging-1 =  -animation-charging-2 =  +animation-charging-0 =  animation-charging-foreground = ${colors.foreground-alt} animation-charging-framerate = 750 @@ -319,7 +321,7 @@ thermal-zone = 0 warn-temperature = 60 format =