From 85c67607efe8b45f7a91f3779469fd62d82c94e0 Mon Sep 17 00:00:00 2001 From: Marrub Date: Wed, 1 May 2019 00:57:45 -0400 Subject: [PATCH] rewrite vimrc to be less arcane --- vimrc | 213 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 109 insertions(+), 104 deletions(-) diff --git a/vimrc b/vimrc index 2f8ee6e..1f2299b 100644 --- a/vimrc +++ b/vimrc @@ -1,106 +1,77 @@ " Settings -------------------------------------------------------------------| -se lbr -se sbr= -se sm -se ve=onemore -se ttm=0 -se hls -se scs -se ic -se is -se ai -se et -se sta -se sw=3 -se sts=-1 -se cf -se ru -se wmnu -se acd -se lz -se cole=1 -se ul=1000 -se ls=2 -se tpm=1000 -se enc=utf-8 -se fencs=ucs_bom,utf_8,sjis -se bs=indent,eol,start -se vi='100,/50,<50,s10,h,% -se stl=[%{&syn}]\ %f -se stl+=%r -se stl+=%m -"se stl+=\ %{tagbar#currenttag('←\ %s\ ','','f')} -se stl+=\ %= -se stl+=\ %{FileSize()} -se stl+=\ %4l:%-3c -se stl+=\ %4L -se stl+=\ %3p%% -se bo=all -se cc=81 -se nuw=4 -se hid -se ffs=unix,dos,mac -se nojs -se ut=500 -se fo=tcrqnolj -se com=s0:/*!,m:\ ,ex:*/,s1:/*,mb:*,ex:*/,:///,://!,:// -se sc -se tw=80 -"se rnu -"se nu +" general settings (use :help for these) +set confirm +set wildmenu +set autochdir +set laststatus=2 -if has('gui_running') - se gcr+=i:hor10-Cursor - se gcr+=a:blinkon0 - se go=agit - se lines=50 - "se co=90 - se co=80 -el - se t_Co=256 - let base16colorspace=256 - se tgc -en +" visuals +set statusline=[%{&syntax}]\ %f +set statusline+=%r +set statusline+=%m +"set statusline+=\ %{tagbar#currenttag('←\ %s\ ','','f')} +set statusline+=\ %= +set statusline+=\ %{FileSize()} +set statusline+=\ %4l:%-3c +set statusline+=\ %4L +set statusline+=\ %3p%% -colo base16-porple +set ruler +set showcmd -sy on +set numberwidth=4 +"set relativenumber +"set number -" 2019-02-25. I finally concede to turning all of these on... -" although my autocommands still turn off most of them. ;P -filet on -filet plugin on -filet indent on +set colorcolumn=81 +set conceallevel=1 - " good fonts: - " =Lucida_Console:h10:cANSI:qDRAFT - " =Noto_Mono:h10:cANSI:qDRAFT - " =ばぐまるゴシック:h12:cSHIFTJIS:qDRAFT - " =Courier:h10:cANSI:qDRAFT - " =Px437_IBM_PS/2thin4:h12:cDEFAULT:qDRAFT - " =PxPlus_IBM_EGA8:h12:cDEFAULT:qDRAFT - " =PxPlus_IBM_VGA8:h12:cDEFAULT:qDRAFT +set belloff=all - " good colors: - " base16-atelier-cave - " base16-atelier-sulphurpool - " base16-atelier-plateu-light - " base16-circus - " base16-material-palenight - " base16-porple - " base16-rebecca - " base16-unikitty-dark - " base16-xcode-dusk - " morning - " JSCZmgNell +" general movement and ergonomics +set linebreak +set showbreak= +set virtualedit=onemore +set backspace=indent,eol,start +set textwidth=80 +set comments=s0:/*!,m:\ ,ex:*/,s1:/*,mb:*,ex:*/,:///,://!,:// +set formatoptions=tcrqnolj +set nojoinspaces +let mapleader="\" -" Global Config --------------------------------------------------------------| +" snappier responses +set ttimeoutlen=0 +set lazyredraw + +" searching options (highlight, smart casing) +set showmatch +set hlsearch +set smartcase +set ignorecase +set incsearch + +" tabulation (3 spaces, auto-indent when my muscle memory demands it) +set autoindent +set expandtab +set smarttab +set shiftwidth=3 +set softtabstop=-1 + +" limits, what/when/how to save and encodings +set undolevels=10000 +set tabpagemax=1000 +set viminfo='100,/50,<50,s10,h,% +set encoding=utf-8 +set fileencodings=ucs_bom,utf_8,sjis +set fileformats=unix,dos,mac +set hidden +set updatetime=500 " bufexplorer let g:bufExplorerDisableDefaultKeyMapping=1 -" Gutentags +" gutentags let g:gutentags_project_root=['.git', 'Makefile'] " TwitVim @@ -123,9 +94,6 @@ let g:netrw_winsize=20 let g:buftabline_indicators=1 let g:buftabline_numbers=2 -" vim -let mapleader="\" - " TagBar let g:tagbar_vertical=7 let g:tagbar_compact=1 @@ -136,21 +104,40 @@ let g:tagbar_autoshowtag=1 " abolish let g:abolish_no_mappings=1 " we set out own later -" OS-specific settings -------------------------------------------------------| +" gui and terminal specific settings +if has('gui_running') + set guicursor+=i:hor10-Cursor + set guicursor+=a:blinkon0 + set guioptions=agit + set lines=50 + set columns=80 +el + " use 256-color terminal capabilities + set t_Co=256 + let base16colorspace=256 + set termguicolors +en + +" OS-specific settings if has('gui_running') if has('win32') - se gfn=PxPlus_IBM_EGA8:h12:cDEFAULT:qDRAFT + set guifont=PxPlus_IBM_EGA8:h12:cDEFAULT:qDRAFT el - se gfn=PxPlus\ IBM\ EGA8\ 12 - se lsp=-2 + set guifont=PxPlus\ IBM\ EGA8\ 12 + set linespace=-2 en en if has('win32') + " windows sucks let $PATH='G:\msys64\usr\bin;'.$PATH - se ssl + + set shellslash + + " netrw let key='G:/msys64/home/marrub/.ssh/id_rsa' + let g:netrw_cygwin=0 let g:netrw_ignorenetrc=1 let g:netrw_list_cmd="ssh -i " . key . " USEPORT HOSTNAME ls -Fa " @@ -158,14 +145,32 @@ if has('win32') let g:netrw_scp_cmd="scp -q -i " . key let g:netrw_sftp_cmd="sftp -i " . key let g:netrw_silent=1 - let g:gutentags_cache_dir=$VIM .'/vimtags/' - se dir=$VIM/vimtemp// + + " gutentags + let g:gutentags_cache_dir=$VIM.'/vimtags/' + + " swap files + set directory=$VIM/vimtemp// el + " gutentags let g:gutentags_cache_dir=$HOME.'/.vim/tags/' - se gp=rg\ --vimgrep\ -n - se dir=$HOME/.vim/temp// + + " searching + set grepprg=rg\ --vimgrep\ -n + + " swap files + set directory=$HOME/.vim/temp// en +" set up colors and file types +colorscheme base16-porple + +syntax on + +filetype on +filetype plugin on +filetype indent on + " Functions ------------------------------------------------------------------| " Automatic headers @@ -225,7 +230,7 @@ au BufNewFile,BufRead *.s,*.inc setl sw=8 ft=asm_ca65 au BufEnter * cal s:CloseEmptyBuffers() " EDF → conf -au FileType edif se syn=conf +au FileType edif set syn=conf " disable most ftplugins au BufReadPre * let b:did_ftplugin=1 @@ -312,7 +317,7 @@ nm 9 BufTabLine.Go(9) nn x gg"+yG`` " Mirror -vn v c:se ri":se nori +vn v c:set ri":set nori " Fix syntax nn :sy sync fromstart