mkModule various + fixes

modules/nixos/services/protonmail-bridge/default.nix

@@ -7,55 +7,65 @@
 }:
 with lib;
 let
-  cfg = config.${namespace}.services.protonmail-bridge;
-in
-{
-  imports = [ ./options.nix ];
+  inherit (lib.${namespace}) mkOpt;
+  name = "protonmail-bridge";
+  cfg = config.${namespace}.services.${name};
 
-  config = mkIf cfg.enable {
-    # Open firewall for protonmail bridge if enabled
-    networking.firewall = mkIf cfg.openFirewall {
-      allowedTCPPorts = [
-        cfg.smtpPort
-        cfg.imapPort
-      ];
-      allowedUDPPorts = [
-        cfg.smtpPort
-        cfg.imapPort
-      ];
+  protonmailConfig = lib.${namespace}.mkModule {
+    inherit config name;
+    description = "protonmail bridge";
+    options = {
+      imapPort = mkOpt types.int 1025 "imap port";
+      smtpPort = mkOpt types.int 1143 "smtp port";
     };
-
-    # Install protonmail-bridge package
-    environment.systemPackages = with pkgs; [
-      protonmail-bridge
-      gnome-keyring
-      gnupg
-      pass
-    ];
-
-    # Configure systemd user service for protonmail-bridge
-    systemd.user.services.protonmail-bridge = {
-      description = "Protonmail Bridge";
-      enable = true;
-      environment = {
-        GNUPGHOME = "%h/.gnupg";
-        PASSWORD_STORE_DIR = "%h/.password-store";
+    moduleConfig = {
+      # Open firewall for protonmail bridge if enabled
+      networking.firewall = mkIf cfg.openFirewall {
+        allowedTCPPorts = [
+          cfg.smtpPort
+          cfg.imapPort
+        ];
+        allowedUDPPorts = [
+          cfg.smtpPort
+          cfg.imapPort
+        ];
       };
-      script = "${lib.getExe pkgs.protonmail-bridge} --noninteractive";
-      path = with pkgs; [
+
+      # Install protonmail-bridge package
+      environment.systemPackages = with pkgs; [
+        protonmail-bridge
         gnome-keyring
         gnupg
         pass
-        protonmail-bridge
       ];
-      wantedBy = [ "default.target" ];
-      after = [ "gpg-agent.service" ];
-    };
 
-    # Configure gpg-agent
-    programs.gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
+      # Configure systemd user service for protonmail-bridge
+      systemd.user.services.protonmail-bridge = {
+        description = "Protonmail Bridge";
+        enable = true;
+        environment = {
+          GNUPGHOME = "%h/.gnupg";
+          PASSWORD_STORE_DIR = "%h/.password-store";
+        };
+        script = "${lib.getExe pkgs.protonmail-bridge} --noninteractive";
+        path = with pkgs; [
+          gnome-keyring
+          gnupg
+          pass
+          protonmail-bridge
+        ];
+        wantedBy = [ "default.target" ];
+        after = [ "gpg-agent.service" ];
+      };
+
+      # Configure gpg-agent
+      programs.gnupg.agent = {
+        enable = true;
+        enableSSHSupport = true;
+      };
     };
   };
+in
+{
+  imports = [ protonmailConfig ];
 }

modules/nixos/services/protonmail-bridge/options.nix

@@ -1,31 +0,0 @@
-{ lib, namespace, ... }:
-with lib;
-{
-  options.${namespace}.services.protonmail-bridge = {
-    enable = mkEnableOption "protonmail bridge service";
-
-    smtpPort = mkOption {
-      type = types.port;
-      default = 1025;
-      description = "SMTP port for protonmail bridge";
-    };
-
-    imapPort = mkOption {
-      type = types.port;
-      default = 1143;
-      description = "IMAP port for protonmail bridge";
-    };
-
-    openFirewall = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Whether to open firewall for protonmail bridge";
-    };
-
-    user = mkOption {
-      type = types.str;
-      default = "admin";
-      description = "User to run protonmail bridge as";
-    };
-  };
-}