From 1abe77b02d4bef23e51e019b5ee591f6260e550b Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Thu, 26 Sep 2019 13:34:32 +0200 Subject: [PATCH] Push to currently working status --- i3/config | 42 +++++++++---- nvim/autoload/plug.vim | 132 ++++++++++++++++++++++++--------------- nvim/conf.d/ctrlp.vim | 16 +++-- nvim/conf.d/deoplete.vim | 14 ++++- nvim/conf.d/neomake.vim | 2 +- nvim/init.vim | 41 ++++++------ 6 files changed, 156 insertions(+), 91 deletions(-) diff --git a/i3/config b/i3/config index 596eb04..8865ab4 100644 --- a/i3/config +++ b/i3/config @@ -12,18 +12,23 @@ set $mod Mod4 # Workspace assignment for monitors -workspace "1:l" output DP-1 -workspace "2:l" output DP-1 -workspace "3:l" output DP-1 -workspace "4:l" output DP-1 -workspace "5:l" output DP-1 -workspace "6:l" output DP-1 +workspace "z:s" output eDP-1 +workspace "u:s" output eDP-1 +workspace "i:s" output eDP-1 +workspace "o:s" output eDP-1 #-- -workspace "7:r" output DP-2 -workspace "8:r" output DP-2 -workspace "9:r" output DP-2 -workspace "0:r" output HDMI-1 -workspace "ß:r" output HDMI-1 +workspace "1:l" output DP-2-1-8 +workspace "2:l" output DP-2-1-8 +workspace "3:l" output DP-2-1-8 +workspace "4:l" output DP-2-1-8 +workspace "5:l" output DP-2-1-8 +workspace "6:l" output DP-2-1-8 +#-- +workspace "7:r" output DP-2-2-8 +workspace "8:r" output DP-2-2-8 +workspace "9:r" output DP-2-2-8 +workspace "0:r" output DP-2-2-8 +workspace "ß:r" output DP-2-2-8 # Font for window titles. Will also be used by the bar unless a different font @@ -48,7 +53,7 @@ floating_modifier $mod bindsym $mod+Return exec xfce4-terminal # start chromium -bindsym $mod+BackSpace exec chromium +bindsym $mod+BackSpace exec firefox # screenshot bindsym $mod+Delete exec scrot -s @@ -107,6 +112,11 @@ bindsym $mod+u focus parent #bindsym $mod+d focus child # switch to workspace +bindsym $mod+k workspace "z:s" +bindsym $mod+h workspace "u:s" +bindsym $mod+g workspace "i:s" +bindsym $mod+f workspace "o:s" + bindsym $mod+1 workspace "1:l" bindsym $mod+2 workspace "2:l" bindsym $mod+3 workspace "3:l" @@ -126,6 +136,11 @@ bindsym $mod+Next workspace next # move focused container to workspace +bindsym $mod+Shift+k move container to workspace "z:s" +bindsym $mod+Shift+h move container to workspace "u:s" +bindsym $mod+Shift+g move container to workspace "i:s" +bindsym $mod+Shift+f move container to workspace "o:s" + bindsym $mod+Shift+1 move container to workspace "1:l" bindsym $mod+Shift+2 move container to workspace "2:l" bindsym $mod+Shift+3 move container to workspace "3:l" @@ -153,10 +168,11 @@ bindsym $mod+F4 exec sh ~/config/susp.sh # TODO: debug bindsym $mod+F12 exec xfce4-terminal --drop-down +bindsym $mod+y exec xfce4-terminal --drop-down #for_window [class="(?i)xfce4-terminal"] floating enable #for_window [class="(?i)xfce4-terminal"] border none - +#for_window [class="VirtualBox" instance="VirtualBox"] floating enable # resize window (you can also use the mouse for that) diff --git a/nvim/autoload/plug.vim b/nvim/autoload/plug.vim index 143c377..6b4caf8 100644 --- a/nvim/autoload/plug.vim +++ b/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 @@ -342,6 +350,23 @@ if s:is_win function! s:is_local_plug(repo) return a:repo =~? '^[a-z]:\|^[%~]' endfunction + + " Copied from fzf + function! s:wrap_cmds(cmds) + return map(['@echo off', 'for /f "tokens=4" %%a in (''chcp'') do set origchcp=%%a', 'chcp 65001 > nul'] + + \ (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) + + \ ['chcp %origchcp% > nul'], '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:rtp(spec) return s:dirpath(a:spec.dir . get(a:spec, 'rtp', '')) @@ -426,8 +451,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 +788,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 +811,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 @@ -798,9 +824,7 @@ function! s:bang(cmd, ...) " 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', cmd], batchfile) - let cmd = 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\\" @@ -908,7 +932,7 @@ function! s:finish(pull) call add(msgs, "Press 'R' to retry.") endif if a:pull && len(s:update.new) < len(filter(getline(5, '$'), - \ "v:val =~ '^- ' && stridx(v:val, 'Already up-to-date') < 0")) + \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'")) call add(msgs, "Press 'D' to see the updated changes.") endif echo join(msgs, ' ') @@ -1008,6 +1032,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 @@ -1081,7 +1107,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)) @@ -1099,7 +1125,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 @@ -1138,7 +1164,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 = {} @@ -1191,15 +1217,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', cmd], job.batchfile) - let cmd = 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, { @@ -1249,9 +1270,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 @@ -1318,7 +1336,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 @@ -1341,8 +1359,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 @@ -1969,17 +1987,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_ps1(arg) + return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'" endfunction -function! s:shellesc(arg) - if &shell =~# 'cmd.exe$' - return s:shellesc_cmd(a:arg) +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 @@ -2013,8 +2037,9 @@ 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, ...) @@ -2022,11 +2047,9 @@ function! s:system(cmd, ...) 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', cmd], batchfile) - let cmd = batchfile + let [batchfile, cmd] = s:batchfile(cmd) endif - return system(s:is_win ? '('.cmd.')' : cmd) + return system(cmd) finally let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] if s:is_win @@ -2102,7 +2125,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 @@ -2211,7 +2234,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', plug#shellescape(s:plug_src), plug#shellescape(tmp))) if v:shell_error return s:err('Error upgrading vim-plug: '. out) endif @@ -2354,11 +2377,9 @@ function! s:preview_commit() setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable 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', cmd], batchfile) - let cmd = batchfile + let [batchfile, cmd] = s:batchfile(cmd) endif execute 'silent %!' cmd finally @@ -2407,7 +2428,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], 'plug#shellescape(v:val)')) + if has_key(v, 'rtp') + let cmd .= ' -- '.plug#shellescape(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 +2451,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/conf.d/ctrlp.vim b/nvim/conf.d/ctrlp.vim index 57ea5c4..841a014 100644 --- a/nvim/conf.d/ctrlp.vim +++ b/nvim/conf.d/ctrlp.vim @@ -1,6 +1,12 @@ -" if theres a .git, use ls-commands (honoring gitignore) -let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files -co --exclude-standard'] -" all dem files -let g:ctrlp_max_files = 1000000 +" r if theres a .git, use ls-commands (honoring gitignore) +"let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files -co --exclude-standard'] +"" all dem files +"let g:ctrlp_max_files = 1000000 +" +"let g:ctrlp_cmd = 'CtrlPLastMode' +"let g:ctrlp_extensions = ['buffertag', 'tag', 'line', 'dir'] +" +"nmap :CtrlPBuffer + +nnoremap :FuzzyOpen -nmap :CtrlPBuffer diff --git a/nvim/conf.d/deoplete.vim b/nvim/conf.d/deoplete.vim index 2e91169..08cd225 100644 --- a/nvim/conf.d/deoplete.vim +++ b/nvim/conf.d/deoplete.vim @@ -6,5 +6,15 @@ let g:deoplete#enable_at_startup = 1 inoremap \ pumvisible() ? "\" : "" " deoplete-clang opions -let g:deoplete#sources#clang#libclang_path = "/usr/lib/llvm-3.8/lib/libclang.so" -let g:deoplete#sources#clang#clang_header = "/usr/lib/llvm-3.8/include/clang" +"let g:deoplete#sources#clang#libclang_path = "/usr/lib/llvm-3.8/lib/libclang.so" +"let g:deoplete#sources#clang#clang_header = "/usr/lib/llvm-3.8/include/clang" + +"let g:deoplete#sources#ternjs#tern_bin = '/usr/local/bin/tern' +"let g:deoplete#sources#ternjs#timeout = 1 +"let g:deoplete#sources#ternjs#depths = 1 +"let g:deoplete#sources#ternjs#case_insensitive = 1 +"let g:deoplete#sources#ternjs#guess = 0 +"let g:deoplete#sources#ternjs#include_keywords = 1 + +call deoplete#custom#source('LC', 'rank', 1000) +call deoplete#custom#source('jedi', 'rank', 900) diff --git a/nvim/conf.d/neomake.vim b/nvim/conf.d/neomake.vim index ce3c967..580667c 100644 --- a/nvim/conf.d/neomake.vim +++ b/nvim/conf.d/neomake.vim @@ -1 +1 @@ -autocmd! BufWritePost * Neomake +"autocmd! BufWritePost * Neomake diff --git a/nvim/init.vim b/nvim/init.vim index 5abcd44..cc04b38 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -7,44 +7,47 @@ Plug 'morhetz/gruvbox' Plug 'rakr/vim-one' Plug 'tpope/vim-fugitive' -Plug 'sheerun/vim-polyglot' -Plug 'benekastah/neomake' +"Plug 'sheerun/vim-polyglot' +"Plug 'benekastah/neomake' " Commenting " Plug 'scrooloose/nerdcommenter' fucks up Autocompletion? " Autocompletion -Plug 'Shougo/deoplete.nvim' -Plug 'Shougo/neoinclude.vim' -Plug 'zchee/deoplete-clang' +Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } + Plug 'Shougo/neoinclude.vim' +"Plug 'zchee/deoplete-clang' Plug 'zchee/deoplete-jedi' -Plug 'racer-rust/vim-racer' -Plug 'jistr/vim-nerdtree-tabs' -Plug 'scrooloose/nerdtree' -Plug 'ctrlpvim/ctrlp.vim' -"Plug 'cloudhead/neovim-fuzzy' +"Plug 'jistr/vim-nerdtree-tabs' +"Plug 'scrooloose/nerdtree' +"Plug 'ctrlpvim/ctrlp.vim' +Plug 'cloudhead/neovim-fuzzy' " Plug 'rking/ag.vim' -Plug 'mileszs/ack.vim' +" Plug 'mileszs/ack.vim' Plug 'AndrewRadev/splitjoin.vim' -Plug 'zchee/deoplete-go' Plug 'davidhalter/jedi-vim' -Plug 'tpope/vim-commentary' -Plug 'easymotion/vim-easymotion' -Plug 'terryma/vim-multiple-cursors' +" Plug 'neoclide/coc.nvim', {'branch': 'release'} + +"Plug 'tpope/vim-commentary' +"Plug 'easymotion/vim-easymotion' +"Plug 'terryma/vim-multiple-cursors' Plug 'Raimondi/delimitMate' " session mgmt -Plug 'tpope/vim-obsession' +"Plug 'tpope/vim-obsession' " display marks -Plug 'kshenoy/vim-signature' +"Plug 'kshenoy/vim-signature' " tag sidebar -Plug 'majutsushi/tagbar' +"Plug 'majutsushi/tagbar' " ~magic~? -Plug 'tpope/vim-abolish' +"Plug 'tpope/vim-abolish' + +" tree-view for undo buffer wtf +"Plug 'mbbill/undotree' call g:plug#end()