From 32c6ef934062799b72cf9ba64f4b6267342a3450 Mon Sep 17 00:00:00 2001
From: Luca Bilke <luca@gmail.com>
Date: Thu, 9 Feb 2023 14:51:03 +0100
Subject: [PATCH] minor fixes + cleanup
---
.local/bin/cron/mailsync | 99 ---------------------------------------
.local/bin/daemons/remapd | 1 +
.local/bin/remaps | 2 +-
.local/bin/startgraphical | 2 +-
4 files changed, 3 insertions(+), 101 deletions(-)
delete mode 100755 .local/bin/cron/mailsync
diff --git a/.local/bin/cron/mailsync b/.local/bin/cron/mailsync
deleted file mode 100755
index 9f13a57b..00000000
--- a/.local/bin/cron/mailsync
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# - Syncs mail for all accounts, or a single account given as an argument.
-# - Displays a notification showing the number of new mails.
-# - Displays a notification for each new mail with its subject displayed.
-# - Runs notmuch to index new mail.
-# - This script can be set up as a cron job for automated mail syncing.
-
-# There are many arbitrary and ugly features in this script because it is
-# inherently difficult to pass environmental variables to cronjobs and other
-# issues. It also should at least be compatible with Linux (and maybe BSD) with
-# Xorg and MacOS as well.
-
-# Run only if user logged in (prevent cron errors)
-pgrep -u "${USER:=$LOGNAME}" >/dev/null || {
- echo "$USER not logged in; sync will not run."
- exit
-}
-# Run only if not already running in other instance
-pgrep mbsync >/dev/null && {
- echo "mbsync is already running."
- exit
-}
-
-# First, we have to get the right variables for the mbsync file, the pass
-# archive, notmuch and the GPG home. This is done by searching common profile
-# files for variable assignments. This is ugly, but there are few options that
-# will work on the maximum number of machines.
-
-pkill -RTMIN+12 dwmblocks
-
-eval "$(grep -h -- \
- "^\s*\(export \)\?\(MBSYNCRC\|PASSWORD_STORE_DIR\|NOTMUCH_CONFIG\|GNUPGHOME\)=" \
- "$HOME/.profile" "$HOME/.bash_profile" "$HOME/.zprofile" "$HOME/.config/zsh/.zprofile" "$HOME/.zshenv" \
- "$HOME/.config/zsh/.zshenv" "$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.config/zsh/.zshrc" \
- "$HOME/.pam_environment" 2>/dev/null)"
-
-export GPG_TTY="$(tty)"
-
-alias mbsync="mbsync -c $MBSYNCRC"
-
-# Settings are different for MacOS (Darwin) systems.
-case "$(uname)" in
-Darwin)
- notify() { osascript -e "display notification \"$2 in $1\" with title \"You've got Mail\" subtitle \"Account: $account\"" && sleep 2; }
- ;;
-*)
- case "$(readlink -f /sbin/init)" in
- *systemd* | *openrc*) export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus ;;
- esac
- # remember if a display server is running since `ps` doesn't always contain a display
- pgrepoutput="$(pgrep -a X\(org\|wayland\))"
- displays="$(echo "$pgrepoutput" | grep -wo "[0-9]*:[0-9]\+" | sort -u)"
- notify() { [ -n "$pgrepoutput" ] && for x in ${displays:-0:}; do
- export DISPLAY=$x
- notify-send --app-name="mutt-wizard" "New mail!" "📬 $2 new mail(s) in \`$1\` account."
- done; }
- ;;
-esac
-
-# Check account for new mail. Notify if there is new content.
-syncandnotify() {
- acc="$(echo "$account" | sed "s/.*\///")"
- if [ -z "$opts" ]; then mbsync "$acc"; else mbsync "$opts" "$acc"; fi
- new=$(find "$HOME/.local/share/mail/$acc/INBOX/new/" \
- "$HOME/.local/share/mail/$acc/Inbox/new/" \
- "$HOME/.local/share/mail/$acc/inbox/new/" \
- "$HOME/.local/share/mail/$acc/INBOX/cur/" \
- "$HOME/.local/share/mail/$acc/Inbox/cur/" \
- "$HOME/.local/share/mail/$acc/inbox/cur/" \
- -type f -newer "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun" 2>/dev/null)
- newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l)
- case 1 in
- $((newcount > 0))) notify "$acc" "$newcount" ;;
- esac
-}
-
-# Sync accounts passed as argument or all.
-if [ "$#" -eq "0" ]; then
- accounts="$(awk '/^Channel/ {print $2}' "$MBSYNCRC")"
-else
- for arg in "$@"; do
- [ "${arg%${arg#?}}" = '-' ] && opts="${opts:+${opts} }${arg}" && shift 1
- done
- accounts=$*
-fi
-
-# Parallelize multiple accounts
-for account in $accounts; do
- syncandnotify &
-done
-
-wait
-
-notmuch new 2>/dev/null
-
-#Create a touch file that indicates the time of the last run of mailsync
-touch "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun"
-pkill -RTMIN+12 dwmblocks
diff --git a/.local/bin/daemons/remapd b/.local/bin/daemons/remapd
index 4acc7140..a4141335 100755
--- a/.local/bin/daemons/remapd
+++ b/.local/bin/daemons/remapd
@@ -4,5 +4,6 @@ mkfifo -m 600 /tmp/udev_pipe
udevadm monitor -u -t seat -s input -s usb >> /tmp/udev_pipe &
while :; do
grep -q "add" /tmp/udev_pipe && grep -q " bind" /tmp/udev_pipe
+ sleep 0.5
remaps us:dvorak
done
diff --git a/.local/bin/remaps b/.local/bin/remaps
index d58ebca9..9c3f7e59 100755
--- a/.local/bin/remaps
+++ b/.local/bin/remaps
@@ -32,4 +32,4 @@ killall xcape 2>/dev/null
xcape -e 'Super_L=Escape'
xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock
sleep 0.03
-pkill -RTMIN+15 dwmblocks
+[ "$1" != "-n" ] && pkill -RTMIN+15 dwmblocks
diff --git a/.local/bin/startgraphical b/.local/bin/startgraphical
index 4f2e15e0..a6cceadf 100755
--- a/.local/bin/startgraphical
+++ b/.local/bin/startgraphical
@@ -25,7 +25,7 @@ done
display=":$d"
unset d
-if [ -n "${XAUTHORITY+x}" ]; then
+if [ -z "${XAUTHORITY+x}" ]; then
XAUTHORITY=$HOME/.Xauthority
export XAUTHORITY
fi