flake.nix

@@ -111,8 +111,6 @@
         gitName = fullName;
         gitEmail = "7386960+nmasur@users.noreply.github.com";
         mail.server = "noahmasur.com";
-        mail.imapHost = "imap.purelymail.com";
-        mail.smtpHost = "smtp.purelymail.com";
         dotfilesRepo = "git@github.com:nmasur/dotfiles";
       };
 

hosts/swan/default.nix

@@ -12,6 +12,7 @@ nixpkgs.lib.nixosSystem {
     ./hardware-configuration.nix
     ../../modules/common
     ../../modules/nixos
+    (removeAttrs globals [ "mail.server" ])
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager
     disko.nixosModules.disko

modules/common/mail/aerc.nix

@@ -181,11 +181,6 @@
         };
       };
 
-      xdg.desktopEntries.aerc = lib.mkIf pkgs.stdenv.isLinux {
-        name = "aerc";
-        exec = "kitty aerc %u";
-      };
-
       programs.fish.shellAbbrs = { ae = "aerc"; };
 
     };

modules/common/mail/default.nix

@@ -10,17 +10,9 @@
       default = config.user;
     };
     mail.server = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
+      type = 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 {
@@ -50,7 +42,7 @@
             folders = { };
             getmail = { };
             imap = {
-              host = config.mail.imapHost;
+              host = "imap.purelymail.com";
               port = 993;
               tls.enable = true;
             };
@@ -63,9 +55,9 @@
             maildir = { path = "main"; };
             mbsync = {
               enable = true;
-              create = "both";
-              expunge = "both";
-              remove = "both";
+              create = "maildir";
+              expunge = "none";
+              remove = "none";
               patterns = [ "*" ];
               extraConfig.channel = {
                 CopyArrivalDate = "yes"; # Sync time of original message
@@ -78,7 +70,7 @@
                 builtins.toString ../../../private/mailpass.age
               }";
             smtp = {
-              host = config.mail.smtpHost;
+              host = "smtp.purelymail.com";
               port = 465;
               tls.enable = true;
             };

modules/nixos/services/arr.nix

@@ -1,8 +1,10 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+
+{
 
   options = {
     arrServer = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
+      type = lib.types.str;
       description = "Hostname for arr services";
       default = null;
     };