modularize cinny and ente-auth, add package ente-auth-web

The previous was more of a workaround not fitting in the spirit of
nixos, this fixes this and makes proper modules out of them. Sadly
ente-web-auth has to be build with a env var and therefore can't be
configured before properly.

modules/nixos/services/caddy/default.nix

@@ -1,60 +0,0 @@
-{
-  lib,
-  config,
-  namespace,
-  ...
-}:
-with lib;
-with lib.${namespace};
-let
-  cfg = config.${namespace}.services.caddy;
-in
-{
-  options.${namespace}.services.caddy = {
-    enable = mkEnableOption "Caddy";
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = [
-      1338
-      8686
-    ];
-
-    services.caddy = {
-      enable = true;
-      virtualHosts = {
-        ":1338" = {
-          extraConfig = ''
-            root * /var/lib/caddy/ente
-            file_server
-          '';
-        };
-        ":8686" = {
-          extraConfig = ''
-            root * /var/lib/caddy/cinny
-            file_server
-
-            @index {
-              not path /index.html
-              not path /public/*
-              not path /assets/*
-
-              not path /config.json
-
-              not path /manifest.json
-              not path /sw.js
-
-              not path /pdf.worker.min.js
-              not path /olm.wasm
-
-              path /*
-            }
-
-            rewrite /*/olm.wasm /olm.wasm
-            rewrite @index /index.html
-          '';
-        };
-      };
-    };
-  };
-}

modules/nixos/services/cinny/default.nix

@@ -0,0 +1,64 @@
+{
+  lib,
+  pkgs,
+  config,
+  namespace,
+  ...
+}:
+with lib;
+with lib.${namespace};
+let
+  cfg = config.${namespace}.services.cinny;
+in
+{
+  options.${namespace}.services.cinny = {
+    enable = mkEnableOption "Cinny";
+
+    package = mkOption {
+      description = "The package of Cinny to use.";
+      type = types.package;
+      default = pkgs.cinny-unwrapped;
+    };
+
+    port = mkOption {
+      description = "The port to serve Cinny on.";
+      type = types.nullOr types.int;
+      default = 8686;
+    };
+
+  };
+  config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = [
+      cfg.port
+    ];
+
+    services.caddy = {
+      enable = true;
+      virtualHosts.":${builtins.toString cfg.port}" = {
+        extraConfig = ''
+          root * ${cfg.package}
+          file_server
+
+          @index {
+            not path /index.html
+            not path /public/*
+            not path /assets/*
+
+            not path /config.json
+
+            not path /manifest.json
+            not path /sw.js
+
+            not path /pdf.worker.min.js
+            not path /olm.wasm
+
+            path /*
+          }
+
+          rewrite /*/olm.wasm /olm.wasm
+          rewrite @index /index.html
+        '';
+      };
+    };
+  };
+}

modules/nixos/services/ente-auth/default.nix

@@ -0,0 +1,47 @@
+{
+  lib,
+  pkgs,
+  config,
+  namespace,
+  ...
+}:
+with lib;
+with lib.${namespace};
+let
+  cfg = config.${namespace}.services.ente-auth;
+in
+{
+  options.${namespace}.services.ente-auth = {
+    enable = mkEnableOption "Ente-Auth";
+
+    package = mkOption {
+      description = "The package of Ente-Auth to use.";
+      type = types.package;
+      default = pkgs.awesome-flake.ente-web-auth;
+    };
+
+    port = mkOption {
+      description = "The port to serve Ente-Auth on.";
+      type = types.nullOr types.int;
+      default = 1338;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = [
+      cfg.port
+    ];
+
+    services.caddy = {
+      enable = true;
+      virtualHosts = {
+        ":${builtins.toString cfg.port}" = {
+          extraConfig = ''
+            root * ${cfg.package}
+            file_server
+          '';
+        };
+      };
+    };
+  };
+}