From 47d5c52e18b4d4fe04ea3e5ee156f80a915f8993 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Fri, 4 Oct 2024 11:13:45 -0400
Subject: [PATCH] cleanup

---
 configuration.nix      |   4 ++
 secrets/mullvad.nix    | Bin 238 -> 269 bytes
 services/immich.nix    |   2 +-
 services/jellyfin.nix  |   2 -
 services/minecraft.nix |   3 --
 services/quadlet.nix   |  89 ++++++++++++++++++-----------------------
 6 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 9ea7519..d7344a2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -239,6 +239,10 @@
       "wheel"
       "video"
       "render"
+
+      "minecraft"
+      "gitea"
+      "jellyfin"
     ];
     hashedPasswordFile = "/etc/nixos/secrets/hashedPass";
 
diff --git a/secrets/mullvad.nix b/secrets/mullvad.nix
index 54a389797966e32eba5596b700b7978a23f74baf..45d962b3c0a32968dcfc9301c62f12279e893efc 100644
GIT binary patch
literal 269
zcmZQ@_Y83kiVO&0D6+_&d{cVa{^xGfe{^>quPeXyp0%pKuZZhv@9EQl+vm>+RdCyv
zb+O_JKew^Pip@^fx&KP1u>UFP{i9~AJ176<j#E=|nWjp9-0@e@ojtK;|K~du27G@H
z*}mVq{@g>$?Q;8nDNgjfR+N<L*%+0}z5CdohU)8PC*wk!*cYUwD5|vt&$|$P>-9DD
zv-iJpc5a?ABWb}E=ihu1ZWd1qW_s#XPmf4Cv{LbujZ+fSg~qVGyq1-w+4oxW^4HJ1
zaq-|2y&r!nUu`kEJx|_j?jzm8L^Y`+)y`KgO}g?w%U$q#GK(ntw}#HwzKd9oY+7`|
ej=lEkfB6!lXg&*H{Yxe%AFfthb-AT_u08-d*oFcC

literal 238
zcmZQ@_Y83kiVO&0V9-r^7^s$@{(i4u#4c57k+x&469rGWdG6S&9k!b%d6VI_4IxKg
z|C`(xCh+;<nq_nEK3<-avUjeF*16j|7MR=&yKq3Mdb5azhSkC3nWYMbU;B6cnXWPa
zj^iQ|<F9%}C)GTAPjx*zskoZo;7<?lT&I=h2C)e#m-LTjFT1@tnBR29qZB8n54n$C
zv94NrBEjp8Q}FCn&sVLT)~RxJ_oaukj#UZ;X&rbPTz!7wG`{bttv4z*%(6edenF~`
zu-ne#(@NeX-LFeLIrsh<A&aR&XL*@EURacSefieM-)&yXoLpjf-&dnL^tlB9p-6bu

diff --git a/services/immich.nix b/services/immich.nix
index 114b2d4..d7ed8e2 100644
--- a/services/immich.nix
+++ b/services/immich.nix
@@ -11,7 +11,7 @@
     port = service_configs.ports.immich;
     host = "0.0.0.0";
     database = {
-      createDB = true;
+      createDB = false;
     };
   };
 
diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index b1b6072..70d6054 100644
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -17,8 +17,6 @@
     # used for local streaming
     openFirewall = true;
 
-    user = "primary";
-    group = "users";
     dataDir = service_configs.jellyfin.data_dir;
     cacheDir = service_configs.jellyfin.cache_dir;
   };
diff --git a/services/minecraft.nix b/services/minecraft.nix
index 815d47b..1ca53ed 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -14,14 +14,11 @@ in
       "minecraft-server"
     ];
 
-  users.groups.minecraft = { };
-
   services.minecraft-servers = {
     enable = true;
     eula = true;
     dataDir = service_configs.minecraft.parent_dir;
     openFirewall = true;
-    group = "users";
 
     servers.${service_configs.minecraft.server_name} = {
       enable = true;
diff --git a/services/quadlet.nix b/services/quadlet.nix
index 97767a5..5011543 100644
--- a/services/quadlet.nix
+++ b/services/quadlet.nix
@@ -1,66 +1,57 @@
 { service_configs, ... }:
 {
   virtualisation.quadlet = {
-    containers =
-      let
-        baseContainerConfig = {
-          autoUpdate = "registry";
+    containers = {
+      gluetun.containerConfig = {
+        image = "docker.io/qmcgaw/gluetun";
+        name = "gluetun";
+        autoUpdate = "registry";
+
+        addCapabilities = [
+          "NET_ADMIN"
+          "MKNOD"
+        ];
+
+        environments = import ../secrets/mullvad.nix;
+
+        publishPorts = [
+          "6081:6081"
+          "6081:6081/udp"
+          "${builtins.toString service_configs.ports.torrent}:6011"
+        ];
+
+        volumes = [ "${service_configs.gluetun.dir}:/gluetun:z" ];
+        podmanArgs = [
+          "--device=/dev/net/tun"
+          "--security-opt label=disable"
+        ];
+      };
+
+      qbittorrent = {
+        containerConfig = {
+          image = "lscr.io/linuxserver/qbittorrent:latest";
+          name = "qbittorrent";
           environments = {
+            WEBUI_PORT = service_configs.ports.torrent;
+            DOCKER_MODS = "ghcr.io/gabe565/linuxserver-mod-vuetorrent";
             PUID = 1000;
             PGID = 1000;
           };
-        };
-      in
-      {
-        gluetun.containerConfig = baseContainerConfig // {
-          image = "docker.io/qmcgaw/gluetun";
-          name = "gluetun";
 
-          addCapabilities = [
-            "NET_ADMIN"
-            "MKNOD"
+          volumes = [
+            "${service_configs.torrent.config_dir}:/config:z"
+            "${service_configs.torrent.download_dir}:/downloads:z"
           ];
 
-          environments = import ../secrets/mullvad.nix;
-
-          publishPorts = [
-            "6081:6081"
-            "6081:6081/udp"
-            "${builtins.toString service_configs.ports.torrent}:6011"
-          ];
-
-          volumes = [ "${service_configs.gluetun.dir}:/gluetun:z" ];
-          podmanArgs = [
-            "--device=/dev/net/tun"
-            "--security-opt label=disable"
-          ];
+          networks = [ "container:gluetun" ];
         };
 
-        qbittorrent = {
-          containerConfig = baseContainerConfig // {
-            image = "lscr.io/linuxserver/qbittorrent:latest";
-            name = "qbittorrent";
-            environments = {
-              WEBUI_PORT = service_configs.ports.torrent;
-              DOCKER_MODS = "ghcr.io/gabe565/linuxserver-mod-vuetorrent";
-              PUID = 1000;
-              PGID = 1000;
-            };
-
-            volumes = [
-              "${service_configs.torrent.config_dir}:/config:z"
-              "${service_configs.torrent.download_dir}:/downloads:z"
-            ];
-
-            networks = [ "container:gluetun" ];
-          };
-
-          serviceConfig = {
-            requires = [ "gluetun.service" ];
-            after = [ "gluetun.service" ];
-          };
+        serviceConfig = {
+          requires = [ "gluetun.service" ];
+          after = [ "gluetun.service" ];
         };
       };
+    };
     networks = {
       internal.networkConfig.subnets = [ "10.0.123.1/24" ];
     };