From 754b8e3a37755a705c4a42ee89ec5044422689c0 Mon Sep 17 00:00:00 2001 From: Von Random Date: Sat, 23 Jun 2018 20:18:01 +0300 Subject: [PATCH] move vim pack, stage 1 --- .gitmodules | 34 +++++++------- .../start/mousetoggle/plugin/mousetoggle.vim | 15 ------- {pack/general => vimpack}/opt/vimwiki | 0 .../general => vimpack}/start/vim-commentary | 0 .../general => vimpack}/start/vim-easy-align | 0 {pack/general => vimpack}/start/vim-fugitive | 0 {pack/general => vimpack}/start/vim-polyglot | 0 {pack/general => vimpack}/start/vim-rsi | 0 .../plugin/directionalWindowResizer.vim | 0 .../start/vim-scripts/plugin/mouse_toggle.vim | 44 +++++++++++++++++++ {pack/general => vimpack}/start/vim-signify | 0 .../start/vim-tru-typewriter | 0 vimrc | 4 +- 13 files changed, 63 insertions(+), 34 deletions(-) delete mode 100644 pack/general/start/mousetoggle/plugin/mousetoggle.vim rename {pack/general => vimpack}/opt/vimwiki (100%) rename {pack/general => vimpack}/start/vim-commentary (100%) rename {pack/general => vimpack}/start/vim-easy-align (100%) rename {pack/general => vimpack}/start/vim-fugitive (100%) rename {pack/general => vimpack}/start/vim-polyglot (100%) rename {pack/general => vimpack}/start/vim-rsi (100%) rename {pack/general/start/directionalWindowResizer => vimpack/start/vim-scripts}/plugin/directionalWindowResizer.vim (100%) create mode 100644 vimpack/start/vim-scripts/plugin/mouse_toggle.vim rename {pack/general => vimpack}/start/vim-signify (100%) rename {pack/general => vimpack}/start/vim-tru-typewriter (100%) diff --git a/.gitmodules b/.gitmodules index 206ab51..1297b52 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,24 +1,27 @@ -[submodule "pack/general/start/vim-easy-align"] - path = pack/general/start/vim-easy-align +[submodule "vimpack/start/vim-easy-align"] + path = vimpack/start/vim-easy-align url = https://github.com/junegunn/vim-easy-align.git -[submodule "pack/general/start/vim-signify"] - path = pack/general/start/vim-signify +[submodule "vimpack/start/vim-signify"] + path = vimpack/start/vim-signify url = https://github.com/mhinz/vim-signify.git -[submodule "pack/general/start/vim-commentary"] - path = pack/general/start/vim-commentary +[submodule "vimpack/start/vim-commentary"] + path = vimpack/start/vim-commentary url = https://github.com/tpope/vim-commentary.git -[submodule "pack/general/start/vim-fugitive"] - path = pack/general/start/vim-fugitive +[submodule "vimpack/start/vim-fugitive"] + path = vimpack/start/vim-fugitive url = https://github.com/tpope/vim-fugitive.git -[submodule "pack/general/start/vim-rsi"] - path = pack/general/start/vim-rsi +[submodule "vimpack/start/vim-rsi"] + path = vimpack/start/vim-rsi url = https://github.com/tpope/vim-rsi.git -[submodule "pack/general/start/vim-polyglot"] - path = pack/general/start/vim-polyglot +[submodule "vimpack/start/vim-polyglot"] + path = vimpack/start/vim-polyglot url = https://github.com/sheerun/vim-polyglot -[submodule "pack/general/start/vim-tru-typewriter"] - path = pack/general/start/vim-tru-typewriter +[submodule "vimpack/start/vim-tru-typewriter"] + path = vimpack/start/vim-tru-typewriter url = https://git.vdrandom.org/vim-tru-typewriter +[submodule "vimpack/opt/vimwiki"] + path = vimpack/opt/vimwiki + url = https://github.com/vimwiki/vimwiki.git [submodule "pack/colors/start/lucius"] path = pack/colors/start/lucius url = https://github.com/jonathanfilip/vim-lucius.git @@ -37,6 +40,3 @@ [submodule "pack/colors/start/blame"] path = pack/colors/start/blame url = https://github.com/hauleth/blame.vim.git -[submodule "pack/general/opt/vimwiki"] - path = pack/general/opt/vimwiki - url = https://github.com/vimwiki/vimwiki.git diff --git a/pack/general/start/mousetoggle/plugin/mousetoggle.vim b/pack/general/start/mousetoggle/plugin/mousetoggle.vim deleted file mode 100644 index 7ec009f..0000000 --- a/pack/general/start/mousetoggle/plugin/mousetoggle.vim +++ /dev/null @@ -1,15 +0,0 @@ -fun! s:ToggleMouse() - if !exists("s:old_mouse") - let s:old_mouse = "a" - set ttymouse=sgr - endif - if &mouse == "" - let &mouse = s:old_mouse - echo "mouse enabled (" . &mouse . ")" - else - let s:old_mouse = &mouse - let &mouse="" - echo "mouse disabled" - endif -endfunction -noremap m :call ToggleMouse() diff --git a/pack/general/opt/vimwiki b/vimpack/opt/vimwiki similarity index 100% rename from pack/general/opt/vimwiki rename to vimpack/opt/vimwiki diff --git a/pack/general/start/vim-commentary b/vimpack/start/vim-commentary similarity index 100% rename from pack/general/start/vim-commentary rename to vimpack/start/vim-commentary diff --git a/pack/general/start/vim-easy-align b/vimpack/start/vim-easy-align similarity index 100% rename from pack/general/start/vim-easy-align rename to vimpack/start/vim-easy-align diff --git a/pack/general/start/vim-fugitive b/vimpack/start/vim-fugitive similarity index 100% rename from pack/general/start/vim-fugitive rename to vimpack/start/vim-fugitive diff --git a/pack/general/start/vim-polyglot b/vimpack/start/vim-polyglot similarity index 100% rename from pack/general/start/vim-polyglot rename to vimpack/start/vim-polyglot diff --git a/pack/general/start/vim-rsi b/vimpack/start/vim-rsi similarity index 100% rename from pack/general/start/vim-rsi rename to vimpack/start/vim-rsi diff --git a/pack/general/start/directionalWindowResizer/plugin/directionalWindowResizer.vim b/vimpack/start/vim-scripts/plugin/directionalWindowResizer.vim similarity index 100% rename from pack/general/start/directionalWindowResizer/plugin/directionalWindowResizer.vim rename to vimpack/start/vim-scripts/plugin/directionalWindowResizer.vim diff --git a/vimpack/start/vim-scripts/plugin/mouse_toggle.vim b/vimpack/start/vim-scripts/plugin/mouse_toggle.vim new file mode 100644 index 0000000..9d46640 --- /dev/null +++ b/vimpack/start/vim-scripts/plugin/mouse_toggle.vim @@ -0,0 +1,44 @@ +" plugin/mouse_toggle.vim +" mouse_toggle -> toggle 'mouse' option +" m -> mouse_toggle +" Written by Kobus Retief + + +if !has("mouse") + finish +endif + + +if exists("loaded_mouse_toggle") + finish +endif +let loaded_mouse_toggle = 1 + + +let s:save_cpo = &cpo +set cpo&vim + + +let s:oldmouse = exists("mouse_default") ? mouse_default : "a" + + +function s:mouse_toggle() + if &mouse == "" + let &mouse = s:oldmouse + echo "mouse enabled (=" . &mouse . ")" + else + let s:oldmouse = &mouse + let &mouse = "" + echo "mouse disabled" + endif +endfunction + + +nnoremap mouse_toggle :call mouse_toggle() +if ! hasmapto("mouse_toggle") + map m mouse_toggle +endif + + +let &cpo = s:save_cpo +unlet s:save_cpo diff --git a/pack/general/start/vim-signify b/vimpack/start/vim-signify similarity index 100% rename from pack/general/start/vim-signify rename to vimpack/start/vim-signify diff --git a/pack/general/start/vim-tru-typewriter b/vimpack/start/vim-tru-typewriter similarity index 100% rename from pack/general/start/vim-tru-typewriter rename to vimpack/start/vim-tru-typewriter diff --git a/vimrc b/vimrc index c39fdd0..7252ae5 100644 --- a/vimrc +++ b/vimrc @@ -72,8 +72,8 @@ if v:version >= 800 if has('gui_running') || $TERM =~ '^\(tmux\|st\)' let &t_8f = "\033[38;2;%lu;%lu;%lum" let &t_8b = "\033[48;2;%lu;%lu;%lum" - set termguicolors bg=light - colorscheme PaperColor + set termguicolors bg=dark + colorscheme gruvbox8 else let g:solarized_use16 = 1 let g:solarized_term_italics = 0