diff --git a/stow/vim/.vim/vimrc b/stow/vim/.vim/vimrc index 9ab21fd..75ac975 100644 --- a/stow/vim/.vim/vimrc +++ b/stow/vim/.vim/vimrc @@ -9,10 +9,6 @@ if filereadable(expand('$VIMRUNTIME/defaults.vim')) source $VIMRUNTIME/defaults.vim endif -if has('win32') - let &runtimepath.=",$HOME/.vim" -endif - "plugins (vim-plug) "------------------ "vim-plug paths @@ -26,9 +22,6 @@ if empty(glob(plugDir)) autocmd VimEnter * PlugInstall --sync | source $MYVIMRC endif -"filetype *may* interfere with certain plugins -filetype off - call plug#begin(pluginDir) Plug 'junegunn/vim-plug' @@ -48,7 +41,6 @@ call plug#begin(pluginDir) Plug 'flazz/vim-colorschemes' "linting Plug 'w0rp/ale' - "javascript/css/html Plug 'pangloss/vim-javascript' Plug 'mattn/emmet-vim' @@ -75,7 +67,7 @@ let g:netrw_usetab = 1 let g:netrw_browsex_viewer = "xdg-open" let g:NetrwIsOpen = 0 "for toggle function -"netrw gx is borked and open-browser is way better +"replace netrw gx command let g:netrw_nogx = 1 nmap gx (openbrowser-smart-search) vmap gx (openbrowser-smart-search) @@ -97,7 +89,7 @@ let g:ale_sign_warning = '--' let g:ale_lint_on_save = 1 let g:ale_fix_on_save = 1 -"md +"vim-markdown let g:vim_markdown_folding_disabled = 1 let g:vim_markdown_no_default_key_mappings = 1 let g:vim_markdown_toc_autofit = 1 @@ -178,6 +170,8 @@ set ttimeoutlen=20 "for keycodes set splitbelow set splitright +"vim feature cleanup +"------------------- "swap let mySwapDir = expand("$HOME/.vim/.swap") if !isdirectory(mySwapDir) @@ -205,11 +199,12 @@ if has('writebackup') set backup endif -"leader key -let mapleader=' ' "normal/visual mode keybinds "--------------------------- +"leader key +let mapleader=' ' + "paste and search nnoremap :let @/ = "" nnoremap p :set invpaste @@ -338,8 +333,9 @@ if has("autocmd") \ let g:go_auto_type_info = 1 | \ let g:go_imports_autosave = 1 autocmd FileType html :syntax sync fromstart - autocmd FileType html,javascript,css,json,yaml,sh - \ setlocal ts=2 sts=2 sw=2 expandtab - autocmd BufRead,BufNewFile *.md setlocal spell + autocmd FileType html,javascript,css,json,yaml,markdown + \ setlocal ts=2 sts=2 sw=2 expandtab | + \ nnoremap f :%!prettier % + autocmd Filetype markdown setlocal spell augroup END endif