From 798ba175d0edd50a696edc8467b2eedeaf881a4c Mon Sep 17 00:00:00 2001 From: Alessio Artoni <34690870+aartoni@users.noreply.github.com> Date: Fri, 25 Aug 2023 07:53:59 +0000 Subject: [PATCH 01/10] Fix wrong font name (#1353) --- .config/fontconfig/fonts.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index d7048ba..761ae00 100755 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -32,7 +32,7 @@ monospace Noto Sans Mono - Liberatinus Mono + Libertinus Mono FontAwesome Braille From 86f05abcce1fd270032975775adb40040c746cfe Mon Sep 17 00:00:00 2001 From: appeasementPolitik <108810900+appeasementPolitik@users.noreply.github.com> Date: Fri, 25 Aug 2023 07:56:50 +0000 Subject: [PATCH 02/10] Fix the extra space between sb-internet and the block on the right of sb-internet (#1352) --- .local/bin/statusbar/sb-internet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.local/bin/statusbar/sb-internet b/.local/bin/statusbar/sb-internet index 4c8131c..5440a52 100755 --- a/.local/bin/statusbar/sb-internet +++ b/.local/bin/statusbar/sb-internet @@ -25,9 +25,9 @@ elif [ "$(cat /sys/class/net/w*/operstate 2>/dev/null)" = 'down' ] ; then fi # Ethernet -[ "$(cat /sys/class/net/e*/operstate 2>/dev/null)" = 'up' ] && ethericon="🌐 " || ethericon="❎ " +[ "$(cat /sys/class/net/e*/operstate 2>/dev/null)" = 'up' ] && ethericon="🌐" || ethericon="❎" # TUN -[ -n "$(cat /sys/class/net/tun*/operstate 2>/dev/null)" ] && tunicon="🔒 " +[ -n "$(cat /sys/class/net/tun*/operstate 2>/dev/null)" ] && tunicon=" 🔒" printf "%s%s%s\n" "$wifiicon" "$ethericon" "$tunicon" From c550a7c6e54fba8d4cf6024b2ffcf2a475367bd3 Mon Sep 17 00:00:00 2001 From: Hylke Hellinga Date: Sun, 3 Sep 2023 09:20:13 +0200 Subject: [PATCH 03/10] Fixed Booksplit for termux (#1358) Co-authored-by: Simbaclaws --- .local/bin/booksplit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.local/bin/booksplit b/.local/bin/booksplit index a6845f7..079d85f 100755 --- a/.local/bin/booksplit +++ b/.local/bin/booksplit @@ -12,7 +12,7 @@ inputaudio="$1" ext="${1##*.}" # Get a safe file name from the book. -escbook="$(echo "$booktitle" | iconv -cf UTF-8 -t ASCII//TRANSLIT | tr -d '[:punct:]' | tr '[:upper:]' '[:lower:]' | tr ' ' '-' | sed "s/-\+/-/g;s/\(^-\|-\$\)//g")" +escbook="$(echo "$booktitle" | iconv -c -f UTF-8 -t ASCII//TRANSLIT | tr -d '[:punct:]' | tr '[:upper:]' '[:lower:]' | tr ' ' '-' | sed "s/-\+/-/g;s/\(^-\|-\$\)//g")" ! mkdir -p "$escbook" && echo "Do you have write access in this directory?" && @@ -31,7 +31,7 @@ do cmd="$cmd -metadata artist=\"$author\" -metadata title=\"$title\" -metadata album=\"$booktitle\" -metadata year=\"$year\" -metadata track=\"$track\" -metadata total=\"$total\" -ss \"$start\" -to \"$end\" -vn -c:a copy \"$file\" " fi title="$(echo "$x" | cut -d' ' -f2-)" - esctitle="$(echo "$title" | iconv -cf UTF-8 -t ASCII//TRANSLIT | tr -d '[:punct:]' | tr '[:upper:]' '[:lower:]' | tr ' ' '-' | sed "s/-\+/-/g;s/\(^-\|-\$\)//g")" + esctitle="$(echo "$title" | iconv -c -f UTF-8 -t ASCII//TRANSLIT | tr -d '[:punct:]' | tr '[:upper:]' '[:lower:]' | tr ' ' '-' | sed "s/-\+/-/g;s/\(^-\|-\$\)//g")" track="$((track+1))" start="$end" done < "$2" From b8cd0ab4953d053fef09c48ba04f2fbb2df57aa4 Mon Sep 17 00:00:00 2001 From: sban <30375170+mr-sban@users.noreply.github.com> Date: Tue, 5 Sep 2023 07:51:05 +0000 Subject: [PATCH 04/10] Timeout added to forecast module, ncmpcpp now tracks player state (#1359) * Added timeout to getforecast to prevent status bar breakage. A 2 second timeout is used in the case that wttr.in is inaccessible when dwm is started; as otherwise it tries to curl wttr.in indefinitely, not allowing other status bar modules to be loaded. * Update music status bar module on player state change --- .config/ncmpcpp/config | 1 + .local/bin/statusbar/sb-forecast | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config index 3111aab..1e2a8b0 100644 --- a/.config/ncmpcpp/config +++ b/.config/ncmpcpp/config @@ -31,3 +31,4 @@ progressbar_elapsed_color = blue:b statusbar_color = red statusbar_time_color = cyan:b execute_on_song_change="pkill -RTMIN+11 dwmblocks" +execute_on_player_state_change="pkill -RTMIN+11 dwmblocks" diff --git a/.local/bin/statusbar/sb-forecast b/.local/bin/statusbar/sb-forecast index 368c17f..d8a16aa 100755 --- a/.local/bin/statusbar/sb-forecast +++ b/.local/bin/statusbar/sb-forecast @@ -7,7 +7,7 @@ url="${WTTRURL:-wttr.in}" weatherreport="${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport" # Get a weather report from 'wttr.in' and save it locally. -getforecast() { curl -sf "$url/$LOCATION" > "$weatherreport" || exit 1; } +getforecast() { timeout --signal=1 2s curl -sf "$url/$LOCATION" > "$weatherreport" || exit 1; } # Forecast should be updated only once a day. checkforecast() { From 708d6c67317ca90138681d4a7892cc5db2e092cc Mon Sep 17 00:00:00 2001 From: appeasementPolitik <108810900+appeasementPolitik@users.noreply.github.com> Date: Wed, 4 Oct 2023 20:01:05 +0000 Subject: [PATCH 05/10] Change remaining tremc entry in script to stig (#1364) --- .local/bin/statusbar/sb-torrent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.local/bin/statusbar/sb-torrent b/.local/bin/statusbar/sb-torrent index 6527005..08c9173 100755 --- a/.local/bin/statusbar/sb-torrent +++ b/.local/bin/statusbar/sb-torrent @@ -11,9 +11,9 @@ transmission-remote -l | grep % | sort -h | uniq -c | awk '{print $3 $1}' | paste -sd ' ' - case $BLOCK_BUTTON in - 1) setsid -f "$TERMINAL" -e tremc ;; + 1) setsid -f "$TERMINAL" -e stig ;; 2) td-toggle ;; - 3) notify-send "🌱 Torrent module" "\- Left click to open tremc. + 3) notify-send "🌱 Torrent module" "\- Left click to open stig. - Middle click to toggle transmission. - Shift click to edit script. Module shows number of torrents: From 42f3efb4b0c57003d8c49e8e946948b458bea873 Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Sat, 28 Oct 2023 07:52:44 +1300 Subject: [PATCH 06/10] Add xdg-terminal-exec script to launch "$TERMINAL" for .desktop files (#1302) --- .local/bin/xdg-terminal-exec | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 .local/bin/xdg-terminal-exec diff --git a/.local/bin/xdg-terminal-exec b/.local/bin/xdg-terminal-exec new file mode 100755 index 0000000..12b18ff --- /dev/null +++ b/.local/bin/xdg-terminal-exec @@ -0,0 +1,3 @@ +#!/bin/sh + +"$TERMINAL" -e "$@" From bca6b403eb61df8f36e543a95ea48a07e546a9d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20AKY=C3=9CZ?= Date: Fri, 27 Oct 2023 21:54:15 +0300 Subject: [PATCH 07/10] Unpack Function for LF Without Aunpack (#1334) We can simply eliminate the usage of an external tool by adding a simple case statement to handle different types of compressed files. --- .config/lf/lfrc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.config/lf/lfrc b/.config/lf/lfrc index 56a4182..e104591 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -58,7 +58,22 @@ cmd extract ${{ printf "%s\n\t" "$fx" printf "extract?[y/N]" read ans - [ $ans = "y" ] && aunpack $fx + [ $ans = "y" ] && { + case $fx in + *.tar.bz2) tar xjf $fx ;; + *.tar.gz) tar xzf $fx ;; + *.bz2) bunzip2 $fx ;; + *.rar) unrar e $fx ;; + *.gz) gunzip $fx ;; + *.tar) tar xf $fx ;; + *.tbz2) tar xjf $fx ;; + *.tgz) tar xzf $fx ;; + *.zip) unzip $fx ;; + *.Z) uncompress $fx ;; + *.7z) 7z x $fx ;; + *.tar.xz) tar xf $fx ;; + esac + } }} cmd delete ${{ From 54c0aa2af8e0b998d1666a13bd86e6abcd08a291 Mon Sep 17 00:00:00 2001 From: poeplva <132710624+poeplva@users.noreply.github.com> Date: Fri, 27 Oct 2023 21:58:05 +0300 Subject: [PATCH 08/10] none of the encrypted devices are listed if no drives are decrypted already (#1338) The part ``` for open in $decrypted; do [ "$uuid" = "$open" ] && break 1 done ``` exits with `0` if the variable `$decrypted` is empty, causing none of the encrypted devices to be put into the `$unopenedluks` variable. This commit fixes this problem. --- .local/bin/mounter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/bin/mounter b/.local/bin/mounter index b532e08..756d04d 100755 --- a/.local/bin/mounter +++ b/.local/bin/mounter @@ -36,7 +36,7 @@ filter() { sed "s/ /:/g" | awk -F':' '$7==""{printf "%s%s (%s) %s\n",$1,$3,$5,$6 unopenedluks="$(for drive in $allluks; do uuid="${drive%% *}" uuid="${uuid//-}" # This is a bashism. - for open in $decrypted; do + [ -n "$decrypted" ] && for open in $decrypted; do [ "$uuid" = "$open" ] && break 1 done && continue 1 echo "🔒 $drive" From ca8cb1f6a7513e52b112b99a686844a587cebd89 Mon Sep 17 00:00:00 2001 From: appeasementPolitik <108810900+appeasementPolitik@users.noreply.github.com> Date: Fri, 27 Oct 2023 18:58:40 +0000 Subject: [PATCH 09/10] Update sb-mailbox in statusbar on closing neomutt (#1329) --- .local/bin/statusbar/sb-mailbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox index 2132184..88522f2 100755 --- a/.local/bin/statusbar/sb-mailbox +++ b/.local/bin/statusbar/sb-mailbox @@ -4,7 +4,7 @@ # When clicked, brings up `neomutt`. case $BLOCK_BUTTON in - 1) setsid -f "$TERMINAL" -e neomutt ;; + 1) setsid -w -f "$TERMINAL" -e neomutt; pkill -RTMIN+12 "${STATUSBAR:-dwmblocks}" ;; 2) setsid -f mw -Y >/dev/null ;; 3) notify-send "📬 Mail module" "\- Shows unread mail - Shows 🔃 if syncing mail From 1e3adf9c03b2e563e81a13d6907ffd5ca20b887a Mon Sep 17 00:00:00 2001 From: Lalle <29478339+LalleSX@users.noreply.github.com> Date: Fri, 27 Oct 2023 21:42:32 +0200 Subject: [PATCH 10/10] Launch dwm in a dbus session (#1340) * Launch dwm in a dbus session * Add ssh-agent * Update dbus env * Update xprofile --- .config/x11/xinitrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 2debc01..e99da8c 100755 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -13,5 +13,6 @@ if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile" ]; then else . "$HOME/.xprofile" fi - +# Activate dbus variables +dbus-update-activation-environment --all ssh-agent dwm