diff options
| -rw-r--r-- | dot_config/git/config | 4 | ||||
| -rw-r--r-- | dot_config/sway/config | 3 | ||||
| -rw-r--r-- | dot_config/sway/executable_tb-autostart.sh | 12 | ||||
| -rw-r--r-- | dot_config/waybar/config.jsonc | 3 | ||||
| -rw-r--r-- | dot_config/waybar/executable_tb-unread.sh | 2 | ||||
| -rw-r--r-- | systemd-units/user.txt | 3 |
6 files changed, 14 insertions, 13 deletions
diff --git a/dot_config/git/config b/dot_config/git/config index 6416efc..a4831cf 100644 --- a/dot_config/git/config +++ b/dot_config/git/config @@ -140,7 +140,7 @@ path = config-personal [sendemail] smtpServer = 127.0.0.1 - smtpServerPort = 1025 + smtpServerPort = 1016 smtpEncryption = tls smtpDomain = localhost smtpSslCertPath = @@ -150,7 +150,7 @@ thread = true annotate = true assume8bitEncoding = UTF-8 -[credential "smtp://127.0.0.1:1025"] +[credential "smtp://127.0.0.1:1016"] helper = "!f() { test \"$1\" = get && printf 'password=%s\\n' \"$(pass show proton/bridge-smtp)\"; }; f" [include] ; Machine-local overrides. Git silently skips this if the file is absent. diff --git a/dot_config/sway/config b/dot_config/sway/config index 3e8a179..bfdfed1 100644 --- a/dot_config/sway/config +++ b/dot_config/sway/config @@ -264,8 +264,7 @@ exec systemctl --user import-environment PATH DISPLAY WAYLAND_DISPLAY SWAYSOCK X exec dbus-update-activation-environment --systemd PATH DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP PASSWORD_STORE_DIR GNUPGHOME GPG_TTY exec "sleep 2 && ~/.config/sway/display-toggle.sh apply" exec systemctl --user start sway-session.target -# Disabled while Proton Mail Bridge auth refresh is broken. -# exec ~/.config/sway/tb-autostart.sh +exec ~/.config/sway/tb-autostart.sh # GTK4 reads dark mode from gsettings (settings.ini's prefer-dark is GTK3 only). exec gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' diff --git a/dot_config/sway/executable_tb-autostart.sh b/dot_config/sway/executable_tb-autostart.sh index 3a85dc5..b7b9b78 100644 --- a/dot_config/sway/executable_tb-autostart.sh +++ b/dot_config/sway/executable_tb-autostart.sh @@ -8,22 +8,26 @@ set -eu MARK=tb-main BRIDGE_HOST=127.0.0.1 -BRIDGE_PORT=1143 +BRIDGE_IMAP_PORT=1144 +BRIDGE_SMTP_PORT=1016 # protonmail-bridge opens the IMAP socket early (before the keyring is # unlocked), so "port is listening" is not enough — TB will race and pop up # "failed to login to 127.0.0.1". Wait for the real IMAP '* OK' greeting, # which the bridge only sends once it can actually service logins. for _ in $(seq 1 300); do - banner=$(ncat -w 1 -i 1 "$BRIDGE_HOST" "$BRIDGE_PORT" </dev/null 2>/dev/null | head -c 64) + banner=$(ncat -w 1 -i 1 "$BRIDGE_HOST" "$BRIDGE_IMAP_PORT" </dev/null 2>/dev/null | head -c 64) case "$banner" in "* OK"*) break ;; esac sleep 0.2 done -# Small grace period so the SMTP listener (1025) catches up too. -sleep 10 +# SMTP tends to come up after IMAP; wait briefly so TB sees both local servers. +for _ in $(seq 1 50); do + ncat -z -w 1 "$BRIDGE_HOST" "$BRIDGE_SMTP_PORT" 2>/dev/null && break + sleep 0.2 +done flatpak run org.mozilla.thunderbird & diff --git a/dot_config/waybar/config.jsonc b/dot_config/waybar/config.jsonc index 89a8ea9..6422280 100644 --- a/dot_config/waybar/config.jsonc +++ b/dot_config/waybar/config.jsonc @@ -25,8 +25,7 @@ "custom/arch-audit", "custom/failed-units", "custom/lostfiles", - // Disabled while Proton Mail Bridge auth refresh is broken. - // "custom/thunderbird", + "custom/thunderbird", "clock", "tray", ], diff --git a/dot_config/waybar/executable_tb-unread.sh b/dot_config/waybar/executable_tb-unread.sh index b969215..208333b 100644 --- a/dot_config/waybar/executable_tb-unread.sh +++ b/dot_config/waybar/executable_tb-unread.sh @@ -11,7 +11,7 @@ set -eu PASS_USER=email/protonmail-bridge/user PASS_PW=email/protonmail-bridge/pass HOST=127.0.0.1 -PORT=1143 +PORT=1144 emit() { printf '%s\n' "$1" diff --git a/systemd-units/user.txt b/systemd-units/user.txt index bff836a..b254aea 100644 --- a/systemd-units/user.txt +++ b/systemd-units/user.txt @@ -19,5 +19,4 @@ waybar.service wob.service # --- mail --- -# Disabled while Proton Mail Bridge auth refresh is broken. -# protonmail-bridge.service +protonmail-bridge.service |