feat(mail): improved services and install scripts

15 files changed, 78 insertions, 33 deletions

diff --git a/aerc/.config/maildir-rank-addr/config.toml b/aerc/.config/maildir-rank-addr/config.toml
deleted file mode 100644
index 139faba..0000000
--- a/aerc/.config/maildir-rank-addr/config.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-addresses = [
-    "tobyv@tobyvin.dev",
-    "tobyv13@gmail.com"
-]
-template = "{{.Address}}\t{{.Name}}\t{{.NormalizedName}}"
diff --git a/aerc/.config/systemd/user/maildir-rank-addr@.timer b/aerc/.config/systemd/user/maildir-rank-addr@.timer
deleted file mode 100644
index d8542ab..0000000
--- a/aerc/.config/systemd/user/maildir-rank-addr@.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Addressbook generation timer
-
-[Timer]
-OnUnitActiveSec=12h
-Unit=maildir-rank-addr@%i.service
-
-[Install]
-WantedBy=timers.target
diff --git a/mbsync/.config/imapnotify/gmail.conf b/goimapnotify/.config/imapnotify/gmail.conf
index fc109ff..ae39a8c 100644
--- a/mbsync/.config/imapnotify/gmail.conf
+++ b/goimapnotify/.config/imapnotify/gmail.conf
@@ -6,7 +6,6 @@
         "rejectUnauthorized": false
     },
     "username": "tobyv13@gmail.com",
-    "password": "",
     "passwordCmd": "pass gmail | head -n1",
     "onNewMail": "mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail",
     "onNewMailPost": "",
diff --git a/mbsync/.config/imapnotify/porkbun.conf b/goimapnotify/.config/imapnotify/porkbun.conf
index 60b71f9..60b71f9 100644
--- a/mbsync/.config/imapnotify/porkbun.conf
+++ b/goimapnotify/.config/imapnotify/porkbun.conf
diff --git a/goimapnotify/install.sh b/goimapnotify/install.sh
new file mode 100755
index 0000000..312c51b
--- /dev/null
+++ b/goimapnotify/install.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if ! command -v "goimapnotify" >/dev/null; then
+	printf "%s: goimapnotify not found, skipping...\n" "$0"
+	exit 0
+fi
+
+printf "%s: Installing services\n" "$0"
+
+systemctl --user enable --now --no-block goimapnotify@gmail.service
+systemctl --user enable --now --no-block goimapnotify@porkbun.service
diff --git a/maildir-rank-addr/.config/maildir-rank-addr/config.toml b/maildir-rank-addr/.config/maildir-rank-addr/config.toml
new file mode 100644
index 0000000..ef2b04a
--- /dev/null
+++ b/maildir-rank-addr/.config/maildir-rank-addr/config.toml
@@ -0,0 +1,2 @@
+addresses = ["tobyv@tobyvin.dev", "tobyv13@gmail.com", "tovince@siue.edu"]
+template = "{{.Address}}\t{{.Name}}\t{{.NormalizedName}}"
diff --git a/aerc/.config/systemd/user/maildir-rank-addr@.service b/maildir-rank-addr/.config/systemd/user/maildir-rank-addr@.service
index 03436a3..650b77c 100644
--- a/aerc/.config/systemd/user/maildir-rank-addr@.service
+++ b/maildir-rank-addr/.config/systemd/user/maildir-rank-addr@.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=Generates a ranked addressbook from a maildir folder
+After=mbsync@.service
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/maildir-rank-addr --maildir=${XDG_DATA_HOME}/mail/%i/INBOX --outputpath=${XDG_DATA_HOME}/mail/%i/addressbook.tsv
 
 [Install]
