Changed caddy config

hosts/v-th-ctr-01/configuration.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ modulesPath, ... }:
+{ modulesPath, lib, ... }:
 
 {
   imports = [
@@ -12,6 +12,8 @@
     ../../modules/system/default.nix
   ];
 
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
   settings = {
     hostname = "v-th-ctr-01";
     display-manager = "none";

hosts/v-th-ctr-01/home.nix

@@ -57,6 +57,7 @@
         vikunja.enable = true;
         stalwart.enable = true;
         linkding.enable = true;
+        jellyfin.enable = true;
       };
     };
 

modules/home/containers/beszel.nix

@@ -49,11 +49,10 @@ in {
       };
     };
 
-    settings.containers.caddy.routes.tbmrs-local.routes = [{
+    settings.containers.caddy.routes.tbmrs-local.routes.beszel = {
-      name = "beszel";
       host = "monitor";
       url = "beszel:8090"; 
-    }];
+    };
 
     sops.secrets = {
       "containers/beszel/key" = { };

modules/home/containers/caddy.nix

@@ -5,6 +5,12 @@ with lib;
 let
   cfg = config.settings.containers.caddy;
 
+  toInternal = name: routesDef: {
+    name = name;
+    host = routesDef.host;
+    url = routesDef.url;
+  };
+
   generateRoutes = domain: entries: lib.concatMapStrings (route: ''
     @${route.name} host ${route.host}.${domain}
     handle @${route.name} {
@@ -13,11 +19,8 @@ let
   '') entries;
 
   routesOption = lib.mkOption {
-    type = types.listOf (types.submodule {
+    type = types.attrsOf (types.submodule {
       options = {
-        name = mkOption {
-          type = types.str;
-        };
         url = mkOption {
           type = types.str;
         };
@@ -79,7 +82,7 @@ in {
           resolvers 1.1.1.1
         }
 
-        ${generateRoutes cfg.routes.tbmrs.domain cfg.routes.tbmrs.routes}
+        ${generateRoutes cfg.routes.tbmrs.domain (mapAttrsToList toInternal cfg.routes.tbmrs.routes)}
       }
 
       *.local.tbmrs.nl {
@@ -88,7 +91,7 @@ in {
           resolvers 1.1.1.1
         }
 
-        ${generateRoutes cfg.routes.tbmrs-local.domain cfg.routes.tbmrs-local.routes}
+        ${generateRoutes cfg.routes.tbmrs-local.domain (mapAttrsToList toInternal cfg.routes.tbmrs-local.routes)}
       }
     '';
   };

modules/home/containers/forgejo.nix

@@ -29,10 +29,9 @@ in {
       };
     };
 
-    settings.containers.caddy.routes.tbmrs.routes = [{
+    settings.containers.caddy.routes.tbmrs.routes.forgejo = {
-      name = "forgejo";
       host = "git";
       url = "forgejo:3000"; 
-    }];
+    };
   };
 }

modules/home/containers/homeassistant.nix

@@ -28,10 +28,9 @@ in {
       };
     };
 
-    settings.containers.caddy.routes.tbmrs-local.routes = [{
+    settings.containers.caddy.routes.tbmrs-local.routes.home-assistant = {
-      name = "homeassistant";
       host = "home-assistant";
       url = "homeassistant:8123"; 
-    }];
+    };
   };
 }

modules/home/containers/homepage.nix

@@ -32,6 +32,11 @@ in {
       };
     };
 
+    settings.containers.caddy.routes.tbmrs.routes.homepage = {
+      host = "home";
+      url = "homepage:3000"; 
+    };
+
     home.file."containers/homepage/config/settings.yaml".source = (pkgs.formats.yaml { }).generate "settings" {
       title = "Timo's Server";
       description = "server from Timo";
@@ -125,12 +130,21 @@ in {
             };    
           }
           {
-            "Karakeep" = {
+            "Linkding" = {
-              href = "https://karakeep.local.tbmrs.nl";
+              href = "https://links.local.tbmrs.nl";
-              description = "Data hoarder";
+              description = "Bookmarks";
-              icon = "karakeep";
+              icon = "linkding";
               server = "podman";
-              container = "karakeep";
+              container = "linkding";
+            };    
+          }
+          {
+            "Stalwart" = {
+              href = "https://mail.tbmrs.nl";
+              description = "Mailserver";
+              icon = "stalwart";
+              server = "podman";
+              container = "stalwart";
             };    
           }
         ];

modules/home/containers/immich.nix

@@ -72,10 +72,9 @@ in {
       exec = ''postgres -c shared_preload_libraries=vectors.so -c 'search_path="$$user", public, vectors' -c logging_collector=on -c max_wal_size=2GB -c shared_buffers=512MB -c wal_compression=on'';
     };
 
-    settings.containers.caddy.routes.tbmrs.routes = [{
+    settings.containers.caddy.routes.tbmrs.routes.immich = {
-      name = "immich";
       host = "photos";
       url = "immich-server:2283"; 
-    }];
+    };
   };
 }

