Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos

home/accounts/afew/config

@@ -9,7 +9,7 @@ sent_tag = sent
 
 [FolderNameFilter]
 folder_explicit_list = Proton/Archive Proton/Sent Proton/Trash iCloud/Archive 'iCloud/Deleted Messages' 'iCloud/Sent Messages' Outlook/Archive Outlook/Trash Outlook/Sent
-folder_transforms = Drafts:draft Sent:sent 'Sent Messages':sent Trash:deleted 'Deleted Messages':deleted
+folder_transforms = Archive:archive Drafts:draft Sent:sent 'Sent Messages':sent Trash:deleted 'Deleted Messages':deleted
 folder_lowercases = true
 maildir_separator = /
 
@@ -23,6 +23,16 @@ message = Untagged inbox from archive
 query = tag:archive AND tag:inbox
 tags = -inbox
 
+[Filter.3]
+message = Tag ReqCo emails
+query = from:reqco@jet.uk
+tags = +reqco
+
+[Filter.4]
+message = Tag operations update emails
+query = from:no-reply@jet.uk
+tags = +operations
+
 [MailMover]
 folders = Proton/Inbox iCloud/Inbox Outlook/Inbox
 rename = True

home/accounts/email.nix

@@ -16,7 +16,9 @@
       enable = true;
       maildir.synchronizeFlags = true;
       new.tags = [ "new" ];
-      hooks.postNew = ''
+      hooks = {
+        preNew = "${pkgs.isync}/bin/mbsync inboxes";
+        postNew = ''
           if [ $(${pkgs.notmuch}/bin/notmuch count is:new) -gt 0 ]; then
              ${pkgs.libnotify}/bin/notify-send "Notmuch Email" "Unread emails in inbox"
           fi
@@ -24,6 +26,7 @@
           ${pkgs.afew}/bin/afew --move-mail
         '';
       };
