From bdb4ad8160557fa71321f30c995495216fc17ce0 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Wed, 1 Oct 2025 16:33:55 +0200
Subject: [PATCH 01/16] Updates

---
 modules/apps/arr/default.nix         |  2 +-
 modules/apps/jellyfin/default.nix    | 24 +++++++++---------------
 modules/services/actions/default.nix |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/modules/apps/arr/default.nix b/modules/apps/arr/default.nix
index 3b05429..e2c0df5 100644
--- a/modules/apps/arr/default.nix
+++ b/modules/apps/arr/default.nix
@@ -343,7 +343,7 @@ in {
         port = 7878;
       in lib.mkIf cfg.radarr.enable {
         hostname = "radarr";
-        image = "ghcr.io/hotio/radarr:release-5.28.0.10205";
+        image = "ghcr.io/hotio/radarr:testing-5.28.0.10205";
         autoStart = true;
         ports = lib.mkIf cfg.radarr.exposePorts [
           "${toString port}:${toString port}/tcp"
diff --git a/modules/apps/jellyfin/default.nix b/modules/apps/jellyfin/default.nix
index 5b4081a..011f56b 100644
--- a/modules/apps/jellyfin/default.nix
+++ b/modules/apps/jellyfin/default.nix
@@ -4,6 +4,7 @@ let
   cfg = config.homelab.apps.jellyfin;
 
   networkName = "jellyfin";
+  inherit (config.homelab.fileSystems) media;
 
   UID = 3008;
   GID = config.users.groups.media.gid;
@@ -12,6 +13,11 @@ in {
 
   config = lib.mkIf cfg.enable {
     homelab = {
+      fileSystems.media.video = {
+        enable = true;
+        permissions = [ "read" ];
+      };
+
       users = {
         apps.enable = true;
         media.enable = true;
@@ -32,18 +38,6 @@ in {
         ];
       };
 
-      "/srv/video" = {
-        device = "192.168.0.11:/mnt/SMALL/MEDIA/VIDEO";
-        fsType = "nfs";
-        options = [
-          "ro"
-          "nfsvers=4.2"
-          "async" "soft"
-          "timeo=100" "retry=50" "actimeo=1800" "lookupcache=all"
-          "nosuid" "tcp"
-        ];
-      };
-
       "/srv/homevideo" = {
         device = "192.168.0.11:/mnt/BIG/MEDIA/HOMEVIDEO/ARCHIVE";
         fsType = "nfs";
@@ -101,7 +95,7 @@ in {
     virtualisation.oci-containers.containers = {
       jellyfin = {
         hostname = "jellyfin";
-        image = "jellyfin/jellyfin:10.10.0";
+        image = "jellyfin/jellyfin:10.10.7";
         user = "${toString UID}:${toString GID}";
         autoStart = true;
         ports = [
@@ -117,7 +111,7 @@ in {
           "cache:/cache"
 
           "/srv/audio:/media/audio"
-          "/srv/video:/media/video"
+          "${media.video.hostPath}:/media/video"
           "/srv/homevideo:/media/homevideo"
           "/srv/photo:/media/photo"
         ];
@@ -144,7 +138,7 @@ in {
         feishinPort = "9180";
       in {
         hostname = "feishin";
-        image = "ghcr.io/jeffvli/feishin:0.7.1";
+        image = "ghcr.io/jeffvli/feishin:0.19.0";
         autoStart = true;
         ports = [
           "${feishinPort}:9180/tcp" # Web player (HTTP)
diff --git a/modules/services/actions/default.nix b/modules/services/actions/default.nix
index 338b963..ea6b025 100644
--- a/modules/services/actions/default.nix
+++ b/modules/services/actions/default.nix
@@ -44,6 +44,6 @@ in {
         ];
       };
     };
-
   };
 }
+

From d2a0da648c5c1e7f4ae1f2be02431bf4116a5bb2 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Wed, 1 Oct 2025 16:36:14 +0200
Subject: [PATCH 02/16] feat(solidtime): Add module

---
 modules/apps/solidtime/default.nix | 238 +++++++++++++++++++++++++++++
 1 file changed, 238 insertions(+)
 create mode 100644 modules/apps/solidtime/default.nix

diff --git a/modules/apps/solidtime/default.nix b/modules/apps/solidtime/default.nix
new file mode 100644
index 0000000..9174df4
--- /dev/null
+++ b/modules/apps/solidtime/default.nix
@@ -0,0 +1,238 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.homelab.apps.solidtime;
+
+  networkName = "solidtime";
+  internalNetworkName = "solidtime-internal";
+
+  version = "0.8.0";
+
+  port = 8000;
+  user = "1000:1000";
+
+  # dbExternalPort = ...;
+  dbInternalPort = 5432;
+
+  gotenbergPort = 3000;
+
+  inherit (config.virtualisation.oci-containers) containers;
+
+  volumes = [
+    "solidtime-storage:/var/www/html/storage"
+    "solidtime-logs:/var/www/html/storage/logs"
+    "solidtime-app:/var/www/html/storage/app"
+  ];
+
+  # laravel.env
+  laravelEnv = {
+    APP_NAME = "Solidtime";
+    VITE_APP_NAME = laravelEnv.APP_NAME;
+    APP_ENV = "production";
+    APP_DEBUG = "false";
+    APP_URL = "http://localhost:${toString port}";
+    APP_FORCE_HTTPS = "false";
+    APP_ENABLE_REGISTRATION = "false";
+    TRUSTED_PROXIES = "0.0.0.0/0,2000:0:0:0:0:0:0:0/3";
+
+    # Logging
+    LOG_CHANNEL = "stderr_daily";
+    LOG_LEVEL = "debug";
+
+    # Database
+    DB_CONNECTION = "pgsql";
+    DB_HOST = containers.solidtimeDb.hostname;
+    DB_PORT = toString dbInternalPort;
+    DB_SSL_MODE = "require";
+    DB_DATABASE = "solidtime";
+    DB_USERNAME = "solidtime";
+    DB_PASSWORD = "ChangeMe";
+
+    # Mail
+    #MAIL_MAILER = "smtp";
+    #MAIL_HOST = "smtp.gmail.com";
+    #MAIL_PORT = "465";
+    #MAIL_ENCRYPTION = "tls";
+    #MAIL_FROM_ADDRESS = "no-reply@time.depeuter.dev";
+    MAIL_FROM_NAME = laravelEnv.APP_NAME;
+    #MAIL_USERNAME = "kmtl.hugo@gmail.com";
+    #MAIL_PASSWORD = "fhfxoequhhqidrhd";
+
+    # Queue
+    QUEUE_CONNECTION = "database";
+
+    # File storage
+    FILESYSTEM_DISK = "local";
+    PUBLIC_FILESYSTEM_DISK = "public";
+
+    # Services
+    GOTENBERG_URL = "http://${containers.solidtimeGotenberg.hostname}:${toString gotenbergPort}";
+  };
+
+in {
+  options.homelab.apps.solidtime.enable = lib.mkEnableOption "Solidtime time tracker using Docker";
+
+  config = lib.mkIf cfg.enable {
+    homelab.virtualisation.containers.enable = true;
+
+    # Make sure the Docker network exists.
+    systemd.services = {
+      "docker-${networkName}-create-network" = {
+        description = "Create Docker network for ${networkName}";
+        requiredBy = [
+          "${containers.solidtime.serviceName}.service"
+        ];
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+        };
+        script = ''
+          if ! ${pkgs.docker}/bin/docker network ls | grep -q ${networkName}; then
+            ${pkgs.docker}/bin/docker network create ${networkName}
+          fi
+        '';
+      };
+      "docker-${internalNetworkName}-create-network" = {
+        description = "Create Docker network for ${internalNetworkName}";
+        requiredBy = [
+          "${containers.solidtime.serviceName}.service"
+          "${containers.solidtimeScheduler.serviceName}.service"
+          "${containers.solidtimeQueue.serviceName}.service"
+          "${containers.solidtimeDb.serviceName}.service"
+          "${containers.solidtimeGotenberg.serviceName}.service"
+        ];
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+        };
+        script = ''
+          if ! ${pkgs.docker}/bin/docker network ls | grep -q ${internalNetworkName}; then
+            ${pkgs.docker}/bin/docker network create ${internalNetworkName}
+          fi
+        '';
+      };
+    };
+    
+    virtualisation.oci-containers.containers = {
+      solidtime = {
+        hostname = "solidtime";
+        image = "solidtime/solidtime:${version}";
+        autoStart = true;
+        inherit user;
+        ports = [
+          # Open ports if you don't use Traefik
+          "${toString port}:8000"
+        ];
+        extraOptions = [
+          "--network=${networkName}"
+          "--network=${internalNetworkName}"
+
+          # Healthecks
+          # test: [ "CMD-SHELL", "curl --fail http://localhost:8000/health-check/up || exit 1" ]
+          ''--health-cmd=curl --fail http://localhost:8000/health-check/up || exit 1''
+        ];
+        inherit volumes;
+        dependsOn = [
+          "solidtimeDb"
+        ];
+        environmentFiles = [
+          "/home/admin/.solidtime.env"
+        ];
+        environment = laravelEnv // {
+          CONTAINER_MODE = "http";
+        };
+        labels = {
+          "traefik.enable" = "true";
+          "traefik.http.routers.solidtime.rule" = "Host(`time.${config.networking.hostName}.depeuter.dev`)";
+          "traefik.http.services.solidtime.loadbalancer.server.port" = toString port;
+        };
+      };
+      solidtimeScheduler = {
+        hostname = "scheduler";
+        image = "solidtime/solidtime:${version}";
+        inherit user;
+        autoStart = true;
+        extraOptions = [
+          "--network=${internalNetworkName}"
+
+          # Healthchecks
+          # test: [ "CMD-SHELL", "supervisorctl status scheduler:scheduler_00" ]
+          ''--health-cmd="supervisorctl status scheduler:scheduler_00"''
+        ];
+        inherit volumes;
+        dependsOn = [
+          "solidtimeDb"
+        ];
+        environmentFiles = [
+          "/home/admin/.solidtime.env"
+        ];
+        environment = laravelEnv // {
+          CONTAINER_MODE = "scheduler";
+        };
+      };
+      solidtimeQueue = {
+        hostname = "queue";
+        image = "solidtime/solidtime:${version}";
+        inherit user;
+        autoStart = true;
+        extraOptions = [
+          "--network=${internalNetworkName}"
+
+          # Healthchecks
+          # test: [ "CMD-SHELL", "supervisorctl status worker:worker_00" ]
+          ''--health-cmd="supervisorctl status worker:worker_00"''
+        ];
+        inherit volumes;
+        dependsOn = [
+          "solidtimeDb"
+        ];
+        environmentFiles = [
+          "/home/admin/.solidtime.env"
+        ];
+        environment = laravelEnv // {
+          CONTAINER_MODE = "worker";
+          WORKER_COMMAND = "php /var/www/html/artisan queue:work";
+        };
+      };
+      solidtimeDb = {
+        hostname = "database";
+        image = "postgres:15";
+        autoStart = true;
+        ports = [
+          # "${toString dbExternalPort}:${toString dbInternalPort}"
+        ];
+        extraOptions = [
+          "--network=${internalNetworkName}"
+
+          # Healthchecks
+          # test: - CMD - pg_isready - '-q' - '-d' - '${DB_DATABASE}' - '-U' - '${DB_USERNAME}' retries: 3 timeout: 5s
+          ''--health-cmd="pg_isready -q -d ${laravelEnv.DB_DATABASE} -U ${laravelEnv.DB_USERNAME}"''
+          "--health-retries=3"
+          "--health-timeout=5s"
+        ];
+        volumes = [
+          "solidtime-db:/var/lib/postgresql/data"
+        ];
+        environment = {
+          PGPASSWORD = laravelEnv.DB_PASSWORD;
+          POSTGRES_DB = laravelEnv.DB_DATABASE;
+          POSTGRES_USER = laravelEnv.DB_USERNAME;
+          POSTGRES_PASSWORD = laravelEnv.DB_PASSWORD;
+        };
+      };
+      solidtimeGotenberg = {
+        hostname = "gotenberg";
+        image = "gotenberg/gotenberg:8";
+        autoStart = true;
+        extraOptions = [
+          "--network=${internalNetworkName}"
+
+          # Healthchecks
+          # test: [ "CMD", "curl", "--silent", "--fail", "http://localhost:3000/health" ]
+          ''--health-cmd="curl --silent --fail http://localhost:${toString gotenbergPort}/health"''
+        ];
+      };
+    };
+  };
+}
+

From ef55596de6a09ceeb5441ebe71920a53ad9fcf0f Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Tue, 7 Oct 2025 23:02:48 +0200
Subject: [PATCH 03/16] feat(coder): Add module

---
 hosts/Development/default.nix        |   5 +
 modules/apps/bind9/db.depeuter.dev   |   5 +-
 modules/apps/coder/default.nix       | 131 +++++++++++++++++++++++++++
 modules/apps/default.nix             |   1 +
 modules/apps/vaultwarden/default.nix |   2 +-
 5 files changed, 142 insertions(+), 2 deletions(-)
 create mode 100644 modules/apps/coder/default.nix

diff --git a/hosts/Development/default.nix b/hosts/Development/default.nix
index b2237b7..608a31c 100644
--- a/hosts/Development/default.nix
+++ b/hosts/Development/default.nix
@@ -7,6 +7,11 @@
         bind9.enable = true;
         traefik.enable = true;
         plex.enable = true;
+        coder = {
+          enable = true;
+          accessUrl = "https://code.depeuter.dev";
+          wildcardAccessUrl = "*.code.depeuter.dev";
+        };
       };
       virtualisation.guest.enable = true;
     };
diff --git a/modules/apps/bind9/db.depeuter.dev b/modules/apps/bind9/db.depeuter.dev
index 72f3825..d3b6b42 100644
--- a/modules/apps/bind9/db.depeuter.dev
+++ b/modules/apps/bind9/db.depeuter.dev
@@ -1,6 +1,6 @@
 $TTL    604800
 @               IN      SOA     ns1 admin (
-                                 15 ; Serial
+                                 18 ; Serial
                              604800 ; Refresh
                               86400 ; Retry
                             2419200 ; Expire
@@ -40,6 +40,9 @@ sonarr          IN      A       192.168.0.33
 ; Development VM
 plex            IN      A       192.168.0.91
 
+code            IN      A       192.168.0.91
+*.code          IN      A       192.168.0.91
+
 ; Catchalls
 *.production    IN      A        192.168.0.31
 *.development   IN      A        192.168.0.91
diff --git a/modules/apps/coder/default.nix b/modules/apps/coder/default.nix
new file mode 100644
index 0000000..98e0a63
--- /dev/null
+++ b/modules/apps/coder/default.nix
@@ -0,0 +1,131 @@
+{ config, lib, pkgs, ... }:
+
+let
+    cfg = config.homelab.apps.coder;
+
+    postgresUser = "coder";
+    postgresPassword = "ChangeMe";
+    postgresDb = "coder";
+
+    networkName = "coder";
+    proxyNet = config.homelab.apps.traefik.sharedNetworkName;
+
+    coderVersion = "v2.25.3";
+    coderDbVersion = "17.6";
+in {
+  options.homelab.apps.coder = {
+    enable = lib.mkEnableOption "Coder (Docker)";
+    port = lib.mkOption {
+      type = lib.types.port;
+      default = 7080;
+      description = "Port to expose Coder on.";
+    };
+    accessUrl = lib.mkOption {
+      type = lib.types.str;
+      description = "The URL to access Coder at.";
+    };
+    wildcardAccessUrl = lib.mkOption {
+      type = lib.types.str;
+      description = "A wildcard URL to access Coder at (e.g. for workspaces).";
+    };
+
+    db.port = lib.mkOption {
+      type = lib.types.either lib.types.bool lib.types.port;
+      default = false;
+      description = "Port to expose the database on. Set to false to not expose.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    homelab.virtualisation.containers.enable = true;
+
+    systemd.services."docker-${networkName}-create-network" = {
+      description = "Create Docker network for ${networkName}";
+      requiredBy = [
+        "docker-coder.service"
+        "docker-coderDb.service"
+      ];
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+      };
+      script = ''
+        if ! ${pkgs.docker}/bin/docker network ls | grep -q ${networkName}; then
+          ${pkgs.docker}/bin/docker network create ${networkName}
+        fi
+      '';
+    };
+
+    virtualisation.oci-containers.containers = {
+      coder = let
+        coderPort = 7080;
+      in {
+        hostname = "coder";
+        image = "ghcr.io/coder/coder:${coderVersion}";
+        autoStart = true;
+        dependsOn = [
+          "coderDb"
+        ];
+        ports = [
+          "${toString cfg.port}:${toString coderPort}/tcp"
+        ];
+        networks = [
+          networkName
+          proxyNet
+        ];
+        volumes = [
+          "/var/run/docker.sock:/var/run/docker.sock"
+        ];
+        labels = {
+          "traefik.enable" = "true";
+          "traefik.docker.network" = proxyNet;
+          "traefik.http.routers.coder.rule" = "Host(`code.depeuter.dev`)";
+          "traefik.http.services.coder.loadbalancer.server.port" = toString coderPort;
+        };
+        environment = {
+          CODER_PG_CONNECTION_URL = "postgresql://${postgresUser}:${postgresPassword}@database/${postgresDb}?sslmode=disable";
+
+          # Required if you are not using the tunnel
+          CODER_ACCESS_URL = cfg.accessUrl;
+          CODER_WILDCARD_ACCESS_URL = cfg.wildcardAccessUrl;
+          CODER_DISABLE_PATH_APPS = "true";
+
+          CODER_HTTP_ADDRESS = "0.0.0.0:${toString coderPort}";
+          CODER_TLS_ENABLE = "false";
+
+          # TODO Enable me!
+          #CODER_REDIRECT_TO_ACCESS_URL = "true";
+
+          # Disable telemetry
+          CODER_TELEMETRY_ENABLED = "false";
+        };
+      };
+
+      coderDb = {
+        hostname = "coder-db";
+        image = "postgres:${coderDbVersion}";
+        autoStart = true;
+        ports = lib.mkIf cfg.db.port [
+          "${toString cfg.db.port}:5432/tcp"
+        ];
+        networks = [
+          networkName
+        ];
+        extraOptions = [
+          ''--health-cmd="pg_isready -U ${postgresUser} -d ${postgresDb}"''
+          "--health-interval=5s"
+          "--health-timeout=5s"
+          "--health-retries=5"
+        ];
+        volumes = [
+          "coder_data:/var/lib/postgresql/data"
+        ];
+        environment = {
+          POSTGRES_USER = postgresUser;
+          POSTGRES_PASSWORD = postgresPassword;
+          POSTGRES_DB = postgresDb;
+        };
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index 7c8b8f8..9974f68 100644
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -4,6 +4,7 @@
     ./bind9
     ./calibre
     ./changedetection
+    ./coder
     ./freshrss
     ./gitea
     ./jellyfin
diff --git a/modules/apps/vaultwarden/default.nix b/modules/apps/vaultwarden/default.nix
index 4510299..4b1016e 100644
--- a/modules/apps/vaultwarden/default.nix
+++ b/modules/apps/vaultwarden/default.nix
@@ -8,7 +8,7 @@ in {
   options.homelab.apps.vaultwarden = {
     enable = lib.mkEnableOption "Vaultwarden";
     port = lib.mkOption {
-      type = lib.types.int;
+      type = lib.types.port;
       default = 10102;
       description = "Vaultwarden WebUI port";
     };

From ae777ec4600a3fa02fa30579588033109603aac2 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Sat, 11 Oct 2025 15:29:58 +0200
Subject: [PATCH 04/16] fix(coder): Reverse proxy domains

---
 modules/apps/coder/default.nix | 37 +++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/modules/apps/coder/default.nix b/modules/apps/coder/default.nix
index 98e0a63..18751c8 100644
--- a/modules/apps/coder/default.nix
+++ b/modules/apps/coder/default.nix
@@ -66,6 +66,12 @@ in {
         dependsOn = [
           "coderDb"
         ];
+        extraOptions = [
+          "--group-add" "131" # Add docker group to access the socket
+
+          # Modify DNS
+          "--dns=192.168.0.91"
+        ];
         ports = [
           "${toString cfg.port}:${toString coderPort}/tcp"
         ];
@@ -79,16 +85,16 @@ in {
         labels = {
           "traefik.enable" = "true";
           "traefik.docker.network" = proxyNet;
-          "traefik.http.routers.coder.rule" = "Host(`code.depeuter.dev`)";
+          "traefik.http.routers.coder.rule" = "HostRegexp(`.+\.code\.depeuter\.dev`) || Host(`code.depeuter.dev`)";
           "traefik.http.services.coder.loadbalancer.server.port" = toString coderPort;
         };
         environment = {
-          CODER_PG_CONNECTION_URL = "postgresql://${postgresUser}:${postgresPassword}@database/${postgresDb}?sslmode=disable";
+          CODER_PG_CONNECTION_URL = "postgresql://${postgresUser}:${postgresPassword}@coder-db/${postgresDb}?sslmode=disable";
 
           # Required if you are not using the tunnel
           CODER_ACCESS_URL = cfg.accessUrl;
           CODER_WILDCARD_ACCESS_URL = cfg.wildcardAccessUrl;
-          CODER_DISABLE_PATH_APPS = "true";
+          CODER_DISABLE_PATH_APPS = "false"; # TODO Enable me!
 
           CODER_HTTP_ADDRESS = "0.0.0.0:${toString coderPort}";
           CODER_TLS_ENABLE = "false";
@@ -105,18 +111,18 @@ in {
         hostname = "coder-db";
         image = "postgres:${coderDbVersion}";
         autoStart = true;
-        ports = lib.mkIf cfg.db.port [
-          "${toString cfg.db.port}:5432/tcp"
-        ];
-        networks = [
-          networkName
-        ];
         extraOptions = [
           ''--health-cmd="pg_isready -U ${postgresUser} -d ${postgresDb}"''
           "--health-interval=5s"
           "--health-timeout=5s"
           "--health-retries=5"
         ];
+        ports = lib.mkIf cfg.db.port [
+          "${toString cfg.db.port}:5432/tcp"
+        ];
+        networks = [
+          networkName
+        ];
         volumes = [
           "coder_data:/var/lib/postgresql/data"
         ];
@@ -126,6 +132,17 @@ in {
           POSTGRES_DB = postgresDb;
         };
       };
+
+      traefik.cmd = [
+        "--entrypoints.websecure.http.tls.domains[2].main=code.depeuter.dev"
+        "--entrypoints.websecure.http.tls.domains[2].sans=*.code.depeuter.dev"
+      ];
+    };
+
+    virtualisation.docker.daemon.settings = {
+      dns = [
+        "192.168.0.91"
+      ];
     };
   };
-}
\ No newline at end of file
+}

From 297a6df29e56fd72e4888fad295a4683659c9e6f Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Sat, 11 Oct 2025 15:40:43 +0200
Subject: [PATCH 05/16] feat: Add gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..485dee6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea

From b2e904306b299e96fdd316857ead0ac351c5a4c1 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Sat, 11 Oct 2025 15:41:13 +0200
Subject: [PATCH 06/16] feat(traefik): Add external services

---
 hosts/Binnenpost/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hosts/Binnenpost/default.nix b/hosts/Binnenpost/default.nix
index d78e2da..561fbe1 100644
--- a/hosts/Binnenpost/default.nix
+++ b/hosts/Binnenpost/default.nix
@@ -16,6 +16,7 @@
       apps = {
         speedtest.enable = true;
         technitiumDNS.enable = true;
+        traefik.enable = true;
       };
       virtualisation.guest.enable = true;
     };
@@ -76,6 +77,14 @@
       };
     };
 
+    virtualisation.oci-containers.containers.traefik.labels = {
+      "traefik.http.routers.roxanne.rule" = "Host(`roxanne.depeuter.dev`)";
+      "traefik.http.services.roxanne.loadbalancer.server.url" = "https://192.168.0.13:8006";
+
+      "traefik.http.routers.hugo.rule" = "Host(`hugo.depeuter.dev`)";
+      "traefik.http.services.hugo.loadbalancer.server.url" = "https://192.168.0.11:444";
+    };
+
     system.stateVersion = "24.05";
   };
 }

From 2c195bf8077c90b2330ba6d43e3de1b5048bfa92 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Mon, 13 Oct 2025 20:35:46 +0200
Subject: [PATCH 07/16] chore(arr): Use functions

---
 modules/apps/arr/default.nix | 178 +++++++----------------------------
 1 file changed, 35 insertions(+), 143 deletions(-)

diff --git a/modules/apps/arr/default.nix b/modules/apps/arr/default.nix
index e2c0df5..7b530c3 100644
--- a/modules/apps/arr/default.nix
+++ b/modules/apps/arr/default.nix
@@ -12,7 +12,16 @@ let
   PGID = toString config.users.groups.media.gid;
   UMASK = "002";
 in {
-  options.homelab.apps.arr = {
+  options.homelab.apps.arr = let
+    mkAppOption = appName: {
+      enable = lib.mkEnableOption "${appName} using Docker";
+      exposePorts = lib.mkOption {
+        type = lib.types.bool;
+        description = "Expose ${appName} port";
+        default = cfg.exposePorts;
+      };
+    };
+  in {
     enable = lib.mkEnableOption "Arr Stack using Docker";
     exposePorts = lib.mkOption {
       type = lib.types.bool;
@@ -21,46 +30,11 @@ in {
       default = ! config.homelab.apps.traefik.enable;
     };
 
-    bazarr = {
-      enable = lib.mkEnableOption "Bazarr using Docker";
-      exposePorts = lib.mkOption {
-        type = lib.types.bool;
-        description = "Expose Bazarr port";
-        default = cfg.exposePorts;
-      };
-    };
-    prowlarr = {
-      enable = lib.mkEnableOption "Prowlarr using Docker";
-      exposePorts = lib.mkOption {
-        type = lib.types.bool;
-        description = "Expose Prowlarr port";
-        default = cfg.exposePorts;
-      };
-    };
-    qbittorrent = {
-      enable = lib.mkEnableOption "qBittorrent using Docker";
-      exposePorts = lib.mkOption {
-        type = lib.types.bool;
-        description = "Expose qBittorrent port";
-        default = cfg.exposePorts;
-      };
-    };
-    radarr = {
-      enable = lib.mkEnableOption "Radarr using Docker";
-      exposePorts = lib.mkOption {
-        type = lib.types.bool;
-        description = "Expose Radarr port";
-        default = cfg.exposePorts;
-      };
-    };
-    sonarr = {
-      enable = lib.mkEnableOption "Sonarr using Docker";
-      exposePorts = lib.mkOption {
-        type = lib.types.bool;
-        description = "Expose Sonarr port";
-        default = cfg.exposePorts;
-      };
-    };
+    bazarr = mkAppOption "Bazarr";
+    prowlarr = mkAppOption "Prowlarr";
+    qbittorrent = mkAppOption "qBittorrent";
+    radarr = mkAppOption "Radarr";
+    sonarr = mkAppOption "Sonarr";
   };
 
   config = {
@@ -87,9 +61,9 @@ in {
       virtualisation.containers.enable = lib.mkIf inUse true;
     };
 
-    fileSystems = lib.mkIf inUse {
-      "/srv/bazarr-backup" = lib.mkIf cfg.bazarr.enable {
-        device = "192.168.0.11:/mnt/BIG/BACKUP/BAZARR";
+    fileSystems = let
+      mkFileSystem = device: {
+        inherit device;
         fsType = "nfs";
         options = [
           "rw"
@@ -102,75 +76,14 @@ in {
         ];
       };
 
-      "/srv/prowlarr-backup" = lib.mkIf cfg.prowlarr.enable {
-        device = "192.168.0.11:/mnt/BIG/BACKUP/PROWLARR";
-        fsType = "nfs";
-        options = [
-          "rw"
-          "auto"
-          "nfsvers=4.2"
-          "rsize=1048576" "wsize=1048576"
-          "hard"
-          "timeo=600" "retrans=2"
-          "_netdev" "nosuid" "tcp"
-        ];
-      };
-
-      "/srv/qbittorrent" = lib.mkIf cfg.qbittorrent.enable {
-        device = "192.168.0.11:/mnt/SMALL/CONFIG/QBITTORRENT";
-        fsType = "nfs";
-        options = [
-          "rw"
-          "auto"
-          "nfsvers=4.2"
-          "rsize=1048576" "wsize=1048576"
-          "hard"
-          "timeo=600" "retrans=2"
-          "_netdev" "nosuid" "tcp"
-        ];
-      };
-
-      "/srv/radarr-backup" = lib.mkIf cfg.radarr.enable {
-        device = "192.168.0.11:/mnt/BIG/BACKUP/RADARR";
-        fsType = "nfs";
-        options = [
-          "rw"
-          "auto"
-          "nfsvers=4.2"
-          "rsize=1048576" "wsize=1048576"
-          "hard"
-          "timeo=600" "retrans=2"
-          "_netdev" "nosuid" "tcp"
-        ];
-      };
-
-      "/srv/sonarr-backup" = lib.mkIf cfg.sonarr.enable {
-        device = "192.168.0.11:/mnt/BIG/BACKUP/SONARR";
-        fsType = "nfs";
-        options = [
-          "rw"
-          "auto"
-          "nfsvers=4.2"
-          "rsize=1048576" "wsize=1048576"
-          "hard"
-          "timeo=600" "retrans=2"
-          "_netdev" "nosuid" "tcp"
-        ];
-      };
-
-      "/srv/torrent" = {
-        device = "192.168.0.11:/mnt/SMALL/MEDIA/TORRENT";
-        fsType = "nfs";
-        options = [
-          "rw"
-          "auto"
-          "nfsvers=4.2"
-          "rsize=1048576" "wsize=1048576"
-          "hard"
-          "timeo=600" "retrans=2"
-          "_netdev" "nosuid" "tcp"
-        ];
-      };
+      hugoBackup = "192.168.0.11:/mnt/BIG/BACKUP";
+    in lib.mkIf inUse {
+      "/srv/bazarr-backup" = lib.mkIf cfg.bazarr.enable (mkFileSystem "${hugoBackup}/BAZARR");
+      "/srv/prowlarr-backup" = lib.mkIf cfg.bazarr.enable (mkFileSystem "${hugoBackup}/PROWLARR");
+      "/srv/qbittorrent" = lib.mkIf cfg.qbittorrent.enable (mkFileSystem "192.168.0.11:/mnt/SMALL/CONFIG/QBITTORRENT");
+      "/srv/radarr-backup" = lib.mkIf cfg.radarr.enable (mkFileSystem "${hugoBackup}/RADARR");
+      "/srv/sonarr-backup" = lib.mkIf cfg.sonarr.enable (mkFileSystem "${hugoBackup}/SONARR");
+      "/srv/torrent" = mkFileSystem "192.168.0.11:/mnt/SMALL/MEDIA/TORRENT";
     };
 
     # Make sure the Docker network exists.
@@ -195,45 +108,24 @@ in {
     };
 
     # Create a user for each app.
-    users.users = {
-      bazarr = lib.mkIf cfg.bazarr.enable {
-        uid = lib.mkForce 3003;
+    users.users = let
+      mkUser = uid: {
+        uid = lib.mkForce uid;
         isSystemUser = true;
         group = config.users.groups.media.name;
         home = "/var/empty";
         shell = null;
       };
-      prowlarr = lib.mkIf cfg.prowlarr.enable {
-        uid = lib.mkForce 3004;
-        isSystemUser = true;
-        group = config.users.groups.media.name;
-        home = "/var/empty";
-        shell = null;
-      };
-      qbittorrent = lib.mkIf cfg.qbittorrent.enable {
-        uid = lib.mkForce 3005;
-        isSystemUser = true;
-        group = config.users.groups.media.name;
+    in {
+      bazarr = lib.mkIf cfg.bazarr.enable (mkUser 3003);
+      prowlarr = lib.mkIf cfg.prowlarr.enable (mkUser 3004);
+      qbittorrent = lib.mkIf cfg.qbittorrent.enable (mkUser 3005) // {
         extraGroups = [
           config.users.groups.apps.name
         ];
-        home = "/var/empty";
-        shell = null;
-      };
-      radarr = lib.mkIf cfg.radarr.enable {
-        uid = lib.mkForce 3006;
-        isSystemUser = true;
-        group = config.users.groups.media.name;
-        home = "/var/empty";
-        shell = null;
-      };
-      sonarr = lib.mkIf cfg.sonarr.enable {
-        uid = lib.mkForce 3007;
-        isSystemUser = true;
-        group = config.users.groups.media.name;
-        home = "/var/empty";
-        shell = null;
       };
+      radarr = lib.mkIf cfg.radarr.enable (mkUser 3006);
+      sonarr = lib.mkIf cfg.sonarr.enable (mkUser 3007);
     };
 
     virtualisation.oci-containers.containers = let

From 652a9da0778b163f401ecc501087d6da45f1ad39 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Sat, 18 Oct 2025 17:09:08 +0200
Subject: [PATCH 08/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7df7ff7d8e00218376575f0acdcc5d66741351ee?narHash=sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs%3D' (2025-10-02)
  → 'github:NixOS/nixpkgs/544961dfcce86422ba200ed9a0b00dd4b1486ec5?narHash=sha256-EVAqOteLBFmd7pKkb0%2BFIUyzTF61VKi7YmvP1tw4nEw%3D' (2025-10-15)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/9fcfabe085281dd793589bdc770a2e577a3caa5d?narHash=sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU%3D' (2025-09-29)
  → 'github:Mic92/sops-nix/ab8d56e85b8be14cff9d93735951e30c3e86a437?narHash=sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E%3D' (2025-10-13)
---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index ca6e418..67df8c4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759381078,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "lastModified": 1760524057,
+        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759188042,
-        "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=",
+        "lastModified": 1760393368,
+        "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d",
+        "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437",
         "type": "github"
       },
       "original": {

From 6deb36d92061cbb5c359a9c2c6c84a07f69882d3 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Sat, 18 Oct 2025 18:59:17 +0200
Subject: [PATCH 09/16] chore(ssh): Update keys

---
 hosts/Gitea/default.nix       |  7 +++++++
 hosts/Vaultwarden/default.nix |  7 +++++++
 users/admin/default.nix       | 20 +++++++++++++-------
 users/backup/default.nix      |  7 +------
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/hosts/Gitea/default.nix b/hosts/Gitea/default.nix
index 5b2492f..c6c9b43 100644
--- a/hosts/Gitea/default.nix
+++ b/hosts/Gitea/default.nix
@@ -5,6 +5,13 @@
     homelab = {
       apps.gitea.enable = true;
       virtualisation.guest.enable = true;
+
+      users.admin = {
+        enable = true;
+        authorizedKeys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFrp6aM62Bf7bj1YM5AlAWuNrANU3N5e8+LtbbpmZPKS"
+        ];
+      };
     };
 
     networking = {
diff --git a/hosts/Vaultwarden/default.nix b/hosts/Vaultwarden/default.nix
index d8115bc..5ded575 100644
--- a/hosts/Vaultwarden/default.nix
+++ b/hosts/Vaultwarden/default.nix
@@ -9,6 +9,13 @@
         name = "Hugo's Vault";
       };
       virtualisation.guest.enable = true;
+
+      users.admin = {
+        enable = true;
+        authorizedKeys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnihoyozOCnm6T9OzL2xoMeMZckBYR2w43us68ABA93"
+        ];
+      };
     };
 
     networking = {
diff --git a/users/admin/default.nix b/users/admin/default.nix
index 4038266..dc01c81 100644
--- a/users/admin/default.nix
+++ b/users/admin/default.nix
@@ -3,24 +3,30 @@
 let
   cfg = config.homelab.users.admin;
 in {
-  options.homelab.users.admin.enable = lib.mkEnableOption "user System Administrator";
+  options.homelab.users.admin = {
+    enable = lib.mkEnableOption "user System Administrator";
+    authorizedKeys = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [
+        # HomeLab > NixOS > admin > ssh
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGWIOOEqTy8cWKpENVbzD4p7bsQgQb/Dgpzk8i0dZ00T"
+      ];
+    };
+  };
 
   config = lib.mkIf cfg.enable {
     nix.settings.trusted-users = [
-      config.users.users.admin.name
+      config.users.users.gh0st.name
     ];
 
-    users.users.admin = {
+    users.users.gh0st = {
       description = "System Administrator";
       isNormalUser = true;
       extraGroups = [
         config.users.groups.wheel.name # Enable 'sudo' for the user.
       ];
       initialPassword = "ChangeMe";
-      openssh.authorizedKeys.keys = [
-        # HomeLab > NixOS > admin > ssh
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGWIOOEqTy8cWKpENVbzD4p7bsQgQb/Dgpzk8i0dZ00T"
-      ];
+      openssh.authorizedKeys.keys = cfg.authorizedKeys;
       packages = with pkgs; [
         curl
         git
diff --git a/users/backup/default.nix b/users/backup/default.nix
index 8181d02..acae033 100644
--- a/users/backup/default.nix
+++ b/users/backup/default.nix
@@ -13,13 +13,8 @@ in {
         "docker" # Allow access to the docker socket.
       ];
       openssh.authorizedKeys.keys = [
-        # TODO ChangeMe
-
-        # Tibo-NixFat
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPrG+ldRBdCeHEXrsy/qHXIJYg8xQXVuiUR0DxhFjYNg"
-
         # Hugo
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAxR813vqq5zbu1NHrIybu5Imlu3k0rDCGxHiuGEhPoVV9c5FpnKNGLCi3ctm15ZcVBX4HcponYsKRBsCzM2pI4uXjxhHkLzbss5LttFuSzv5v/QHfLW1bvyJEMBEPxguGqAydAeWrBFdI9uHBEXeb325uKxMKBZHYvvpyAQ115c1wKy1bL8BfR0LTkhsFqexRvI86q59AVrAU/KFf6RXO0T9QA6H/vyWLlIPc7Ta+tSWwQ68bMmS5Pwn8q58tOAOAd6Lpt4TqUDJSppPjLEPKyKC6ShwMdEjwmwpEG0hxfsvaU8XERyQbSbEE9sLHRA2LoEdtMx3J8nzX3AwYUNspsqIv6NQZksnVqJ8OfL45ngUFcSJ6kBsUvCZfzEUGUTJ6Js0v84NOIXxNG/ZfPsk6ArXm3dvj2TYeK8llO6wpJnMMyztmmiODWoj9tepZSij44IgVM5wdWYIK/RZoYTsCQbmvJFfB8jhyJnf/7F19Vo5+LwhmCOsQh/KEK0F1DVc= admin@Hugo"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICms6vjhE9kOlqV5GBPGInwUHAfCSVHLI2Gtzee0VXPh"
       ];
     };
   };

From ca7875dee906334815393f10920a3d7ab8780108 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <Tibo.DePeuter@UGent.be>
Date: Wed, 4 Feb 2026 09:25:45 +0100
Subject: [PATCH 10/16] feat: Move URLs to vars

---
 hosts/Ingress/default.nix | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/hosts/Ingress/default.nix b/hosts/Ingress/default.nix
index 68cdcfe..9268714 100644
--- a/hosts/Ingress/default.nix
+++ b/hosts/Ingress/default.nix
@@ -80,7 +80,7 @@ prefixLength = 24;
         # Only allow PFS-enabled ciphers with AES256
         sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL";
 
-        upstreams.docservice.servers."192.168.0.14:8080" = {};
+        upstreams.docservice.servers."${nextcloud.host}:${toString nextcloud.officePort}" = {};
 
         appendHttpConfig = ''
           map $http_x_forwarded_proto $the_scheme {
@@ -107,19 +107,24 @@ prefixLength = 24;
             default = true;
           };
 
-          "cloud.depeuter.dev" = {
+          "cloud.depeuter.dev" = let
+            nextcloud = {
+              host = "192.168.0.14";
+              officePort = 8080;
+            };
+          in {
             enableACME = true;
             forceSSL = true;
             locations = {
               "/" = {
-                proxyPass = "http://192.168.0.14";
+                proxyPass = "http://${nextcloud.host}";
                 extraConfig = ''
                   add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
                   fastcgi_request_buffering off;
                 '';
               };
               "/office/" = {
-                proxyPass = "http://192.168.0.14:8080/";
+                proxyPass = "http://${nextcloud.host}:${toString nextcloud.officePort}/";
                 priority = 500;
                 recommendedProxySettings = false;
                 extraConfig = ''
@@ -137,12 +142,6 @@ prefixLength = 24;
               proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             '';
           };
-          "calendar.depeuter.dev" = {
-            useACMEHost = "depeuter.dev";
-            locations."/".return = "301 https://cloud.depeuter.dev/apps/calendar";
-          };
-          "tasks.depeuter.dev".locations."/".return = "301 https://cloud.depeuter.dev/apps/tasks";
-          "notes.depeuter.dev".locations."/".return = "301 https://cloud.depeuter.dev/apps/notes";
 
           "home.depeuter.dev" = {
             enableACME = true;
@@ -158,12 +157,17 @@ prefixLength = 24;
             };
           };
 
-          "jelly.depeuter.dev" = {
+          "jelly.depeuter.dev" = let
+            jellyfin = {
+              host = "192.168.0.94";
+              port = 8096;
+            };
+          in {
             enableACME = true;
             forceSSL = true;
             locations = {
               "/" = {
-                proxyPass = "http://192.168.0.94:8096";
+                proxyPass = "http://${jellyfin.host}:${jellyfin.port}";
                 extraConfig = ''
                   # Proxy main Jellyfin traffic
                   proxy_set_header Host $host;
@@ -178,7 +182,7 @@ prefixLength = 24;
                 '';
               };
               "/socket" = {
-                proxyPass = "http://192.168.0.91:8096";
+                proxyPass = "http://${jellyfin.host}:${jellyfin.port}";
                 extraConfig = ''
                   # Proxy Jellyfin Websockets traffic
                   proxy_http_version 1.1;

From d38c53762a90e1e7993586661c2a338e0b8ca1e6 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Wed, 4 Feb 2026 20:23:56 +0100
Subject: [PATCH 11/16] chore: Change Nextcloud IP

---
 hosts/Ingress/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/hosts/Ingress/default.nix b/hosts/Ingress/default.nix
index 9268714..c0a3ac9 100644
--- a/hosts/Ingress/default.nix
+++ b/hosts/Ingress/default.nix
@@ -68,7 +68,12 @@ prefixLength = 24;
     # List services that you want to enable.
     services = {
       # Enable Nginx as a reverse proxy
-      nginx = {
+      nginx = let
+        nextcloud = {
+          host = "192.168.0.23";
+          officePort = 8080;
+        };
+      in {
         enable = true;
 
         # Use recommended settings
@@ -107,12 +112,7 @@ prefixLength = 24;
             default = true;
           };
 
-          "cloud.depeuter.dev" = let
-            nextcloud = {
-              host = "192.168.0.14";
-              officePort = 8080;
-            };
-          in {
+          "cloud.depeuter.dev" = {
             enableACME = true;
             forceSSL = true;
             locations = {
@@ -167,7 +167,7 @@ prefixLength = 24;
             forceSSL = true;
             locations = {
               "/" = {
-                proxyPass = "http://${jellyfin.host}:${jellyfin.port}";
+                proxyPass = "http://${jellyfin.host}:${toString jellyfin.port}";
                 extraConfig = ''
                   # Proxy main Jellyfin traffic
                   proxy_set_header Host $host;
@@ -182,7 +182,7 @@ prefixLength = 24;
                 '';
               };
               "/socket" = {
-                proxyPass = "http://${jellyfin.host}:${jellyfin.port}";
+                proxyPass = "http://${jellyfin.host}:${toString jellyfin.port}";
                 extraConfig = ''
                   # Proxy Jellyfin Websockets traffic
                   proxy_http_version 1.1;
@@ -244,7 +244,7 @@ prefixLength = 24;
             locations = {
               "/" = {
                 proxyPass = "http://192.168.0.22:10102";
-                proxyWebSockets = true;
+                proxyWebsockets = true;
               };
               "~ ^/admin".return = 403;
             };

From 5582384f01de990f4476d77c954787f04b0171c1 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Fri, 6 Feb 2026 09:20:43 +0100
Subject: [PATCH 12/16] feat: Add homepage module

---
 hosts/Development/default.nix     |  4 ++
 modules/apps/default.nix          |  1 +
 modules/apps/homepage/default.nix | 79 +++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 modules/apps/homepage/default.nix

diff --git a/hosts/Development/default.nix b/hosts/Development/default.nix
index b2237b7..fda8e57 100644
--- a/hosts/Development/default.nix
+++ b/hosts/Development/default.nix
@@ -5,6 +5,10 @@
     homelab = {
       apps = {
         bind9.enable = true;
+        homepage = {
+          enable = true;
+          exposePort = true;
+        };
         traefik.enable = true;
         plex.enable = true;
       };
diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index 7c8b8f8..f62dca7 100644
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -6,6 +6,7 @@
     ./changedetection
     ./freshrss
     ./gitea
+    ./homepage
     ./jellyfin
     ./plex
     ./speedtest
diff --git a/modules/apps/homepage/default.nix b/modules/apps/homepage/default.nix
new file mode 100644
index 0000000..b34f32f
--- /dev/null
+++ b/modules/apps/homepage/default.nix
@@ -0,0 +1,79 @@
+{ config, lib, ... }:
+
+let
+  cfg = config.homelab.apps.homepage;
+
+  PUID = toString config.users.users.homepage.uid;
+  PGID = toString config.users.groups.apps.gid;
+
+  homepage-config = "/srv/homepage-config";
+
+  proxyNet = config.homelab.apps.traefik.sharedNetworkName;
+in {
+  options.homelab.apps.homepage = {
+    enable = lib.mkEnableOption "homepage";
+    port = lib.mkOption {
+      type = lib.types.int;
+      default = 3000;
+      description = "homepage WebUI port";
+    };
+    exposePort = lib.mkEnableOption "expose homepage port";
+  };
+
+  config = lib.mkIf cfg.enable {
+    homelab = {
+      users.apps.enable = true;
+      virtualisation.containers.enable = true;
+    };
+
+    users.users.homepage = {
+      uid = lib.mkForce 3018;
+      isSystemUser = true;
+      group = config.users.groups.apps.name;
+      home = "/var/empty";
+      shell = null;
+    };
+
+    fileSystems."${homepage-config}" = {
+      device = "192.168.0.11:/mnt/SMALL/CONFIG/HOMEPAGE";
+      fsType = "nfs";
+      options = [
+        "rw"
+        "auto"
+        "nfsvers=4.2"
+        "async" "soft" "timeo=100" "retry=50" "actimeo=1800" "lookupcache=all"
+        "nosuid" "tcp"
+      ];
+    };
+
+    virtualisation.oci-containers.containers.homepage = let
+      host = "homepage.${config.networking.domain}";
+    in {
+      hostname = "homepage";
+      image = "ghcr.io/gethomepage/homepage:v1.10.1";
+      autoStart = true;
+      user = "${toString PUID}:${toString PGID}";
+      ports = lib.mkIf cfg.exposePort [
+        "${toString cfg.port}:3000/tcp"
+      ];
+      networks = [
+        proxyNet
+      ];
+      volumes = [
+        "${homepage-config}:/app/config"
+        # "/var/run/docker.sock:/var/run/docker.sock:ro" # For docker integrations
+      ];
+      labels = {
+        "traefik.enable" = "true";
+        "traefik.docker.network" = proxyNet;
+        "traefik.http.routers.homepage.rule" = "Host(`${host}`)";
+        "traefik.http.services.homepage.loadbalancer.server.port" = toString cfg.port;
+      };
+      environment = {
+        inherit PUID PGID;
+
+        HOMEPAGE_ALLOWED_HOSTS = "${host},192.168.0.91:3000";
+      };
+    };
+  };
+}

From 04b4254a72c7b104a28b23ae40bd107e2d158f97 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Tue, 10 Feb 2026 08:30:11 +0100
Subject: [PATCH 13/16] chore(soldtime): Cleanup options

---
 hosts/Development/default.nix      |  1 +
 modules/apps/default.nix           |  1 +
 modules/apps/solidtime/default.nix | 67 ++++++++++++++++++------------
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/hosts/Development/default.nix b/hosts/Development/default.nix
index fda8e57..77f6758 100644
--- a/hosts/Development/default.nix
+++ b/hosts/Development/default.nix
@@ -11,6 +11,7 @@
         };
         traefik.enable = true;
         plex.enable = true;
+        solidtime.enable = true;
       };
       virtualisation.guest.enable = true;
     };
diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index f62dca7..385f915 100644
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -9,6 +9,7 @@
     ./homepage
     ./jellyfin
     ./plex
+    ./solidtime
     ./speedtest
     ./technitium-dns
     ./traefik
diff --git a/modules/apps/solidtime/default.nix b/modules/apps/solidtime/default.nix
index 9174df4..17193a3 100644
--- a/modules/apps/solidtime/default.nix
+++ b/modules/apps/solidtime/default.nix
@@ -5,10 +5,10 @@ let
 
   networkName = "solidtime";
   internalNetworkName = "solidtime-internal";
+  proxyNet = config.homelab.apps.traefiik.sharedNetworkName;
 
   version = "0.8.0";
 
-  port = 8000;
   user = "1000:1000";
 
   # dbExternalPort = ...;
@@ -30,7 +30,7 @@ let
     VITE_APP_NAME = laravelEnv.APP_NAME;
     APP_ENV = "production";
     APP_DEBUG = "false";
-    APP_URL = "http://localhost:${toString port}";
+    APP_URL = "http://localhost:${toString cfg.port}";
     APP_FORCE_HTTPS = "false";
     APP_ENABLE_REGISTRATION = "false";
     TRUSTED_PROXIES = "0.0.0.0/0,2000:0:0:0:0:0:0:0/3";
@@ -70,7 +70,15 @@ let
   };
 
 in {
-  options.homelab.apps.solidtime.enable = lib.mkEnableOption "Solidtime time tracker using Docker";
+  options.homelab.apps.solidtime = {
+    enable = lib.mkEnableOption "Solidtime time tracker using Docker";
+    port = lib.mkOption {
+      type = lib.types.int;
+      default = 8000;
+      description = "Solidtime WebUI port";
+    };
+    exposePort = lib.mkEnableOption "Expose Soldtime port";
+  };
 
   config = lib.mkIf cfg.enable {
     homelab.virtualisation.containers.enable = true;
@@ -117,52 +125,54 @@ in {
       solidtime = {
         hostname = "solidtime";
         image = "solidtime/solidtime:${version}";
-        autoStart = true;
         inherit user;
+        autoStart = true;
+        dependsOn = [
+          "solidtimeDb"
+        ];
         ports = [
           # Open ports if you don't use Traefik
-          "${toString port}:8000"
+          "${toString cfg.port}:8000"
+        ];
+        networks = [
+          networkName
+          internalNetworkName
         ];
         extraOptions = [
-          "--network=${networkName}"
-          "--network=${internalNetworkName}"
-
           # Healthecks
           # test: [ "CMD-SHELL", "curl --fail http://localhost:8000/health-check/up || exit 1" ]
           ''--health-cmd=curl --fail http://localhost:8000/health-check/up || exit 1''
         ];
         inherit volumes;
-        dependsOn = [
-          "solidtimeDb"
-        ];
+        labels = {
+          "traefik.enable" = "true";
+          "traefik.http.routers.solidtime.rule" = "Host(`time.${config.networking.hostName}.depeuter.dev`)";
+          "traefik.http.services.solidtime.loadbalancer.server.port" = toString cfg.port;
+        };
         environmentFiles = [
           "/home/admin/.solidtime.env"
         ];
         environment = laravelEnv // {
           CONTAINER_MODE = "http";
         };
-        labels = {
-          "traefik.enable" = "true";
-          "traefik.http.routers.solidtime.rule" = "Host(`time.${config.networking.hostName}.depeuter.dev`)";
-          "traefik.http.services.solidtime.loadbalancer.server.port" = toString port;
-        };
       };
       solidtimeScheduler = {
         hostname = "scheduler";
         image = "solidtime/solidtime:${version}";
         inherit user;
         autoStart = true;
+        dependsOn = [
+          "solidtimeDb"
+        ];
+        networks = [
+          internalNetworkName
+        ];
         extraOptions = [
-          "--network=${internalNetworkName}"
-
           # Healthchecks
           # test: [ "CMD-SHELL", "supervisorctl status scheduler:scheduler_00" ]
           ''--health-cmd="supervisorctl status scheduler:scheduler_00"''
         ];
         inherit volumes;
-        dependsOn = [
-          "solidtimeDb"
-        ];
         environmentFiles = [
           "/home/admin/.solidtime.env"
         ];
@@ -175,9 +185,10 @@ in {
         image = "solidtime/solidtime:${version}";
         inherit user;
         autoStart = true;
+        networks = [
+          internalNetworkName
+        ];
         extraOptions = [
-          "--network=${internalNetworkName}"
-
           # Healthchecks
           # test: [ "CMD-SHELL", "supervisorctl status worker:worker_00" ]
           ''--health-cmd="supervisorctl status worker:worker_00"''
@@ -201,9 +212,10 @@ in {
         ports = [
           # "${toString dbExternalPort}:${toString dbInternalPort}"
         ];
+        networks = [
+          internalNetworkName
+        ];
         extraOptions = [
-          "--network=${internalNetworkName}"
-
           # Healthchecks
           # test: - CMD - pg_isready - '-q' - '-d' - '${DB_DATABASE}' - '-U' - '${DB_USERNAME}' retries: 3 timeout: 5s
           ''--health-cmd="pg_isready -q -d ${laravelEnv.DB_DATABASE} -U ${laravelEnv.DB_USERNAME}"''
@@ -224,9 +236,10 @@ in {
         hostname = "gotenberg";
         image = "gotenberg/gotenberg:8";
         autoStart = true;
+        networks = [
+          internalNetworkName
+        ];
         extraOptions = [
-          "--network=${internalNetworkName}"
-
           # Healthchecks
           # test: [ "CMD", "curl", "--silent", "--fail", "http://localhost:3000/health" ]
           ''--health-cmd="curl --silent --fail http://localhost:${toString gotenbergPort}/health"''

From 84c94afda46feab5947f5050b0fb9def869ea6a4 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Tue, 10 Feb 2026 08:37:32 +0100
Subject: [PATCH 14/16] chore(solidtime): Update to 0.9.0

---
 modules/apps/solidtime/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/apps/solidtime/default.nix b/modules/apps/solidtime/default.nix
index 17193a3..0a62900 100644
--- a/modules/apps/solidtime/default.nix
+++ b/modules/apps/solidtime/default.nix
@@ -7,7 +7,7 @@ let
   internalNetworkName = "solidtime-internal";
   proxyNet = config.homelab.apps.traefiik.sharedNetworkName;
 
-  version = "0.8.0";
+  version = "0.9.0";
 
   user = "1000:1000";
 
@@ -140,8 +140,8 @@ in {
         ];
         extraOptions = [
           # Healthecks
-          # test: [ "CMD-SHELL", "curl --fail http://localhost:8000/health-check/up || exit 1" ]
-          ''--health-cmd=curl --fail http://localhost:8000/health-check/up || exit 1''
+          # test: [ "CMD", "curl", "--fail", "http://localhost:8000/health-check/up" ]
+          ''--health-cmd=curl --fail http://localhost:8000/health-check/up''
         ];
         inherit volumes;
         labels = {
@@ -169,8 +169,8 @@ in {
         ];
         extraOptions = [
           # Healthchecks
-          # test: [ "CMD-SHELL", "supervisorctl status scheduler:scheduler_00" ]
-          ''--health-cmd="supervisorctl status scheduler:scheduler_00"''
+          # test: [ "CMD", "healthcheck" ]
+          ''--health-cmd="healthcheck"''
         ];
         inherit volumes;
         environmentFiles = [
@@ -190,8 +190,8 @@ in {
         ];
         extraOptions = [
           # Healthchecks
-          # test: [ "CMD-SHELL", "supervisorctl status worker:worker_00" ]
-          ''--health-cmd="supervisorctl status worker:worker_00"''
+          # test: [ "CMD", "healthcheck" ]
+          ''--health-cmd="healthcheck"''
         ];
         inherit volumes;
         dependsOn = [

From 687b85eeefe14c553f6cda03c3c57c7ce716229f Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Tue, 10 Feb 2026 09:08:11 +0100
Subject: [PATCH 15/16] feat(solidtime): Preload Docker images

---
 modules/apps/solidtime/default.nix | 42 +++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/modules/apps/solidtime/default.nix b/modules/apps/solidtime/default.nix
index 0a62900..3348e0b 100644
--- a/modules/apps/solidtime/default.nix
+++ b/modules/apps/solidtime/default.nix
@@ -18,6 +18,15 @@ let
 
   inherit (config.virtualisation.oci-containers) containers;
 
+  solidtimeImageName = "solidtime/solidtime";
+  solidtimeImage = "${solidtimeImageName}:${version}";
+  solidtimeImageFile = pkgs.dockerTools.pullImage {
+    imageName = solidtimeImageName;
+    finalImageTag = version;
+    imageDigest = "sha256:5601b81f63ece49cdc4110f90f7624b0cc4ba87448b3e4bddce904457822a4ef";
+    sha256 = "sha256-/VwuJGczs41XeItNamLahLt/ypUQHTn9AcwneVw/3YY=";
+  };
+
   volumes = [
     "solidtime-storage:/var/www/html/storage"
     "solidtime-logs:/var/www/html/storage/logs"
@@ -124,7 +133,8 @@ in {
     virtualisation.oci-containers.containers = {
       solidtime = {
         hostname = "solidtime";
-        image = "solidtime/solidtime:${version}";
+        image = solidtimeImage;
+        imageFile = solidtimeImageFile;
         inherit user;
         autoStart = true;
         dependsOn = [
@@ -158,7 +168,8 @@ in {
       };
       solidtimeScheduler = {
         hostname = "scheduler";
-        image = "solidtime/solidtime:${version}";
+        image = solidtimeImage;
+        imageFile = solidtimeImageFile;
         inherit user;
         autoStart = true;
         dependsOn = [
@@ -182,7 +193,8 @@ in {
       };
       solidtimeQueue = {
         hostname = "queue";
-        image = "solidtime/solidtime:${version}";
+        image = solidtimeImage;
+        imageFile = solidtimeImageFile;
         inherit user;
         autoStart = true;
         networks = [
@@ -205,9 +217,17 @@ in {
           WORKER_COMMAND = "php /var/www/html/artisan queue:work";
         };
       };
-      solidtimeDb = {
+      solidtimeDb = let
+        imageName = "postgres";
+        finalImageTag = "15";
+      in {
         hostname = "database";
-        image = "postgres:15";
+        image = "${imageName}:${finalImageTag}";
+        imageFile = pkgs.dockerTools.pullImage {
+          inherit imageName finalImageTag;
+          imageDigest = "sha256:98fe06b500b5eb29e45bf8c073eb0ca399790ce17b1d586448edc4203627d342";
+          sha256 = "sha256-AZ4VkOlROX+nR/MjDjsA4xdHzmtKjiBAtsp2Q6IdOvg=";
+        };
         autoStart = true;
         ports = [
           # "${toString dbExternalPort}:${toString dbInternalPort}"
@@ -232,9 +252,17 @@ in {
           POSTGRES_PASSWORD = laravelEnv.DB_PASSWORD;
         };
       };
-      solidtimeGotenberg = {
+      solidtimeGotenberg = let
+        imageName = "gotenberg/gotenberg";
+        finalImageTag = "8.26.0";
+      in {
         hostname = "gotenberg";
-        image = "gotenberg/gotenberg:8";
+        image = "${imageName}:${finalImageTag}";
+        imageFile = pkgs.dockerTools.pullImage {
+          inherit imageName finalImageTag;
+          imageDigest = "sha256:328551506b3dec3ff6381dd47e5cd72a44def97506908269e201a8fbfa1c12c0";
+          sha256 = "sha256-1zz4xDAgXxHUnkCVIfjHTgXb82EFEx+5am6Cu9+eZj4=";
+        };
         autoStart = true;
         networks = [
           internalNetworkName

From 58f2ea9b74731144f1f375419ad1b7f43980cfec Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Tue, 10 Feb 2026 09:25:16 +0100
Subject: [PATCH 16/16] chore(solidtime): Update to 0.10.0

---
 modules/apps/solidtime/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/apps/solidtime/default.nix b/modules/apps/solidtime/default.nix
index 3348e0b..725d32d 100644
--- a/modules/apps/solidtime/default.nix
+++ b/modules/apps/solidtime/default.nix
@@ -7,8 +7,6 @@ let
   internalNetworkName = "solidtime-internal";
   proxyNet = config.homelab.apps.traefiik.sharedNetworkName;
 
-  version = "0.9.0";
-
   user = "1000:1000";
 
   # dbExternalPort = ...;
@@ -19,12 +17,13 @@ let
   inherit (config.virtualisation.oci-containers) containers;
 
   solidtimeImageName = "solidtime/solidtime";
+  version = "0.10.0";
   solidtimeImage = "${solidtimeImageName}:${version}";
   solidtimeImageFile = pkgs.dockerTools.pullImage {
     imageName = solidtimeImageName;
     finalImageTag = version;
-    imageDigest = "sha256:5601b81f63ece49cdc4110f90f7624b0cc4ba87448b3e4bddce904457822a4ef";
-    sha256 = "sha256-/VwuJGczs41XeItNamLahLt/ypUQHTn9AcwneVw/3YY=";
+    imageDigest = "sha256:817d3a366ecc39f0473d7154372afa82dd4e6e50c66d70be45804892c8421cbb";
+    sha256 = "sha256-h5aCKaquUF/EVsOHaLOHrn1HAoXZYPhAbJ+e4cmjSA8=";
   };
 
   volumes = [