modules/home/containers/jellyfin.nix

@@ -0,0 +1,36 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.jellyfin;
+in {
+  options = {
+    settings.containers.jellyfin.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable jellyfin container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.jellyfin = {
+      image = "jellyfin:jellyfin";
+      network = "proxy";
+      volumes = [
+        "%h/containers/jellyfin/data:/data" 
+        "%h/containers/jellyfin/cache:/cache" 
+        "%h/media:/media"
+      ];
+      userNS = "keep-id";
+    };
+
+    settings.containers.caddy.routes.tbmrs.routes.jellyfin = {
+      name = "jellyfin";
+      host = "watch";
+      url = "jellyfin:8096";
+    };
+  };
+}

modules/home/containers/kanidm.nix

@@ -37,10 +37,9 @@ in {
       };
     };
 
-    settings.containers.caddy.routes.tbmrs.routes = [{
+    settings.containers.caddy.routes.tbmrs.routes.kanidm = {
-      name = "kanidm";
       host = "auth";
       url = "https://auth.tbmrs.nl"; 
-    }];
+    };
   };
 }

modules/home/containers/linkding.nix

@@ -36,11 +36,10 @@ in {
       ];
     };
 
-    settings.containers.caddy.routes.tbmrs-local.routes = [{
+    settings.containers.caddy.routes.tbmrs-local.routes.linkding = {
-      name = "linkding";
       host = "links";
       url = "linkding:9090"; 
-    }];
+    };
 
     settings.services.sops.enable = true;
 

modules/home/containers/paperless-ngx.nix

@@ -88,11 +88,10 @@ in {
       ];
     };
 
-    settings.containers.caddy.routes.tbmrs-local.routes = [{
+    settings.containers.caddy.routes.tbmrs-local.routes.paperless-ngx = {
-      name = "paperless-ngx";
       host = "paperless";
       url = "paperless-ngx:8000"; 
-    }];
+    };
 
     sops.secrets = {
       "containers/paperless-ngx/db-password" = { };

modules/home/containers/pingvin-share.nix

@@ -39,11 +39,10 @@ in {
       };
     };
 
-    settings.containers.caddy.routes.tbmrs.routes = [{
+    settings.containers.caddy.routes.tbmrs.routes.pingvin = {
-      name = "pingvin-share";
       host = "share";
       url = "pingvin-share:3000"; 
-    }];
+    };
 
     sops.templates = {
       "container-pingvin.yaml" = {

modules/home/containers/stalwart.nix

@@ -34,10 +34,9 @@ in {
       ];
     };
 
-    settings.containers.caddy.routes.tbmrs.routes = [{
+    settings.containers.caddy.routes.tbmrs.routes.stalwart = {
-      name = "stalwart";
       host = "mail";
       url = "stalwart:8080"; 
-    }];
+    };
   };
 }

modules/home/containers/storage.nix

@@ -44,16 +44,14 @@ in {
       ];
     };
 
-    settings.containers.caddy.routes.tbmrs-local.routes = [{
+    settings.containers.caddy.routes.tbmrs-local.routes.sycnthing = {
-      name = "syncthing";
       host = "syncthing";
       url = "syncthing:8384"; 
-    }];
+    };
 
-    settings.containers.caddy.routes.tbmrs.routes = [{
+    settings.containers.caddy.routes.tbmrs.routes.dufs = {
-      name = "dufs";
       host = "files";
       url = "dufs:5000"; 
-    }];
+    };
   };
 }

modules/home/containers/uptime-kuma.nix

@@ -24,10 +24,9 @@ in {
       ];
     };
 
-    settings.containers.caddy.routes.tbmrs.routes = [{
+    settings.containers.caddy.routes.tbmrs.routes.uptime-kuma = {
-      name = "uptime-kuma";
       host = "uptime";
       url = "uptime-kuma:3001"; 
-    }];
+    };
   };
 }

modules/home/containers/vaultwarden.nix

@@ -28,11 +28,10 @@ in {
       };
     };
 
-    settings.containers.caddy.routes.tbmrs-local.routes = [{
+    settings.containers.caddy.routes.tbmrs-local.routes.vaultwarden = {
-      name = "vaultwarden";
       host = "vault";
       url = "vaultwarden:80"; 
-    }];
+    };
 
   };
 }

modules/home/containers/vikunja.nix

@@ -26,10 +26,9 @@ in {
       ];
     };
 
-    settings.containers.caddy.routes.tbmrs-local.routes = [{
+    settings.containers.caddy.routes.tbmrs-local.routes.vikunja = {
-      name = "vikunja";
       host = "tasks";
       url = "vikunja:3456"; 
-    }];
+    };
   };
 }

modules/home/default.nix

@@ -46,6 +46,7 @@
     ./containers/stalwart.nix
     ./containers/static.nix
     ./containers/linkding.nix
+    ./containers/jellyfin.nix
   ];
 
   config = {