more updates

platforms/home-manager/modules/nmasur/presets/services/i3.nix

@@ -202,9 +202,9 @@ in
               ''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
             "${modifier}+Shift+x" = lib.mkIf cfg.commands.lockScreen != null "exec ${cfg.commands.lockScreen}";
             "${modifier}+Mod1+h" =
-              "exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+              "exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName} || read'";
             "${modifier}+Mod1+r" =
-              "exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+              "exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c 'doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName} || read'";
 
             # Window options
             "${modifier}+q" = "kill";
@@ -322,7 +322,7 @@ in
     # Update lock screen cache only if cache is empty
     home.activation.updateLockScreenCache =
       let
-        cacheDir = "${config.homePath}/.cache/betterlockscreen/current";
+        cacheDir = "${config.xdg.cacheHome}/betterlockscreen/current";
       in
       lib.mkIf cfg.commands.updateLockScreen != null (
         config.lib.dag.entryAfter [ "writeBoundary" ] ''

platforms/home-manager/modules/nmasur/presets/services/mbsync.nix

@@ -0,0 +1,123 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    mail.enable = lib.mkEnableOption "Mail service.";
+    mail.user = lib.mkOption {
+      type = lib.types.str;
+      description = "User name for the email address.";
+      default = config.user;
+    };
+    mail.server = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server name for the email address.";
+    };
+    mail.imapHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server host for IMAP (reading mail).";
+    };
+    mail.smtpHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server host for SMTP (sending mail).";
+    };
+  };
+
+  config = lib.mkIf config.mail.enable {
+
+    home-manager.users.${config.user} = {
+      programs.mbsync = {
+        enable = true;
+      };
+
+      # Automatically check for mail and keep files synced locally
+      services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
+        enable = true;
+        frequency = "*:0/5";
+        postExec = "${lib.getExe pkgs.notmuch} new";
+      };
+
+      # Used to watch for new mail and trigger sync
+      services.imapnotify.enable = pkgs.stdenv.isLinux;
+
+      # Allows sending email from CLI/sendmail
+      programs.msmtp.enable = true;
+
+      accounts.email = {
+
+        # Where email files are stored
+        maildirBasePath = "${config.home.homeDirectory}/mail";
+
+        accounts = {
+          home =
+            let
+              address = "${config.mail.user}@${config.mail.server}";
+            in
+            {
+              userName = address;
+              realName = config.fullName;
+              primary = true;
+              inherit address;
+              aliases = map (user: "${user}@${config.mail.server}") [
+                "me"
+                "hey"
+                "admin"
+              ];
+
+              # Options for contact completion
+              alot = { };
+
+              imap = {
+                host = config.mail.imapHost;
+                port = 993;
+                tls.enable = true;
+              };
+
+              # Watch for mail and run notifications or sync
+              imapnotify = {
+                enable = true;
+                boxes = [ "Inbox" ];
+                onNotify = "${pkgs.isync}/bin/mbsync -a";
+                onNotifyPost =
+                  lib.mkIf config.home-manager.users.${config.user}.services.dunst.enable
+                    "${lib.getExe pkgs.libnotify} 'New mail arrived'";
+              };
+
+              # Name of the directory in maildir for this account
+              maildir = {
+                path = "main";
+              };
+
+              # Bi-directional syncing options for local files
+              mbsync = {
+                enable = true;
+                create = "both";
+                expunge = "both";
+                remove = "both";
+                patterns = [ "*" ];
+                extraConfig.channel = {
+                  CopyArrivalDate = "yes"; # Sync time of original message
+                };
+              };
+
+              # Enable indexing
+              notmuch.enable = true;
+
+              # Used to login and send and receive emails
+              passwordCommand = "${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${pkgs.writeText "mailpass.age" (builtins.readFile ../../../private/mailpass.age)}";
+
+              smtp = {
+                host = config.mail.smtpHost;
+                port = 465;
+                tls.enable = true;
+              };
+            };
+        };
+      };
+    };
+  };
+}