From 32385704f3ffc5d7bb5ed11f5ba7984bb0dc05ec Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Sat, 25 Nov 2023 11:31:21 +0100 Subject: [PATCH] Update 2023-11-25 11:31 OpenBSD/amd64-x13 --- .Xdefaults | 105 +-------------------------------- .bin/_config | 6 +- .bin/sp | 34 +++++++---- .config/spectrwm/spectrwm.conf | 9 +-- .kshrc | 1 - 5 files changed, 32 insertions(+), 123 deletions(-) diff --git a/.Xdefaults b/.Xdefaults index be62b39..d197374 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -167,7 +167,7 @@ xterm*color15: #eee8d5 ! -- XCONSOLE -- ! XConsole*foreground: #D6D5D3 XConsole*background: #121212 -XConsole*font: -uw-ttyp0-medium-r-normal--16-150-75-75-c-80-iso10646-1 +XConsole*font: Terminus:pixelsize=11 XConsole*borderWidth: 0 XConsole*scrollVertical: Never XConsole*scrollHorizontal: Never @@ -180,106 +180,3 @@ XFontSel.printOnQuit: True XFontSel.pattern: -*-*-medium-r-normal-*-*-*-*-*-*-*-iso10646-1 XFontSel*Font: lucidasanstypewriter-14 -! -- XLOCK -- ! -XLock.mode: blank -XLock.erasedelay: 4000 -XLock.font: -b&h-lucida-medium-r-normal-sans-24-*-*-*-*-*-iso8859-1 -!XLock.font: -*-times-*-*-*-*-18-*-*-*-*-*-*-* -!XLock.background: White -!XLock.foreground: Black -XLock.background: Black -XLock.foreground: White -!XLock.foreground: AntiqueWhite -XLock.nolock: off -XLock.inwindow: off -XLock.inroot: off -XLock.remote: off -XLock.mono: off -XLock.allowaccess: off -XLock.vtlock: off -XLock.allowroot: off -XLock.description: on -XLock.echokeys: off -XLock.enablesaver: on -XLock.resetsaver: on -XLock.grabmouse: on -XLock.install: on -XLock.mousemotion: off -XLock.sound: off -XLock.timeelapsed: off -XLock.usefirst: on -XLock.verbose: off -XLock.nice: 10 -XLock.lockdelay: 0 -XLock.unlockdelay: 0 -XLock.timeout: 30 -XLock.echokey: ? - -!XLock.geometry: 64x64 -!XLock.icongeometry: 4x4 -XLock.icongeometry: 64x64 -!XLock.icongeometry: 256x256 - -! For sound -XLock.locksound: /usr/lib/X11/xlock/sounds/complete.au -XLock.infosound: /usr/lib/X11/xlock/sounds/identify-please.au -XLock.validsound: /usr/lib/X11/xlock/sounds/thank-you.au -XLock.invalidsound: /usr/lib/X11/xlock/sounds/not-programmed.au -!XLock.locksound: complete.au -!XLock.infosound: identify-please.au -!XLock.validsound: thank-you.au -!XLock.invalidsound: not-programmed.au - -! For bouboule, pyro, star, & worm modes -XLock.use3d: off -XLock.delta3d: 1.5 -XLock.right3d: Blue -XLock.left3d: Red -XLock.both3d: Magenta - -! For marquee & nose modes -!XLock.program: fortune -o -XLock.program: fortune -s -!XLock.program: fortune -!XLock.program: /usr/games/fortune -o -!XLock.program: /usr/games/fortune -s -!XLock.program: /usr/games/fortune -!XLock.program: finger -!XLock.messagesfile: fortune.dat -!XLock.messagefile: /etc/motd -!XLock.message: "Go away, no one is here" -!XLock.messagefont: -b&h-lucida-medium-r-normal-sans-24-*-*-*-*-*-iso8859-1 -!XLock.messagefont: -*-times-*-*-*-*-18-*-*-*-*-*-*-* - -! For modes with images -XLock.*.bitmap: bitmaps/m-xlock.xbm -XLock.*.bitmap: pixmaps/m-xlock.xpm -XLock.*.bitmap: /usr/lib/X11/xlock/bitmaps - -! For mailbox check application -!XLock.mailCmd: /usr/ucb/mail -e -!XLock.mailCmd: /usr/bin/mail -e -!XLock.mailCmd: /usr/local/bin/chkmbox -!XLock.mailIcon: -!XLock.nomailIcon: - -! 0 defaults to maximum defined value -XLock.logoutAuto: 0 -! 0 defaults to maximum defined value -XLock.logoutButton: 0 - -XLock.username: Name: -XLock.password: Password: -XLock.info: Enter password to unlock; select icon to lock. -XLock.validate: Validating login... -XLock.invalid: Invalid login. -XLock.invalidCapsLock: Invalid login, Caps Lock on. -XLock.logoutButtonLabel: Click here to logout -XLock.logoutButtonHelp: \ -You may log out this session if no terminals are available.\n\ -WARNING: This will crash any open applications that the user\n\ -has running. You should try to contact the user if possible\n\ -before logging them out. -XLock.logoutFailedString: \ -Logout attempt FAILED.\n\ -Current user could not be automatically logged out. diff --git a/.bin/_config b/.bin/_config index 7ee8a68..82f544f 100644 --- a/.bin/_config +++ b/.bin/_config @@ -7,16 +7,14 @@ BFONT="-slavfox-cozette-medium-r-normal--13-120-75-75-m-60-iso10646-1" HFONT="FuraCodeNerdFontMono:pixelsize=28" DFONT="CozetteHidpi:pixelsize=26" +NFONT="Termsyn:pixelsize=9" # TERMINALS # STERM="st -f ${SFONT}" BTERM="st -f ${BFONT}" HTERM="st -f ${HFONT}" - -MICROFONT="-uw-ttyp0-medium-r-normal--13-150-75-75-c-80-iso10646-1" -MICROTERM="st -f ${MICROFONT}" - +NTERM="st -f ${NFONT}" # NOTION ORANGE #DMENUOPTS="-fn '$DFONT' -nb #181818 -nf #707070 -sf #FFA600 -sb #222222 -l 18 -i -f" diff --git a/.bin/sp b/.bin/sp index 9f062ec..dbb74e9 100755 --- a/.bin/sp +++ b/.bin/sp @@ -1,35 +1,49 @@ #!/bin/sh +# read resolution from xrandr: "1920x1080 60.03*+" RES=$(xrandr | grep "*+" | awk '{print $1}') + +# parse xrandr output RESH=${RES%x*} RESV=${RES#*x} -GAP=150 +# calculate pixel gap that should surround the window +GAP=$(( RESH / 12 )) +# Calculate the horzontal/vertical dimensions of the window H=$(( RESH - 2 * GAP )) V=$(( RESV - 2 * GAP )) -# set the following quirk in .config/spectrwm/spectrwm.conf -# quirk[scratchpad] = FLOAT + ANYWHERE +# set the quirk in .config/spectrwm/spectrwm.conf +# quirk[scratchpad] = FLOAT + ANYWHERE + FOCUSPREV # get scratchpad window id WID=$(wmctrl -x -l scratchpad | fgrep '.scratchpad' | cut -d" " -f1) if [ -z "$WID" ] then - sterm -c scratchpad -g 134x29+$GAP+$GAP & - WID=$(wmctrl -x -l scratchpad | fgrep '.scratchpad' | cut -d" " -f1) + # start terminal (sterm is st.suckless.org) + # XXX st is resized properly when hidden, st takes rows, + # columns as size input. We don't have that so that's just + # what echo $COLUMNS $LINES reports after the resize. + # So on the first start, the windows is "almost" correctly + # sized and we fix it later (when hidden). + sterm -c scratchpad -g 134x29+$GAP+$GAP & + # XXX we cannot resize with wmctrl here, because the window is not + # mapped yet. Adding a sleep here and resize then is visually + # unpleasant. else - # check if window is iconfified or on another WS (or both) + # check if window is iconified or on another WS (or both) if xwininfo -id $WID | fgrep -q IsUnMapped then # move window to current workspace - #wmctrl -i -r $WID -t $(xprop -root _NET_CURRENT_DESKTOP | cut -d'=' -f2) - wmctrl -i -r $WID -t $_SWM_WS + [ -z $_SWM_WS ] \ + && wmctrl -i -r $WID -t $(xprop -root _NET_CURRENT_DESKTOP | cut -d'=' -f2) \ + || wmctrl -i -r $WID -t $_SWM_WS # remove hidden flag - wmctrl -i -R $WID -b remove,hidden,sicky + wmctrl -i -r $WID -b remove,hidden # activate (give focus) - # wmctrl -i -a $WID + wmctrl -i -a $WID else # window is visible => hide wmctrl -i -r $WID -b add,hidden diff --git a/.config/spectrwm/spectrwm.conf b/.config/spectrwm/spectrwm.conf index 24497f1..3003a86 100644 --- a/.config/spectrwm/spectrwm.conf +++ b/.config/spectrwm/spectrwm.conf @@ -13,10 +13,10 @@ border_width = 1 color_focus = rgb:ff/6A/00 color_focus_maximized = rgb:ff/6A/00 -color_focus_maximized_free = rgb:ff/6A/00 -color_focus_free = rgb:77/77/77 +color_focus_maximized_free = rgb:ff/A6/00 +color_focus_free = rgb:ff/A6/00 color_unfocus = rgb:47/47/47 -color_unfocus_free = rgb:47/47/47 +color_unfocus_free = rgb:55/35/00 tile_gap = 12 region_padding = 12 disable_border = 1 @@ -99,7 +99,8 @@ click_to_raise = 1 # | QUIRKS # +-------------------------------------------------- -quirk[scratchpad] = FLOAT + ANYWHERE +quirk[mpv] = FLOAT + ANYWHERE + FOCUSPREV +quirk[scratchpad] = FLOAT + ANYWHERE + FOCUSPREV quirk[XConsole:xconsole] = FLOAT + ANYWHERE + NOFOCUSCYCLE + NOFOCUSONMAP # +-------------------------------------------------- diff --git a/.kshrc b/.kshrc index 8f2833f..8847f9c 100644 --- a/.kshrc +++ b/.kshrc @@ -141,7 +141,6 @@ alias web-edit='ssh home.codevoid.de "cd web && make edit"' alias ebay="chrome https://www.ebay-kleinanzeigen.de/m-nachrichten.html &" alias sbl="chrome https://scottsbasslessons.com &" -alias remake="make clean=all && make" alias refake="rm -f pkg/*.orig; make clean=fake && make fake" alias reinstall="remake && make reinstall"