-WantedBy=default.target
+WantedBy=mbsync@.service
diff --git a/maildir-rank-addr/install.sh b/maildir-rank-addr/install.sh
new file mode 100755
index 0000000..5a449b9
--- /dev/null
+++ b/maildir-rank-addr/install.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if ! command -v "maildir-rank-addr" >/dev/null; then
+	printf "%s: maildir-rank-addr not found, skipping...\n" "$0"
+	exit 0
+fi
+
+printf "%s: Installing services\n" "$0"
+
+systemctl --user enable --now --no-block maildir-rank-addr@gmail.service
+systemctl --user enable --now --no-block maildir-rank-addr@porkbun.service
diff --git a/mbsync/.config/systemd/user/mbsync.service b/mbsync/.config/systemd/user/mbsync@.service
index 514795f..4089c04 100644
--- a/mbsync/.config/systemd/user/mbsync.service
+++ b/mbsync/.config/systemd/user/mbsync@.service
@@ -7,7 +7,7 @@ After=network-online.target gpg-agent.socket network.target dbus.socket
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/mbsync -Vac ${XDG_CONFIG_HOME}/mbsync/mbsyncrc
+ExecStart=/usr/bin/mbsync -Vc ${XDG_CONFIG_HOME}/mbsync/mbsyncrc %i
 
 [Install]
 WantedBy=default.target
diff --git a/mbsync/install.sh b/mbsync/install.sh
index 7433fea..de06c1a 100755
--- a/mbsync/install.sh
+++ b/mbsync/install.sh
@@ -1,20 +1,13 @@
 #!/bin/sh
 
-printf "%s: Installing services\n" "$0"
-
-if command -v mbsync >/dev/null; then
-	systemctl --user enable --now --no-block mbsync.service
-	systemctl --user enable --now --no-block maildir-notify@gmail.service
-	systemctl --user enable --now --no-block maildir-notify@porkbun.service
-else
-	printf "%s: command not found: mbsync\n" "$0"
-	exit 1
+if ! command -v "mbsync" >/dev/null; then
+	printf "%s: mbsync not found, skipping...\n" "$0"
+	exit 0
 fi
 
-if command -v goimapnotify >/dev/null; then
-	systemctl --user enable --now --no-block goimapnotify@gmail.service
-	systemctl --user enable --now --no-block goimapnotify@porkbun.service
-else
-	printf "%s: command not found: goimapnotify\n" "$0"
-	exit 1
-fi
+printf "%s: Installing services\n" "$0"
+
+systemctl --user enable --now --no-block mbsync@gmail.service
+systemctl --user enable --now --no-block mbsync@porkbun.service
+systemctl --user enable --now --no-block maildir-notify@gmail.service
+systemctl --user enable --now --no-block maildir-notify@porkbun.service
diff --git a/notmuch/.config/systemd/user/notmuch.service b/notmuch/.config/systemd/user/notmuch.service
new file mode 100644
index 0000000..fcbee89
--- /dev/null
+++ b/notmuch/.config/systemd/user/notmuch.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Mailbox indexer service
+Documentation=man:notmuch(1)
+After=mbsync@.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/notmuch new
+
+[Install]
+WantedBy=mbsync@.service
diff --git a/notmuch/install.sh b/notmuch/install.sh
new file mode 100755
index 0000000..12196c8
--- /dev/null
+++ b/notmuch/install.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if ! command -v "notmuch" >/dev/null; then
+	printf "%s: notmuch not found, skipping...\n" "$0"
+	exit 0
+fi
+
+printf "%s: Installing service\n" "$0"
+
+systemctl --user enable --now --no-block notmuch.service
diff --git a/nvim/install.sh b/nvim/install.sh
index ea885e1..8d21011 100755
--- a/nvim/install.sh
+++ b/nvim/install.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+if ! command -v "nvim" >/dev/null; then
+	printf "%s: nvim not found, skipping...\n" "$0"
+	exit 0
+fi
+
 printf "%s: Restoring plugins\n" "$0"
 
 nvim --headless -c 'Lazy! restore' -c qa
diff --git a/r2e/install.sh b/r2e/install.sh
new file mode 100755
index 0000000..f4cbd0a
--- /dev/null
+++ b/r2e/install.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if ! command -v "r2e" >/dev/null; then
+	printf "%s: r2e not found, skipping...\n" "$0"
+	exit 0
+fi
+
+printf "%s: Installing services\n" "$0"
+
+systemctl --user enable --now --no-block rss2email.timer
+systemctl --user start --no-block rss2email.service
diff --git a/sheldon/install.sh b/sheldon/install.sh
index dc431cf..06f7b5e 100755
--- a/sheldon/install.sh
+++ b/sheldon/install.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+if ! command -v "sheldon" >/dev/null; then
+	printf "%s: sheldon not found, skipping...\n" "$0"
+	exit 0
+fi
+
 printf "%s: Installing plugins\n" "$0"
 
 sheldon -q lock