diff options
| -rw-r--r-- | awesome/.config/awesome/rc.lua | 4 | ||||
| -rw-r--r-- | vim/.vim/after/ftplugin/tex.vim | 6 | ||||
| -rw-r--r-- | vim/.vim/autoload/plug.vim | 46 | ||||
| -rwxr-xr-x | vim/.vim/vimrc | 4 |
4 files changed, 45 insertions, 15 deletions
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua index d06d343..1173325 100644 --- a/awesome/.config/awesome/rc.lua +++ b/awesome/.config/awesome/rc.lua @@ -435,6 +435,8 @@ local globalkeys = awful.util.table.join( {description = "open torified Luakit", group = "launcher"}), awful.key({modkey}, "r", spawner(ranger), {description = "open ranger file manager", group = "launcher"}), + awful.key({modkey, "Shift"}, "r", spawner(ranger .. " Documents/B1"), + {description = "open ranger file manager", group = "launcher"}), awful.key({modkey}, "p", spawner(python3), {description = "open Python 3 interpreter", group = "launcher"}), awful.key({modkey, "Shift"}, "p", spawner(perl6), @@ -546,6 +548,8 @@ local clientkeys = awful.util.table.join( {description = "move to master", group = "client"}), awful.key({modkey, "Shift"}, "0", function (c) c:move_to_screen() end, {description = "move to screen", group = "client"}), + awful.key({modkey, "Shift"}, "`", function (c) c:move_to_screen() end, + {description = "move to screen", group = "client"}), awful.key({modkey}, "t", function (c) c.ontop = not c.ontop end, {description = "toggle keep on top", group = "client"}), awful.key({modkey}, "n", diff --git a/vim/.vim/after/ftplugin/tex.vim b/vim/.vim/after/ftplugin/tex.vim new file mode 100644 index 0000000..8d69096 --- /dev/null +++ b/vim/.vim/after/ftplugin/tex.vim @@ -0,0 +1,6 @@ +setlocal conceallevel=2 +setlocal listchars=eol:$ ambiwidth=double +let g:tex_conceal='abdmg' +let g:tex_flavor='latex' +let g:vimtex_indent_enabled = 0 +let g:vimtex_quickfix_mode=0 diff --git a/vim/.vim/autoload/plug.vim b/vim/.vim/autoload/plug.vim index 143c377..4e05630 100644 --- a/vim/.vim/autoload/plug.vim +++ b/vim/.vim/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('<sfile>: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 @@ -763,6 +771,9 @@ function! s:prepare(...) execute 'silent! unmap <buffer>' 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() @@ -799,7 +810,7 @@ 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) + call writefile(["@echo off\r", cmd . "\r"], batchfile) let cmd = batchfile endif let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') @@ -908,7 +919,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 +1019,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 +1112,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,7 +1209,7 @@ 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) + call writefile(["@echo off\r", cmd . "\r"], job.batchfile) let cmd = job.batchfile endif let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd) @@ -1318,7 +1331,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,7 +2036,7 @@ 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) + call writefile(["@echo off\r", cmd . "\r"], batchfile) let cmd = batchfile endif return system(s:is_win ? '('.cmd.')' : cmd) @@ -2357,7 +2370,7 @@ 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) + call writefile(["@echo off\r", cmd . "\r"], batchfile) let cmd = batchfile endif execute 'silent %!' cmd @@ -2407,7 +2420,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 +2443,13 @@ function! s:diff() \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) if cnts[0] || cnts[1] - nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr> - nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr> + nnoremap <silent> <buffer> <plug>(plug-preview) :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 if cnts[0] nnoremap <silent> <buffer> X :call <SID>revert()<cr> diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index 7829623..b0329de 100755 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -14,15 +14,13 @@ set omnifunc=syntaxcomplete#Complete set diffopt+=algorithm:patience autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal -autocmd FileType c,h,go setlocal cindent noexpandtab shiftwidth=8 +autocmd FileType c,h,go setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 autocmd FileType rst setlocal shiftwidth=3 autocmd FileType css,javascript,python,perl6 setlocal shiftwidth=4 -autocmd FileType python,tex setlocal indentexpr= let g:jedi#popup_on_dot = 0 let g:jedi#popup_select_first = 0 let g:jedi#show_call_signatures = 2 let g:jedi#smart_auto_mappings = 0 -let g:vimtex_indent_enabled = 0 command W w map Q gq |