add vim.d

.zshrc

@@ -1121,8 +1121,10 @@ git-commit-branch() {
 
 # :alias
 
-alias bl='batrak -L -K -s -w'
-alias bb='batrak -L -K -s -m'
+alias bl='batrak -L'
+alias blm='batrak -L -m'
+alias bk='batrak -L -K -s -w'
+alias bkm='batrak -L -K -s -m'
 alias bm='batrak -M'
 alias gpd=:git-push-delete
 alias gpt='git push origin --tags'
@@ -1272,6 +1274,7 @@ alias pf=pkgfile
 
 alias pl='packages-local'
 alias pla='packages-local -a'
+alias vd='cd ~/dotfiles/vim.d/; vim'
 alias viz='vim ~/.zshrc'
 alias tiz='terminal-vim ~/.zshrc'
 alias zr='source ~/.zshrc && print "zsh config has been reloaded"'

vim.d/00-base.vim

@@ -0,0 +1,83 @@
+set nocompatible
+
+let g:mapleader="\<Space>"
+let mapleader=g:mapleader
+
+let g:python3_host_prog = '/usr/bin/python3'
+
+" set up indent/vim.vim
+let g:vim_indent_cont = shiftwidth()
+
+set shortmess+=sAIc
+set encoding=utf-8
+set printencoding=cp1251
+set fileformat=unix
+set textwidth=80
+set timeoutlen=400
+set wildmenu
+set undofile
+set undodir=$HOME/.vim/runtime/undo/
+set directory=$HOME/.vim/runtime/tmp/
+set backupdir=$HOME/.vim/runtime/backup/
+set writebackup
+set backup
+set lazyredraw
+set ttyfast
+set number
+set relativenumber
+set history=500
+set hlsearch
+set incsearch
+set ignorecase
+set smartcase
+set expandtab
+set autoindent
+set shiftwidth=4
+set softtabstop=4
+set tabstop=4
+set backspace=2
+set splitright
+set laststatus=2
+set gdefault
+set completeopt-=preview
+set nowrap
+set updatetime=150
+set timeoutlen=400
+set showtabline=0
+set cino=(s,m1,+0
+set list
+set lcs=trail:·,tab:→\ "
+set pastetoggle=<F11>
+set noequalalways
+set winminheight=0
+set clipboard=unnamedplus
+set tags=./.tags;/
+set cc=80,100
+
+set rtp-=~/.vim
+set rtp^=~/.vim
+
+syntax on
+filetype plugin indent on
+
+if !has('nvim')
+    set signcolumn=number
+else
+    set signcolumn=yes
+endif
+
+if empty(glob('~/.vim/autoload/plug.vim'))
+  silent !mkdir -p ~/.vim/autoload
+  silent !curl -fLo ~/.vim/autoload/plug.vim
+    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+  autocmd VimEnter * PlugInstall
+endif
+
+let g:plug_url_format = '[email protected]:%s'
+let g:plug_shallow = 0
+
+if has('nvim')
+    set viminfo+=n~/.vim/runtime/neoviminfo
+else
+    set viminfo+=n~/.vim/runtime/viminfo
+endif

vim.d/01-plugins.vim

@@ -0,0 +1,120 @@
+call plug#begin('~/.vim/bundle')
+Plug 'junegunn/fzf'
+Plug 'junegunn/fzf.vim'
+Plug 'itchyny/lightline.vim'
+Plug 'scrooloose/nerdcommenter'
+Plug 'kovetskiy/vim-hacks'
+Plug 'kovetskiy/synta'
+Plug 'fatih/vim-go', {'for': ['go', 'yaml', 'template']}
+Plug 'vim-scripts/l9'
+Plug 'sirver/ultisnips', { 'frozen': 1 }
+Plug 'tpope/vim-surround'
+Plug 'pangloss/vim-javascript', { 'for': 'js' }
+Plug 'danro/rename.vim'
+Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
+    let g:vim_markdown_folding_disabled=0
+Plug 'AndrewRadev/sideways.vim'
+Plug 'octol/vim-cpp-enhanced-highlight', { 'for': ['c', 'cpp'] }
+Plug 'justinmk/vim-sneak'
+Plug 'reconquest/vim-pythonx'
+    let g:pythonx_highlight_completion = 0
+    let g:pythonx_go_info_mode = 'coc'
+Plug 'reconquest/snippets'
+Plug 'kovetskiy/vim-empty-lines'
+Plug 'kovetskiy/vim-ski'
+    let g:skeletons_dir=$HOME . '/.vim/bundle/snippets/skeletons/'
+Plug 'bronson/vim-trailing-whitespace'
+Plug 'sjl/gundo.vim', { 'on': 'GundoShow' }
+Plug 'kovetskiy/kb-train', { 'on': 'Train' }
+Plug 'yssl/QFEnter'
+Plug 'rust-lang/rust.vim', {'for': 'rust' }
+Plug 'wellle/targets.vim'
+Plug 'kovetskiy/vim-bash'
+Plug 'FooSoft/vim-argwrap', {'on': 'ArgWrap'}
+Plug 'kovetskiy/sxhkd-vim'
+Plug 'PotatoesMaster/i3-vim-syntax', {'for': 'i3'}
+Plug 'w0rp/ale'
+    let g:ale_enabled = 0
+    let g:ale_fixers = {
+        \ 'ruby':       [function('ale#fixers#rufo#Fix')],
+        \ 'java':       [function('ale#fixers#google_java_format#Fix')],
+        \ 'rust':       ['rustfmt'],
+        \ 'sh':         ['shfmt'],
+        \ 'bash':       ['shfmt'],
+        \ 'pug':        [function('ale#fixers#prettier#Fix')],
+        \ 'scss':       [function('ale#fixers#prettier#Fix')],
+    \}
+    let g:ale_fix_on_save = 1
+Plug 'mg979/vim-visual-multi'
+Plug 'tmhedberg/matchit'
+Plug 'markonm/traces.vim'
+Plug 'tpope/vim-dispatch'
+Plug 'fvictorio/vim-extract-variable'
+Plug 'kovetskiy/coc.nvim', {'do': { -> coc#util#install()}}
+Plug 'majutsushi/tagbar'
+Plug 'kovetskiy/sherlock.vim'
+    cnoremap <C-P> <C-\>esherlock#completeBackward()<CR>
+    cnoremap <C-N> <C-\>esherlock#completeForward()<CR>
+Plug 'uiiaoo/java-syntax.vim'
+Plug 'lambdalisue/gina.vim'
+    let g:gina#command#blame#formatter#format="%su%=%au on %ti %ma%in"
+Plug 'tpope/vim-fugitive'
+    nmap ,a :Git add .<CR>
+    nmap ,s :Gstatus<CR>
+    nmap ,c :Gcommit -v<CR>
+    nmap ,t :Gpush origin<CR>
+    nmap ,g :Dispatch lab ci trace<CR>
+Plug 'junegunn/vim-easy-align'
+    vmap <c-t> :EasyAlign<CR>*
+    let g:easy_align_ignore_groups = []
+Plug 'cespare/vim-toml'
+Plug 'tpope/vim-abolish'
+Plug 'neoclide/coc-tslint-plugin', {'do': 'yarn install --frozen-lockfile'}
+Plug 'lfilho/cosco.vim'
+    "let g:cosco_filetype_whitelist = ['java']
+    "let g:auto_comma_or_semicolon = 1
+    "let g:auto_comma_or_semicolon_events = ["InsertLeave"]
+    "let g:cosco_ignore_comment_lines = 1
+Plug 'camspiers/animate.vim'
+    let g:animate#duration = 100.0
+Plug 'camspiers/lens.vim'
+    let g:lens#disabled_filenames = ['coc:.*', 'list:.*']
+Plug 'digitaltoad/vim-pug'
+Plug 'reedes/vim-lexical'
+Plug 'rakr/vim-one'
+Plug 'kovetskiy/vim-list-mappings'
+    nmap <c-f><c-l> :call FzfListMap()<CR>
+Plug 'ActivityWatch/aw-watcher-vim'
+Plug 'hashivim/vim-terraform', {'for': 'terraform'}
+    let g:terraform_align=1
+    let g:terraform_fmt_on_save=1
+Plug 'ddrscott/vim-side-search'
+Plug 'matze/vim-move'
+Plug 'kovetskiy/neovim-move', { 'do' : ':UpdateRemotePlugins' }
+    if $BACKGROUND == "dark"
+        Plug 'reconquest/vim-colorscheme'
+        func! _setup_colorscheme()
+            colorscheme reconquest
+
+            hi! CursorLineNr ctermbg=1
+            hi! GitDeleted ctermfg=88
+            hi! GitAdded ctermfg=22
+            hi! GitModified ctermfg=238
+            hi! MoreMsg ctermbg=none ctermfg=238
+        endfunc!
+    endif
+    if $BACKGROUND == "light"
+        Plug 'NLKNguyen/papercolor-theme'
+        Plug 'sonph/onehalf', {'rtp': 'vim/'}
+
+        func! _setup_colorscheme()
+            set background="light"
+            colorscheme papercolor
+
+            hi! SpecialKey ctermfg=250
+            hi! String ctermfg=33
+            hi! PreProc ctermfg=19
+            hi! CursorLineNr ctermbg=1
+        endfunc!
+    endif
+call plug#end()

vim.d/10-eclim.vim

@@ -0,0 +1,9 @@
+let g:EclimLoggingDisabled = 1
+let g:EclimJavaCompilerAutoDetect = 0
+let g:EclimShowCurrentError = 0
+let g:EclimShowCurrentErrorBalloon = 0
+let g:EclimMakeQfFilter = 0
+let g:EclimSignLevel = 'off'
+let g:EclimBuffersTabTracking = 0
+let g:EclimMenus = 0
+let g:EclimJavaCompilerAutoDetect = 0

vim.d/11-fzf.vim

@@ -0,0 +1,62 @@
+let g:fzf_prefer_tmux = 1
+let g:fzf_layout = { 'down': '~40%' }
+
+func! _select_file(...)
+    let dir = ""
+    if a:0 > 0
+        let dir = a:1
+    endif
+
+    call _snippets_stop()
+
+    call fzf#run(fzf#wrap({
+        \ 'source': 'prols ' . dir,
+        \ 'options': '--sort --no-exact --tiebreak=index'
+    \ }))
+endfunc!
+
+func! _select_file_cwd()
+    call _select_file(expand('%:h'))
+endfunc!
+
+func! _select_buffer()
+    call _snippets_stop()
+    call fzf#vim#buffers({'options': '--sort --no-exact --tiebreak=index'})
+endfunc!
+
+map <silent> <c-t> :call _select_file()<CR>
+map <silent> <c-e><c-t> :call _select_file_cwd()<CR>
+
+let g:grep_last_query = ""
+
+func! _grep(query)
+    let g:grep_last_query = a:query
+
+    let @/ = a:query
+    call fzf#vim#ag(a:query, {'options': '--delimiter : --nth 4..'})
+endfunc!
+
+func! _grep_word()
+    let l:word = expand('<cword>')
+    call _grep(l:word)
+endfunc!
+
+func! _grep_slash()
+    let l:slash = strpart(@/, 2)
+    call _grep(l:slash)
+endfunc!
+
+func! _grep_recover()
+    call _grep(g:grep_last_query)
+endfunc!
+
+command! -nargs=* Grep call _grep(<q-args>)
+
+nnoremap <silent> <C-F><C-F> :Grep<CR>
+nnoremap <silent> <C-E><C-F> :call _grep_word()<CR>
+
+func! _lstags()
+    call fzf#vim#ag("", {'source':    'lstags', 'options': '--delimiter : --nth 4..'})
+endfunc!
+
+nnoremap <silent> <c-g> :call _lstags()<CR>

vim.d/11-nofolding.vim

@@ -0,0 +1,5 @@
+augroup _no_foldings
+    au!
+    au VimEnter,WinEnter,BufRead,BufNewFile * set nofoldenable
+    au VimEnter,WinEnter,BufRead,BufNewFile * au! matchparen
+augroup end