From 51276df8bea38fadac18f1429f9a5cbe08dc1442 Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Thu, 23 Nov 2023 13:23:56 +0100 Subject: [PATCH] Update 2023-11-23 13:23 OpenBSD/amd64-x13 --- .Xdefaults | 107 +++++++++++++++++++++++++++++++++ .bin/_config | 20 +++--- .bin/apps/amused | 18 +++--- .bin/cbar | Bin 11288 -> 10816 bytes .bin/dexec_browser | 2 +- .bin/dexec_mail | 18 +++--- .bin/dexec_man | 5 +- .bin/dexec_pass | 8 +-- .bin/dexec_port | 4 +- .bin/drink | 6 +- .bin/obsdmake | 9 +++ .bin/s | 27 --------- .bin/sp | 6 +- .bin/sshot | 2 +- .bin/xpick_copy | 2 +- .config/spectrwm/spectrwm.conf | 59 ++++++++---------- .gnupg/pinentry-dmenu.conf | 2 +- .kshrc | 39 +++++++----- .vim/vimrc | 2 +- 19 files changed, 216 insertions(+), 120 deletions(-) delete mode 100755 .bin/s diff --git a/.Xdefaults b/.Xdefaults index 38f7a69..be62b39 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -176,3 +176,110 @@ XConsole*y: 870 XConsole*width: 620 XConsole*height: 160 +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 0cc7e66..7ee8a68 100644 --- a/.bin/_config +++ b/.bin/_config @@ -2,9 +2,11 @@ # FONTS # -SFONT="Cozette:pixelsize=13" -BFONT="CozetteHiDpi:pixelsize=26" -HFONT="LuxiMono-24" +SFONT="-slavfox-cozettehidpi-medium-r-normal--26-240-75-75-m-120-iso10646-1" +BFONT="-slavfox-cozette-medium-r-normal--13-120-75-75-m-60-iso10646-1" +HFONT="FuraCodeNerdFontMono:pixelsize=28" + +DFONT="CozetteHidpi:pixelsize=26" # TERMINALS # @@ -15,22 +17,22 @@ HTERM="st -f ${HFONT}" MICROFONT="-uw-ttyp0-medium-r-normal--13-150-75-75-c-80-iso10646-1" MICROTERM="st -f ${MICROFONT}" -# DMENU -# -DFONT="Cozette:pixelsize=13" # NOTION ORANGE -DMENUOPTS="-fn '$DFONT' -nb #181818 -nf #404040 -sf #FFA600 -sb #222222 -l 18 -i -f" +#DMENUOPTS="-fn '$DFONT' -nb #181818 -nf #707070 -sf #FFA600 -sb #222222 -l 18 -i -f" # BSPWM -# DMENUOPTS="-fn '$DFONT' -nb #222222 -nf #707070 -sf #CCCCCC -sb #222222 -i -f" +#DMENUOPTS="-fn '$DFONT' -nb #222222 -nf #707070 -sf #CCCCCC -sb #222222 -i -f" # SPECTRWM GREY -# DMENUOPTS="-fn $DFONT -nb #181818 -nf #999999 -sf #CCCCCC -sb #181818 -i -f" +DMENUOPTS="-fn $DFONT -nb #181818 -nf #999999 -sf #CCCCCC -sb #181818 -i -f" DMENU_CMD="dmenu $DMENUOPTS" DMENURUN_CMD="dmenu_run $DMENUOPTS" +notify_func() { /usr/local/bin/notify-send " $(date +%H:%M) $@ "; } +NOTIFY_CMD=notify_func + # DEVELOPMENT # # [ ! -d "${HOME}/.dev" ] && mkdir "${HOME}/.dev" diff --git a/.bin/apps/amused b/.bin/apps/amused index 015f7bd..5a28718 100755 --- a/.bin/apps/amused +++ b/.bin/apps/amused @@ -21,28 +21,28 @@ amused show | cut -d'/' -f5- SEL="$( showlist | $DMENU_CMD -p Playlist -l 30)" amused_shuffle() {( - notify-send "shuffle started in background"; + $NOTIFY_CMD "shuffle started in background"; amused show | sort -R | amused load; - notify-send "shuffle finished"; + $NOTIFY_CMD "shuffle finished"; )&} amused_sort() {( - notify-send "sorting started in background" + $NOTIFY_CMD "sorting started in background" amused show | sort -u | amused load - notify-send "sorting finished" + $NOTIFY_CMD "sorting finished" )&} amused_load_tank() {( - notify-send "loading started in background" + $NOTIFY_CMD "loading started in background" amused load < /home/sdk/.music.all.txt - notify-send "loading finished" + $NOTIFY_CMD "loading finished" )&} amused_load_local() {( - notify-send "loading started in background" + $NOTIFY_CMD "loading started in background" find ~/MusicSelection -type f | amused load - notify-send "loading finished" + $NOTIFY_CMD "loading finished" )&} amused_cmd() { amused "${@}" - notify-send "$(amused status | head -1 | cut -d'/' -f5-)" + $NOTIFY_CMD "$(amused status | head -1 | cut -d'/' -f5-)" } case "${SEL}" in diff --git a/.bin/cbar b/.bin/cbar index d474a1832a0b8d2a0d5c844f349c8202a8b0efc4..4897060a7a9086d16be0e739212739fa224617ba 100755 GIT binary patch literal 10816 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 OG5W_1L(_up#Qy`j0QL$1 diff --git a/.bin/dexec_browser b/.bin/dexec_browser index 6bb7089..4096c6b 100755 --- a/.bin/dexec_browser +++ b/.bin/dexec_browser @@ -21,7 +21,7 @@ touch "${HISTFILE}" read_input() { local S=$( { echo "paste_from_clipboard"; tail -r ${HISTFILE}; } \ | awk '!seen[$0]++' \ - | ${DMENU_CMD} -p "bookmark>") + | ${DMENU_CMD} -p "Bookmarks") case "${S}" in paste_from_clipboard) S=$(xclip -o | head -n 1); ;; diff --git a/.bin/dexec_mail b/.bin/dexec_mail index 6716c0a..ef40698 100755 --- a/.bin/dexec_mail +++ b/.bin/dexec_mail @@ -9,15 +9,19 @@ # [ -z "$SEL" ] || texec $SEL . $HOME/.bin/_config -MAILBOXES=$(cd ~/.emails && find Mailboxes/*/ \ - -mindepth 1 -maxdepth 1 -type d \ - -not -path "*/tmp*" \ - -not -path "*/cur*" \ - -not -path "*/new*") +# MAILBOXES=$(cd ~/.emails && find Mailboxes/*/ \ +# -mindepth 1 -maxdepth 1 -type d \ +# -not -path "*/tmp*" \ +# -not -path "*/cur*" \ +# -not -path "*/new*") + +MAILBOXES="$(print "t1 login sdk $(pass Internet/mail.codevoid.de | head -1)\nt1 list \"\" \"*\"\nt1 logout" \ + | openssl s_client -quiet -connect mail.codevoid.de:993 -crlf - 2>/dev/null \ + | grep "^\* LIST" | awk '{ print $NF }' | sort | dos2unix)" + HOST="imaps://mail.codevoid.de" - -SEL=$(echo "$MAILBOXES" | $DMENU_CMD -p Mutt) +SEL=$(echo "$MAILBOXES" | $DMENU_CMD -l 12 -p Mailbox) [ -z "$SEL" ] || texec "mutt -F $HOME/.mutt/rc-account-private -f $HOST/$SEL" diff --git a/.bin/dexec_man b/.bin/dexec_man index 9e20592..2a7479c 100755 --- a/.bin/dexec_man +++ b/.bin/dexec_man @@ -4,7 +4,6 @@ MAN1=$(man -s1 -k .) MAN2=$(man -s2 -k .) MAN3=$(man -s3 -k .) -MAN3P=$(man -s3p -k .) MAN4=$(man -s4 -k .) MAN5=$(man -s5 -k .) MAN6=$(man -s6 -k .) @@ -14,11 +13,11 @@ MAN9=$(man -s9 -k .) SEL=$(echo "$MAN1" "$MAN2" "$MAN3" "$MAN4" \ "$MAN5" "$MAN6" "$MAN7" "$MAN8" \ - "$MAN9" "$MAN3P" | $DMENU_CMD -p "Man") + "$MAN9" "$MAN3P" | $DMENU_CMD -l 10 -p "Man") [ -z "$SEL" ] && exit 0 N=$(echo "$SEL" | cut -d"(" -f2 | cut -d")" -f1) M=$(echo "$SEL" | cut -d"(" -f1 | cut -d"," -f1) -bterm -e man -s $N $M +sterm -e man -s $N $M diff --git a/.bin/dexec_pass b/.bin/dexec_pass index f237718..87dab03 100755 --- a/.bin/dexec_pass +++ b/.bin/dexec_pass @@ -18,12 +18,12 @@ password_out=$(pass "$password" 2> /dev/null) printf "%s" "$password_out" | head -1 | xclip -r # extract additional information -password_info=$(printf "%s" "$password_out" | grep -Ei 'login|user') -url_info=$(printf "%s" "$password_out" | grep -Ei '^url' | awk -F"[ :]*" '{ $1=""; print $0 }' ) +password_info=$(printf "%s" "$password_out" | grep -Ei -m 1 'login|user|email') +#url_info=$(printf "%s" "$password_out" | grep -Ei '^url' | awk -F"[ :]*" '{ $1=""; print $0 }' ) # show desktop notification if [[ -n $password_info ]]; then - notify-send "$(printf '%s' "$password_info")" + $NOTIFY_CMD "$(printf '%s' "$password_info")" else - notify-send "No username provided." + $NOTIFY_CMD "No username provided." fi diff --git a/.bin/dexec_port b/.bin/dexec_port index 1b03cbb..b8fa902 100755 --- a/.bin/dexec_port +++ b/.bin/dexec_port @@ -4,7 +4,7 @@ . $HOME/.bin/_config cd /usr/ports -DIR=$( ls -1d */* mystuff/*/* | egrep -v '^pobj|^distfiles|^log|^plist|^packages|CVS|Makefile|\.tgz$' | dmenu -p "DIR:" $DMENUOPTS -l 20); +DIR=$( ls -1d */* mystuff/*/* | egrep -v '^pobj|^distfiles|^log|^plist|^packages|CVS|Makefile|\.tgz$' | $DMENU_CMD -p "Port" -l 20); if [ ! -z "$DIR" ]; then cd /usr/ports/$DIR DIR2=$(printf "%s\n\n%s\n%s\n%s\n\nCVS %s\n" \ @@ -13,7 +13,7 @@ if [ ! -z "$DIR" ]; then "Maintainer: $(make show=MAINTAINER)" \ "Homepage: $(make show=HOMEPAGE)" \ "$(cvs log -Nl -rHEAD 2>&1 | awk '{ if ($0 ~ /^===/) p++; if (p == 1) print $0; if ($0 ~ /^---/) p++; }')" \ - | dmenu -p "INFO:" $DMENUOPTS -l 20) + | $DMENU_CMD -p "Info" -l 20) if [ ! -z "$DIR2" ]; then case "$DIR2" in Homepage*) firefox "$(make show=HOMEPAGE)" & ;; diff --git a/.bin/drink b/.bin/drink index 240f773..15a6962 100755 --- a/.bin/drink +++ b/.bin/drink @@ -1,5 +1,7 @@ #!/bin/sh . /home/sdk/.dbus_address -MSG="It's $(/bin/date +"%H:%M"). Drink some water!" -/usr/local/bin/notify-send "$MSG" +. /home/sdk/.bin/_config + +MSG="Drink some water!" +$NOTIFY_CMD "$MSG" diff --git a/.bin/obsdmake b/.bin/obsdmake index 3d4a214..2a9819a 100755 --- a/.bin/obsdmake +++ b/.bin/obsdmake @@ -1,6 +1,11 @@ #!/bin/ksh -xe umask 022 +ARGS="$@" + +trap abort 1 2 3 6 9 11 +abort() { echo "Abort with >$0 $ARGS< on $(date)" >> /tmp/obsdmake.log; } + JOBS="${JOBS:=$(sysctl -n hw.ncpuonline)}" export GLOBAL_AUTOCONF_CACHE="/var/ccache/config.cache" @@ -24,6 +29,8 @@ if [ -z "$1" ]; then exit 2 fi +echo "Start with >$0 $ARGS< on $(date)" >> /tmp/obsdmake.log + doas mkdir -p /usr/obj /usr/xobj doas chown build /usr/obj /usr/xobj @@ -124,4 +131,6 @@ case "$1" in release) mkrelease; ;; all) mkkernel; mkbase; mkxenocara; ;; esac + +echo "Finished with >$0 $ARGS< on $(date)" >> /tmp/obsdmake.log sync diff --git a/.bin/s b/.bin/s deleted file mode 100755 index fcee194..0000000 --- a/.bin/s +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -. ~/.bin/_config -[ ! -z "$1" ] && EXTRA="-q $1" -F=$(find /usr/src /usr/xenocara/ /usr/www/ -type f \ - -not -path "*/CVS/*" \ - -not -path "*/.git/*" \ - -not -path "/usr/src/gnu/*" \ - \( -name "*.c" \ - -o -name "*.h" \ - -o -name "*.pl" \ - -o -name "*.inc" \ - -o -name "patch-*" \ - -o -name "DESCR*" \ - -o -name "PLIST*" \ - -o -name "PLIST*" \ - -o -name "Makefile*" \ - \) \ - -not -name "*.orig" \ - -not -name "*.openbsd.orig" \ - | while IFS= read -r l; do echo "${#l} $((++n)) $l"; done \ - | sort -n -k 1 \ - | cut -d" " -f3- \ - | fzf -e -1 -0 +s $EXTRA --preview="cat {1}") -set -xe -R="$(readlink -f "$F")" -test -z "$R" || vim "$R" -echo "$(dirname "$R")" diff --git a/.bin/sp b/.bin/sp index fcc1f81..9f062ec 100755 --- a/.bin/sp +++ b/.bin/sp @@ -17,7 +17,7 @@ WID=$(wmctrl -x -l scratchpad | fgrep '.scratchpad' | cut -d" " -f1) if [ -z "$WID" ] then - sterm -c scratchpad -g 161x38+$GAP+$GAP & + sterm -c scratchpad -g 134x29+$GAP+$GAP & WID=$(wmctrl -x -l scratchpad | fgrep '.scratchpad' | cut -d" " -f1) else # check if window is iconfified or on another WS (or both) @@ -27,9 +27,9 @@ else #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,sicky # 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/.bin/sshot b/.bin/sshot index 250b2a0..4bcd8df 100755 --- a/.bin/sshot +++ b/.bin/sshot @@ -20,4 +20,4 @@ test -f /usr/local/bin/pngcrush \ _SWM_WS=-1 texec "upload \"$file\"" # NOTIFY -notify-send "$(xclip -o)" +$NOTIFY_CMD "$(xclip -o)" diff --git a/.bin/xpick_copy b/.bin/xpick_copy index 876db06..308204e 100755 --- a/.bin/xpick_copy +++ b/.bin/xpick_copy @@ -1,3 +1,3 @@ #!/bin/sh xpick -h | tr -d '\n' | xclip -notify-send "Copied: $(xclip -o)" +$NOTIFY_CMD "Copied: $(xclip -o)" diff --git a/.config/spectrwm/spectrwm.conf b/.config/spectrwm/spectrwm.conf index 429fa53..24497f1 100644 --- a/.config/spectrwm/spectrwm.conf +++ b/.config/spectrwm/spectrwm.conf @@ -17,15 +17,15 @@ color_focus_maximized_free = rgb:ff/6A/00 color_focus_free = rgb:77/77/77 color_unfocus = rgb:47/47/47 color_unfocus_free = rgb:47/47/47 -tile_gap = 0 -region_padding = 0 -disable_border = 0 +tile_gap = 12 +region_padding = 12 +disable_border = 1 # +-------------------------------------------------- # | BAR SETTINGS # +-------------------------------------------------- -bar_enabled = 0 -bar_border_width = 4 +bar_enabled = 1 +bar_border_width = 2 bar_border = rgb:18/18/18 bar_border_unfocus = rgb:18/18/18 bar_border_free = rgb:18/18/18 @@ -35,7 +35,7 @@ bar_color_selected = rgb:18/24/28 bar_font_color = rgb:99/99/99,rgb:ff/6A/00,red bar_font_color_selected = rgb:ff/ff/ff bar_font_color_free = rgb:99/99/99 -bar_font = FuraCodeNerdFont-11 +bar_font = CozetteHidpi:pixelsize=26 bar_action = cbar bar_action_expand = 0 bar_at_bottom = 0 @@ -60,7 +60,7 @@ bar_at_bottom = 0 # ++ A literal ‘+’ # +@ Prefix for text markup sequences -bar_format = +S +L  +R   +I   +M  +W +|1R +A %Y-%m-%d %H:%M +bar_format = +S WS:+I/+R  H:+M  +W +|2R +A %b %d %H:%M #bar_format = +I +S (+M) +|1R +A %Y-%m-%d %H:%M # +-------------------------------------------------- @@ -68,32 +68,20 @@ bar_format = +S +L  +R   +I   +M  +W +|1R +A % # +-------------------------------------------------- workspace_indicator = listall,markcurrent,markactive,markempty,markurgent,noindexes -workspace_mark_active = '' -#workspace_mark_active = '' -workspace_mark_current = '+@fg=1;+@fg=0;' -workspace_mark_empty = '' -workspace_mark_urgent = '+@fg=2;+@fg=0;' +workspace_mark_active = '[A]' +workspace_mark_current = '+@fg=1;[C]+@fg=0;' +workspace_mark_empty = '[ ]' +workspace_mark_urgent = '+@fg=2;[I]+@fg=0;' workspace_limit = 10 -stack_mark_horizontal = '' -stack_mark_horizontal_flip = '' -stack_mark_vertical = '' -stack_mark_vertical_flip = '' -stack_mark_max = '' -stack_mark_floating = '~' +stack_mark_horizontal = 'D' +stack_mark_horizontal_flip = 'U' +stack_mark_vertical = '>' +stack_mark_vertical_flip = '<' +stack_mark_max = 'M' +stack_mark_floating = 'F' verbose_layout = 0 urgent_enabled = 1 -# name = ws[1]:1 -# name = ws[2]:2 -# name = ws[3]:3 -# name = ws[4]:4 -# name = ws[5]:5 -# name = ws[6]:6 -# name = ws[7]:7 -# name = ws[8]:8 -# name = ws[9]:9 -# name = ws[10]:10 - # +-------------------------------------------------- # | FOCUS BEHAVIOR # +-------------------------------------------------- @@ -111,7 +99,7 @@ click_to_raise = 1 # | QUIRKS # +-------------------------------------------------- -quirk[scratchpad] = FLOAT + ANYWHERE + FOCUSPREV + FOCUSONMAP_SINGLE +quirk[scratchpad] = FLOAT + ANYWHERE quirk[XConsole:xconsole] = FLOAT + ANYWHERE + NOFOCUSCYCLE + NOFOCUSONMAP # +-------------------------------------------------- @@ -136,11 +124,11 @@ bind[hterm] = MOD+Control+Return program[irssi] = texec x bind[irssi] = MOD+Shift+X -program[Super] = dexec_super -bind[Super] = Super_L +program[man] = dexec_mail +bind[man] = MOD+Shift+M -program[mutt] = texec mutt -bind[mutt] = MOD+Shift+M +program[vpn] = dexec_vpn +bind[vpn] = MOD+V program[omutt] = texec mutt-openbsd-all bind[omutt] = MOD+Shift+O @@ -151,6 +139,9 @@ bind[exec] = MOD+D program[ssh] = dexec_ssh bind[ssh] = MOD+S +program[ports] = dexec_port +bind[ports] = MOD+Shift+S + program[audio] = dexec_audio bind[audio] = MOD+O diff --git a/.gnupg/pinentry-dmenu.conf b/.gnupg/pinentry-dmenu.conf index 21130c8..8d4f1a2 100644 --- a/.gnupg/pinentry-dmenu.conf +++ b/.gnupg/pinentry-dmenu.conf @@ -1,6 +1,6 @@ asterisk = "*"; prompt = ""; -font = "JetBrainsMono-10"; +font = "CozetteHidpi:pixelsize=26"; bottom = false; prompt_fg = "#FFFFFF"; diff --git a/.kshrc b/.kshrc index 513e581..8f2833f 100644 --- a/.kshrc +++ b/.kshrc @@ -433,7 +433,7 @@ portclean() {( cd /usr/ports doas rm -rf pobj/* plist logs packages bulk update distfiles/* mkdir -p plist logs packages bulk update - doas chown -R sdk:_pbuild /usr/ports/ + #doas chown -R sdk:_pbuild /usr/ports/ doas make fix-permissions )} pmark() { pwd > /var/cache/pmark; } @@ -561,30 +561,39 @@ doupload-gopher() { # YOUTUBE-DL ######################################################################## -YTDL_AGENT="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4506.0 Safari/537.36" -YTDL_OPTS="-i --no-part --abort-on-unavailable-fragment --buffer-size 16K --fragment-retries 100 --http-chunk-size 10M" ytdl() { - local FMT="bestvideo[ext=mp4][height<=1080]+bestaudio[ext=m4a]/best[ext=mp4]/best" - yt-dlp $YTDL_OPTS --user-agent "$YTDL_AGENT" -f "$FMT" "$@"; + yt-dlp "$@"; } -ytdl_playlist() { - local FMT="bestvideo[ext=mp4][height<=1080]+bestaudio[ext=m4a]/best[ext=mp4]/best" - yt-dlp $YTDL_OPTS --user-agent "$YTDL_AGENT" -f "$FMT" -o '%(playlist_title)s/%(title)s.%(ext)s' "$@"; +ytdl_playlist() { + yt-dlp \ + -o '%(playlist_title)s/%(title)s.%(ext)s' \ + "$@"; } ytdl_channel() { - local FMT="bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best" - yt-dlp $YTDL_OPTS --user-agent "$YTDL_AGENT" --download-archive ytdl_channel.txt -f "$FMT" \ - -o '%(upload_date)s - %(title)s.%(ext)s' "$@"; + yt-dlp \ + --download-archive ytdl_channel.txt \ + -o '%(upload_date)s - %(title)s.%(ext)s' \ + "$@"; } ytdl_bandcamp() { - yt-dlp $YTDL_OPTS --user-agent "$YTDL_AGENT" -x --audio-format mp3 -i --embed-thumbnail \ - --add-metadata -o '%(artist)s/%(album)s/%(track_number)02d - %(track)s.%(ext)s' "$@"; + yt-dlp \ + --extract-audio \ + --audio-format mp3 \ + --embed-thumbnail \ + --add-metadata \ + -o '%(artist)s/%(album)s/%(track_number)02d - %(track)s.%(ext)s' \ + "$@"; } ytdl_audio() { - yt-dlp $YTDL_OPTS --user-agent "$YTDL_AGENT" -f bestaudio --extract-audio --embed-thumbnail \ - --add-metadata -o "%(title)s-%(id)s.%(ext)s" "$@"; + yt-dlp \ + -f bestaudio \ + --extract-audio \ + --embed-thumbnail \ + --add-metadata \ + -o "%(title)s-%(id)s.%(ext)s" \ + "$@"; } xdl() { mkdir -p "$HOME/x/$1/" diff --git a/.vim/vimrc b/.vim/vimrc index af78f09..defc9f8 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -49,7 +49,7 @@ set smarttab set textwidth=72 " set colorcolumn=72 -set formatprg=par\ -w72q +"set formatprg=par\ -w72q set list set listchars=tab:»·,trail:•