4 files changed, 20 insertions, 32 deletions
diff --git a/notmuch/.config/goimapnotify/goimapnotify.conf b/notmuch/.config/goimapnotify/goimapnotify.conf
deleted file mode 100644
index ddc6871..0000000
--- a/notmuch/.config/goimapnotify/goimapnotify.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-  {
-    "host": "mail.tobyvin.dev",
-    "port": 993,
-    "tls": true,
-    "username": "tobyv",
-    "passwordCmd": "pass mail.tobyvin.dev/tobyv/imap",
-    "boxes": [
-      {
-        "mailbox": "INBOX",
-        "onNewMail": "MAILDIR=personal:INBOX notmuch new"
-      }
-    ]
-  },
-  {
-    "host": "imap.gmail.com",
-    "port": 993,
-    "tls": true,
-    "tlsOptions": {
-      "reject_unauthorized": false
-    },
-    "username": "tobyv13@gmail.com",
-    "passwordCmd": "pass gmail.com/tobyv13@gmail.com",
-    "boxes": [
-      {
-        "mailbox": "INBOX",
-        "onNewMail": "MAILDIR=gmail:INBOX notmuch new"
-      }
-    ]
-  }
-]
diff --git a/notmuch/.config/goimapnotify/goimapnotify.yaml b/notmuch/.config/goimapnotify/goimapnotify.yaml
new file mode 100644
index 0000000..d157aae
--- /dev/null
+++ b/notmuch/.config/goimapnotify/goimapnotify.yaml
@@ -0,0 +1,19 @@
+configurations:
+  - host: mail.tobyvin.dev
+    port: 993
+    tls: true
+    username: tobyv
+    passwordCmd: pass mail.tobyvin.dev/tobyv/imap
+    boxes:
+      - mailbox: INBOX
+        onNewMail: "MAILDIR=personal:INBOX notmuch new"
+  - host: imap.gmail.com
+    port: 993
+    tls: true
+    tlsOptions:
+      reject_unauthorized: false
+    username: tobyv13@gmail.com
+    passwordCmd: pass gmail.com/tobyv13@gmail.com
+    boxes:
+      - mailbox: INBOX
+        onNewMail: "MAILDIR=gmail:INBOX notmuch new"
diff --git a/notmuch/.config/notmuch/default/hooks/post-new b/notmuch/.config/notmuch/default/hooks/post-new
index 6f4c03f..912d8bc 100755
--- a/notmuch/.config/notmuch/default/hooks/post-new
+++ b/notmuch/.config/notmuch/default/hooks/post-new
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 afew -C "$XDG_CONFIG_HOME"/notmuch/default/config --tag --new
-~/.local/lib/notmuch/notmuch-notify.py
+"$HOME"/.local/bin/notmuch-notify
diff --git a/notmuch/.local/lib/notmuch/notmuch-notify.py b/notmuch/.local/bin/notmuch-notify
index 18c6c83..18c6c83 100755
--- a/notmuch/.local/lib/notmuch/notmuch-notify.py
+++ b/notmuch/.local/bin/notmuch-notify