+    };
     afew = {
       enable = true;
       extraConfig = builtins.readFile ./afew/config;
@@ -32,7 +35,7 @@
   services = {
     mbsync = {
       enable = true;
-      frequency = "*:0/15";
+      frequency = "*:0/30";
       postExec = "${pkgs.notmuch}/bin/notmuch new";
     };
     imapnotify.enable = true;
@@ -65,8 +68,7 @@
         imapnotify = {
           enable = lib.mkDefault accountEnabled;
           boxes = [ "INBOX" ];
-          onNotify = "${pkgs.isync}/bin/mbsync proton";
+          onNotify = "${pkgs.notmuch}/bin/notmuch new";
-          onNotifyPost = "${pkgs.notmuch}/bin/notmuch new";
           extraConfig = {
             wait = 300;
             tls = false;
@@ -105,8 +107,7 @@
         imapnotify = {
           enable = lib.mkDefault accountEnabled;
           boxes = [ "INBOX" ];
-          onNotify = "${pkgs.isync}/bin/mbsync icloud";
+          onNotify = "${pkgs.notmuch}/bin/notmuch new";
-          onNotifyPost = "${pkgs.notmuch}/bin/notmuch new";
           extraConfig.wait = 300;
         };
         mbsync = {
@@ -144,8 +145,7 @@
         imapnotify = {
           enable = lib.mkDefault accountEnabled;
           boxes = [ "INBOX" ];
-          onNotify = "${pkgs.isync}/bin/mbsync outlook";
+          onNotify = "${pkgs.notmuch}/bin/notmuch new";
-          onNotifyPost = "${pkgs.notmuch}/bin/notmuch new";
           extraConfig = {
             wait = 300;
             tls = false;

home/emacs/default.nix

@@ -9,10 +9,20 @@
   };
   services.git-sync = {
     enable = true;
-    repositories.org = {
+    repositories = with config.home; {
-      path = "${config.home.homeDirectory}/Org";
+      org = {
+        path = "${homeDirectory}/Org";
         uri = "git+https://git.xenia.me.uk/xenia/Org.git";
       };
+      notmuch = {
+        path = "${homeDirectory}/.notmuch";
+        uri = "git+https://git.xenia.me.uk/xenia/notmuch.git";
+      };
+      elfeed = {
+        path = "${homeDirectory}/.elfeed";
+        uri = "git+https://git.xenia.me.uk/xenia/elfeed.git";
+      };
+    };
   };
   home = {
     packages = with pkgs; [

home/emacs/modules/custom-email-config.el

@@ -9,8 +9,10 @@
                          (".*@icloud.com" . "iCloud/Sent")
                          (".*@ukaea.uk" . "Outlook/Sent")
                          (".*@jet.uk" . "Outlook/Sent"))
-      notmuch-indicator-refresh-count 60
+      notmuch-indicator-args '((:terms "tag:unread and tag:inbox" :label "󰮒 "))
-      notmuch-indicator-args '((:terms "tag:unread and tag:inbox" :label "󰮒 ")))
+      notmuch-indicator-force-refresh-commands '(notmuch-refresh-this-buffer
+                                                 notmuch-refresh-all-buffers
+                                                 notmuch-poll-and-refresh-this-buffer))
 (require 'notmuch)
 (require 'notmuch-indicator)
 (notmuch-indicator-mode +1)

hosts/Ronin/configuration.nix

@@ -17,5 +17,4 @@
     '';
     systemPackages = with pkgs; [ openfortivpn ];
   };
-  services.syncthing.settings.folders = { "Pictures".enable = false; };
 }

services/syncthing/default.nix

@@ -22,18 +22,6 @@ in {
           "I366QNQ-D3FTDRX-RNOTXMW-YITZXOF-DSCDMQD-63Q72LI-ME2Y4HZ-T34RMQK";
       };
       folders = {
-        "Elfeed" = {
-          inherit devices;
-          id = "hnnxy-lb5af";
-          path = "${dataDir}/.elfeed";
-          ignorePerms = true;
-        };
-        "Notmuch" = {
-          inherit devices;
-          id = "yiaiy-xrnse";
-          path = "${dataDir}/.notmuch";
-          ignorePerms = true;
-        };
         "Pictures" = {
           inherit devices;
           id = "ziuj8-rm6dn";

system/firefox.nix

@@ -75,8 +75,11 @@
       ManagedBookmarks = [
         { toplevel_name = "Standard Bookmarks"; }
         {
-          name = "Config Repo";
+          name = "Pins";
-          url = "https://git.xenia.me.uk/xenia/nixos";
+          children = [
+            {
+              name = "ntfy.sh";
+              url = "https://ntfy.xenia.me.uk/";
             }
             {
               name = "WhatsApp Web";
@@ -86,6 +89,8 @@
               name = "Discord";
               url = "https://discord.com/app";
             }
+          ];
+        }
         {
           name = "Server";
           children = [
@@ -97,22 +102,35 @@
               name = "Gitea";
               url = "https://git.xenia.me.uk";
             }
-            {
-              name = "Grafana Dashboard";
-              url = "https://status.xenia.me.uk";
-            }
-            {
-              name = "ntfy.sh";
-              url = "https://ntfy.xenia.me.uk";
-            }
             {
               name = "AdGuard Home";
               url = "https://guard.xenia.me.uk";
             }
+            {
+              name = "Grafana Dashboard";
+              url = "https://status.xenia.me.uk";
+            }
             {
               name = "Traefik";
               url = "https://traefik.xenia.me.uk";
             }
+            {
+              name = "ntfy.sh topics";
+              children = [
+                {
+                  name = "Emacs";
+                  url = "https://ntfy.xenia.me.uk/UhrNGphnSKCpCnk8";
+                }
+                {
+                  name = "JET Pulse Notifications";
+                  url = "https://ntfy.xenia.me.uk/jet_pulse_notifications";
+                }
+                {
+                  name = "MAST-U Pulse Notifications";
+                  url = "https://ntfy.xenia.me.uk/mast_u_pulse_notifications";
+                }
+              ];
+            }
           ];
         }
         {
@@ -133,16 +151,24 @@
           ];
         }
         {
-          name = "Docs";
+          name = "Docs and Repos";
           children = [
+            {
+              name = "Config";
+              url = "https://git.xenia.me.uk/xenia/nixos";
+            }
+            {
+              name = "Crafted Emacs";
+              url = "https://github.com/SystemCrafters/crafted-emacs";
+            }
+            {
+              name = "Awesome Hyprland";
+              url = "https://github.com/hyprland-community/awesome-hyprland";
+            }
             {
               name = "NixOS and Flakes";
               url = "https://nixos-and-flakes.thiscute.world/";
             }
-            {
-              name = "Crafted Emacs Repo";
-              url = "https://github.com/SystemCrafters/crafted-emacs";
-            }
             {
               name = "Nerd Fonts Cheat Sheet";
               url = "https://www.nerdfonts.com/cheat-sheet";
@@ -161,19 +187,6 @@
             }
           ];
         }
-        {
-          name = "Dev";
-          children = [
-            {
-              name = "GitHub";
-              url = "https://github.com";
-            }
-            {
-              name = "GitLab";
-              url = "https://gitlab.com";
-            }
-          ];
-        }
       ];
       NoDefaultBookmarks = true;
       OfferToSaveLogins = false;