✨ rework email module

modules/config/default.nix

@@ -7,7 +7,6 @@
 {
   imports = [
     ./bin
-    ./email.nix
     ./nix.nix
     ./shell.nix
     ./theming

modules/config/email.nix

@@ -1,50 +0,0 @@
-{ config
-, lib
-, pkgs
-, ...
-}:
-
-with lib;
-let
-  cfg = config.my.email;
-  name = "Moritz Böhme";
-  email = "mail@moritzboeh.me";
-  mailDirectory = "/home/moritz/.mail";
-in
-{
-  options.my.email = {
-    enable = mkOption {
-      default = false;
-      type = types.bool;
-      example = true;
-    };
-    passwordFile = mkOption {
-      default = null;
-      type = types.path;
-      description = "File containing the email password.";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Protonbridge Setup
-    environment.systemPackages = with pkgs; [ protonmail-bridge ];
-    systemd.user.services.protonmail-bridge = {
-      description = "Protonmail Bridge";
-      enable = true;
-      script = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --log-level debug";
-      path = [
-        pkgs.gnome3.gnome-keyring
-      ]; # HACK: https://github.com/ProtonMail/proton-bridge/issues/176
-      wantedBy = [ "graphical-session.target" ];
-      partOf = [ "graphical-session.target" ];
-    };
-    age.secrets.email = {
-      file = cfg.passwordFile;
-      owner = "1000";
-    };
-
-    # Email Applications
-    home-manager.users.moritz.home.packages = with pkgs; [ thunderbird ];
-    networking.firewall.allowedTCPPorts = [ 33728 1025 1143 ];
-  };
-}

modules/profiles/desktop.nix

@@ -23,6 +23,7 @@ with lib; {
       bspwm.enable = true;
       code.enable = true;
       emacs.enable = true;
+      email.enable = true;
       firefox = {
         enable = true;
         arkenfox = {

modules/programs/default.nix

@@ -11,6 +11,7 @@
     ./code.nix
     ./direnv.nix
     ./emacs.nix
+    ./email.nix
     ./firefox.nix
     ./fish.nix
     ./git.nix

modules/programs/email.nix

@@ -0,0 +1,25 @@
+{ config
+, lib
+, pkgs
+, ...
+}:
+
+with lib;
+let
+  cfg = config.my.programs.email;
+in
+{
+  options.my.programs.email = {
+    enable = mkOption {
+      default = false;
+      type = types.bool;
+      example = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Email Applications
+    users.users.moritz.packages = with pkgs; [ thunderbird ];
+    networking.firewall.allowedTCPPorts = [ 33728 1025 1143 ];
+  };
+}