From 6dbb2076f6b9452dd82bfe97a48080780c722223 Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Thu, 6 Apr 2023 17:48:14 +0200 Subject: [PATCH] Update 2023-04-06 17:48 OpenBSD/amd64 --- .bin/dexec_browser | 34 +++++----------------------------- .bin/obsdmake | 2 -- .kshrc | 1 + .vimrc | 46 +++++++++++++++++++++++++--------------------- 4 files changed, 31 insertions(+), 52 deletions(-) diff --git a/.bin/dexec_browser b/.bin/dexec_browser index 306d612..07d2bec 100755 --- a/.bin/dexec_browser +++ b/.bin/dexec_browser @@ -19,23 +19,10 @@ test -f ${HOME}/.bin/_config \ test -f "${HISTFILE}" \ || touch "${HISTFILE}" -HISTDATA="$(while IFS= read -r l; do echo "${#l} $((++n)) $l"; done \ - < "${HISTFILE}" \ - | sed 's|/$||;s|http[s]\{0,1\}://||' \ - | sort -t\| -k 2 -u \ - | sort -n \ - | cut -d" " -f3-)" - -PICKLIST="paste_from_clipboard -pick_from_history -edit_history_file ------------------ -$(echo "${HISTDATA}" \ - | cut -b 23- \ - | egrep -v ' |^[^a-zA-Z0-9]' \ - | grep '..\...'\ -) -http://localhost" +PICKLIST="\ +paste_from_clipboard +$(< "${HISTFILE}") +" # show filtered history file # EXPECTS: $PICKLIST $HISTFILE $DMENU_CMD @@ -43,21 +30,11 @@ http://localhost" read_input() { local S=$(printf '%s\n' "${PICKLIST}" \ | ${DMENU_CMD} -p "Bookmarks") - case "${S}" in paste_from_clipboard) S=$(xclip -o \ | head -n 1) ;; - pick_from_history) - S=$(sort -r "${HISTFILE}" \ - | ${DMENU_CMD} -p "History:" \ - |cut -b23-) ;; - edit_history_file) - texec "vim +\$ ${HISTFILE}" - dexec_browser - exit 0 ;; esac - [ -z "${S}" ] && exit 0 INPUT="${S}" } @@ -198,8 +175,7 @@ choose_browser() { } save_history() { - printf '%s %s\n' "$(date +"%Y-%m-%d %H:%M:%S |")" "${INPUT}" \ - >> "${HISTFILE}" + printf '%s\n' "${INPUT}" >> "${HISTFILE}" } # main program starts here. diff --git a/.bin/obsdmake b/.bin/obsdmake index e22ec33..5b8aa5f 100755 --- a/.bin/obsdmake +++ b/.bin/obsdmake @@ -2,8 +2,6 @@ umask 022 JOBS="${JOBS:=$(sysctl -n hw.ncpuonline)}" -export MAKE_JOBS="$JOBS" - export GLOBAL_AUTOCONF_CACHE="/var/ccache/config.cache" export CCACHE_DIR="/var/ccache" diff --git a/.kshrc b/.kshrc index 9f23e1b..e90488a 100644 --- a/.kshrc +++ b/.kshrc @@ -6,6 +6,7 @@ ### SEARCH PATHS PATH=~/.bin\ +:~/.local/bin\ :/bin\ :/sbin\ :/usr/bin\ diff --git a/.vimrc b/.vimrc index 623f0c4..ad33fbc 100644 --- a/.vimrc +++ b/.vimrc @@ -6,36 +6,18 @@ set showcmd set backspace=indent,eol,start let g:is_posix=1 +" file stuff set undofile set undodir=~/.local/vim/undo// set backupdir=~/.local/vim/backup// set directory=~/.local/vim/swapfiles// -set list -set listchars=tab:»·,trail:• -set fillchars=vert:\|,eob:\ - -set textwidth=72 -set formatprg=par\ -w72q - -hi LineNr ctermfg=15 -hi EndOfBuffer ctermfg=15 -match ErrorMsg '\(TODO\|FIXME\|XXX\|: error:.*\|\s\+$\| \+\ze\t\)' - -hi DiffAdd ctermbg=22 ctermfg=NONE cterm=NONE -hi DiffDelete ctermbg=234 ctermfg=NONE cterm=NONE -hi DiffChange ctermbg=234 ctermfg=NONE cterm=NONE -hi DiffText ctermbg=NONE ctermfg=NONE cterm=NONE - -hi VertSplit ctermbg=NONE ctermfg=246 cterm=NONE -hi FoldColumn ctermbg=NONE ctermfg=251 cterm=NONE -hi Folded ctermbg=233 ctermfg=251 cterm=NONE - silent execute '!mkdir -p \ ~/.local/vim/backup \ ~/.local/vim/undo \ ~/.local/vim/swapfiles' +" code stuff set tags="/home/sdk/.dev/tags" silent execute 'cs add /home/sdk/.dev/cscope.out' set csprg=cscope\ -C @@ -51,8 +33,12 @@ nnoremap ,i :cs find i nnoremap ,a :cs find a nnoremap ,b +" show special characters +set list +set listchars=tab:»·,trail:• +set fillchars=vert:\|,eob:\ + nnoremap # *`` -nnoremap n * augroup code au! @@ -60,6 +46,24 @@ augroup code au BufRead,BufNewFile Makefile,/usr/src/*.c,/usr/src/*.h,*.gmk setl sw=8 sts=8 noet augroup end +" visual sugar +set textwidth=72 +set formatprg=par\ -w72q + +hi LineNr ctermfg=15 +hi EndOfBuffer ctermfg=15 + +hi DiffAdd ctermbg=22 ctermfg=NONE cterm=NONE +hi DiffDelete ctermbg=234 ctermfg=NONE cterm=NONE +hi DiffChange ctermbg=234 ctermfg=NONE cterm=NONE +hi DiffText ctermbg=NONE ctermfg=NONE cterm=NONE + +hi VertSplit ctermbg=NONE ctermfg=246 cterm=NONE +hi FoldColumn ctermbg=NONE ctermfg=251 cterm=NONE +hi Folded ctermbg=233 ctermfg=251 cterm=NONE + +match ErrorMsg '\(TODO\|FIXME\|XXX\|: error:.*\|\s\+$\| \+\ze\t\)' + " vi compatible options (from .exrc) set showmode set showmatch