From fd57c4350b5cebe82ca0790856340eae1dbb3d81 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 2 Apr 2019 19:20:26 -0400 Subject: [PATCH] fix for dunst update --- .config/dunst/dunstrc | 2 +- .scripts/statusbar/battery | 3 +-- .scripts/statusbar/clock | 5 ++--- .scripts/statusbar/cpu | 6 ++---- .scripts/statusbar/disk | 6 ++---- .scripts/statusbar/help | 3 +-- .scripts/statusbar/internet | 3 +-- .scripts/statusbar/mailbox | 5 ++--- .scripts/statusbar/memory | 6 ++---- .scripts/statusbar/music | 5 ++--- .scripts/statusbar/news | 3 +-- .scripts/statusbar/pacpackages | 3 +-- .scripts/statusbar/torrent | 3 +-- .scripts/statusbar/volume | 3 +-- .scripts/statusbar/weather | 3 +-- 15 files changed, 21 insertions(+), 38 deletions(-) diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 81d4721..abf5586 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -38,7 +38,7 @@ # %n progress value if set without any extra characters # %% Literal % # Markup is allowed - format = "%s\n%b" + format = "%s\n%b" alignment = left show_age_threshold = 60 diff --git a/.scripts/statusbar/battery b/.scripts/statusbar/battery index e5f6ec7..25c9269 100755 --- a/.scripts/statusbar/battery +++ b/.scripts/statusbar/battery @@ -2,8 +2,7 @@ # Give a battery name (e.g. BAT0) as an argument. case $BLOCK_BUTTON in - 3) pgrep -x dunst >/dev/null && notify-send "🔋 Battery module: -🔋: discharging + 3) pgrep -x dunst >/dev/null && notify-send "🔋 Battery module" "🔋: discharging 🛑: not charging ♻: stagnant charge 🔌: charging diff --git a/.scripts/statusbar/clock b/.scripts/statusbar/clock index 588c523..d6d54ef 100755 --- a/.scripts/statusbar/clock +++ b/.scripts/statusbar/clock @@ -3,9 +3,8 @@ date '+%Y %b %d (%a) %I:%M%p' case $BLOCK_BUTTON in - 1) pgrep -x dunst >/dev/null && notify-send "$(cal --color=always | sed "s/..7m//;s/..27m/<\/span><\/b>/")" && notify-send "$(calcurse -D ~/.config/calcurse -d3)" ;; + 1) pgrep -x dunst >/dev/null && notify-send "This Month" "$(cal --color=always | sed "s/..7m//;s/..27m/<\/span><\/b>/")" && notify-send "Appointments" "$(calcurse -D ~/.config/calcurse -d3)" ;; 2) "$TERMINAL" -e calcurse -D ~/.config/calcurse ;; - 3) pgrep -x dunst >/dev/null && notify-send "📅 Time/date module: -- Left click to show upcoming appointments for the next three days via \`calcurse -d3\` and show the month via \`cal\` + 3) pgrep -x dunst >/dev/null && notify-send "📅 Time/date module" "\- Left click to show upcoming appointments for the next three days via \`calcurse -d3\` and show the month via \`cal\` - Middle click opens calcurse if installed" ;; esac diff --git a/.scripts/statusbar/cpu b/.scripts/statusbar/cpu index fc9d617..3b1394a 100755 --- a/.scripts/statusbar/cpu +++ b/.scripts/statusbar/cpu @@ -1,10 +1,8 @@ #!/bin/sh case $BLOCK_BUTTON in - 1) notify-send "🖥 CPU hogs: -$(ps axch -o cmd:15,%cpu --sort=-%cpu | head)" ;; - 3) notify-send "🖥 CPU module: -- Shows CPU temperature. + 1) notify-send "🖥 CPU hogs" "$(ps axch -o cmd:15,%cpu --sort=-%cpu | head)" ;; + 3) notify-send "🖥 CPU module " "\- Shows CPU temperature. - Click to show intensive processes. - % is of single core." ;; esac diff --git a/.scripts/statusbar/disk b/.scripts/statusbar/disk index 3a12394..d3dd07d 100755 --- a/.scripts/statusbar/disk +++ b/.scripts/statusbar/disk @@ -10,10 +10,8 @@ icon="$2" [ -z "$2" ] && icon="$1" case $BLOCK_BUTTON in - 1) pgrep -x dunst >/dev/null && notify-send "💽 Disk space: -$(df -h --output=target,used,size)" ;; - 3) pgrep -x dunst >/dev/null && notify-send "💽 Hard drive space remaining: -- Shows used hard drive space. + 1) pgrep -x dunst >/dev/null && notify-send "💽 Disk space" "$(df -h --output=target,used,size)" ;; + 3) pgrep -x dunst >/dev/null && notify-send "💽 Disk module" "\- Shows used hard drive space. - Click to show all disk info." ;; esac diff --git a/.scripts/statusbar/help b/.scripts/statusbar/help index 21c84ce..1374769 100755 --- a/.scripts/statusbar/help +++ b/.scripts/statusbar/help @@ -2,7 +2,6 @@ case $BLOCK_BUTTON in 1) groff -mom ~/.readme.mom -Tpdf | zathura - ;; 2) i3 restart ;; - 3) pgrep -x dunst >/dev/null && notify-send "❓ Help module: -- Left click to open LARBS guide. + 3) pgrep -x dunst >/dev/null && notify-send "❓ Help module" "\- Left click to open LARBS guide. - Middle click to refresh i3.";; esac; echo "❓" diff --git a/.scripts/statusbar/internet b/.scripts/statusbar/internet index e26e633..1d2f2e8 100755 --- a/.scripts/statusbar/internet +++ b/.scripts/statusbar/internet @@ -2,8 +2,7 @@ case $BLOCK_BUTTON in 1) $TERMINAL -e nmtui ;; - 3) pgrep -x dunst >/dev/null && notify-send "🌐 Internet module: -- Click for \`nmtui\` for wifi access + 3) pgrep -x dunst >/dev/null && notify-send "🌐 Internet module" "\- Click to connect 📡: no wifi connection 📶: wifi connection with quality ❎: no ethernet diff --git a/.scripts/statusbar/mailbox b/.scripts/statusbar/mailbox index 0c5ccbe..c0794e5 100755 --- a/.scripts/statusbar/mailbox +++ b/.scripts/statusbar/mailbox @@ -7,11 +7,10 @@ case $BLOCK_BUTTON in 1) "$TERMINAL" -e neomutt ;; 2) setsid $HOME/.config/mutt/etc/mailsync.sh >/dev/null & ;; - 3) pgrep -x dunst >/dev/null && notify-send "📬 Mail module: -- Shows unread mail + 3) pgrep -x dunst >/dev/null && notify-send "📬 Mail module" "\- Shows unread mail - Shows 🔃 if syncing mail - Left click opens neomutt - Middle click syncs mail" ;; esac -echo "$(du -a ~/.mail/*/INBOX/new/* 2>/dev/null | sed -n '$=')$(cat /tmp/imapsyncicon 2>/dev/null)" +echo "$(du -a ~/.local/share/mail/*/INBOX/new/* 2>/dev/null | sed -n '$=')$(cat /tmp/imapsyncicon 2>/dev/null)" diff --git a/.scripts/statusbar/memory b/.scripts/statusbar/memory index 40705c4..dfd3d7b 100755 --- a/.scripts/statusbar/memory +++ b/.scripts/statusbar/memory @@ -1,10 +1,8 @@ #!/bin/sh case $BLOCK_BUTTON in - 1) notify-send "🧠 Memory hogs: -$(ps axch -o cmd:15,%mem --sort=-%mem | head)" ;; - 3) notify-send "🧠 Memory module: -- Shows Memory Used/Total. + 1) notify-send "🧠 Memory hogs" "$(ps axch -o cmd:15,%mem --sort=-%mem | head)" ;; + 3) notify-send "🧠 Memory module" "\- Shows Memory Used/Total. - Click to show memory hogs." ;; esac diff --git a/.scripts/statusbar/music b/.scripts/statusbar/music index ef3a6c3..93c2c9c 100755 --- a/.scripts/statusbar/music +++ b/.scripts/statusbar/music @@ -7,8 +7,7 @@ filter() { case $BLOCK_BUTTON in 1) mpc status | filter && setsid "$TERMINAL" -e ncmpcpp & ;; # right click, pause/unpause 2) mpc toggle | filter ;; # right click, pause/unpause - 3) mpc status | filter && pgrep -x dunst >/dev/null && notify-send "🎵 Music module: -- Shows mpd song playing. + 3) mpc status | filter && pgrep -x dunst >/dev/null && notify-send "🎵 Music module" "\- Shows mpd song playing. - Italic when paused. - Left click opens ncmpcpp. - Middle click pauses. @@ -16,4 +15,4 @@ case $BLOCK_BUTTON in 4) mpc prev | filter ;; # scroll up, previous 5) mpc next | filter ;; # scroll down, next *) mpc status | filter ;; -esac +esac; exit diff --git a/.scripts/statusbar/news b/.scripts/statusbar/news index 6c19d53..b7ca1a7 100755 --- a/.scripts/statusbar/news +++ b/.scripts/statusbar/news @@ -7,8 +7,7 @@ case $BLOCK_BUTTON in 1) setsid "$TERMINAL" -e newsboat ;; 2) setsid newsup >/dev/null & exit ;; - 3) pgrep -x dunst >/dev/null && notify-send "📰 News module: -- Shows unread news items + 3) pgrep -x dunst >/dev/null && notify-send "📰 News module" "\- Shows unread news items - Shows 🔃 if updating with \`newsup\` - Left click opens newsboat - Middle click syncs RSS feeds diff --git a/.scripts/statusbar/pacpackages b/.scripts/statusbar/pacpackages index 9ec679e..418bc2d 100755 --- a/.scripts/statusbar/pacpackages +++ b/.scripts/statusbar/pacpackages @@ -9,8 +9,7 @@ case $BLOCK_BUTTON in 1) $TERMINAL -e popupgrade ;; 2) notify-send "$(/usr/bin/pacman -Qu)" ;; - 3) pgrep -x dunst >/dev/null && notify-send "Upgrade module: -📦: number of upgradable packages + 3) pgrep -x dunst >/dev/null && notify-send "Upgrade module" "📦: number of upgradable packages - Left click to upgrade packages - Middle click to show upgradable packages" ;; esac diff --git a/.scripts/statusbar/torrent b/.scripts/statusbar/torrent index 8534cb1..0ab811c 100755 --- a/.scripts/statusbar/torrent +++ b/.scripts/statusbar/torrent @@ -18,8 +18,7 @@ transmission-remote -l | grep % | case $BLOCK_BUTTON in 1) $TERMINAL -e transmission-remote-cli ;; - 3) pgrep -x dunst >/dev/null && notify-send "Torrent module: -🛑: paused + 3) pgrep -x dunst >/dev/null && notify-send "Torrent module" "🛑: paused ⏳: idle (seeds needed) 🔼: uploading (unfinished) 🔽: downloading diff --git a/.scripts/statusbar/volume b/.scripts/statusbar/volume index 26e5a17..3bbb32b 100755 --- a/.scripts/statusbar/volume +++ b/.scripts/statusbar/volume @@ -5,8 +5,7 @@ case $BLOCK_BUTTON in 2) pulsemixer --toggle-mute ;; 4) pulsemixer --change-volume +5 ;; 5) pulsemixer --change-volume -5 ;; - 3) pgrep -x dunst >/dev/null && notify-send "📢 Volume module: -- Shows volume 🔊, 🔇 if muted. + 3) pgrep -x dunst >/dev/null && notify-send "📢 Volume module" "\- Shows volume 🔊, 🔇 if muted. - Middle click to mute. - Scroll to change." esac diff --git a/.scripts/statusbar/weather b/.scripts/statusbar/weather index 9244dbc..0b600cc 100755 --- a/.scripts/statusbar/weather +++ b/.scripts/statusbar/weather @@ -10,8 +10,7 @@ sed '13q;d' "$HOME/.local/share/weatherreport" | grep -o "m\\(-\\)*[0-9]\\+" | s case $BLOCK_BUTTON in 1) $TERMINAL -e less -S "$HOME/.local/share/weatherreport" ;; 2) getforecast && showweather ;; - 3) pgrep -x dunst >/dev/null && notify-send "🌈 Weather module: -- Left click for full forecast. + 3) pgrep -x dunst >/dev/null && notify-send "🌈 Weather module" "\- Left click for full forecast. - Middle click to update forecast. ☔: Chance of rain/snow ❄: Daily low