From dfa8472c04781aa8d7cc0c3b7bad864525b2836c Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Mon, 7 Oct 2024 23:16:04 -0400
Subject: [PATCH] fixes

---
 flake.lock            | 12 ++++++------
 flake.nix             |  1 +
 services/caddy.nix    |  2 +-
 services/gitea.nix    |  4 ++--
 services/jellyfin.nix |  1 -
 services/quadlet.nix  |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5c3b03d..ab73c22 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728006367,
-        "narHash": "sha256-Bdf5twzinaacnn1JBogvxq0S8Ytm+25mWD2cfJ7fvpo=",
+        "lastModified": 1728351976,
+        "narHash": "sha256-X83r7hCo6fzllvgVGT2sJhl0dwZbA4xfud3GFtkwaBg=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "a3a7888df1b87bdababfd9f0b00b574ee4c2e204",
+        "rev": "02bae91cf389340c62bb367d4a5b6ad06a2562d1",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728348559,
-        "narHash": "sha256-jVgMjAEhwvnuI1WZWoZfM8Luh3zsjn4ZsfOHKKF7kKI=",
+        "lastModified": 1728352754,
+        "narHash": "sha256-rIa/pEDxkQqSaDMxNIlsFq0GpKSCeNxWkvhUzdLLrWk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6235ae1ef7b09fe720a7f32bd38f74ccb859305a",
+        "rev": "3727d51a8e07e635b9bcbc5f812b16d80d46eaeb",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9c57d1a..dd28d8f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,6 +49,7 @@
 
         gitea = {
           dir = service_configs.services_dir + "/gitea";
+          domain = "git.gardling.com";
         };
 
         postgres = {
diff --git a/services/caddy.nix b/services/caddy.nix
index 493548c..df814df 100644
--- a/services/caddy.nix
+++ b/services/caddy.nix
@@ -25,7 +25,7 @@
         }
       '';
 
-      "git.gardling.com".extraConfig = ''
+      ${service_configs.gitea.domain}.extraConfig = ''
         reverse_proxy 127.0.0.1:${builtins.toString service_configs.ports.gitea}
       '';
     };
diff --git a/services/gitea.nix b/services/gitea.nix
index ff7bff3..76e1500 100644
--- a/services/gitea.nix
+++ b/services/gitea.nix
@@ -15,8 +15,8 @@
 
     settings = {
       server = {
-        DOMAIN = "git.gardling.com";
-        ROOT_URL = "https://git.gardling.com";
+        DOMAIN = service_configs.gitea.domain;
+        ROOT_URL = "https://" + service_configs.gitea.domain;
         HTTP_PORT = service_configs.ports.gitea;
         LANDING_PAGE = "/explore/repos";
       };
diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index 70d6054..dc492ad 100644
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -2,7 +2,6 @@
   pkgs,
   config,
   service_configs,
-  lib,
   ...
 }:
 {
diff --git a/services/quadlet.nix b/services/quadlet.nix
index e65ecd3..cfad5af 100644
--- a/services/quadlet.nix
+++ b/services/quadlet.nix
@@ -5,7 +5,7 @@
       gluetun.containerConfig = {
         image = "docker.io/qmcgaw/gluetun";
         name = "gluetun";
-        autoUpdate = "registry";
+        # autoUpdate = "registry";
 
         addCapabilities = [
           "NET_ADMIN"
@@ -36,7 +36,6 @@
           environments = {
             WEBUI_PORT = service_configs.ports.torrent;
             DOCKER_MODS = "ghcr.io/gabe565/linuxserver-mod-vuetorrent";
-            # PUID = 1000;
             PGID = config.users.groups.${config.services.jellyfin.group}.gid;
           };
 
@@ -54,6 +53,7 @@
         };
       };
     };
+
     networks = {
       internal.networkConfig.subnets = [ "10.0.123.1/24" ];
     };