From beac7b226a910098681d666646d29b1ab7e71111 Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Sun, 15 Dec 2024 12:31:05 +0100 Subject: [PATCH] Update 2024-12-15 12:31 OpenBSD/amd64-t14 --- .mutt/scripts/portpatch2.sh | 6 +++-- .vim/vimrc | 48 ++++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/.mutt/scripts/portpatch2.sh b/.mutt/scripts/portpatch2.sh index fb8071d..9b17904 100755 --- a/.mutt/scripts/portpatch2.sh +++ b/.mutt/scripts/portpatch2.sh @@ -29,5 +29,7 @@ printf "Strip? [0]: " read -r _strip echo "CMD: ${_catcmd} "${1}" | doas -u sdk patch -E -pp${_strip:=0} -d ${_path}" -${_catcmd} "${1}" | doas -u sdk patch -E -N -p${_strip:=0} -d ${_path} -echo ${_path} > /var/cache/pmark +${_catcmd} "${1}" | doas -u sdk patch -i -E -N -p${_strip:=0} -d ${_path} +echo ${_path} | xclip +echo "done. +read diff --git a/.vim/vimrc b/.vim/vimrc index c75362b..1b64a45 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -25,6 +25,10 @@ set modelines=5 " top/bottom line no. to search set lazyredraw " no scr. update during macros set spelllang=de,en " spell check languages syntax enable " enable syntax plugin (builtin) +if &diff + syntax off + set colorcolumn= +endif filetype plugin indent on " load plugins based on filetype set re=1 " use old regexp engine (faster) let mapleader = "," @@ -54,6 +58,10 @@ set textwidth=0 " automatically break lines here set list " display control characers set listchars=tab:>- " which characters to display +set fillchars=vert:\│ +set fillchars+=foldsep:\│,fold:\— +set fillchars+=foldclose:\🗁 +set fillchars+=foldopen:\🗁 set wildmode=full @@ -72,17 +80,16 @@ let g:currentmode={ \} " STATUSLINE, AIRLINE/POWERLINE IS FOR NOOBS -set statusline=%#VisualNOS# -set statusline+=\ [%#Visual#%{toupper(g:currentmode[mode()])}%#VisualNOS#] -set statusline+=\ [%#Visual#%f%#VisualNOS#] +set statusline=\ %{toupper(g:currentmode[mode()])} +set statusline+=\ %f set statusline+=%m%r%h%w%q set statusline+=%= -set statusline+=\ [BUF:%#Visual#%n%#VisualNOS#] -set statusline+=\ [%#Visual#%{&fileencoding?&fileencoding:&encoding}%#VisualNOS#] -set statusline+=\ [%#Visual#%{&fileformat}%#VisualNOS#] -set statusline+=\ [HEX:%#Visual#%B%#VisualNOS#\ INT:%#Visual#%b%#VisualNOS#] -set statusline+=\ [ROW:%#Visual#%l%#VisualNOS#\ COL:%#Visual#%c%#VisualNOS#] -set statusline+=\ [%#Visual#%p%#VisualNOS#%%] +set statusline+=\ BUF:%n +set statusline+=\ %{&fileencoding?&fileencoding:&encoding} +set statusline+=\ %{&fileformat} +set statusline+=\ HEX:%B\ INT:%b +set statusline+=\ ROW:%l\ COL:%c +set statusline+=\ %p%% set statusline+=\ " C specific highlighting @@ -124,10 +131,15 @@ highlight SpecialKey ctermbg=232 ctermfg=245 highlight Normal ctermbg=232 highlight NonText ctermbg=232 ctermfg=234 highlight ErrorMsg ctermbg=0 ctermfg=160 cterm=none -highlight VisualNOS ctermbg=0 ctermfg=238 highlight Visual ctermbg=232 ctermfg=208 highlight Search ctermbg=220 ctermfg=0 -highlight VertSplit ctermbg=none + +highlight VertSplit ctermfg=208 ctermbg=0 +highlight Folded ctermfg=45 ctermbg=0 +highlight FoldColumn ctermfg=45 ctermbg=0 + +highlight StatusLine ctermbg=234 ctermfg=245 +highlight StatusLineNC ctermbg=0 ctermfg=245 " HIGHLIGHT SPECIAL WORDS match ErrorMsg '\(TODO:\|FIXME\|XXX\|workaround\|WTF\|\s\+$\| \+\ze\t\)' @@ -136,11 +148,11 @@ match ErrorMsg '\(TODO:\|FIXME\|XXX\|workaround\|WTF\|\s\+$\| \+\ze\t\)' highlight SpellBad cterm=NONE ctermfg=darkred ctermbg=NONE " VIMDIFF COLOR FIX -highlight DiffAdd ctermfg=1 ctermbg=0 -highlight DiffDelete ctermfg=2 ctermbg=0 -highlight DiffChange ctermfg=3 ctermbg=0 -highlight DiffText ctermfg=4 ctermbg=0 -highlight VertSplit ctermfg=1 ctermbg=0 +highlight DiffAdd ctermfg=76 ctermbg=234 +highlight DiffDelete ctermfg=234 ctermbg=0 +highlight DiffChange ctermfg=255 ctermbg=234 +highlight DiffText ctermfg=166 ctermbg=234 + " GITGUTTER set signcolumn=number @@ -325,3 +337,7 @@ autocmd BufReadPost * \ exe "normal! g`\"" | \ endif augroup END + +augroup diffsyntax + autocmd! OptionSet diff syntax off +augroup END