✨ rework email module

hosts/nixos-desktop/default.nix

@@ -14,12 +14,6 @@
   # KERNEL
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  # MY MODULES
-  my.email = {
-    enable = true;
-    passwordFile = ../../secrets/email-desktop.age;
-  };
-
   # BOOT
   boot = {
     supportedFilesystems = [ "btrfs" "ntfs" ];

hosts/nixos-laptop/default.nix

@@ -11,12 +11,6 @@
     ./hardware-configuration.nix
   ];
 
-  # MY MODULES
-  my.email = {
-    enable = true;
-    passwordFile = ../../secrets/email-desktop.age;
-  };
-
   # BOOT
   boot = {
     supportedFilesystems = [ "btrfs" ];

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 ];
+  };
+}

secrets/email-laptop.age

@@ -1,15 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 CjuqfA 42ZhJgcVV9rxkVmvEj4aCeeVx4Tldtx2L54hS1mZCxE
-dqSOKoGxChgMHmiY4SgoJqxH9nSGlLVnmbke2+xZHYA
--> ssh-ed25519 QRYDmg yHGmTle30O7BQ7SFG7m5gaZctmwT26LNfJPbocs1WTM
-lQZa4yp8R8UZpG+/JGuZ4z4gxlGXColGCs8qlKFyCP4
--> ssh-ed25519 wG6LYg wokwDVXoQaZlpX4qM/2OmSo9lbDFIqqg/dKesIETJBI
-0MBgUClVsQksxRCa4WhSvQlzZRl673CZeeP7PVfHtCI
--> ssh-ed25519 ZYd7Zg cGYmLN+nSv5NGR+HMbofhtzbmZ/LjftCpcUIbZ5Z+hY
-3u9UgW7TDWX+dfuJuIwRxSkwTOLrUw1znEkU9ao5Ltw
--> ssh-ed25519 as9VYQ dK/VaOUKsr58sTfiF3qjUPHi3mxfioW5IXkyMmx+xCY
-mTF8kUni1pxBrcE+j4mHZx/Zs8D8SgqWjfRkDH66m5k
--> Pzw,"-grease R`h7fZ+ 'U[<2@ `Ay6[
-3a6T
---- I5udQOeevThPQ3VGfarWDe+n1y1DnC1vNqd+hU53ENw
-­¶Ç»–·<E28093>@ŠÅC¶þ¢	˜ÉÿwWÛøLouåsº»¾Ý
f½zÐëb+Ùû÷“4’ÿŒ

secrets/secrets.nix

@@ -13,8 +13,6 @@ in
 {
   "nordvpn.age".publicKeys = all;
   "spotifyd.age".publicKeys = all;
-  "email-desktop.age".publicKeys = all;
-  "email-laptop.age".publicKeys = all;
   "home-vpn.age".publicKeys = all;
   "home-vpn-password.age".publicKeys = all;
   "github.age".publicKeys = all;