From 1d3ee78382560aa0c4c1e94188de55069318ca90 Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Wed, 22 Feb 2023 08:18:57 +0100 Subject: [PATCH] Update 2023-02-22 08:18 OpenBSD/amd64 --- .bin/dev-src | 61 ----------------------------------- .bin/dexec_browser | 3 +- .etc/X11/xenodm/Xresources | 63 ++++++++++++++++++++++++++++--------- .etc/X11/xenodm/Xsetup_0 | 5 +-- .kshrc | 7 ++++- .mutt/scripts/portpatch2.sh | 3 +- .notion/cfg_notioncore.lua | 2 +- .notion/cfg_sp.lua | 2 +- 8 files changed, 63 insertions(+), 83 deletions(-) delete mode 100755 .bin/dev-src diff --git a/.bin/dev-src b/.bin/dev-src deleted file mode 100755 index c675817..0000000 --- a/.bin/dev-src +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -. ~/.bin/_config - -if [ ! -z "$1" ] -then - QUERY="--query $1" -fi -export INITIAL_QUERY="$1" - -cd /usr - -( find src \ - ports/{archivers,astro,audio,benchmarks} \ - ports/{biology,books,cad,chinese,comms} \ - ports/{converters,databases,devel,editors} \ - ports/{education,emulators,fonts,games} \ - ports/{geo,graphics,infrastructure} \ - ports/{inputmethods,japanese,java,korean} \ - ports/{lang,mail,math,meta,misc,multimedia} \ - ports/{mystuff,net,news,plan9,print} \ - ports/{productivity,security,shells,sysutils} \ - ports/{telephony,textproc,wayland,www,x11} \ - -not -path "*/CVS/*" \ - -not -path "*/.git/*" \ - -type f \ - \( -name "*.c" \ - -o -name "*.cc" \ - -o -name "*.cpp" \ - -o -name "*.h" \ - -o -name "*.hh" \ - -o -name "*.hpp" \ - -o -name "*.pl" \ - -o -name "*.awk" \ - -o -name "*.sh" \ - -o -name "*.mk" \ - -o -name "*.in" \ - -o -name "*conf" \ - -o -name "*devs" \ - -o -name "patch-*" \ - -o -name "Makefile*" \ - -o -name "PLIST*" \ - -o -name "DESCR*" \ - -o -name ".gitignore" \ - -o -name ".cvsignore" \ - \) > /tmp/dev-src-list.tmp && mv /tmp/dev-src-list.tmp /tmp/dev-src-list ) & - - -[ ! -f /tmp/dev-src-list ] \ - && wait - - -F="$(fzf --exact \ - --no-sort \ - --preview-window=right:65% \ - $QUERY \ - --preview='highlight -O ansi -O xterm256 --force {}' \ - < /tmp/dev-src-list - )" - -[ -z "$F" ] || v "$F" - diff --git a/.bin/dexec_browser b/.bin/dexec_browser index 8fbb086..cd08ef5 100755 --- a/.bin/dexec_browser +++ b/.bin/dexec_browser @@ -91,7 +91,7 @@ OpenStreetMap (OSM) Grep.app Google Maps Youtube -DELETE" +Zalando" local C="$(printf '%s' "${INPUT}" \ | head -n 1)" @@ -138,6 +138,7 @@ DELETE" M*I*T*List) URI="https://marc.info/?l=openbsd-tech&s=${C}&q=b"; ;; M*I*M*List) URI="https://marc.info/?l=openbsd-misc&s=${C}&q=b"; ;; M*I*P*CVS) URI="https://marc.info/?l=openbsd-ports-cvs&s=${C}&q=b"; ;; + Zalando) URI="https://www.zalando.de/herren/?q=${C}"; ;; *) exit 0 ;; esac } diff --git a/.etc/X11/xenodm/Xresources b/.etc/X11/xenodm/Xresources index a591396..88ede6b 100644 --- a/.etc/X11/xenodm/Xresources +++ b/.etc/X11/xenodm/Xresources @@ -1,5 +1,14 @@ +! $OpenBSD: Xresources.in,v 1.4 2022/11/07 17:12:06 matthieu Exp $ +! +! +! +! +! + + + + xlogin*login.translations: #override \ - CtrlR: abort-display()\n\ F1: set-session-argument(failsafe) finish-field()\n\ Left: move-backward-character()\n\ Right: move-forward-character()\n\ @@ -10,35 +19,59 @@ xlogin*login.translations: #override \ CtrlReturn: set-session-argument(failsafe) finish-field()\n\ Return: set-session-argument() finish-field() -xlogin*greeting: Login -xlogin.Login.sepWidth: 1 +xlogin*greeting: login. +xlogin*namePrompt: +xlogin.Login.passwdPrompt: xlogin*fail: Login incorrect or forbidden -xlogin*greetFace: Monospace-20:dpi=100 -xlogin*face: Monospace-16:dpi=100 -xlogin*promptFace: Monospace-16:dpi=100 -xlogin*failFace: Monospace-16:dpi=100 +#if WIDTH > 2000 +xlogin*greetFace: DejaVu Sans Condensed-20:dpi=200 +xlogin*face: DejaVu Sans Condensed-16:dpi=200 +xlogin*promptFace: DejaVu Sans Condensed-16:dpi=200 +xlogin*failFace: DejaVu Sans Condensed-16:dpi=200 +#else +xlogin*greetFace: DejaVu Sans Condensed-20:dpi=100 +xlogin*face: DejaVu Sans Condensed-16:dpi=100 +xlogin*promptFace: DejaVu Sans Condensed-16:dpi=100 +xlogin*failFace: DejaVu Sans Condensed-16:dpi=100 +#endif -xlogin*borderWidth: 1 +xlogin*borderWidth: 3 xlogin*frameWidth: 2 xlogin*innerFramesWidth: 0 + xlogin.Login.sepWidth: 0 + +! top/left border xlogin*hiColor: #181818 + +! bottom/right border xlogin*shdColor: #181818 +! flood fill xlogin*background: #000000 xlogin*inpColor: #181818 xlogin*failColor: #aa0000 -xlogin.Login.echoPasswd: true -xlogin.Login.namePrompt: -xlogin.Login.passwdPrompt: - -xlogin*borderWidth: 3 -xlogin*frameWidth: 5 -xlogin*innerFramesWidth: 1 +! 'Login:' and 'Password:' *Foreground: #cccccc + +! border/shadow *Background: #000000 xlogin*logoFileName: /etc/X11/xenodm/pixmaps/OpenBSD_15bpp.xpm xlogin*useShape: false xlogin*logoPadding: 10 + +! uncomment to disable logins +xlogin.Login.allowRootLogin: false + +XConsole*background: black +XConsole*foreground: white +XConsole*borderWidth: 2 +XConsole*borderColor: grey +XConsole.text.geometry: 480x130 +XConsole.verbose: true +XConsole*iconic: true +XConsole*font: fixed + +xlogin.Login.echoPasswd: true diff --git a/.etc/X11/xenodm/Xsetup_0 b/.etc/X11/xenodm/Xsetup_0 index b7411c5..e56cb25 100755 --- a/.etc/X11/xenodm/Xsetup_0 +++ b/.etc/X11/xenodm/Xsetup_0 @@ -1,7 +1,8 @@ #!/bin/sh -# $OpenBSD: Xsetup_0,v 1.5 2018/07/17 11:52:12 matthieu Exp $ +# $OpenBSD: Xsetup_0.in,v 1.1 2021/08/30 15:38:27 matthieu Exp $ -#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail +prefix="/usr/X11R6" +exec_prefix="${prefix}" xset fp+ /home/sdk/.fonts xset fp rehash xsetroot -solid black diff --git a/.kshrc b/.kshrc index aa8bc51..c7a23d3 100644 --- a/.kshrc +++ b/.kshrc @@ -126,8 +126,13 @@ alias vimrc="vim ~/.vim/vimrc" alias kludges="vim ~/.notion/cfg_kludges.lua" alias spectrwmrc="vim ~/.config/spectrwm/spectrwm.conf" +# vim +vimdiffdir() { + vim -c "DirDiff $1 $2" +} + # remind -alias rem="clear; remind -c+cu3 -wt ~/.reminders" +alias rem="clear; remind -c+cu4 -wt ~/.reminders" alias remy="clear; remind -cu12 -wt ~/.reminders | less" rems() { echo "Reminders for $(date +%Y/%m/%d) (today)" diff --git a/.mutt/scripts/portpatch2.sh b/.mutt/scripts/portpatch2.sh index f5b6339..278824c 100755 --- a/.mutt/scripts/portpatch2.sh +++ b/.mutt/scripts/portpatch2.sh @@ -8,8 +8,9 @@ printf '\n---------------------------------------------------------------------\ grep -E 'Subject: |^Index|^RCS|^diff --git|^file +|^[-+]{3} ' "${1}" printf '---------------------------------------------------------------------\n\n' -printf "Apply patch on path [defaults to /usr/ports]? " +printf "Apply patch on path? " read -r _path +_path=$(dev-dirs $_path) printf "Fix quoted-printable mangeled patch? [y/N]: " read -r _qprint diff --git a/.notion/cfg_notioncore.lua b/.notion/cfg_notioncore.lua index 6e2dd5f..42786c3 100644 --- a/.notion/cfg_notioncore.lua +++ b/.notion/cfg_notioncore.lua @@ -119,7 +119,7 @@ defbindings("WMPlex.toplevel", { kpress(META.."D", "ioncore.exec_on(_, 'dexec')"), bdoc("Port list viewer"), - kpress(META.."S", "ioncore.exec_on(_, 'bterm goport')"), + kpress(META.."S", "ioncore.exec_on(_, 'bterm portjump /')"), bdoc("cscope /usr/src/sys"), kpress(META.."Shift+L", "ioncore.exec_on(_, 'dsys')"), diff --git a/.notion/cfg_sp.lua b/.notion/cfg_sp.lua index 6a48303..f17c64c 100644 --- a/.notion/cfg_sp.lua +++ b/.notion/cfg_sp.lua @@ -2,7 +2,7 @@ -- Ion mod_sp configuration file -- --- mod_sp.set_size(1400, 800); +mod_sp.set_size(1400, 800); defbindings("WScreen", { bdoc("Toggle scratchpad."),