caddy: redo stuff

flake.nix

@@ -7,9 +7,6 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-    quadlet-nix.url = "github:SEIAROTg/quadlet-nix";
-    quadlet-nix.inputs.nixpkgs.follows = "nixpkgs";
-
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
     nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -21,7 +18,6 @@
   outputs =
     {
       nixpkgs,
-      quadlet-nix,
       nix-minecraft,
       nixos-hardware,
       vpn-confinement,
@@ -33,7 +29,7 @@
       hostname = "muffin";
       eth_interface = "enp3s0";
 
-      service_configs = {
+      service_configs = rec {
         hdd_path = "/mnt/hdd";
         services_dir = "/tank/services";
 
@@ -47,13 +43,14 @@
         };
 
         https = {
-          certs = service_configs.services_dir + "/http_certs";
-          data_dir = service_configs.services_dir + "/http";
+          certs = services_dir + "/http_certs";
+          data_dir = services_dir + "/http";
+          domain = "gardling.com";
         };
 
         gitea = {
-          dir = service_configs.services_dir + "/gitea";
-          domain = "git.gardling.com";
+          dir = services_dir + "/gitea";
+          domain = "git.${https.domain}";
         };
 
         postgres = {
@@ -61,29 +58,29 @@
         };
 
         immich = {
-          dir = service_configs.services_dir + "/immich";
+          dir = services_dir + "/immich";
         };
 
         minecraft = {
-          parent_dir = service_configs.services_dir + "/minecraft";
+          parent_dir = services_dir + "/minecraft";
           server_name = "main";
         };
 
         gluetun = {
-          dir = service_configs.services_dir + "/gluetun";
+          dir = services_dir + "/gluetun";
         };
 
         torrent = {
-          config_dir = service_configs.services_dir + "/qbittorrent/config";
-          download_dir = service_configs.hdd_path + "/torrents";
+          SavePath = hdd_path + "/torrents";
+          TempPath = hdd_path + "/torrents/incomplete";
         };
 
         jellyfin = {
-          dir = service_configs.services_dir + "/jellyfin";
+          dir = services_dir + "/jellyfin";
         };
 
         ollama = {
-          data_dir = service_configs.services_dir + "/ollama";
+          data_dir = services_dir + "/ollama";
         };
       };
     in
@@ -98,27 +95,30 @@
             inputs
             ;
         };
-        modules = [
-          ./configuration.nix
-          quadlet-nix.nixosModules.quadlet
-          nixos-hardware.nixosModules.common-cpu-amd-pstate
-          nixos-hardware.nixosModules.common-cpu-amd-zenpower
-          nixos-hardware.nixosModules.common-pc-ssd
-          nixos-hardware.nixosModules.common-gpu-intel
+        modules =
+          [
+            ./configuration.nix
 
-          vpn-confinement.nixosModules.default
+            vpn-confinement.nixosModules.default
 
-          # import the `services.qbittorrent` module
-          (nixpkgs-qbt + "/nixos/modules/services/torrent/qbittorrent.nix")
+            # import the `services.qbittorrent` module
+            (nixpkgs-qbt + "/nixos/modules/services/torrent/qbittorrent.nix")
 
-          (
-            { pkgs, lib, ... }:
-            {
-              imports = [ nix-minecraft.nixosModules.minecraft-servers ];
-              nixpkgs.overlays = [ nix-minecraft.overlay ];
-            }
-          )
-        ];
+            # get nix-minercaft working!
+            nix-minecraft.nixosModules.minecraft-servers
+            (
+              { ... }:
+              {
+                nixpkgs.overlays = [ nix-minecraft.overlay ];
+              }
+            )
+          ]
+          ++ (with nixos-hardware.nixosModules; [
+            common-cpu-amd-pstate
+            common-cpu-amd-zenpower
+            common-pc-ssd
+            common-gpu-intel
+          ]);
       };
     };
 }