From ed4b5f69144ee6f93e0c7059b3676c230cbce581 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 19 Nov 2021 22:28:06 +0900 Subject: vim: make vim XDG-Base-Directory-aware --- .config/vim/my/after/ftplugin/c.vim | 20 ++++ .config/vim/my/after/ftplugin/cmake.vim | 16 +++ .config/vim/my/after/ftplugin/cpp.vim | 20 ++++ .config/vim/my/after/ftplugin/css.vim | 16 +++ .config/vim/my/after/ftplugin/gitcommit.vim | 14 +++ .config/vim/my/after/ftplugin/go.vim | 17 ++++ .config/vim/my/after/ftplugin/haskell.vim | 22 ++++ .config/vim/my/after/ftplugin/html.vim | 16 +++ .config/vim/my/after/ftplugin/javascript.vim | 16 +++ .config/vim/my/after/ftplugin/json.vim | 16 +++ .config/vim/my/after/ftplugin/lisp.vim | 16 +++ .config/vim/my/after/ftplugin/lua.vim | 16 +++ .config/vim/my/after/ftplugin/markdown.vim | 18 ++++ .config/vim/my/after/ftplugin/php.vim | 30 ++++++ .config/vim/my/after/ftplugin/python.vim | 21 ++++ .config/vim/my/after/ftplugin/qf.vim | 40 ++++++++ .config/vim/my/after/ftplugin/ruby.vim | 19 ++++ .config/vim/my/after/ftplugin/toml.vim | 16 +++ .config/vim/my/after/ftplugin/typescript.vim | 16 +++ .config/vim/my/after/ftplugin/vim.vim | 22 ++++ .config/vim/my/after/ftplugin/yaml.vim | 16 +++ .config/vim/my/after/syntax/json.vim | 23 +++++ .config/vim/my/after/syntax/python.vim | 19 ++++ .config/vim/my/after/syntax/vim.vim | 30 ++++++ .config/vim/my/autoload/autosave.vim | 70 +++++++++++++ .config/vim/my/autoload/dummy.vim | 39 +++++++ .config/vim/my/colors/ocean.vim | 146 +++++++++++++++++++++++++++ .config/vim/my/plugin/autosave.vim | 29 ++++++ .config/vim/my/plugin/dummy.vim | 15 +++ .config/vim/my/syntax/gitcommit.vim | 96 ++++++++++++++++++ .gitignore | 4 +- .vim/my/after/ftplugin/c.vim | 20 ---- .vim/my/after/ftplugin/cmake.vim | 16 --- .vim/my/after/ftplugin/cpp.vim | 20 ---- .vim/my/after/ftplugin/css.vim | 16 --- .vim/my/after/ftplugin/gitcommit.vim | 14 --- .vim/my/after/ftplugin/go.vim | 17 ---- .vim/my/after/ftplugin/haskell.vim | 22 ---- .vim/my/after/ftplugin/html.vim | 16 --- .vim/my/after/ftplugin/javascript.vim | 16 --- .vim/my/after/ftplugin/json.vim | 16 --- .vim/my/after/ftplugin/lisp.vim | 16 --- .vim/my/after/ftplugin/lua.vim | 16 --- .vim/my/after/ftplugin/markdown.vim | 18 ---- .vim/my/after/ftplugin/php.vim | 30 ------ .vim/my/after/ftplugin/python.vim | 21 ---- .vim/my/after/ftplugin/qf.vim | 40 -------- .vim/my/after/ftplugin/ruby.vim | 19 ---- .vim/my/after/ftplugin/toml.vim | 16 --- .vim/my/after/ftplugin/typescript.vim | 16 --- .vim/my/after/ftplugin/vim.vim | 22 ---- .vim/my/after/ftplugin/yaml.vim | 16 --- .vim/my/after/syntax/json.vim | 23 ----- .vim/my/after/syntax/python.vim | 19 ---- .vim/my/after/syntax/vim.vim | 30 ------ .vim/my/autoload/autosave.vim | 70 ------------- .vim/my/autoload/dummy.vim | 39 ------- .vim/my/colors/ocean.vim | 146 --------------------------- .vim/my/plugin/autosave.vim | 29 ------ .vim/my/plugin/dummy.vim | 15 --- .vim/my/syntax/gitcommit.vim | 96 ------------------ .vimrc | 28 +++-- setup.sh | 12 +-- 63 files changed, 896 insertions(+), 888 deletions(-) create mode 100644 .config/vim/my/after/ftplugin/c.vim create mode 100644 .config/vim/my/after/ftplugin/cmake.vim create mode 100644 .config/vim/my/after/ftplugin/cpp.vim create mode 100644 .config/vim/my/after/ftplugin/css.vim create mode 100644 .config/vim/my/after/ftplugin/gitcommit.vim create mode 100644 .config/vim/my/after/ftplugin/go.vim create mode 100644 .config/vim/my/after/ftplugin/haskell.vim create mode 100644 .config/vim/my/after/ftplugin/html.vim create mode 100644 .config/vim/my/after/ftplugin/javascript.vim create mode 100644 .config/vim/my/after/ftplugin/json.vim create mode 100644 .config/vim/my/after/ftplugin/lisp.vim create mode 100644 .config/vim/my/after/ftplugin/lua.vim create mode 100644 .config/vim/my/after/ftplugin/markdown.vim create mode 100644 .config/vim/my/after/ftplugin/php.vim create mode 100644 .config/vim/my/after/ftplugin/python.vim create mode 100644 .config/vim/my/after/ftplugin/qf.vim create mode 100644 .config/vim/my/after/ftplugin/ruby.vim create mode 100644 .config/vim/my/after/ftplugin/toml.vim create mode 100644 .config/vim/my/after/ftplugin/typescript.vim create mode 100644 .config/vim/my/after/ftplugin/vim.vim create mode 100644 .config/vim/my/after/ftplugin/yaml.vim create mode 100644 .config/vim/my/after/syntax/json.vim create mode 100644 .config/vim/my/after/syntax/python.vim create mode 100644 .config/vim/my/after/syntax/vim.vim create mode 100644 .config/vim/my/autoload/autosave.vim create mode 100644 .config/vim/my/autoload/dummy.vim create mode 100644 .config/vim/my/colors/ocean.vim create mode 100644 .config/vim/my/plugin/autosave.vim create mode 100644 .config/vim/my/plugin/dummy.vim create mode 100644 .config/vim/my/syntax/gitcommit.vim delete mode 100644 .vim/my/after/ftplugin/c.vim delete mode 100644 .vim/my/after/ftplugin/cmake.vim delete mode 100644 .vim/my/after/ftplugin/cpp.vim delete mode 100644 .vim/my/after/ftplugin/css.vim delete mode 100644 .vim/my/after/ftplugin/gitcommit.vim delete mode 100644 .vim/my/after/ftplugin/go.vim delete mode 100644 .vim/my/after/ftplugin/haskell.vim delete mode 100644 .vim/my/after/ftplugin/html.vim delete mode 100644 .vim/my/after/ftplugin/javascript.vim delete mode 100644 .vim/my/after/ftplugin/json.vim delete mode 100644 .vim/my/after/ftplugin/lisp.vim delete mode 100644 .vim/my/after/ftplugin/lua.vim delete mode 100644 .vim/my/after/ftplugin/markdown.vim delete mode 100644 .vim/my/after/ftplugin/php.vim delete mode 100644 .vim/my/after/ftplugin/python.vim delete mode 100644 .vim/my/after/ftplugin/qf.vim delete mode 100644 .vim/my/after/ftplugin/ruby.vim delete mode 100644 .vim/my/after/ftplugin/toml.vim delete mode 100644 .vim/my/after/ftplugin/typescript.vim delete mode 100644 .vim/my/after/ftplugin/vim.vim delete mode 100644 .vim/my/after/ftplugin/yaml.vim delete mode 100644 .vim/my/after/syntax/json.vim delete mode 100644 .vim/my/after/syntax/python.vim delete mode 100644 .vim/my/after/syntax/vim.vim delete mode 100644 .vim/my/autoload/autosave.vim delete mode 100644 .vim/my/autoload/dummy.vim delete mode 100644 .vim/my/colors/ocean.vim delete mode 100644 .vim/my/plugin/autosave.vim delete mode 100644 .vim/my/plugin/dummy.vim delete mode 100644 .vim/my/syntax/gitcommit.vim diff --git a/.config/vim/my/after/ftplugin/c.vim b/.config/vim/my/after/ftplugin/c.vim new file mode 100644 index 0000000..12de33e --- /dev/null +++ b/.config/vim/my/after/ftplugin/c.vim @@ -0,0 +1,20 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_c_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=4 +FtpluginSetLocal softtabstop=4 +FtpluginSetLocal cinoptions=:0,l1 + +let g:c_comment_strings = v:true +let g:c_space_errors = v:true + + + +let b:did_ftplugin_c_after = 1 diff --git a/.config/vim/my/after/ftplugin/cmake.vim b/.config/vim/my/after/ftplugin/cmake.vim new file mode 100644 index 0000000..b4f5591 --- /dev/null +++ b/.config/vim/my/after/ftplugin/cmake.vim @@ -0,0 +1,16 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_cmake_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + + + +let b:did_ftplugin_cmake_after = 1 \ No newline at end of file diff --git a/.config/vim/my/after/ftplugin/cpp.vim b/.config/vim/my/after/ftplugin/cpp.vim new file mode 100644 index 0000000..13c0374 --- /dev/null +++ b/.config/vim/my/after/ftplugin/cpp.vim @@ -0,0 +1,20 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_cpp_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=4 +FtpluginSetLocal softtabstop=4 +FtpluginSetLocal cinoptions=:0,l1,g0,N-s + +let g:c_comment_strings = v:true +let g:c_space_errors = v:true + + + +let b:did_ftplugin_cpp_after = 1 \ No newline at end of file diff --git a/.config/vim/my/after/ftplugin/css.vim b/.config/vim/my/after/ftplugin/css.vim new file mode 100644 index 0000000..e4743e8 --- /dev/null +++ b/.config/vim/my/after/ftplugin/css.vim @@ -0,0 +1,16 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_css_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + + + +let b:did_ftplugin_css_after = 1 diff --git a/.config/vim/my/after/ftplugin/gitcommit.vim b/.config/vim/my/after/ftplugin/gitcommit.vim new file mode 100644 index 0000000..915a193 --- /dev/null +++ b/.config/vim/my/after/ftplugin/gitcommit.vim @@ -0,0 +1,14 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_gitcommit_after') + finish +endif + + + +FtpluginSetLocal spell + + + +let b:did_ftplugin_gitcommit_after = 1 diff --git a/.config/vim/my/after/ftplugin/go.vim b/.config/vim/my/after/ftplugin/go.vim new file mode 100644 index 0000000..54aa34b --- /dev/null +++ b/.config/vim/my/after/ftplugin/go.vim @@ -0,0 +1,17 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_go_after') + finish +endif + + + +FtpluginSetLocal noexpandtab +FtpluginSetLocal shiftwidth=4 +FtpluginSetLocal softtabstop=4 +FtpluginSetLocal tabstop=4 + + + +let b:did_ftplugin_go_after = 1 \ No newline at end of file diff --git a/.config/vim/my/after/ftplugin/haskell.vim b/.config/vim/my/after/ftplugin/haskell.vim new file mode 100644 index 0000000..676dcce --- /dev/null +++ b/.config/vim/my/after/ftplugin/haskell.vim @@ -0,0 +1,22 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_haskell_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=4 +FtpluginSetLocal softtabstop=4 + +let g:hs_highlight_boolean = v:true +let g:hs_highlight_types = v:true +let g:hs_highlight_more_types = v:true +let g:hs_highlight_debug = v:true +let g:hs_allow_hash_operator = v:true + + + +let b:did_ftplugin_haskell_after = 1 diff --git a/.config/vim/my/after/ftplugin/html.vim b/.config/vim/my/after/ftplugin/html.vim new file mode 100644 index 0000000..a7b36ad --- /dev/null +++ b/.config/vim/my/after/ftplugin/html.vim @@ -0,0 +1,16 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_html_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + + + +let b:did_ftplugin_html_after = 1 \ No newline at end of file diff --git a/.config/vim/my/after/ftplugin/javascript.vim b/.config/vim/my/after/ftplugin/javascript.vim new file mode 100644 index 0000000..a79e644 --- /dev/null +++ b/.config/vim/my/after/ftplugin/javascript.vim @@ -0,0 +1,16 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_javascript_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + + + +let b:did_ftplugin_javascript_after = 1 diff --git a/.config/vim/my/after/ftplugin/json.vim b/.config/vim/my/after/ftplugin/json.vim new file mode 100644 index 0000000..9886a95 --- /dev/null +++ b/.config/vim/my/after/ftplugin/json.vim @@ -0,0 +1,16 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_json_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + + + +let b:did_ftplugin_json_after = 1 diff --git a/.config/vim/my/after/ftplugin/lisp.vim b/.config/vim/my/after/ftplugin/lisp.vim new file mode 100644 index 0000000..13c1abc --- /dev/null +++ b/.config/vim/my/after/ftplugin/lisp.vim @@ -0,0 +1,16 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_lisp_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + + + +let b:did_ftplugin_lisp_after = 1 diff --git a/.config/vim/my/after/ftplugin/lua.vim b/.config/vim/my/after/ftplugin/lua.vim new file mode 100644 index 0000000..d0eb8b2 --- /dev/null +++ b/.config/vim/my/after/ftplugin/lua.vim @@ -0,0 +1,16 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_lua_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=3 +FtpluginSetLocal softtabstop=3 + + + +let b:did_ftplugin_lua_after = 1 diff --git a/.config/vim/my/after/ftplugin/markdown.vim b/.config/vim/my/after/ftplugin/markdown.vim new file mode 100644 index 0000000..36791bc --- /dev/null +++ b/.config/vim/my/after/ftplugin/markdown.vim @@ -0,0 +1,18 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_markdown_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=4 +FtpluginSetLocal softtabstop=4 + +let g:markdown_syntax_conceal = v:false + + + +let b:did_ftplugin_markdown_after = 1 diff --git a/.config/vim/my/after/ftplugin/php.vim b/.config/vim/my/after/ftplugin/php.vim new file mode 100644 index 0000000..ec7fd3e --- /dev/null +++ b/.config/vim/my/after/ftplugin/php.vim @@ -0,0 +1,30 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_php_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + + + +" If a buffer is empty, insert ` p zzp +nnoremap dd :call del_entry() +xnoremap d :call del_entry() +nnoremap u :call undo_entry() + + +if exists('*s:undo_entry') + finish +endif + + +function! s:undo_entry() + let history = get(w:, 'qf_history', []) + if !empty(history) + call setqflist(remove(history, -1), 'r') + endif +endfunction + +function! s:del_entry() range + let qf = getqflist() + let history = get(w:, 'qf_history', []) + call add(history, copy(qf)) + let w:qf_history = history + unlet! qf[a:firstline - 1 : a:lastline - 1] + call setqflist(qf, 'r') + execute a:firstline +endfunction + + + +let b:did_ftplugin_qf_after = 1 diff --git a/.config/vim/my/after/ftplugin/ruby.vim b/.config/vim/my/after/ftplugin/ruby.vim new file mode 100644 index 0000000..4d246e8 --- /dev/null +++ b/.config/vim/my/after/ftplugin/ruby.vim @@ -0,0 +1,19 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_ruby_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + +let g:ruby_operators = v:true +let g:ruby_space_errors = v:true + + + +let b:did_ftplugin_ruby_after = 1 diff --git a/.config/vim/my/after/ftplugin/toml.vim b/.config/vim/my/after/ftplugin/toml.vim new file mode 100644 index 0000000..84f6ca7 --- /dev/null +++ b/.config/vim/my/after/ftplugin/toml.vim @@ -0,0 +1,16 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_toml_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + + + +let b:did_ftplugin_toml_after = 1 diff --git a/.config/vim/my/after/ftplugin/typescript.vim b/.config/vim/my/after/ftplugin/typescript.vim new file mode 100644 index 0000000..cdb1674 --- /dev/null +++ b/.config/vim/my/after/ftplugin/typescript.vim @@ -0,0 +1,16 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_typescript_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + + + +let b:did_ftplugin_typescript_after = 1 diff --git a/.config/vim/my/after/ftplugin/vim.vim b/.config/vim/my/after/ftplugin/vim.vim new file mode 100644 index 0000000..1ffa6a3 --- /dev/null +++ b/.config/vim/my/after/ftplugin/vim.vim @@ -0,0 +1,22 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_vim_after') + finish +endif + + + +FtpluginSetLocal colorcolumn=+1 +FtpluginSetLocal expandtab +FtpluginSetLocal iskeyword-=# +FtpluginSetLocal keywordprg=:help +FtpluginSetLocal shiftwidth=4 +FtpluginSetLocal softtabstop=4 +FtpluginSetLocal textwidth=78 + +let g:vim_indent_cont = 4 + + + +let b:did_ftplugin_vim_after = 1 \ No newline at end of file diff --git a/.config/vim/my/after/ftplugin/yaml.vim b/.config/vim/my/after/ftplugin/yaml.vim new file mode 100644 index 0000000..5b4734e --- /dev/null +++ b/.config/vim/my/after/ftplugin/yaml.vim @@ -0,0 +1,16 @@ +scriptencoding utf-8 + + +if exists('b:did_ftplugin_yaml_after') + finish +endif + + + +FtpluginSetLocal expandtab +FtpluginSetLocal shiftwidth=2 +FtpluginSetLocal softtabstop=2 + + + +let b:did_ftplugin_yaml_after = 1 diff --git a/.config/vim/my/after/syntax/json.vim b/.config/vim/my/after/syntax/json.vim new file mode 100644 index 0000000..0d2651e --- /dev/null +++ b/.config/vim/my/after/syntax/json.vim @@ -0,0 +1,23 @@ +scriptencoding utf-8 + +if exists("b:current_syntax_my_json") + finish +endif + +if b:current_syntax !=# 'json' + finish +endif + + +" $VIMRUNTIME/syntax/json.vim +" Language: JSON +" Maintainer: Eli Parra +" Last Change: 2014 Aug 23 +" Version: 0.12 +" Overwrite syntax by non-conceal version even if 'conceal' is enabled. +syn region jsonString oneline matchgroup=jsonQuote start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=jsonEscape contained +syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ contained + + + +let b:current_syntax_my_json = 1 diff --git a/.config/vim/my/after/syntax/python.vim b/.config/vim/my/after/syntax/python.vim new file mode 100644 index 0000000..834ab1f --- /dev/null +++ b/.config/vim/my/after/syntax/python.vim @@ -0,0 +1,19 @@ +scriptencoding utf-8 + + +if exists("b:current_syntax_my_python") + finish +endif + +if b:current_syntax !=# 'python' + finish +endif + + + +" Highlight "self". +syn keyword pythonSelf self +hi default link pythonSelf Identifier + + +let b:current_syntax_my_python = 1 diff --git a/.config/vim/my/after/syntax/vim.vim b/.config/vim/my/after/syntax/vim.vim new file mode 100644 index 0000000..a6b0d31 --- /dev/null +++ b/.config/vim/my/after/syntax/vim.vim @@ -0,0 +1,30 @@ +scriptencoding utf-8 + + +if exists("b:current_syntax_my_vim") + finish +endif + +if b:current_syntax !=# 'vim' + finish +endif + + + +" Tags +syn match vimrcDocTagFollowingName /@\(param\|var\|const\|field\)/ contained skipwhite nextgroup=vimrcDocName,vimrcDocName2 +syn match vimrcDocTagFollowingType /@\(return\|class\|ctor\|method\|type\)/ contained skipwhite nextgroup=vimrcDocType +syn match vimrcDocName /\w\+/ contained skipwhite nextgroup=vimrcDocType +syn match vimrcDocName2 /\[\w\+\]/hs=s+1,he=e-1 contained skipwhite nextgroup=vimrcDocType +syn match vimrcDocType /(\w\+)/hs=s+1,he=e-1 contained skipwhite nextgroup=vimrcDocType + +syn cluster vimCommentGroup add=vimrcDocTagFollowingName,vimrcDocTagFollowingType + +hi def link vimrcDocTagFollowingName Statement +hi def link vimrcDocTagFollowingType Statement +hi def link vimrcDocName Identifier +hi def link vimrcDocName2 Identifier +hi def link vimrcDocType Type + + +let b:current_syntax_my_vim = 1 diff --git a/.config/vim/my/autoload/autosave.vim b/.config/vim/my/autoload/autosave.vim new file mode 100644 index 0000000..0c34d0e --- /dev/null +++ b/.config/vim/my/autoload/autosave.vim @@ -0,0 +1,70 @@ +scriptencoding utf-8 + + + +if !exists('g:autosave_interval_ms') + let g:autosave_interval_ms = 10 * 1000 +endif + +if !exists('g:autosave_silent') + let g:autosave_silent = v:true +endif + + + +function! autosave#handler(timer_id) abort + if !&modified + return + endif + if &readonly + return + endif + if &buftype !=# '' + return + endif + if expand('%') ==# '' + return + endif + + if !g:autosave_silent + echohl Comment + echo 'Auto-saving...' + echohl None + endif + + silent! write + + if !g:autosave_silent + echohl Comment + echo 'Saved.' + echohl None + endif +endfunction + + +function! autosave#enable() abort + if has('+timers') + echohl Error + echo "Feature '+timers' not available." + echohl None + return + endif + if exists('b:autosave_timer') + return + endif + + let b:autosave_timer = timer_start( + \ g:autosave_interval_ms, + \ 'autosave#handler', + \ { 'repeat': -1 }) +endfunction + + +function! autosave#disable() abort + if !exists('b:autosave_timer') + return + endif + + call timer_stop('b:autosave_timer') + unlet b:autosave_timer +endfunction diff --git a/.config/vim/my/autoload/dummy.vim b/.config/vim/my/autoload/dummy.vim new file mode 100644 index 0000000..3019bdf --- /dev/null +++ b/.config/vim/my/autoload/dummy.vim @@ -0,0 +1,39 @@ +scriptencoding utf-8 + + + +let s:text = {} + +let s:text.lipsum = [ + \ 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor', + \ 'incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis', + \ 'nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.', + \ 'Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore', + \ 'eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt', + \ 'in culpa qui officia deserunt mollit anim id est laborum.', + \ ] + +let s:text.lipsum1 = join(s:text.lipsum) + +let s:text.quickbrownfox = 'The quick brown fox jumps over the lazy dog.' + +let s:text.ABC = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' + +let s:text.abc = 'abcdefghijklmnopqrstuvwxyz' + +let s:text.hiragana = 'あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをん' + +let s:text.katakana = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲン' + +let s:text.ihatovo = 'あのイーハトーヴォのすきとおった風、夏でも底に冷たさをもつ青いそら、うつくしい森で飾られたモリーオ市、郊外のぎらぎらひかる草の波。' + + + +function! dummy#insert(type) + call append(line('.'), get(s:text, a:type, '')) +endfunction + + +function! dummy#complete(arglead, cmdline, cursorpos) abort + return sort(filter(keys(s:text), {idx, val -> val[0:len(a:arglead)-1] =~? a:arglead})) +endfunction diff --git a/.config/vim/my/colors/ocean.vim b/.config/vim/my/colors/ocean.vim new file mode 100644 index 0000000..f220740 --- /dev/null +++ b/.config/vim/my/colors/ocean.vim @@ -0,0 +1,146 @@ +scriptencoding utf-8 + + +hi clear +let g:colors_name = 'ocean' + + + +let s:dark = { + \ 'NONE' : 'NONE', + \ 'bg' : '#101020', + \ 'fg' : '#b1b1c8', + \ 'gray1' : '#a7a7a7', + \ 'gray2' : '#353535', + \ 'gray3' : '#464646', + \ 'gray4' : '#252525', + \ 'red' : '#a65f49', + \ 'red2' : '#2e1f28', + \ 'orange' : '#deab52', + \ 'yellow' : '#a68f49', + \ 'yellow2' : '#a89562', + \ 'yellow3' : '#5c5241', + \ 'green' : '#c4e088', + \ 'blue' : '#6e6eff', + \ 'blue2' : '#70b0ff', + \ 'diff_add' : '#202050', + \ 'diff_change' : '#204020', + \ 'diff_delete' : '#402020', + \ 'diff_text' : '#3e6333', + \ 'visual' : '#303060', + \ 'comment' : '#8686bf', + \ 'cursor' : '#5b5bb6', + \ } + +let s:light = { + \ 'NONE' : 'NONE', + \ 'bg' : '#f5f5ff', + \ 'fg' : '#203050', + \ 'gray1' : '#4f4f4f', + \ 'gray2' : '#bebebe', + \ 'gray3' : '#aeaeae', + \ 'gray4' : '#cecece', + \ 'red' : '#d77253', + \ 'red2' : '#dcc8c2', + \ 'orange' : '#e79230', + \ 'yellow' : '#cba224', + \ 'yellow2' : '#af8e29', + \ 'yellow3' : '#c6b683', + \ 'green' : '#6f9226', + \ 'blue' : '#6e6eff', + \ 'blue2' : '#6f8fff', + \ 'diff_add' : '#202050', + \ 'diff_change' : '#204020', + \ 'diff_delete' : '#402020', + \ 'diff_text' : '#c4ff88', + \ 'visual' : '#f0f0d0', + \ 'comment' : '#a0a0e0', + \ 'cursor' : '#5b5bb6', + \ } + + +function! s:hi(group_name, guifg, guibg, ...) abort + let attributes = get(a:000, 0, 'NONE') + " Even if 'termguicolors' is enabled the attribute "gui" is ignored, + " instead, "cterm" is used. + execute printf('hi %s guifg=%s guibg=%s gui=%s cterm=%s', + \ a:group_name, + \ s:pallete[a:guifg], s:pallete[a:guibg], attributes, attributes) +endfunction + +command! -nargs=* + \ Hi + \ call s:hi() + + + +let s:pallete = &background ==# 'dark' ? s:dark : s:light + +Hi ColorColumn NONE red2 +Hi Comment comment NONE +Hi Constant red NONE +Hi Cursor fg cursor +Hi DiffAdd NONE diff_add +Hi DiffChange NONE diff_change +Hi DiffDelete NONE diff_delete +Hi DiffText NONE diff_text +Hi EndOfBuffer bg bg +Hi Error red NONE +Hi Identifier green NONE +Hi LineNr gray1 visual +Hi MatchParen NONE NONE +Hi MoreMsg comment NONE +Hi Normal fg bg +Hi PMenu fg gray2 +Hi PMenuSbar NONE gray2 +Hi PMenuSel fg visual +Hi PMenuThumb NONE gray4 +Hi PreProc orange NONE +Hi Search bg yellow3 bold +Hi Special red NONE +Hi SpecialComment comment NONE bold +Hi SpecialKey gray2 NONE +Hi SpellBad red NONE underline +Hi SpellCap red NONE underline +Hi SpellLocal yellow2 NONE underline +Hi SpellRare yellow2 NONE underline +Hi Statement blue NONE +Hi StatusLine gray1 gray2 +Hi StatusLineNC gray1 gray3 +Hi String yellow NONE +Hi Title orange NONE +Hi Todo fg NONE bold +Hi Type blue2 NONE +Hi Underlined NONE NONE underline +Hi Visual NONE visual +Hi WarningMsg yellow2 NONE bold + + +hi! link Character String +hi! link CursorColumn CursorLine +hi! link CursorIM Cursor +hi! link CursorLine Visual +hi! link CursorLineNr Normal +hi! link Directory Type +hi! link ErrorMsg Error +hi! link FoldColumn LineNr +hi! link Folded Comment +hi! link IncSearch Search +hi! link ModeMsg Comment +hi! link NonText SpecialKey +hi! link Operator Identifier +hi! link Question MoreMsg +hi! link SignColumn LineNr +hi! link TabLine StatusLineNC +hi! link TabLineFill EndOfBuffer +hi! link TabLineSel StatusLine +hi! link VertSplit StatusLine +hi! link WildMenu Title + + + +unlet s:pallete +unlet s:dark +unlet s:light +delfunction s:hi +delcommand Hi diff --git a/.config/vim/my/plugin/autosave.vim b/.config/vim/my/plugin/autosave.vim new file mode 100644 index 0000000..2548609 --- /dev/null +++ b/.config/vim/my/plugin/autosave.vim @@ -0,0 +1,29 @@ +scriptencoding utf-8 + +if exists('g:loaded_autosave') + finish +endif + + + +command! -bar + \ AutosaveEnable + \ call autosave#enable() + + +command! -bar + \ AutosaveDisable + \ call autosave#disable() + + +command! -bar + \ AutosaveToggle + \ if exists('b:autosave_timer') | + \ call autosave#enable() | + \ else | + \ call autosave#disable() | + \ endif + + + +let g:loaded_autosave = 1 diff --git a/.config/vim/my/plugin/dummy.vim b/.config/vim/my/plugin/dummy.vim new file mode 100644 index 0000000..ce7b901 --- /dev/null +++ b/.config/vim/my/plugin/dummy.vim @@ -0,0 +1,15 @@ +scriptencoding utf-8 + +if exists('g:loaded_dummy') + finish +endif + + + +command! -bar -complete=customlist,dummy#complete -nargs=1 + \ Dummy + \ call dummy#insert() + + + +let g:loaded_dummy = 1 diff --git a/.config/vim/my/syntax/gitcommit.vim b/.config/vim/my/syntax/gitcommit.vim new file mode 100644 index 0000000..14232a2 --- /dev/null +++ b/.config/vim/my/syntax/gitcommit.vim @@ -0,0 +1,96 @@ +" Vim syntax file +" Language: git commit file +" Maintainer: Tim Pope +" Filenames: *.git/COMMIT_EDITMSG +" Last Change: 2019 Dec 05 +" +" Modified By: nsfisis +" Changed comment char from '#' (git default) to ';'. + +if exists("b:current_syntax") + finish +endif + +syn case match +syn sync minlines=50 + +if has("spell") + syn spell toplevel +endif + +syn include @gitcommitDiff syntax/diff.vim +syn region gitcommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|#\)\@=/ fold contains=@gitcommitDiff + +syn match gitcommitSummary "^.*\%<51v." contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell +syn match gitcommitOverflow ".*" contained contains=@Spell +syn match gitcommitBlank "^[^;].*" contained contains=@Spell + +if get(g:, "gitcommit_cleanup") is# "scissors" + syn match gitcommitFirstLine "\%^.*" nextgroup=gitcommitBlank skipnl + syn region gitcommitComment start=/^; -\+ >8 -\+$/ end=/\%$/ contains=gitcommitDiff +else + syn match gitcommitFirstLine "\%^[^;].*" nextgroup=gitcommitBlank skipnl + syn match gitcommitComment "^;.*" +endif + +syn match gitcommitHead "^\%(; .*\n\)\+;$" contained transparent +syn match gitcommitOnBranch "\%(^; \)\@<=On branch" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite +syn match gitcommitOnBranch "\%(^; \)\@<=Your branch .\{-\} '" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite +syn match gitcommitBranch "[^ ']\+" contained +syn match gitcommitNoBranch "\%(^; \)\@<=Not currently on any branch." contained containedin=gitcommitComment +syn match gitcommitHeader "\%(^; \)\@<=.*:$" contained containedin=gitcommitComment +syn region gitcommitAuthor matchgroup=gitCommitHeader start=/\%(^; \)\@<=\%(Author\|Committer\):/ end=/$/ keepend oneline contained containedin=gitcommitComment transparent +syn match gitcommitNoChanges "\%(^; \)\@<=No changes$" contained containedin=gitcommitComment + +syn region gitcommitUntracked start=/^; Untracked files:/ end=/^;$\|^;\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUntrackedFile fold +syn match gitcommitUntrackedFile "\t\@<=.*" contained + +syn region gitcommitDiscarded start=/^; Change\%(s not staged for commit\|d but not updated\):/ end=/^;$\|^;\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitDiscardedType fold +syn region gitcommitSelected start=/^; Changes to be committed:/ end=/^;$\|^;\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitSelectedType fold +syn region gitcommitUnmerged start=/^; Unmerged paths:/ end=/^;$\|^;\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUnmergedType fold + + +syn match gitcommitDiscardedType "\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitDiscardedFile skipwhite +syn match gitcommitSelectedType "\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitSelectedFile skipwhite +syn match gitcommitUnmergedType "\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitUnmergedFile skipwhite +syn match gitcommitDiscardedFile ".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitDiscardedArrow +syn match gitcommitSelectedFile ".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow +syn match gitcommitUnmergedFile ".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow +syn match gitcommitDiscardedArrow " -> " contained nextgroup=gitcommitDiscardedFile +syn match gitcommitSelectedArrow " -> " contained nextgroup=gitcommitSelectedFile +syn match gitcommitUnmergedArrow " -> " contained nextgroup=gitcommitSelectedFile + +syn match gitcommitWarning "\%^[^;].*: needs merge$" nextgroup=gitcommitWarning skipnl +syn match gitcommitWarning "^[^;].*: needs merge$" nextgroup=gitcommitWarning skipnl contained +syn match gitcommitWarning "^\%(no changes added to commit\|nothing \%(added \)\=to commit\)\>.*\%$" + +hi def link gitcommitSummary Keyword +hi def link gitcommitComment Comment +hi def link gitcommitUntracked gitcommitComment +hi def link gitcommitDiscarded gitcommitComment +hi def link gitcommitSelected gitcommitComment +hi def link gitcommitUnmerged gitcommitComment +hi def link gitcommitOnBranch Comment +hi def link gitcommitBranch Special +hi def link gitcommitNoBranch gitCommitBranch +hi def link gitcommitDiscardedType gitcommitType +hi def link gitcommitSelectedType gitcommitType +hi def link gitcommitUnmergedType gitcommitType +hi def link gitcommitType Type +hi def link gitcommitNoChanges gitcommitHeader +hi def link gitcommitHeader PreProc +hi def link gitcommitUntrackedFile gitcommitFile +hi def link gitcommitDiscardedFile gitcommitFile +hi def link gitcommitSelectedFile gitcommitFile +hi def link gitcommitUnmergedFile gitcommitFile +hi def link gitcommitFile Constant +hi def link gitcommitDiscardedArrow gitcommitArrow +hi def link gitcommitSelectedArrow gitcommitArrow +hi def link gitcommitUnmergedArrow gitcommitArrow +hi def link gitcommitArrow gitcommitComment +"hi def link gitcommitOverflow Error +hi def link gitcommitBlank Error + +hi def link gitcommitIssue Constant + +let b:current_syntax = "gitcommit" diff --git a/.gitignore b/.gitignore index bec3c6a..7702980 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/.vim/* -!/.vim/my/ +/.config/vim/* +!/.config/vim/my/ /.config/emacs vim-startup.log diff --git a/.vim/my/after/ftplugin/c.vim b/.vim/my/after/ftplugin/c.vim deleted file mode 100644 index 12de33e..0000000 --- a/.vim/my/after/ftplugin/c.vim +++ /dev/null @@ -1,20 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_c_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 -FtpluginSetLocal cinoptions=:0,l1 - -let g:c_comment_strings = v:true -let g:c_space_errors = v:true - - - -let b:did_ftplugin_c_after = 1 diff --git a/.vim/my/after/ftplugin/cmake.vim b/.vim/my/after/ftplugin/cmake.vim deleted file mode 100644 index b4f5591..0000000 --- a/.vim/my/after/ftplugin/cmake.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_cmake_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_cmake_after = 1 \ No newline at end of file diff --git a/.vim/my/after/ftplugin/cpp.vim b/.vim/my/after/ftplugin/cpp.vim deleted file mode 100644 index 13c0374..0000000 --- a/.vim/my/after/ftplugin/cpp.vim +++ /dev/null @@ -1,20 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_cpp_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 -FtpluginSetLocal cinoptions=:0,l1,g0,N-s - -let g:c_comment_strings = v:true -let g:c_space_errors = v:true - - - -let b:did_ftplugin_cpp_after = 1 \ No newline at end of file diff --git a/.vim/my/after/ftplugin/css.vim b/.vim/my/after/ftplugin/css.vim deleted file mode 100644 index e4743e8..0000000 --- a/.vim/my/after/ftplugin/css.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_css_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_css_after = 1 diff --git a/.vim/my/after/ftplugin/gitcommit.vim b/.vim/my/after/ftplugin/gitcommit.vim deleted file mode 100644 index 915a193..0000000 --- a/.vim/my/after/ftplugin/gitcommit.vim +++ /dev/null @@ -1,14 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_gitcommit_after') - finish -endif - - - -FtpluginSetLocal spell - - - -let b:did_ftplugin_gitcommit_after = 1 diff --git a/.vim/my/after/ftplugin/go.vim b/.vim/my/after/ftplugin/go.vim deleted file mode 100644 index 54aa34b..0000000 --- a/.vim/my/after/ftplugin/go.vim +++ /dev/null @@ -1,17 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_go_after') - finish -endif - - - -FtpluginSetLocal noexpandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 -FtpluginSetLocal tabstop=4 - - - -let b:did_ftplugin_go_after = 1 \ No newline at end of file diff --git a/.vim/my/after/ftplugin/haskell.vim b/.vim/my/after/ftplugin/haskell.vim deleted file mode 100644 index 676dcce..0000000 --- a/.vim/my/after/ftplugin/haskell.vim +++ /dev/null @@ -1,22 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_haskell_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 - -let g:hs_highlight_boolean = v:true -let g:hs_highlight_types = v:true -let g:hs_highlight_more_types = v:true -let g:hs_highlight_debug = v:true -let g:hs_allow_hash_operator = v:true - - - -let b:did_ftplugin_haskell_after = 1 diff --git a/.vim/my/after/ftplugin/html.vim b/.vim/my/after/ftplugin/html.vim deleted file mode 100644 index a7b36ad..0000000 --- a/.vim/my/after/ftplugin/html.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_html_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_html_after = 1 \ No newline at end of file diff --git a/.vim/my/after/ftplugin/javascript.vim b/.vim/my/after/ftplugin/javascript.vim deleted file mode 100644 index a79e644..0000000 --- a/.vim/my/after/ftplugin/javascript.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_javascript_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_javascript_after = 1 diff --git a/.vim/my/after/ftplugin/json.vim b/.vim/my/after/ftplugin/json.vim deleted file mode 100644 index 9886a95..0000000 --- a/.vim/my/after/ftplugin/json.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_json_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_json_after = 1 diff --git a/.vim/my/after/ftplugin/lisp.vim b/.vim/my/after/ftplugin/lisp.vim deleted file mode 100644 index 13c1abc..0000000 --- a/.vim/my/after/ftplugin/lisp.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_lisp_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_lisp_after = 1 diff --git a/.vim/my/after/ftplugin/lua.vim b/.vim/my/after/ftplugin/lua.vim deleted file mode 100644 index d0eb8b2..0000000 --- a/.vim/my/after/ftplugin/lua.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_lua_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=3 -FtpluginSetLocal softtabstop=3 - - - -let b:did_ftplugin_lua_after = 1 diff --git a/.vim/my/after/ftplugin/markdown.vim b/.vim/my/after/ftplugin/markdown.vim deleted file mode 100644 index 36791bc..0000000 --- a/.vim/my/after/ftplugin/markdown.vim +++ /dev/null @@ -1,18 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_markdown_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 - -let g:markdown_syntax_conceal = v:false - - - -let b:did_ftplugin_markdown_after = 1 diff --git a/.vim/my/after/ftplugin/php.vim b/.vim/my/after/ftplugin/php.vim deleted file mode 100644 index ec7fd3e..0000000 --- a/.vim/my/after/ftplugin/php.vim +++ /dev/null @@ -1,30 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_php_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -" If a buffer is empty, insert ` p zzp -nnoremap dd :call del_entry() -xnoremap d :call del_entry() -nnoremap u :call undo_entry() - - -if exists('*s:undo_entry') - finish -endif - - -function! s:undo_entry() - let history = get(w:, 'qf_history', []) - if !empty(history) - call setqflist(remove(history, -1), 'r') - endif -endfunction - -function! s:del_entry() range - let qf = getqflist() - let history = get(w:, 'qf_history', []) - call add(history, copy(qf)) - let w:qf_history = history - unlet! qf[a:firstline - 1 : a:lastline - 1] - call setqflist(qf, 'r') - execute a:firstline -endfunction - - - -let b:did_ftplugin_qf_after = 1 diff --git a/.vim/my/after/ftplugin/ruby.vim b/.vim/my/after/ftplugin/ruby.vim deleted file mode 100644 index 4d246e8..0000000 --- a/.vim/my/after/ftplugin/ruby.vim +++ /dev/null @@ -1,19 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_ruby_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - -let g:ruby_operators = v:true -let g:ruby_space_errors = v:true - - - -let b:did_ftplugin_ruby_after = 1 diff --git a/.vim/my/after/ftplugin/toml.vim b/.vim/my/after/ftplugin/toml.vim deleted file mode 100644 index 84f6ca7..0000000 --- a/.vim/my/after/ftplugin/toml.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_toml_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_toml_after = 1 diff --git a/.vim/my/after/ftplugin/typescript.vim b/.vim/my/after/ftplugin/typescript.vim deleted file mode 100644 index cdb1674..0000000 --- a/.vim/my/after/ftplugin/typescript.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_typescript_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_typescript_after = 1 diff --git a/.vim/my/after/ftplugin/vim.vim b/.vim/my/after/ftplugin/vim.vim deleted file mode 100644 index 1ffa6a3..0000000 --- a/.vim/my/after/ftplugin/vim.vim +++ /dev/null @@ -1,22 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_vim_after') - finish -endif - - - -FtpluginSetLocal colorcolumn=+1 -FtpluginSetLocal expandtab -FtpluginSetLocal iskeyword-=# -FtpluginSetLocal keywordprg=:help -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 -FtpluginSetLocal textwidth=78 - -let g:vim_indent_cont = 4 - - - -let b:did_ftplugin_vim_after = 1 \ No newline at end of file diff --git a/.vim/my/after/ftplugin/yaml.vim b/.vim/my/after/ftplugin/yaml.vim deleted file mode 100644 index 5b4734e..0000000 --- a/.vim/my/after/ftplugin/yaml.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_yaml_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_yaml_after = 1 diff --git a/.vim/my/after/syntax/json.vim b/.vim/my/after/syntax/json.vim deleted file mode 100644 index 0d2651e..0000000 --- a/.vim/my/after/syntax/json.vim +++ /dev/null @@ -1,23 +0,0 @@ -scriptencoding utf-8 - -if exists("b:current_syntax_my_json") - finish -endif - -if b:current_syntax !=# 'json' - finish -endif - - -" $VIMRUNTIME/syntax/json.vim -" Language: JSON -" Maintainer: Eli Parra -" Last Change: 2014 Aug 23 -" Version: 0.12 -" Overwrite syntax by non-conceal version even if 'conceal' is enabled. -syn region jsonString oneline matchgroup=jsonQuote start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=jsonEscape contained -syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ contained - - - -let b:current_syntax_my_json = 1 diff --git a/.vim/my/after/syntax/python.vim b/.vim/my/after/syntax/python.vim deleted file mode 100644 index 834ab1f..0000000 --- a/.vim/my/after/syntax/python.vim +++ /dev/null @@ -1,19 +0,0 @@ -scriptencoding utf-8 - - -if exists("b:current_syntax_my_python") - finish -endif - -if b:current_syntax !=# 'python' - finish -endif - - - -" Highlight "self". -syn keyword pythonSelf self -hi default link pythonSelf Identifier - - -let b:current_syntax_my_python = 1 diff --git a/.vim/my/after/syntax/vim.vim b/.vim/my/after/syntax/vim.vim deleted file mode 100644 index a6b0d31..0000000 --- a/.vim/my/after/syntax/vim.vim +++ /dev/null @@ -1,30 +0,0 @@ -scriptencoding utf-8 - - -if exists("b:current_syntax_my_vim") - finish -endif - -if b:current_syntax !=# 'vim' - finish -endif - - - -" Tags -syn match vimrcDocTagFollowingName /@\(param\|var\|const\|field\)/ contained skipwhite nextgroup=vimrcDocName,vimrcDocName2 -syn match vimrcDocTagFollowingType /@\(return\|class\|ctor\|method\|type\)/ contained skipwhite nextgroup=vimrcDocType -syn match vimrcDocName /\w\+/ contained skipwhite nextgroup=vimrcDocType -syn match vimrcDocName2 /\[\w\+\]/hs=s+1,he=e-1 contained skipwhite nextgroup=vimrcDocType -syn match vimrcDocType /(\w\+)/hs=s+1,he=e-1 contained skipwhite nextgroup=vimrcDocType - -syn cluster vimCommentGroup add=vimrcDocTagFollowingName,vimrcDocTagFollowingType - -hi def link vimrcDocTagFollowingName Statement -hi def link vimrcDocTagFollowingType Statement -hi def link vimrcDocName Identifier -hi def link vimrcDocName2 Identifier -hi def link vimrcDocType Type - - -let b:current_syntax_my_vim = 1 diff --git a/.vim/my/autoload/autosave.vim b/.vim/my/autoload/autosave.vim deleted file mode 100644 index 0c34d0e..0000000 --- a/.vim/my/autoload/autosave.vim +++ /dev/null @@ -1,70 +0,0 @@ -scriptencoding utf-8 - - - -if !exists('g:autosave_interval_ms') - let g:autosave_interval_ms = 10 * 1000 -endif - -if !exists('g:autosave_silent') - let g:autosave_silent = v:true -endif - - - -function! autosave#handler(timer_id) abort - if !&modified - return - endif - if &readonly - return - endif - if &buftype !=# '' - return - endif - if expand('%') ==# '' - return - endif - - if !g:autosave_silent - echohl Comment - echo 'Auto-saving...' - echohl None - endif - - silent! write - - if !g:autosave_silent - echohl Comment - echo 'Saved.' - echohl None - endif -endfunction - - -function! autosave#enable() abort - if has('+timers') - echohl Error - echo "Feature '+timers' not available." - echohl None - return - endif - if exists('b:autosave_timer') - return - endif - - let b:autosave_timer = timer_start( - \ g:autosave_interval_ms, - \ 'autosave#handler', - \ { 'repeat': -1 }) -endfunction - - -function! autosave#disable() abort - if !exists('b:autosave_timer') - return - endif - - call timer_stop('b:autosave_timer') - unlet b:autosave_timer -endfunction diff --git a/.vim/my/autoload/dummy.vim b/.vim/my/autoload/dummy.vim deleted file mode 100644 index 3019bdf..0000000 --- a/.vim/my/autoload/dummy.vim +++ /dev/null @@ -1,39 +0,0 @@ -scriptencoding utf-8 - - - -let s:text = {} - -let s:text.lipsum = [ - \ 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor', - \ 'incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis', - \ 'nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.', - \ 'Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore', - \ 'eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt', - \ 'in culpa qui officia deserunt mollit anim id est laborum.', - \ ] - -let s:text.lipsum1 = join(s:text.lipsum) - -let s:text.quickbrownfox = 'The quick brown fox jumps over the lazy dog.' - -let s:text.ABC = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - -let s:text.abc = 'abcdefghijklmnopqrstuvwxyz' - -let s:text.hiragana = 'あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをん' - -let s:text.katakana = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲン' - -let s:text.ihatovo = 'あのイーハトーヴォのすきとおった風、夏でも底に冷たさをもつ青いそら、うつくしい森で飾られたモリーオ市、郊外のぎらぎらひかる草の波。' - - - -function! dummy#insert(type) - call append(line('.'), get(s:text, a:type, '')) -endfunction - - -function! dummy#complete(arglead, cmdline, cursorpos) abort - return sort(filter(keys(s:text), {idx, val -> val[0:len(a:arglead)-1] =~? a:arglead})) -endfunction diff --git a/.vim/my/colors/ocean.vim b/.vim/my/colors/ocean.vim deleted file mode 100644 index f220740..0000000 --- a/.vim/my/colors/ocean.vim +++ /dev/null @@ -1,146 +0,0 @@ -scriptencoding utf-8 - - -hi clear -let g:colors_name = 'ocean' - - - -let s:dark = { - \ 'NONE' : 'NONE', - \ 'bg' : '#101020', - \ 'fg' : '#b1b1c8', - \ 'gray1' : '#a7a7a7', - \ 'gray2' : '#353535', - \ 'gray3' : '#464646', - \ 'gray4' : '#252525', - \ 'red' : '#a65f49', - \ 'red2' : '#2e1f28', - \ 'orange' : '#deab52', - \ 'yellow' : '#a68f49', - \ 'yellow2' : '#a89562', - \ 'yellow3' : '#5c5241', - \ 'green' : '#c4e088', - \ 'blue' : '#6e6eff', - \ 'blue2' : '#70b0ff', - \ 'diff_add' : '#202050', - \ 'diff_change' : '#204020', - \ 'diff_delete' : '#402020', - \ 'diff_text' : '#3e6333', - \ 'visual' : '#303060', - \ 'comment' : '#8686bf', - \ 'cursor' : '#5b5bb6', - \ } - -let s:light = { - \ 'NONE' : 'NONE', - \ 'bg' : '#f5f5ff', - \ 'fg' : '#203050', - \ 'gray1' : '#4f4f4f', - \ 'gray2' : '#bebebe', - \ 'gray3' : '#aeaeae', - \ 'gray4' : '#cecece', - \ 'red' : '#d77253', - \ 'red2' : '#dcc8c2', - \ 'orange' : '#e79230', - \ 'yellow' : '#cba224', - \ 'yellow2' : '#af8e29', - \ 'yellow3' : '#c6b683', - \ 'green' : '#6f9226', - \ 'blue' : '#6e6eff', - \ 'blue2' : '#6f8fff', - \ 'diff_add' : '#202050', - \ 'diff_change' : '#204020', - \ 'diff_delete' : '#402020', - \ 'diff_text' : '#c4ff88', - \ 'visual' : '#f0f0d0', - \ 'comment' : '#a0a0e0', - \ 'cursor' : '#5b5bb6', - \ } - - -function! s:hi(group_name, guifg, guibg, ...) abort - let attributes = get(a:000, 0, 'NONE') - " Even if 'termguicolors' is enabled the attribute "gui" is ignored, - " instead, "cterm" is used. - execute printf('hi %s guifg=%s guibg=%s gui=%s cterm=%s', - \ a:group_name, - \ s:pallete[a:guifg], s:pallete[a:guibg], attributes, attributes) -endfunction - -command! -nargs=* - \ Hi - \ call s:hi() - - - -let s:pallete = &background ==# 'dark' ? s:dark : s:light - -Hi ColorColumn NONE red2 -Hi Comment comment NONE -Hi Constant red NONE -Hi Cursor fg cursor -Hi DiffAdd NONE diff_add -Hi DiffChange NONE diff_change -Hi DiffDelete NONE diff_delete -Hi DiffText NONE diff_text -Hi EndOfBuffer bg bg -Hi Error red NONE -Hi Identifier green NONE -Hi LineNr gray1 visual -Hi MatchParen NONE NONE -Hi MoreMsg comment NONE -Hi Normal fg bg -Hi PMenu fg gray2 -Hi PMenuSbar NONE gray2 -Hi PMenuSel fg visual -Hi PMenuThumb NONE gray4 -Hi PreProc orange NONE -Hi Search bg yellow3 bold -Hi Special red NONE -Hi SpecialComment comment NONE bold -Hi SpecialKey gray2 NONE -Hi SpellBad red NONE underline -Hi SpellCap red NONE underline -Hi SpellLocal yellow2 NONE underline -Hi SpellRare yellow2 NONE underline -Hi Statement blue NONE -Hi StatusLine gray1 gray2 -Hi StatusLineNC gray1 gray3 -Hi String yellow NONE -Hi Title orange NONE -Hi Todo fg NONE bold -Hi Type blue2 NONE -Hi Underlined NONE NONE underline -Hi Visual NONE visual -Hi WarningMsg yellow2 NONE bold - - -hi! link Character String -hi! link CursorColumn CursorLine -hi! link CursorIM Cursor -hi! link CursorLine Visual -hi! link CursorLineNr Normal -hi! link Directory Type -hi! link ErrorMsg Error -hi! link FoldColumn LineNr -hi! link Folded Comment -hi! link IncSearch Search -hi! link ModeMsg Comment -hi! link NonText SpecialKey -hi! link Operator Identifier -hi! link Question MoreMsg -hi! link SignColumn LineNr -hi! link TabLine StatusLineNC -hi! link TabLineFill EndOfBuffer -hi! link TabLineSel StatusLine -hi! link VertSplit StatusLine -hi! link WildMenu Title - - - -unlet s:pallete -unlet s:dark -unlet s:light -delfunction s:hi -delcommand Hi diff --git a/.vim/my/plugin/autosave.vim b/.vim/my/plugin/autosave.vim deleted file mode 100644 index 2548609..0000000 --- a/.vim/my/plugin/autosave.vim +++ /dev/null @@ -1,29 +0,0 @@ -scriptencoding utf-8 - -if exists('g:loaded_autosave') - finish -endif - - - -command! -bar - \ AutosaveEnable - \ call autosave#enable() - - -command! -bar - \ AutosaveDisable - \ call autosave#disable() - - -command! -bar - \ AutosaveToggle - \ if exists('b:autosave_timer') | - \ call autosave#enable() | - \ else | - \ call autosave#disable() | - \ endif - - - -let g:loaded_autosave = 1 diff --git a/.vim/my/plugin/dummy.vim b/.vim/my/plugin/dummy.vim deleted file mode 100644 index ce7b901..0000000 --- a/.vim/my/plugin/dummy.vim +++ /dev/null @@ -1,15 +0,0 @@ -scriptencoding utf-8 - -if exists('g:loaded_dummy') - finish -endif - - - -command! -bar -complete=customlist,dummy#complete -nargs=1 - \ Dummy - \ call dummy#insert() - - - -let g:loaded_dummy = 1 diff --git a/.vim/my/syntax/gitcommit.vim b/.vim/my/syntax/gitcommit.vim deleted file mode 100644 index 14232a2..0000000 --- a/.vim/my/syntax/gitcommit.vim +++ /dev/null @@ -1,96 +0,0 @@ -" Vim syntax file -" Language: git commit file -" Maintainer: Tim Pope -" Filenames: *.git/COMMIT_EDITMSG -" Last Change: 2019 Dec 05 -" -" Modified By: nsfisis -" Changed comment char from '#' (git default) to ';'. - -if exists("b:current_syntax") - finish -endif - -syn case match -syn sync minlines=50 - -if has("spell") - syn spell toplevel -endif - -syn include @gitcommitDiff syntax/diff.vim -syn region gitcommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|#\)\@=/ fold contains=@gitcommitDiff - -syn match gitcommitSummary "^.*\%<51v." contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell -syn match gitcommitOverflow ".*" contained contains=@Spell -syn match gitcommitBlank "^[^;].*" contained contains=@Spell - -if get(g:, "gitcommit_cleanup") is# "scissors" - syn match gitcommitFirstLine "\%^.*" nextgroup=gitcommitBlank skipnl - syn region gitcommitComment start=/^; -\+ >8 -\+$/ end=/\%$/ contains=gitcommitDiff -else - syn match gitcommitFirstLine "\%^[^;].*" nextgroup=gitcommitBlank skipnl - syn match gitcommitComment "^;.*" -endif - -syn match gitcommitHead "^\%(; .*\n\)\+;$" contained transparent -syn match gitcommitOnBranch "\%(^; \)\@<=On branch" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite -syn match gitcommitOnBranch "\%(^; \)\@<=Your branch .\{-\} '" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite -syn match gitcommitBranch "[^ ']\+" contained -syn match gitcommitNoBranch "\%(^; \)\@<=Not currently on any branch." contained containedin=gitcommitComment -syn match gitcommitHeader "\%(^; \)\@<=.*:$" contained containedin=gitcommitComment -syn region gitcommitAuthor matchgroup=gitCommitHeader start=/\%(^; \)\@<=\%(Author\|Committer\):/ end=/$/ keepend oneline contained containedin=gitcommitComment transparent -syn match gitcommitNoChanges "\%(^; \)\@<=No changes$" contained containedin=gitcommitComment - -syn region gitcommitUntracked start=/^; Untracked files:/ end=/^;$\|^;\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUntrackedFile fold -syn match gitcommitUntrackedFile "\t\@<=.*" contained - -syn region gitcommitDiscarded start=/^; Change\%(s not staged for commit\|d but not updated\):/ end=/^;$\|^;\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitDiscardedType fold -syn region gitcommitSelected start=/^; Changes to be committed:/ end=/^;$\|^;\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitSelectedType fold -syn region gitcommitUnmerged start=/^; Unmerged paths:/ end=/^;$\|^;\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUnmergedType fold - - -syn match gitcommitDiscardedType "\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitDiscardedFile skipwhite -syn match gitcommitSelectedType "\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitSelectedFile skipwhite -syn match gitcommitUnmergedType "\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitUnmergedFile skipwhite -syn match gitcommitDiscardedFile ".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitDiscardedArrow -syn match gitcommitSelectedFile ".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow -syn match gitcommitUnmergedFile ".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow -syn match gitcommitDiscardedArrow " -> " contained nextgroup=gitcommitDiscardedFile -syn match gitcommitSelectedArrow " -> " contained nextgroup=gitcommitSelectedFile -syn match gitcommitUnmergedArrow " -> " contained nextgroup=gitcommitSelectedFile - -syn match gitcommitWarning "\%^[^;].*: needs merge$" nextgroup=gitcommitWarning skipnl -syn match gitcommitWarning "^[^;].*: needs merge$" nextgroup=gitcommitWarning skipnl contained -syn match gitcommitWarning "^\%(no changes added to commit\|nothing \%(added \)\=to commit\)\>.*\%$" - -hi def link gitcommitSummary Keyword -hi def link gitcommitComment Comment -hi def link gitcommitUntracked gitcommitComment -hi def link gitcommitDiscarded gitcommitComment -hi def link gitcommitSelected gitcommitComment -hi def link gitcommitUnmerged gitcommitComment -hi def link gitcommitOnBranch Comment -hi def link gitcommitBranch Special -hi def link gitcommitNoBranch gitCommitBranch -hi def link gitcommitDiscardedType gitcommitType -hi def link gitcommitSelectedType gitcommitType -hi def link gitcommitUnmergedType gitcommitType -hi def link gitcommitType Type -hi def link gitcommitNoChanges gitcommitHeader -hi def link gitcommitHeader PreProc -hi def link gitcommitUntrackedFile gitcommitFile -hi def link gitcommitDiscardedFile gitcommitFile -hi def link gitcommitSelectedFile gitcommitFile -hi def link gitcommitUnmergedFile gitcommitFile -hi def link gitcommitFile Constant -hi def link gitcommitDiscardedArrow gitcommitArrow -hi def link gitcommitSelectedArrow gitcommitArrow -hi def link gitcommitUnmergedArrow gitcommitArrow -hi def link gitcommitArrow gitcommitComment -"hi def link gitcommitOverflow Error -hi def link gitcommitBlank Error - -hi def link gitcommitIssue Constant - -let b:current_syntax = "gitcommit" diff --git a/.vimrc b/.vimrc index 155bb77..28573c8 100644 --- a/.vimrc +++ b/.vimrc @@ -32,19 +32,26 @@ else let g:MY_ENV.os = 'unknown' endif -let g:MY_ENV.vim_dir = !empty($XDG_CONFIG_HOME) ? expand('$XDG_CONFIG_HOME/vim') : - \ g:MY_ENV.os ==# 'windows' ? expand('$HOME/vimfiles') : - \ expand('$HOME/.vim') +if empty($XDG_CONFIG_HOME) + let g:MY_ENV.xdg_config_home = $HOME . '/.config' +else + let g:MY_ENV.xdg_config_home = $XDG_CONFIG_HOME +endif +if empty($XDG_CACHE_HOME) + let g:MY_ENV.xdg_cache_home = $HOME . '/.cache' +else + let g:MY_ENV.xdg_cache_home = $XDG_CONFIG_HOME +endif + +let g:MY_ENV.vim_dir = g:MY_ENV.xdg_config_home . '/vim' let g:MY_ENV.my_dir = g:MY_ENV.vim_dir . '/my' let g:MY_ENV.plug_dir = g:MY_ENV.vim_dir . '/plugged' -let g:MY_ENV.cache_dir = !empty($XDG_CACHE_HOME) ? expand('$XDG_CACHE_HOME/vim') : - \ g:MY_ENV.vim_dir . '/cache' -let g:MY_ENV.undo_dir = g:MY_ENV.cache_dir . '/undo' -let g:MY_ENV.backup_dir = g:MY_ENV.cache_dir . '/backup' -let g:MY_ENV.swap_dir = g:MY_ENV.cache_dir . '/swap' +let g:MY_ENV.cache_dir = g:MY_ENV.xdg_cache_home . '/vim' +let g:MY_ENV.undo_dir = g:MY_ENV.cache_dir . '/undo' +let g:MY_ENV.backup_dir = g:MY_ENV.cache_dir . '/backup' +let g:MY_ENV.swap_dir = g:MY_ENV.cache_dir . '/swap' let g:MY_ENV.yankround_dir = g:MY_ENV.cache_dir . '/yankround' -let g:MY_ENV.skk_dir = !empty($XDG_CONFIG_HOME) ? expand('$XDG_CONFIG_HOME/skk') : - \ expand('$HOME/.config/skk') +let g:MY_ENV.skk_dir = g:MY_ENV.xdg_config_home . '/skk' for [s:k, s:v] in items(g:MY_ENV) if s:k =~# '_dir$' && !isdirectory(s:v) @@ -384,6 +391,7 @@ let &viminfo .= ',n' . g:MY_ENV.cache_dir . '/viminfo' " === BEGIN === {{{2 +execute 'set runtimepath+=' . g:MY_ENV.vim_dir call plug#begin(g:MY_ENV.plug_dir) diff --git a/setup.sh b/setup.sh index e12c174..28e6ae1 100755 --- a/setup.sh +++ b/setup.sh @@ -1,13 +1,7 @@ #!/bin/bash -if [ ! -f ~/dotfiles/.vim/autoload/plug.vim ]; then - echo "download: ~/dotfiles/.vim/autoload/plug.vim" - curl -fLo ~/dotfiles/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -fi - for name in \ .tmux.conf \ - .vim \ .vimrc \ .zshrc \ ; \ @@ -28,6 +22,7 @@ for name in \ bat \ emacs \ git \ + vim \ ; \ do if [ ! -L ~/.config/"$name" ]; then @@ -36,6 +31,11 @@ do fi done +if [ ! -f ~/dotfiles/.config/vim/autoload/plug.vim ]; then + echo "download: ~/dotfiles/.config/vim/autoload/plug.vim" + curl -fLo ~/dotfiles/.config/vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim +fi + if [ ! -d ~/.config/skk ]; then echo "dir: ~/.config/skk" mkdir ~/.config/skk -- cgit v1.2.3-70-g09d2