diff --git a/etc/rc.linux-gnu b/etc/rc.linux-gnu index e3bb898..347bd89 100644 --- a/etc/rc.linux-gnu +++ b/etc/rc.linux-gnu @@ -48,6 +48,7 @@ mkdir -p ~/.config/dunst + soft/dunst/dunstrc ~/.config/dunst - soft/mc ~/.config + soft/vim/vim ~ ++ soft/nvim ~/.config + soft/vifm ~ + soft/vim/vimrc ~ - soft/vimperator ~ diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases index 5c76808..e8483ef 100755 --- a/etc/shell/bash/aliases +++ b/etc/shell/bash/aliases @@ -11,9 +11,14 @@ alias pd="pushd" #noindex alias po="popd" #noindex #- Удаление, перемещение и копирование с подтверждением -#+ Строка прогресса: http://beatex.org/web/advancedcopy.html +#+ Строка прогресса: +#+ http://beatex.org/web/advancedcopy.html +#+ https://github.com/mrdrogdrog/advcpmv alias mv='mv -g -i -v' #noindex alias cp='cp -g -i -v -r' #noindex + +alias mv='mv -i -v' #noindex +alias cp='cp -i -v -r' #noindex alias rm="rm -i -v" #noindex alias rmdir="rmdir -v" #noindex @@ -56,13 +61,13 @@ alias xlock="i3lock -i $SHELLRC/etc/wm/locker.png" #noindex #- Замена стандартных путей для конфигурационных файлов alias mpd="mpd $SHELLRC/etc/media/mpd/mpd.conf" #noindex alias mpdr="\mpd $SHELLRC/etc/media/mpd/mpd_remote.conf" #noindex -alias vi="vim -u NONE" #noindex -alias vim="vim -N -i $SHELLRC/var/vim/viminfo -p $*" #noindex +alias vi="nvim -u NONE" #noindex +# alias vim="vim -N -i $SHELLRC/var/vim/viminfo -p $*" #noindex +alias vim="nvim -i $SHELLRC/var/vim/nviminfo -p $*" #noindex alias lsi="TERM=xterm-256color lsi" #noindex alias mutt="TERM=xterm-256color neomutt -F $SHELLRC/etc/mail/mutt/muttrc && echo "0" > $MD/new" #noindex alias screen="TERM=rxvt-256color screen" #noindex alias figlet="figlet -f $SHELLRC/etc/soft/figlet/fonts/standard.flf" #noindex -alias cdargs="cdargs -b -f $SHELLRC/etc/soft/cdargs/cdargs -o $SHELLRC/etc/soft/cdargs/cdargsresult" #noindex alias zathura="nh zathura" #noindex alias z="nh zathura" #noindex alias kz="killall zathura" #noindex @@ -206,7 +211,7 @@ write() { # urxvtc -fn 'xft:TrixiePro:pixelsize=20' \ # -e bash -c "vim '+colorscheme $1' '+Goyo 60%' $2" xst -f 'TrixiePro:pixelsize=22' \ - -e bash -c "vim '+colorscheme $1' '+Goyo 60%' $2" + -e bash -c "nvim '+colorscheme $1' '+Goyo 60%' $2" } alias :w="write OneHalfDark" #noindex alias :wl="write OneHalfLight" #noindex diff --git a/etc/shell/bash/bashrc b/etc/shell/bash/bashrc index 7710f0c..bf6c8c9 100755 --- a/etc/shell/bash/bashrc +++ b/etc/shell/bash/bashrc @@ -1,6 +1,6 @@ #!/bin/bash #################################################################### # -# Изменён: Пн 31 дек 2018 17:10:09 +# Изменён: Пн 31 дек 2018 21:39:04 # ################################################################################ @@ -217,7 +217,7 @@ fi [ -f $BASHRC/aliases ] && ALIASES="$BASHRC/aliases" && . $ALIASES && HELPSRC+=("$ALIASES") #Раскрывать псевдонимы в скриптах -shopt -s expand_aliases +# shopt -s expand_aliases # }}} ########################################################################## # {{{ Настройка Cygwin @@ -251,7 +251,7 @@ PS4="$green++ $rstc" short_pwd() { # echo -en '  ' # pwd | sed 's@/home/'$USER'@~@; s@^\([~/][^/]*/\).*\(\(/[^/]*\)\{3\}\)$@\1\2@' - pwd | sed 's@/home/'$USER'@~@; s@^\(\([~/][^/]*\)\{1\}/\).*\(\(/[^/]*\)\{2\}\)$@\1...\3@' + pwd | sed 's@/home/'$USER'@~@; s@^\(\([~/][^/]*\)\{2\}/\).*\(\(/[^/]*\)\{2\}\)$@\1...\3@' } # PROMPT_COMMAND="history -a; history -n;" diff --git a/etc/soft/git/gitconfig b/etc/soft/git/gitconfig index 8ed0cfc..9cfa3ce 100644 --- a/etc/soft/git/gitconfig +++ b/etc/soft/git/gitconfig @@ -63,6 +63,8 @@ hub = "!github_clone() { git clone git://github.com/${1}.git; }; github_clone" + calendar = !git-cal + pk = !git archive HEAD --format=zip > `basename $PWD`_`\\date '+%Y.%M.%d'`.zip [push] diff --git a/etc/soft/htop/htoprc b/etc/soft/htop/htoprc index d3b06c8..216f7fa 100644 --- a/etc/soft/htop/htoprc +++ b/etc/soft/htop/htoprc @@ -1,6 +1,6 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. -fields=0 48 38 2 46 47 49 1 +fields=0 48 38 2 46 47 49 1 sort_key=46 sort_direction=1 hide_threads=0 @@ -20,7 +20,7 @@ update_process_names=0 account_guest_in_cpu_meter=0 color_scheme=0 delay=15 -left_meters=AllCPUs2 -left_meter_modes=1 -right_meters=Memory Swap -right_meter_modes=1 1 +left_meters=AllCPUs2 +left_meter_modes=1 +right_meters=Memory Swap +right_meter_modes=1 1 diff --git a/etc/soft/nvim/init.vim b/etc/soft/nvim/init.vim new file mode 100644 index 0000000..f182e5b --- /dev/null +++ b/etc/soft/nvim/init.vim @@ -0,0 +1,3 @@ +set runtimepath^=~/.vim runtimepath+=~/.vim/after +let &packpath = &runtimepath +source ~/.vimrc diff --git a/etc/soft/packages.list b/etc/soft/packages.list index e908d47..1cfde50 100644 --- a/etc/soft/packages.list +++ b/etc/soft/packages.list @@ -19,4 +19,5 @@ tig #? ls https://github.com/illinoisjackson/even-better-ls xst https://github.com/gnotclub/xst ufed +cpg, mvg https://github.com/mrdrogdrog/advcpmv diff --git a/etc/soft/vifm/commands b/etc/soft/vifm/commands index 1b517c0..a509160 100644 --- a/etc/soft/vifm/commands +++ b/etc/soft/vifm/commands @@ -10,7 +10,7 @@ command tag !tmsu tag --tags="%a" %c command untagged tmsu untagged | sort %M command bklist cat ~/.vifm/bookmarks.list %M -command bkedit !vim ~/.vifm/bookmarks.list +command bkedit !nvim ~/.vifm/bookmarks.list command bkadd :!echo %c:p >> ~/.vifm/bookmarks.list command man man %a %m @@ -32,7 +32,7 @@ command ext ext %f command diff vimdiff %f %F command run !! ./%f -command vim !vim %f +command vim !nvim %f command git !!git %a command gitdf g st | grep '^[[:space:]]' | grep -v '\)$' | sed 's/[[:space:]]*//' %u @@ -41,7 +41,7 @@ command cal cal -y %m command xc xc %c -command config :vim $MYVIFMRC +command config :nvim $MYVIFMRC command z !!zathura %c:p diff --git a/etc/soft/vifm/filetypes b/etc/soft/vifm/filetypes index 57cc792..e06408b 100644 --- a/etc/soft/vifm/filetypes +++ b/etc/soft/vifm/filetypes @@ -19,7 +19,7 @@ fileviewer *.so,*.so.* file %f fileviewer *.torrent dumptorrent -v %f " txt -filetype *.txt vim %f +filetype *.txt nvim %f " img filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif sxiv %c %d/ diff --git a/etc/soft/vifm/mappings b/etc/soft/vifm/mappings index 1eb9194..dcd9483 100644 --- a/etc/soft/vifm/mappings +++ b/etc/soft/vifm/mappings @@ -1,3 +1,4 @@ + nmap O :only nmap I :vsplit nmap S :sort @@ -5,25 +6,32 @@ nmap T :tabnew nmap w :view nmap s :sync +" use < and > without ctrl-w prefix key in normal mode +nnoremap < < +nnoremap > > + +" moving cursor in another pane +nnoremap J j +nnoremap K k + nmap ,t :tree! nmap ,m :media -nmap cr :!rsync -r --progress %c %D nmap cd :cd nmap nf :touch nmap nd :mkdir " nmap gr :grep nmap ,u :!urxvt -cd %d & -nmap ,v :!urxvt -e bash vim & -nmap ,V :!urxvt -e bash vim %f & +nmap ,v :!urxvt -e bash nvim & +nmap ,V :!stab -e bash nvim %f & " path nmap yp :!echo %c:p | xclip " name nmap yn :!echo %c | xclip -nmap :!bash +nmap :shell nmap x nmap ,bl :bklist diff --git a/etc/soft/vifm/vifmrc b/etc/soft/vifm/vifmrc index 38ba8e9..9b36ccc 100644 --- a/etc/soft/vifm/vifmrc +++ b/etc/soft/vifm/vifmrc @@ -1,16 +1,31 @@ +" Цветовая схема colorscheme custom + +" Редактор по умолчанию +set vicmd=nvim + +" Информация, сохраняемая в vifminfo set vifminfo=bookmarks,tui,dhistory,state,savedirs,chistory,shistory,phistory +" cp/mv/rm с прогрессом +set syscalls + +set rulerformat='%2l/%S %[(+%x)%]' + set history=512 set undolevels=512 +" Дополнение в виде меню +set wildstyle=popup set wildmenu + set fastrun set sortnumbers set scrolloff=4 windo set number windo set numberwidth=1 +set ignorecase set smartcase set nohlsearch set incsearch @@ -33,7 +48,7 @@ set timefmt="%d.%m.%y %H:%M" " %{} - evaluate arbitrary vifm expression '', e.g. '&sort' " %* - resets or applies one of User1..User9 highlight groups; reset happens when width field is 0 or not specified, one of groups gets picked when width field is in the range from 1 to 9 -set statusline=" %t %T%= %1*廬%A %2*  %u:%-g %3*%7E %4* %5*%14d %6* %7*[ %a] %8*%9* %D " +set statusline=" %t %T%= %1* 廬%A %2*  %u:%-g %3*%7E %4* %5*%14d %6* %7*[ %a] %8*%9* %D " set slowfs=curlftpfs diff --git a/etc/soft/vim/vim.rc b/etc/soft/vim/vim.rc new file mode 100644 index 0000000..ff0dbae --- /dev/null +++ b/etc/soft/vim/vim.rc @@ -0,0 +1,872 @@ +" ~/.vimrc +" +" Изменён: Чт. 25 сент. 2014 11:39:50 +" +"############################################################################### +" {{{ НАСТРОЙКИ VIM +"############################################################################### + +" {{{-------------------------- Общие настройки -------------------------------- + +" let &runtimepath.=',$SHELLRC/etc/vim/vim' + +set nocompatible " Несовместимость настроек с Vi +set history=500 " Настройка истории +set t_Co=256 " 256-цветный режим +set nohidden " Выгружать буферы при переключении +set novisualbell " Отключение визуального оповещения +set t_vb= " Отключение визуального оповещения +set tabpagemax=99 " Предел открытия вкладок +set winminheight=0 " Минимальная высота окна +set winminwidth=0 " Минимальная ширина окна +set winaltkeys=menu " Включение Win/Alt +set autochdir " Переходить в каталог файла +set viewdir=$HOME/.shellrc/var/vim/view " Директория файлов состояний буферов + +" При выходе запоминать состояние файла +au BufWinLeave * if bufname("") =~ "..*" | mkview | endif + + " Восстановление состояния + function RestoreState() + if getline(1) != "" + if bufname("") =~ "..*" + " !empty(expand("")) + silent loadview + endif + endif + endfunction + +au BufWinEnter * call RestoreState() +au BufWinEnter * set cursorline + +" Vimwiki тормозит +au BufWinEnter *.wiki set nocursorline + +" Отключение zip +let g:loaded_zipPlugin = 1 +let g:loaded_zip = 1 + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Работа с файловой системой---------------------- + +set autoread " Перечитывать файл при изменении +set browsedir=current " Открывать в Ex директорию файла +set wildignore=*.bak,*.~ " Не показывать временные файлы в меню + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Языки и кодировки ------------------------------ + +set helplang=ru,en " Языки справки +set encoding=utf8 " Кодировка +set termencoding=utf-8 " Кодировка текста по умолчанию + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Настройка мыши и клавиатуры -------------------- + +"set mouse=a " Мышь в текстовом режиме +set ruler " Всегда показывать положение курсора +set mousehide " Скрывать указатель мыши при наборе +set scrolljump=7 " Вверх в режиме редактирования +set scrolloff=7 " Вниз в режиме редактирования + +" Смена указателя в зависимости от режима + +let &t_SI = "\]50;CursorShape=1\x7" +let &t_EI = "\]50;CursorShape=0\x7" + +if &term =~ "xterm\\|rxvt" + let &t_SI = "\033]12;orange\007" + let &t_EI = "\033]12;darkgrey\007" + autocmd VimLeave * :!echo -ne "\033]12;darkgrey\007" +endif + +set backspace=indent,eol,start whichwrap+=<,>,[,] + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Редактирование текста -------------------------- + +syntax on " Подсветка синтаксиса +filetype on " Определение типа файла +filetype plugin on " Определение типа файла +set nu " Нумерация строк +set iminsert=0 " Раскладка по умолчанию - английская + +"match ErrorMsg '\%>80v.\+' " Подсветка выхода за 80-й символ + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Настройка табуляции ---------------------------- + +set tabstop=8 " Размер табуляции +set softtabstop=8 " Табуляция +set shiftwidth=8 " Размер сдвига блоков ( << , >> ) +set listchars=tab:>.,trail:+,extends:#,nbsp:. " Показывать табуляцию и висящие пробелы + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Настройка отступов ----------------------------- + +set autoindent " Автоматическая расстановка отступов +set smartindent " Умная расстановка отступов +set cindent " Умная расстановка отступов +set cin " Расстановка отступов в стиле С + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Настройка автодополнения ----------------------- + +set wildmenu " Меню при автодополнении команд + +set completeopt=menu " Показывать меню автодополнения +set undolevels=1000 " Размер истории для отмены +set wrap " Включаем перенос строк +set linebreak " Перенос строк по словам, а не по буквам + +set complete="" " Автозавершение слов +set complete+=. " Из текущего буфера +set complete+=k " Из словаря +set complete+=b " Из других открытых буферов +set complete+=t " Из тегов + +" Автодополнение из файла с синтаксисом +autocmd FileType * exec('set dict+='.$VIMRUNTIME.'/syntax/'.getbufvar("%","current_syntax").'.vim') + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Скрытие блоков кода ---------------------------- + +set foldcolumn=1 " Видимая колонка фолдинга +set foldmethod=syntax " Скрытие блоков текста + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Настройки поиска ------------------------------- + +set incsearch " Поиск по набору текста +set hlsearch " Подсветка результатов поиска +set wrapscan " Не останавливать поиск при достижении конца файла +set ignorecase " Игнорировать регистр букв при поиске +set smartcase " Учитывать регистр, если есть заглавные буквы + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Настройка резервного копирования --------------- + +set dir^=~/.shellrc/var/vim/swp/ " Директория сохранения swap-файлов +set backup " Cоздавать .bak файлы +set backupdir=~/.shellrc/var/vim/backup " Директория хранения бэкапов + + " Бэкапы в поддиректории + function! BackupDir() + " Каталог для сохранения резервной копии + let l:backupdir=$HOME.'/.shellrc/var/vim/backup/'. + \substitute(expand('%:p:h'), '^'.$HOME, '~', '') + + " Каталог не существует, создадим его рекурсивно + if !isdirectory(l:backupdir) + call mkdir(l:backupdir, 'p', 0700) + endif + + " Каталог для резервных копий + let &backupdir=l:backupdir + + " Расширение файла резервной копии + let &backupext=strftime('.%d-%m-%Y.%T~') + endfunction + + autocmd! bufwritepre * call BackupDir()" + +" }}}--------------------------------------------------------------------------- + +" {{{-------------------------- Настройка отмены действий ---------------------- +set undodir=$SHELLRC/var/vim/undo +set undofile +set undolevels=1000 +set undoreload=10000" +" }}}--------------------------------------------------------------------------- + +" }}}########################################################################### +" {{{ НАСТРОЙКИ ЦВЕТА +" ############################################################################## + +set background=dark +colo wombat_converted " Цветовая схема + +"Грамматические ошибки +hi clear SpellBad +hi SpellBad cterm=bold ctermfg=160 ctermbg=NONE + +"Ошибки в заглавных буквах +hi clear SpellCap +hi SpellCap cterm=bold ctermfg=110 ctermbg=NONE + +"Стилистические ошибки +hi clear SpellLocal +hi SpellLocal cterm=bold ctermfg=120 ctermbg=NONE + +hi Todo ctermfg=black ctermbg=221 " Метки TODO + +hi MatchParen ctermfg=47 ctermbg=NONE " Парные скобки + +hi Pmenu ctermfg=black ctermbg=lightgreen " Дополнение - Фон +hi PmenuSel ctermfg=black ctermbg=darkgreen " Дополнение - Элемент + +hi CursorLine ctermfg=NONE ctermbg=234 cterm=NONE " Подсветка строки +set cursorline + +"hi Folded ctermfg=black ctermbg=gray " Скрытие блоков +hi FoldColumn ctermfg=black ctermbg=black " Скрытие блоков + +hi Error ctermfg=NONE ctermbg=1 " Ошибки +hi ErrorMsg ctermfg=grey ctermbg=red " Сообщение об ошибке + +hi TabLineFill ctermfg=black ctermbg=black " Строка вкладок +hi TabLineSel ctermfg=lightgreen ctermbg=NONE " Текущая вкладка +hi TabLine ctermfg=yellow ctermbg=NONE " Остальные вкладки + +hi Comment ctermfg=darkgray " Цвет комментариев + +hi Search ctermfg=black ctermbg=209 " Цвет найденного + +hi SignColor ctermbg=64 ctermfg=lightyellow guibg=grey guifg=RoyalBlue3 + +" }}}########################################################################### +" {{{ СТРОКА СОСТОЯНИЯ +" ############################################################################## + +" set titlestring=\ %t\ (%{expand('%:p:h')}) + +set showcmd " Показывать размер выделенной области +set ch=1 " Количество строк +set cmdheight=1 " Коммандная строка в одну линию +set laststatus=2 " Всегда отображать статусную строку + +" Функция отображения конструкции языка +function! SyntaxItem() + if synIDattr(synID(line("."),col("."),1),"name") == "" + return " --- " + else + return synIDattr(synID(line("."),col("."),1),"name") +endfunction + +set statusline=%#Question# " Цвет +set statusline+=%t%m%r%h%w " Имя файла +" set statusline+=%{strlen(GitBranch())?'@'.GitBranch().'.git':''} " Ветка Git +set statusline+=%= " Выравн. справа +" set statusline+=%#Function# " Цвет +" set statusline+=%{functionator#GetName()} " Функция +" set statusline+=%#Question# " Цвет +" set statusline+=\ [ЛЕКСЕМА:\ %{SyntaxItem()}] " Лексема +" set statusline+=%#WarningMsg# " Цвет +set statusline+=%#Function# " Цвет +set statusline+=\ [%{strlen(&ft)?&ft:'none'} " Тип файла +set statusline+=\/\%{(&fenc==\"\"?&enc:&fenc)} " Кодировка +" set statusline+=%#String# " Цвет +set statusline+=\|%L:%03l,%03v\ %p%%] " Строка/столбец + +" }}}########################################################################### +" {{{ ДОПОЛНИТЕЛЬНЫЕ ФУНКЦИИ +" ############################################################################## + +" Автоматически делать файл исполняемым +function ModeChange() + if getline(1) =~ "^#!/" + silent !chmod a+x + endif +endfunction +au BufWritePost * call ModeChange() + +" Отображение декларации функции +function GetDeclaration() + if strlen(glob("~/.vim/+scripts/declarations/".&ft)) + echo system("~/.vim/+scripts/declarations/".&ft." '".expand("")."' ".expand("%")) + endif + + " elseif &ft == 'perl' + " echo system("echo -n $(perldoc -i -f " + " \ .expand("") + " \ . " | head -1 | sed -r 's/^[[:space:]]+//g')") + " endif +endfunction + +nmap fd :call GetDeclaration() + +" }}}########################################################################### +" {{{ КОМБИНАЦИИ КЛАВИШ +" ############################################################################## + +" , как +let mapleader="," +nmap \ , + +" Открытие/закрытие блоков текста +nnoremap za +vnoremap za + +" Удаление конечных пробелов +map S :%s/\s\+$//:let @/='' + +" Удаление дубликатов строк +map D :%s/^\(.*\)\(\n\1\)\+$/\1/ + +" Выделение недавно редактированного текста +nmap gV `[v`] + +" Отключение подсветки найденного +nmap ,/ :nohlsearch + +" Перемещение курсора в режиме вставки +imap +imap +imap +imap + +" Показ строк, содержащих слово под курсором +nmap g [I:let nr=input("> ")exe "normal " . nr . "[\t" + +" История комманд +cmap + +" Omnicompletion +imap + +" Открытие буфера с ошибками +map co :copen + +" URxvt Home/End +map! [7;7^ +map [7;7^ +map [8;8^ +map! [8;8^ + +" Копирование от курсора до конца строки +map Y y$ + +" Открытие руководства +nmap +imap +vmap +nmap fm + +" Сохранение файла +nmap :up +vmap :upi +imap :upi + +" Открытие/закрытие окна с тэгами +nmap :TlistToggle +imap :TlistToggle +vmap :TlistToggle + +" Включение режима вклейки +set pastetoggle= + +"nmap `` Goto_next_sign + +" Проверка орфографии +set wcm= +menu Spell.ru :setlocal spell:setlocal spelllang=:setlocal spelllang=ru +menu Spell.el :setlocal spell:setlocal spelllang=:setlocal spelllang=el +menu Spell.en :setlocal spell:setlocal spelllang=:setlocal spelllang=en +menu Spell.ru,en,el :setlocal spell:setlocal spelllang=:setlocal spelllang=ru,en,el +menu Spell.off :setlocal nospell +map :emenu Spell. + +" Навигация по ошибкам +"nmap :cnzv:cc +"vmap :cnzv:cc +"imap :cnzv:cc + +"nmap :cpzv:cc +"vmap :cpzv:cc +"imap :cpzv:cc + +" Компиляция/запуск интерпретатора +nmap :make +vmap :make +imap :make + +nmap :copen +imap :copen +imap :copen + +" Выполнение файла с параметрами +nmap :call Run("") +vmap :call Run("") +imap :call Run("") + + function Run(...) + if getline(1) =~ "^#!/" + execute "!%:p" a:1 + else + execute "!\'".getcwd()."/%<\'" a:1 + endif + endfunction + +nmap :echo system("robodoc &"):echo "MAKING DOCUMENTATION" +imap :echo system("robodoc &"):echo "MAKING DOCUMENTATION" +vmap :echo system("robodoc &"):echo "MAKING DOCUMENTATION" + +" < & > - отступы для блоков текста +vmap < >gv + +" Открытие новой вкладки +" nmap :tabnew +" imap :tabnew +" vmap :tabnew + +" Редактирование командной строки как в Emacs +cnoremap +cnoremap +" cnoremap +cnoremap +cnoremap +cnoremap b +cnoremap +cnoremap f +cnoremap +cnoremap + +" Редактирование окружений (cib/dap/...) {{{ +" Редактирование СЛЕДУЮЩЕГО окружения" +nnoremap cinb f(ci( +nnoremap canb f(ca( +nnoremap cinB f{ci{ +nnoremap canB f{ca{ +nnoremap cin( f(ci( +nnoremap can( f(ca( +nnoremap cin{ f{ci{ +nnoremap can{ f{ca{ +nnoremap cin) f(ci( +nnoremap can) f(ca( +nnoremap cin} f{ci{ +nnoremap can} f{ca{ +nnoremap cin[ f[ci[ +nnoremap can[ f[ca[ +nnoremap cin] f[ci[ +nnoremap can] f[ca[ +nnoremap cin< f f f f f f f F F F F F FF#xi + +iabbrev cpr (c) 2014 Maxim Lihachev, + +" }}}########################################################################### +" {{{ ВВОД КОМАНД В ДРУГИХ РАСКЛАДКАХ +" ############################################################################## + +source $SHELLRC/etc/soft/vim/vim/+layouts/russian.vim +source $SHELLRC/etc/soft/vim/vim/+layouts/greek.vim + +" }}}########################################################################### +" {{{ НАСТРОЙКИ ПЛАГИНОВ +" ############################################################################## + +" Pathogen {{{ +" Отключенные плагины +let g:pathogen_disabled = ['colorsupport', 'timelog'] +execute pathogen#infect('+plugins/{}') +" call pathogen#runtime_append_all_bundles() +call pathogen#helptags() +" }}} + +" Airline {{{ +let g:airline_left_sep = '' +let g:airline_right_sep = '' +let g:airline_linecolumn_prefix = '/ ' +let g:airline_branch_prefix = '⇵ ' +let g:airline_paste_symbol = '' +let g:airline_whitespace_symbol = '∅' + +let g:airline_section_c = '%t%m%r%h%w' +let g:airline_section_z = '%L:%03l,%03v %p%%' + +" enable/disable fugitive/lawrencium integration +let g:airline_enable_branch=1 + +" enable/disable syntastic integration +let g:airline_enable_syntastic=0 + +" enable/disable tagbar integration +let g:airline_enable_tagbar=0 + +" enable modified detection +let g:airline_detect_modified=1 + +" enable paste detection +let g:airline_detect_paste=1 + +" enable iminsert detection +let g:airline_detect_iminsert=1 + +" enable whitespace detection +let g:airline_detect_whitespace=1 "icon and message (default) + +" change the default theme +let g:airline_theme='wombat' + +" enable/disable usage of patched powerline font symbols +let g:airline_powerline_fonts=0 + +" define the set of text to display for each mode. +let g:airline_mode_map = { 'i': '+', 'n': ' ', 'v': '⇄', 'V': '⇄', '': '⇅', 'R': '✂', 'c': '#', 's': 'SELECT', '^S': 'S-BLOCK', 'S': 'S-LINE' } + +" }}} + +" GIT"{{{ +" Смена ветки Git +function GetGitBranches() + if bufname("") !~ "COMMIT.*" + if system("git status 2>/dev/null >/dev/null; echo -n $?") == 0 + exe system("echo -n let s:git_branches = ;git branch | tr '\n*' ' '" + \."| sed -r \"s/^\\s+/['/; s/\\s+$/']/; s/\\s+/','/g\"") + + set wcm= + for branch in s:git_branches + exe "menu Git.".branch." :GitCheckout ".branch.":edit" + endfor + map gb :emenu Git. + endif + endif +endfunction + +au BufWinEnter * call GetGitBranches() +au! BufEnter * if bufname("") !~ ".*COMMIT_EDITMSG.*" | lcd %:p:h | endif + +"}}} + +" VimWiki"{{{ +let wiki = {} + +if has("win32unix") + let wiki.path = '/d/etc/wiki/' + let wiki.path_html = '/z/wiki/' +else + let wiki.path = '~/.shellrc/vimwiki/wiki/' + let wiki.path_html = '~/.shellrc/vimwiki/html/' +endif + +let wiki.template_path = '~/.shellrc/vimwiki/style/' +let wiki.template_default = 'template' +let wiki.template_ext = '.html' +let wiki.css_name = 'css/vimwiki.css' +let wiki.auto_export = 0 +let wiki.nested_syntaxes = { + \'prolog': 'prolog' + \, 'bash': 'sh' + \, 'tcl': 'tcl' + \, 'scheme': 'scheme' + \, 'haskell': 'haskell' + \, 'erlang': 'erlang' + \, 'bnf': 'abnf' + \, 'plain': 'txt' + \, 'diff': 'diff' + \, 'javascript': 'javascript' + \, 'vim': 'vim' + \, 'latex': 'tex'} + +let wiki.diary_rel_path = 'ЖЖ/Календарь/' +let wiki.diary_index = 'Календарь' +let wiki.diary_header = 'Календарь' +let wiki.diary_link_count = 4 +let wiki.maxhi = 0 " Не проверять ссылки (на больших файлах вики тормозит) + +let g:vimwiki_list = [wiki] + +let g:vimwiki_hl_headers = 1 +let g:vimwiki_folding = 1 +let g:vimwiki_fold_lists = 1 " Скрытие блоков +let g:vimwiki_camel_case = 0 " Не использовать ВикиСлова +let g:vimwiki_list_ignore_newline = 0 " Преобразовывать переводы строк в + +let g:vimwiki_html_header_numbering = 2 " Нумерация заголовков HTML со второго уровня +let g:vimwiki_html_header_numbering_sym = '.' " Нумерация оканчивается точкой + +let g:vimwiki_user_htmls = 'ЖЖ/Календарь/today.html,ЖЖ/Календарь/timeline.html,ЖЖ/Календарь/statistic_words.html,ЖЖ/Календарь/statistic_tags.html,ЖЖ/Календарь/Карты/Челябинск.html,ЖЖ/Календарь/Карты/Дегтярск.html,ЖЖ/Календарь/Карты/Карабаш.html,ЖЖ/Календарь/Карты/Екатеринбург.html' + +let g:vimwiki_hl_cb_checked = 1 " Подсвечивать выполненные задания как комментарии + +let g:vimwiki_valid_html_tags = 'b,i,s,u,sub,sup,kbd,br,hr,embed,type,src,width,height,quality,object,param,p,cite' +let g:vimwiki_file_exts = 'pdf,txt,doc,rtf,xls,php,zip,rar,7z,html,gz,mp3,ogg' + +"}}} + +" MRU"{{{ +nmap m :MRU + +let MRU_File = $HOME . '/.shellrc/var/vim/mru/vim_mru_files' +let MRU_Max_Entries = 100 +let MRU_Exclude_Files = '^/tmp/.*\|^/var/tmp/.*\|.*COMMIT_EDITMSG.*' +"}}} + +" Quickhl {{{ +nmap qq (quickhl-toggle) +vmap qq (quickhl-toggle) +nmap qr (quickhl-reset) +vmap qr (quickhl-reset) +"}}} + +" CommentToggle"{{{ +nmap CommentToggle +imap CommentToggle +vmap CommentToggle +"}}} + +" Calendar"{{{ +let g:calendar_navi_label = 'Пред,Тек,След' +let g:calendar_mruler = 'Январь,Февраль,Март,Апрель,Май,Июнь,Июль,Август,Сентябрь' + \.',Октябрь,Ноябрь,Декабрь' +let g:calendar_wruler = 'Вс Пн Вт Ср Чт Пт Сб' +let g:calendar_monday = 1 +"}}} + +" Tasklist"{{{ +let g:tlWindowPosition = 1 " Открывать окно снизу экрана +let g:tlTokenList = ['TODO','FIXME','DONE','INPROGRESS','XXX','DEBUG','TMP','BUGS', 'knownBug'] +"}}} + +" Neocomplcache {{{ +let g:neocomplcache_enable_at_startup = 1 "Автоматически загружать плагин +let g:neocomplcache_auto_completion_start_length = 3 +let g:neocomplcache_disable_auto_complete = 1 "Дополнение возможно по +let g:neocomplcache_temporary_dir = $HOME . '/.shellrc/var/vim/neocon' +"}}} + +" Neosnippet {{{ +let g:neosnippet#snippets_directory = $HOME . '/.vim/+snippets/' + +imap (neosnippet_expand_or_jump) +smap (neosnippet_expand_or_jump) +xmap (neosnippet_expand_target) + +if has('conceal') + set conceallevel=2 concealcursor=i +endif +"}}} + +" Timestamp {{{ +let g:timestamp_regexp = '\v\C%(<%(Last %([cC]hanged?|modified)|Modified|Измен(е|ё)н)\s*:\s+)@<=.{2,3} \d{2} .{3} \d{4} \d{2}:\d{2}:\d{2}.*$|TIMESTAMP' + +" %c seems to be different on different systems. Use a full form instead. +let g:timestamp_rep = '%a %d %b %Y %H:%M:%S' + +"}}} + +"Pummode"{{{ +" Выбор вариантов дополнения курсорными клавишами +call pummode#map('i', '', 0, 'j', '') +call pummode#map('i', '', 0, 'k', '') +call pummode#map('i', '', 0, '', '') +"}}} + +"Yankring {{{ +let g:yankring_history_file=".shellrc/var/vim/yankring/history" +let g:yankring_min_element_length = 5 +let g:yankring_map_dot = 0 +let g:yankring_ignore_operator = 'g~ gu gU ! = gq g? > < zf g@ @:' + +map y :YRShow +"}}} + +"Errormarker {{{ +let g:errormarker_errorgroup = "Error" +let g:errormarker_warninggroup = "Todo" +let g:errormarker_errortext = "⚫" +let g:errormarker_warningtext = "⚑" +"}}} + +" Figlet {{{ +let g:figletFontDir = $HOME . '/.shellrc/etc/soft/figlet/fonts/' +let g:figletFont = 'slant' +" }}} + +" Vim-Easy-Align {{{ +vnoremap :EasyAlign +" }}} + +" vim-sdcv {{{ +let g:sdcv_save = 1 +let g:sdcv_cmd = "sdcv -n --data-dir ~/.shellrc/etc/soft/sdcv/dictionaries/ " + +nmap fw ,qq:call Dict(expand("")) +vmap fw ,qqgv:call Dict(@*) +" }}} + +" javascript-libraries-syntax {{{ +let g:used_javascript_libs = 'jquery,angularjs,angularui,angularuirouter' +" }}} + +" languagetool {{{ +" +function LTCheck(ltl) + let g:languagetool_win_height=-1 + let g:languagetool_lang=a:ltl + echo ' [*]' + execute 'LanguageToolCheck' + execute 'lopen' +endfunction + +nmap lr :call LTCheck("ru") +nmap le :call LTCheck("en") +nmap ls :call LTCheck("sr") +" }}} + +" }}}########################################################################### + diff --git a/etc/soft/vim/vim/+ftplugin/markdown.vim b/etc/soft/vim/vim/+ftplugin/markdown.vim new file mode 100644 index 0000000..10461d3 --- /dev/null +++ b/etc/soft/vim/vim/+ftplugin/markdown.vim @@ -0,0 +1,2 @@ +" setlocal syntax=off +" set re=1 diff --git a/etc/soft/vim/vim/+plugins/AnsiESC/README.md b/etc/soft/vim/vim/+plugins_disabled/AnsiESC/README.md similarity index 100% rename from etc/soft/vim/vim/+plugins/AnsiESC/README.md rename to etc/soft/vim/vim/+plugins_disabled/AnsiESC/README.md diff --git a/etc/soft/vim/vim/+plugins/AnsiESC/autoload/AnsiEsc.vim b/etc/soft/vim/vim/+plugins_disabled/AnsiESC/autoload/AnsiEsc.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/AnsiESC/autoload/AnsiEsc.vim rename to etc/soft/vim/vim/+plugins_disabled/AnsiESC/autoload/AnsiEsc.vim diff --git a/etc/soft/vim/vim/+plugins/AnsiESC/doc/AnsiEsc.txt b/etc/soft/vim/vim/+plugins_disabled/AnsiESC/doc/AnsiEsc.txt similarity index 100% rename from etc/soft/vim/vim/+plugins/AnsiESC/doc/AnsiEsc.txt rename to etc/soft/vim/vim/+plugins_disabled/AnsiESC/doc/AnsiEsc.txt diff --git a/etc/soft/vim/vim/+plugins/AnsiESC/plugin/AnsiEscPlugin.vim b/etc/soft/vim/vim/+plugins_disabled/AnsiESC/plugin/AnsiEscPlugin.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/AnsiESC/plugin/AnsiEscPlugin.vim rename to etc/soft/vim/vim/+plugins_disabled/AnsiESC/plugin/AnsiEscPlugin.vim diff --git a/etc/soft/vim/vim/+plugins/AnsiESC/plugin/cecutil.vim b/etc/soft/vim/vim/+plugins_disabled/AnsiESC/plugin/cecutil.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/AnsiESC/plugin/cecutil.vim rename to etc/soft/vim/vim/+plugins_disabled/AnsiESC/plugin/cecutil.vim diff --git a/etc/soft/vim/vim/+plugins/figlet/plugin/Figlet.vim b/etc/soft/vim/vim/+plugins_disabled/figlet/plugin/Figlet.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/figlet/plugin/Figlet.vim rename to etc/soft/vim/vim/+plugins_disabled/figlet/plugin/Figlet.vim diff --git a/etc/soft/vim/vim/_old_plg/functionator/functionator.patch b/etc/soft/vim/vim/+plugins_disabled/functionator/functionator.patch similarity index 100% rename from etc/soft/vim/vim/_old_plg/functionator/functionator.patch rename to etc/soft/vim/vim/+plugins_disabled/functionator/functionator.patch diff --git a/etc/soft/vim/vim/_old_plg/functionator/plugin/functionator.vim b/etc/soft/vim/vim/+plugins_disabled/functionator/plugin/functionator.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/functionator/plugin/functionator.vim rename to etc/soft/vim/vim/+plugins_disabled/functionator/plugin/functionator.vim diff --git a/etc/soft/vim/vim/+plugins/lispcomplete/autoload/lispcomplete.vim b/etc/soft/vim/vim/+plugins_disabled/lispcomplete/autoload/lispcomplete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/lispcomplete/autoload/lispcomplete.vim rename to etc/soft/vim/vim/+plugins_disabled/lispcomplete/autoload/lispcomplete.vim diff --git a/etc/soft/vim/vim/+plugins/marks_corey/marks_corey.patch b/etc/soft/vim/vim/+plugins_disabled/marks_corey/marks_corey.patch similarity index 100% rename from etc/soft/vim/vim/+plugins/marks_corey/marks_corey.patch rename to etc/soft/vim/vim/+plugins_disabled/marks_corey/marks_corey.patch diff --git a/etc/soft/vim/vim/+plugins/marks_corey/plugin/marks_corey.vim b/etc/soft/vim/vim/+plugins_disabled/marks_corey/plugin/marks_corey.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/marks_corey/plugin/marks_corey.vim rename to etc/soft/vim/vim/+plugins_disabled/marks_corey/plugin/marks_corey.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/README.md b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/README.md similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/README.md rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/README.md diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/async_cache.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/async_cache.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/async_cache.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/async_cache.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/cache.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/cache.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/cache.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/cache.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/commands.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/commands.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/commands.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/commands.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/context_filetype.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/context_filetype.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/context_filetype.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/context_filetype.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/converter_abbr.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_abbr.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/converter_abbr.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_abbr.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/converter_case.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_case.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/converter_case.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_case.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/converter_delimiter.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_delimiter.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/converter_delimiter.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_delimiter.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/converter_nothing.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_nothing.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/converter_nothing.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_nothing.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/converter_remove_next_keyword.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_remove_next_keyword.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/converter_remove_next_keyword.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_remove_next_keyword.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/matcher_fuzzy.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_fuzzy.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/matcher_fuzzy.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_fuzzy.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/matcher_head.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_head.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/matcher_head.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_head.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/matcher_old.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_old.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/matcher_old.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_old.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/sorter_length.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_length.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/sorter_length.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_length.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/sorter_nothing.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_nothing.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/sorter_nothing.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_nothing.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/sorter_rank.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_rank.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/filters/sorter_rank.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_rank.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/handler.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/handler.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/handler.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/handler.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/helper.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/helper.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/helper.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/helper.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/init.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/init.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/init.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/init.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/mappings.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/mappings.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/mappings.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/mappings.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/buffer_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/buffer_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/buffer_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/buffer_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/dictionary_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/dictionary_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/dictionary_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/dictionary_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/filename_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/filename_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/filename_include.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_include.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/filename_include.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_include.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/include_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/include_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/include_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/include_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/member_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/member_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/member_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/member_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/omni_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/omni_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/omni_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/omni_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/syntax_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/syntax_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/syntax_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/syntax_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/tags_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/tags_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/tags_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/tags_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/autocmds.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/autocmds.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/autocmds.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/autocmds.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_args.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_args.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_args.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_args.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_completions.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_completions.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_completions.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_completions.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_prototypes.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_prototypes.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_prototypes.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_prototypes.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_replaces.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_replaces.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_replaces.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_replaces.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/commands.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/commands.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/commands.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/commands.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/features.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/features.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/features.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/features.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/functions.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/functions.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/functions.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/functions.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/helper.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/helper.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/helper.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/helper.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/mappings.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/mappings.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/mappings.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/mappings.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/options.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/options.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/options.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/options.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/variables.dict b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/variables.dict similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/variables.dict rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/variables.dict diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/util.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/util.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/util.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/util.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/variables.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/variables.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/neocomplcache/variables.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/variables.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/unite/sources/file_include.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/file_include.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/unite/sources/file_include.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/file_include.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/unite/sources/neocomplcache.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/neocomplcache.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/unite/sources/neocomplcache.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/neocomplcache.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/_a20a988.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/_a20a988.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/_a20a988/Data/List.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/List.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/_a20a988/Data/List.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/List.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/_a20a988/Data/String.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/String.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/_a20a988/Data/String.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/String.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/_a20a988/Prelude.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Prelude.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/_a20a988/Prelude.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Prelude.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/_a20a988/System/Cache.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/System/Cache.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/_a20a988/System/Cache.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/System/Cache.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/neocomplcache.vital b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/neocomplcache.vital similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/autoload/vital/neocomplcache.vital rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/neocomplcache.vital diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/doc/neocomplcache.txt b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/doc/neocomplcache.txt similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/doc/neocomplcache.txt rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/doc/neocomplcache.txt diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache/buffer_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/buffer_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache/buffer_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/buffer_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache/dictionary_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/dictionary_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache/dictionary_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/dictionary_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache/include_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/include_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache/include_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/include_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache/syntax_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/syntax_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache/syntax_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/syntax_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache/tags_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/tags_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/plugin/neocomplcache/tags_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/tags_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neocomplcache.vim/vest/test-neocomplcache.vim b/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/vest/test-neocomplcache.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neocomplcache.vim/vest/test-neocomplcache.vim rename to etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/vest/test-neocomplcache.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/README.md b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/README.md similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/README.md rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/README.md diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neocomplcache/sources/snippets_complete.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neocomplcache/sources/snippets_complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neocomplcache/sources/snippets_complete.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neocomplcache/sources/snippets_complete.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neocomplete/sources/neosnippet.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neocomplete/sources/neosnippet.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neocomplete/sources/neosnippet.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neocomplete/sources/neosnippet.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/Gemfile.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/Gemfile.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/Gemfile.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/Gemfile.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/_.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/_.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/_.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/_.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/actionscript.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/actionscript.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/actionscript.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/actionscript.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/apache.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/apache.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/apache.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/apache.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/applescript.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/applescript.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/applescript.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/applescript.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/c.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/c.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/c.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/c.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/clojure.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/clojure.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/clojure.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/clojure.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/coffee.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/coffee.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/coffee.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/coffee.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/cpp.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/cpp.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/cpp.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/cpp.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/css.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/css.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/css.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/css.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/d.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/d.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/d.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/d.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/erlang.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/erlang.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/erlang.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/erlang.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/eruby.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/eruby.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/eruby.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/eruby.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/go.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/go.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/go.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/go.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/groovy.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/groovy.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/groovy.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/groovy.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/haskell.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/haskell.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/haskell.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/haskell.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/html.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/html.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/html.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/html.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/java.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/java.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/java.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/java.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/javascript.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/javascript.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/javascript.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/javascript.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/kp19pp.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/kp19pp.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/kp19pp.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/kp19pp.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/liquid.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/liquid.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/liquid.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/liquid.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/lua.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/lua.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/lua.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/lua.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/make.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/make.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/make.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/make.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/markdown.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/markdown.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/markdown.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/markdown.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/mediawiki.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/mediawiki.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/mediawiki.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/mediawiki.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/objc.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/objc.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/objc.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/objc.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/perl.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/perl.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/perl.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/perl.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/php.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/php.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/php.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/php.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/python.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/python.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/python.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/python.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/rails.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rails.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/rails.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rails.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/rst.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rst.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/rst.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rst.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/ruby.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/ruby.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/ruby.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/ruby.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/scala.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scala.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/scala.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scala.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/scheme.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scheme.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/scheme.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scheme.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/sh.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sh.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/sh.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sh.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/snippet.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/snippet.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/snippet.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/snippet.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/sql.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sql.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/sql.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sql.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/sshconfig.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sshconfig.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/sshconfig.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sshconfig.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/tcl.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tcl.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/tcl.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tcl.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/tex.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tex.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/tex.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tex.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/vim.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/vim.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/vim/vital.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim/vital.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/vim/vital.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim/vital.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/vimshell.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimshell.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/vimshell.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimshell.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/vimwiki.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimwiki.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/vimwiki.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimwiki.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/xhtml.snip b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/xhtml.snip similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/snippets/xhtml.snip rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/xhtml.snip diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/util.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/util.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/neosnippet/util.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/util.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/unite/sources/neosnippet_file.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/neosnippet_file.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/unite/sources/neosnippet_file.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/neosnippet_file.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/unite/sources/snippet.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/unite/sources/snippet.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/unite/sources/snippet_target.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet_target.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/unite/sources/snippet_target.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet_target.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/vital.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/vital.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/vital/_de83b96.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/vital/_de83b96.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/vital/_de83b96/Prelude.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96/Prelude.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/vital/_de83b96/Prelude.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96/Prelude.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/vital/neosnippet.vital b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/neosnippet.vital similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/autoload/vital/neosnippet.vital rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/neosnippet.vital diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/doc/neosnippet.txt b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/doc/neosnippet.txt similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/doc/neosnippet.txt rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/doc/neosnippet.txt diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/ftdetect/snippet.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/ftdetect/snippet.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/ftdetect/snippet.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/ftdetect/snippet.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/ftplugin/snippet.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/ftplugin/snippet.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/ftplugin/snippet.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/ftplugin/snippet.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/indent/snippet.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/indent/snippet.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/indent/snippet.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/indent/snippet.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/plugin/neosnippet.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/plugin/neosnippet.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/plugin/neosnippet.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/plugin/neosnippet.vim diff --git a/etc/soft/vim/vim/+plugins/neosnippet.vim/syntax/snippet.vim b/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/syntax/snippet.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/neosnippet.vim/syntax/snippet.vim rename to etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/syntax/snippet.vim diff --git a/etc/soft/vim/vim/+plugins/vCoolor/autoload/vcoolor/convert.vim b/etc/soft/vim/vim/+plugins_disabled/vCoolor/autoload/vcoolor/convert.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vCoolor/autoload/vcoolor/convert.vim rename to etc/soft/vim/vim/+plugins_disabled/vCoolor/autoload/vcoolor/convert.vim diff --git a/etc/soft/vim/vim/+plugins/vCoolor/autoload/vcoolor/misc.vim b/etc/soft/vim/vim/+plugins_disabled/vCoolor/autoload/vcoolor/misc.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vCoolor/autoload/vcoolor/misc.vim rename to etc/soft/vim/vim/+plugins_disabled/vCoolor/autoload/vcoolor/misc.vim diff --git a/etc/soft/vim/vim/+plugins/vCoolor/doc/vCoolor.txt b/etc/soft/vim/vim/+plugins_disabled/vCoolor/doc/vCoolor.txt similarity index 100% rename from etc/soft/vim/vim/+plugins/vCoolor/doc/vCoolor.txt rename to etc/soft/vim/vim/+plugins_disabled/vCoolor/doc/vCoolor.txt diff --git a/etc/soft/vim/vim/+plugins/vCoolor/pickers/osx/color-picker b/etc/soft/vim/vim/+plugins_disabled/vCoolor/pickers/osx/color-picker similarity index 100% rename from etc/soft/vim/vim/+plugins/vCoolor/pickers/osx/color-picker rename to etc/soft/vim/vim/+plugins_disabled/vCoolor/pickers/osx/color-picker diff --git a/etc/soft/vim/vim/+plugins/vCoolor/plugin/vCoolor.vim b/etc/soft/vim/vim/+plugins_disabled/vCoolor/plugin/vCoolor.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vCoolor/plugin/vCoolor.vim rename to etc/soft/vim/vim/+plugins_disabled/vCoolor/plugin/vCoolor.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/README b/etc/soft/vim/vim/+plugins_disabled/vimple/README similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/README rename to etc/soft/vim/vim/+plugins_disabled/vimple/README diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/args.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/args.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/args.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/args.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/complete.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/complete.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/complete.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/complete.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/completers.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/completers.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/completers.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/completers.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/file.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/file.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/file.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/file.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/list.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/list.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/list.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/list.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/loclist.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/loclist.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/loclist.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/loclist.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/ml/bayes.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/ml/bayes.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/ml/bayes.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/ml/bayes.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/ml/porter.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/ml/porter.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/ml/porter.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/ml/porter.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/overlay.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/overlay.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/overlay.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/overlay.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/parse/ini.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/parse/ini.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/parse/ini.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/parse/ini.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/quickfix.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/quickfix.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/quickfix.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/quickfix.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/regex.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/regex.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/regex.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/regex.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/rng.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/rng.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/rng.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/rng.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/scope.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/scope.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/scope.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/scope.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/scripts.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/scripts.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/scripts.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/scripts.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/string.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/string.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/string.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/string.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/variable.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/variable.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/variable.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/variable.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/abbreviations.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/abbreviations.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/abbreviations.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/abbreviations.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/comparators.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/comparators.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/comparators.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/comparators.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/highlight.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/highlight.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/highlight.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/highlight.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/history.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/history.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/history.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/history.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/ls.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/ls.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/ls.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/ls.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/map.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/map.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/map.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/map.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/marks.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/marks.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/marks.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/marks.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/options.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/options.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/options.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/options.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/scriptnames.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/scriptnames.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/scriptnames.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/scriptnames.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/undolist.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/undolist.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/undolist.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/undolist.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/autoload/vimple/version.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/version.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/autoload/vimple/version.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/version.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/bufgrep.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/bufgrep.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/bufgrep.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/bufgrep.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/calendar.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/calendar.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/calendar.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/calendar.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/changelist.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/changelist.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/changelist.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/changelist.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/global_marks.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/global_marks.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/global_marks.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/global_marks.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/helptoc.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/helptoc.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/helptoc.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/helptoc.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/iabbrevs.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/iabbrevs.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/iabbrevs.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/iabbrevs.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/identsearch.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/identsearch.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/identsearch.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/identsearch.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/jumplist.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/jumplist.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/jumplist.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/jumplist.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/oldfiles.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/oldfiles.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/oldfiles.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/oldfiles.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/spellsuggest.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/spellsuggest.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/spellsuggest.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/spellsuggest.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/tagkinds.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/tagkinds.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/tagkinds.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/tagkinds.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/demo/tagsearch.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/demo/tagsearch.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/demo/tagsearch.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/demo/tagsearch.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/doc/vimple.txt b/etc/soft/vim/vim/+plugins_disabled/vimple/doc/vimple.txt similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/doc/vimple.txt rename to etc/soft/vim/vim/+plugins_disabled/vimple/doc/vimple.txt diff --git a/etc/soft/vim/vim/+plugins/vimple/doc/vimple_ls.txt b/etc/soft/vim/vim/+plugins_disabled/vimple/doc/vimple_ls.txt similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/doc/vimple_ls.txt rename to etc/soft/vim/vim/+plugins_disabled/vimple/doc/vimple_ls.txt diff --git a/etc/soft/vim/vim/+plugins/vimple/ftplugin/python_scope.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/ftplugin/python_scope.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/ftplugin/python_scope.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/ftplugin/python_scope.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/ftplugin/vim_scope.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/ftplugin/vim_scope.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/ftplugin/vim_scope.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/ftplugin/vim_scope.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/plugin/vimple.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/plugin/vimple.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/plugin/vimple.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/plugin/vimple.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/syntax/vimple_jumplist.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/syntax/vimple_jumplist.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/syntax/vimple_jumplist.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/syntax/vimple_jumplist.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/test/Makefile b/etc/soft/vim/vim/+plugins_disabled/vimple/test/Makefile similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/Makefile rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/Makefile diff --git a/etc/soft/vim/vim/+plugins/vimple/test/README b/etc/soft/vim/vim/+plugins_disabled/vimple/test/README similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/README rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/README diff --git a/etc/soft/vim/vim/+plugins/vimple/test/_setup.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/test/_setup.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/_setup.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/_setup.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/test/buffer_list.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/test/buffer_list.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/buffer_list.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/buffer_list.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/test/ini_001.ini b/etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_001.ini similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/ini_001.ini rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_001.ini diff --git a/etc/soft/vim/vim/+plugins/vimple/test/ini_001_out.ini b/etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_001_out.ini similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/ini_001_out.ini rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_001_out.ini diff --git a/etc/soft/vim/vim/+plugins/vimple/test/ini_002.ini b/etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_002.ini similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/ini_002.ini rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_002.ini diff --git a/etc/soft/vim/vim/+plugins/vimple/test/ini_002_out.ini b/etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_002_out.ini similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/ini_002_out.ini rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_002_out.ini diff --git a/etc/soft/vim/vim/+plugins/vimple/test/parse_ini_001.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/test/parse_ini_001.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/parse_ini_001.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/parse_ini_001.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/test/parse_ini_002.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/test/parse_ini_002.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/parse_ini_002.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/parse_ini_002.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/test/string001.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/test/string001.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/string001.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/string001.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/test/vimple001.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/test/vimple001.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/vimple001.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/vimple001.vim diff --git a/etc/soft/vim/vim/+plugins/vimple/test/vimple002.vim b/etc/soft/vim/vim/+plugins_disabled/vimple/test/vimple002.vim similarity index 100% rename from etc/soft/vim/vim/+plugins/vimple/test/vimple002.vim rename to etc/soft/vim/vim/+plugins_disabled/vimple/test/vimple002.vim diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/autoload/vimwiki.vim b/etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/autoload/vimwiki.vim rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki.vim diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/autoload/vimwiki_diary.vim b/etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_diary.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/autoload/vimwiki_diary.vim rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_diary.vim diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/autoload/vimwiki_html.vim b/etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_html.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/autoload/vimwiki_html.vim rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_html.vim diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/autoload/vimwiki_lst.vim b/etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_lst.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/autoload/vimwiki_lst.vim rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_lst.vim diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/autoload/vimwiki_tbl.vim b/etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_tbl.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/autoload/vimwiki_tbl.vim rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_tbl.vim diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/doc/vimwiki.txt b/etc/soft/vim/vim/+plugins_disabled/vimwiki/doc/vimwiki.txt similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/doc/vimwiki.txt rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/doc/vimwiki.txt diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/ftplugin/vimwiki.vim b/etc/soft/vim/vim/+plugins_disabled/vimwiki/ftplugin/vimwiki.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/ftplugin/vimwiki.vim rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/ftplugin/vimwiki.vim diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/plugin/vimwiki.vim b/etc/soft/vim/vim/+plugins_disabled/vimwiki/plugin/vimwiki.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/plugin/vimwiki.vim rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/plugin/vimwiki.vim diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/syntax/vimwiki.vim b/etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/syntax/vimwiki.vim rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki.vim diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/syntax/vimwiki_default.vim b/etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki_default.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/syntax/vimwiki_default.vim rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki_default.vim diff --git a/etc/soft/vim/vim/_old_plg/vimwiki/syntax/vimwiki_media.vim b/etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki_media.vim similarity index 100% rename from etc/soft/vim/vim/_old_plg/vimwiki/syntax/vimwiki_media.vim rename to etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki_media.vim diff --git a/etc/soft/vim/vim/ftplugin/markdown/markdown.custom.vim b/etc/soft/vim/vim/ftplugin/markdown/markdown.custom.vim new file mode 120000 index 0000000..b2e2781 --- /dev/null +++ b/etc/soft/vim/vim/ftplugin/markdown/markdown.custom.vim @@ -0,0 +1 @@ +../../+ftplugin/markdown.vim \ No newline at end of file diff --git a/etc/soft/vim/vimrc b/etc/soft/vim/vimrc index 40bcaaa..4c22ef8 100644 --- a/etc/soft/vim/vimrc +++ b/etc/soft/vim/vimrc @@ -1,7 +1,5 @@ " ~/.vimrc " -" Изменён: Чт. 25 сент. 2014 11:39:50 -" "############################################################################### " {{{ НАСТРОЙКИ VIM "############################################################################### @@ -46,6 +44,10 @@ au BufWinEnter *.wiki set nocursorline let g:loaded_zipPlugin = 1 let g:loaded_zip = 1 +" Режим терминала {{{ +nmap ,s :split term://bash +" }}} + " }}}--------------------------------------------------------------------------- " {{{-------------------------- Работа с файловой системой---------------------- @@ -77,7 +79,7 @@ set scrolloff=7 " Вниз в режиме редактирования let &t_SI = "\]50;CursorShape=1\x7" let &t_EI = "\]50;CursorShape=0\x7" -if &term =~ "xterm\\|rxvt" +if &term =~ "xterm\\|rxvt\\|xterm-256color" let &t_SI = "\033]12;orange\007" let &t_EI = "\033]12;darkgrey\007" autocmd VimLeave * :!echo -ne "\033]12;darkgrey\007" @@ -140,7 +142,7 @@ autocmd FileType * exec('set dict+='.$VIMRUNTIME.'/syntax/'.getbufvar("%","curre " {{{-------------------------- Скрытие блоков кода ---------------------------- set foldcolumn=1 " Видимая колонка фолдинга -set foldmethod=syntax " Скрытие блоков текста +" set foldmethod=syntax " Скрытие блоков текста " }}}--------------------------------------------------------------------------- @@ -201,11 +203,11 @@ hi clear SpellBad hi SpellBad cterm=bold ctermfg=160 ctermbg=NONE "Ошибки в заглавных буквах -hi clear SpellCap +hi clear SpellCap hi SpellCap cterm=bold ctermfg=110 ctermbg=NONE "Стилистические ошибки -hi clear SpellLocal +hi clear SpellLocal hi SpellLocal cterm=bold ctermfg=120 ctermbg=NONE hi Todo ctermfg=black ctermbg=221 " Метки TODO @@ -238,6 +240,7 @@ hi SignColor ctermbg=64 ctermfg=lightyellow guibg=grey guifg=RoyalBlue3 " {{{ СТРОКА СОСТОЯНИЯ " ############################################################################## +set title " set titlestring=\ %t\ (%{expand('%:p:h')}) set showcmd " Показывать размер выделенной области @@ -344,7 +347,7 @@ map [8;8^ map! [8;8^ " Копирование от курсора до конца строки -map Y y$ +nmap Y y$ " Открытие руководства nmap @@ -357,11 +360,6 @@ nmap :up vmap :upi imap :upi -" Открытие/закрытие окна с тэгами -nmap :TlistToggle -imap :TlistToggle -vmap :TlistToggle - " Включение режима вклейки set pastetoggle= @@ -587,28 +585,6 @@ nnoremap yaN" F"ya" " }}} " }}}########################################################################### -" {{{ АББРЕВИАТУРЫ -" ############################################################################## - -" ROBODOC -iabbrev rDV DEFAULT VALUE -iabbrev rIV INIT VALUE -iabbrev rNS NAMESPACE -iabbrev rSA SEE ALSO -iabbrev rSE SIDE EFFECTS -iabbrev rUB USED BY -iabbrev rUGV USED GLOBAL VARIABLES -iabbrev rUH USER HELP -iabbrev rUV USED VARIABLES -iabbrev rV VARIABLE -iabbrev rVS VARIABLES -iabbrev rW WARNING - -iabbrev chg Создан: TIMESTAMP#Изменён: TIMESTAMPF#xi - -iabbrev cpr (c) 2014 Maxim Lihachev, - -" }}}########################################################################### " {{{ ВВОД КОМАНД В ДРУГИХ РАСКЛАДКАХ " ############################################################################## @@ -670,28 +646,6 @@ let g:airline_mode_map = { 'i': '+', 'n': ' ', 'v': '⇄', 'V': '⇄', '': '⇅ " }}} -" GIT"{{{ -" Смена ветки Git -function GetGitBranches() - if bufname("") !~ "COMMIT.*" - if system("git status 2>/dev/null >/dev/null; echo -n $?") == 0 - exe system("echo -n let s:git_branches = ;git branch | tr '\n*' ' '" - \."| sed -r \"s/^\\s+/['/; s/\\s+$/']/; s/\\s+/','/g\"") - - set wcm= - for branch in s:git_branches - exe "menu Git.".branch." :GitCheckout ".branch.":edit" - endfor - map gb :emenu Git. - endif - endif -endfunction - -au BufWinEnter * call GetGitBranches() -au! BufEnter * if bufname("") !~ ".*COMMIT_EDITMSG.*" | lcd %:p:h | endif - -"}}} - " VimWiki"{{{ let wiki = {} @@ -752,7 +706,7 @@ let g:vimwiki_file_exts = 'pdf,txt,doc,rtf,xls,php,zip,rar,7z,html,gz,mp3, nmap m :MRU let MRU_File = $HOME . '/.shellrc/var/vim/mru/vim_mru_files' -let MRU_Max_Entries = 100 +let MRU_Max_Entries = 150 let MRU_Exclude_Files = '^/tmp/.*\|^/var/tmp/.*\|.*COMMIT_EDITMSG.*' "}}} @@ -782,25 +736,6 @@ let g:tlWindowPosition = 1 " Открывать окно снизу экрана let g:tlTokenList = ['TODO','FIXME','DONE','INPROGRESS','XXX','DEBUG','TMP','BUGS', 'knownBug'] "}}} -" Neocomplcache {{{ -let g:neocomplcache_enable_at_startup = 1 "Автоматически загружать плагин -let g:neocomplcache_auto_completion_start_length = 3 -let g:neocomplcache_disable_auto_complete = 1 "Дополнение возможно по -let g:neocomplcache_temporary_dir = $HOME . '/.shellrc/var/vim/neocon' -"}}} - -" Neosnippet {{{ -let g:neosnippet#snippets_directory = $HOME . '/.vim/+snippets/' - -imap (neosnippet_expand_or_jump) -smap (neosnippet_expand_or_jump) -xmap (neosnippet_expand_target) - -if has('conceal') - set conceallevel=2 concealcursor=i -endif -"}}} - " Timestamp {{{ let g:timestamp_regexp = '\v\C%(<%(Last %([cC]hanged?|modified)|Modified|Измен(е|ё)н)\s*:\s+)@<=.{2,3} \d{2} .{3} \d{4} \d{2}:\d{2}:\d{2}.*$|TIMESTAMP' @@ -821,6 +756,7 @@ let g:yankring_history_file=".shellrc/var/vim/yankring/history" let g:yankring_min_element_length = 5 let g:yankring_map_dot = 0 let g:yankring_ignore_operator = 'g~ gu gU ! = gq g? > < zf g@ @:' +let g:yankring_clipboard_monitor = 0 map y :YRShow "}}} @@ -832,15 +768,6 @@ let g:errormarker_errortext = "⚫" let g:errormarker_warningtext = "⚑" "}}} -" Figlet {{{ -let g:figletFontDir = $HOME . '/.shellrc/etc/soft/figlet/fonts/' -let g:figletFont = 'slant' -" }}} - -" Vim-Easy-Align {{{ -vnoremap :EasyAlign -" }}} - " vim-sdcv {{{ let g:sdcv_save = 1 let g:sdcv_cmd = "sdcv -n --data-dir ~/.shellrc/etc/soft/sdcv/dictionaries/ " @@ -850,22 +777,7 @@ vmap fw ,qqgv:call Dict(@*) " }}} " javascript-libraries-syntax {{{ -let g:used_javascript_libs = 'jquery,angularjs,angularui,angularuirouter' -" }}} - -" languagetool {{{ -" -function LTCheck(ltl) - let g:languagetool_win_height=-1 - let g:languagetool_lang=a:ltl - echo ' [*]' - execute 'LanguageToolCheck' - execute 'lopen' -endfunction - -nmap lr :call LTCheck("ru") -nmap le :call LTCheck("en") -nmap ls :call LTCheck("sr") +let g:used_javascript_libs = 'jquery' " }}} " }}}###########################################################################