From 5149974cae276b69ea5b61ede730e014895b9cfd Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Tue, 24 Oct 2023 16:14:42 +0200 Subject: [PATCH] Update 2023-10-24 16:14 OpenBSD/amd64-x13 --- .bin/c | 17 ++++++++++++++++- .bin/dexec_browser | 29 ++++++++++++++--------------- .config/spectrwm/spectrwm.conf | 2 +- .config/spectrwm/spectrwm_map.conf | 3 +++ .kshrc | 14 +++++++------- 5 files changed, 41 insertions(+), 24 deletions(-) diff --git a/.bin/c b/.bin/c index 9ffa2b2..187ad09 100755 --- a/.bin/c +++ b/.bin/c @@ -1,5 +1,17 @@ #!/bin/sh +if [ -f ~/.c.query ] +then + echo -n "Open $(< ~/.c.query) again (Y/n)? " + read + case $REPLY in + [Nn]) rm -f ~/.c.query; ;; + esac +fi + +[ -f ~/.c.query ] \ + && EXTRA="--query $(<~/.c.query)" + [ ! -z "$@" ] \ && EXTRA="--query $@" @@ -26,4 +38,7 @@ export FZF_DEFAULT_COMMAND F=$(fzf -1 -e +s $EXTRA --preview='cat {}') [ -z "$F" ] \ - || vim "$F"; + || vim "$F" && echo "$F" > ~/.c.query; + +[ -z "$F" ] \ + && rm -f ~/.c.query diff --git a/.bin/dexec_browser b/.bin/dexec_browser index 9e0382b..06eadb4 100755 --- a/.bin/dexec_browser +++ b/.bin/dexec_browser @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/ksh # dexec_browser # A multi browser launcher @@ -10,7 +10,6 @@ # 3. choose which browser to use # (can suggest a matching default) - . ${HOME}/.bin/_config HISTFILE="${HOME}/.browser_history" @@ -125,22 +124,22 @@ choose_browser() { gopher://*) DEFAULT="Lagrange (default)"; ;; gemini://*) DEFAULT="Lagrange (default)"; ;; *.pdf|*.cb|*.ps) DEFAULT="Zathura (default)"; ;; - *) DEFAULT="Vimb (default)"; ;; + *) DEFAULT="$BROWSER (default)"; ;; esac - local S="${DEFAULT}\nLuakit\nFirefox\nChrome\nQutebrowser\nNetsurf\nTor-Browser" + local S="${DEFAULT}\nLuakit\nVimb\nFirefox\nChrome\nQutebrowser\nNetsurf\nTor-Browser" case $(echo "${S}" | ${DMENU_CMD} -p "Browser") in - Netsurf*) BROWSER=netsurf-gtk3 ;; - Vimb*) BROWSER=vimb ;; - Quteb*r*) BROWSER=qutebrowser ;; - Surf*) BROWSER=surf ;; - Otter*r*) BROWSER=otter-browser ;; - Luakit*) BROWSER="luakit -Un" ;; - Chrome*) BROWSER=chrome ;; - Firefox*) BROWSER=firefox ;; - Tor-B*r*) BROWSER=tor-browser ;; - Zathura*) BROWSER=zathura ;; - Lagrange*) BROWSER=lagrange ;; + [Nn]etsurf*) BROWSER=netsurf-gtk3 ;; + [Vv]imb*) BROWSER=vimb ;; + [Qq]uteb*r*) BROWSER=qutebrowser ;; + [Ss]urf*) BROWSER=surf ;; + [Oo]tter*r*) BROWSER=otter-browser ;; + [Ll]uakit*) BROWSER="luakit -Un" ;; + [Cc]hrome*) BROWSER=chrome ;; + [Ff]irefox*) BROWSER=firefox ;; + [Tt]or-B*r*) BROWSER=tor-browser ;; + [Zz]athura*) BROWSER=zathura ;; + [Ll]agrange*) BROWSER=lagrange ;; *) exit 0;; esac } diff --git a/.config/spectrwm/spectrwm.conf b/.config/spectrwm/spectrwm.conf index ca2a3dd..e584364 100644 --- a/.config/spectrwm/spectrwm.conf +++ b/.config/spectrwm/spectrwm.conf @@ -41,7 +41,7 @@ warp_pointer = 1 # Custom Quirks quirk[IPMIView20-IPMIView20:IPMIView20-IPMIView20] = FLOAT + ANYWHERE -quirk[scratchpad] = FLOAT + ANYWHERE + FOCUSPREV +quirk[scratchpad] = WS[-1] + ANYWHERE + FLOAT quirk[Nsxiv:tabbed] = NOFOCUSONMAP + FOCUSPREV # Window Manager Keys diff --git a/.config/spectrwm/spectrwm_map.conf b/.config/spectrwm/spectrwm_map.conf index 81f3a62..913ca07 100644 --- a/.config/spectrwm/spectrwm_map.conf +++ b/.config/spectrwm/spectrwm_map.conf @@ -7,6 +7,9 @@ bind[cycle_layout] = MOD+l bind[flip_layout] = MOD+Shift+l bind[float_toggle] = MOD+space +bind[free_toggle] = MOD+Shift+space +bind[focus_free] = MOD+Shift+BackSpace + # FOCUS bind[focus_main] = MOD+m bind[focus_next] = MOD+Down diff --git a/.kshrc b/.kshrc index 6b68132..fb20a87 100644 --- a/.kshrc +++ b/.kshrc @@ -33,6 +33,13 @@ LC_NUMERIC=C LC_TIME=en_US.UTF-8 export LANG LC_ALL LC_MESSAGES LC_NUMERIC LC_TIME +### SOFTWARE PREFERENCES +EDITOR="vim" +VISUAL="vim" +BROWSER="vimb" +PAGER="less" +export EDITOR VISUAL BROWSER PAGER + ######################################################################## # STOP HERE IF NON INTERACTIVE ######################################################################## @@ -54,13 +61,6 @@ HISTFILE=$HOME/.ksh-history HISTSIZE=2000 export HISTCONTROL HISTFILE HISTSIZE -### SOFTWARE PREFERENCES -EDITOR="vim" -VISUAL="vim" -BROWSER="qutebrowser" -PAGER="less" -export EDITOR VISUAL BROWSER PAGER - ### TUIR (reddit) TUIR_BROWSER="$BROWSER" export TUIR_BROWSER