From bb942d377c113480f777515a287df3ac5758c3ec Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Mon, 18 Nov 2024 15:43:44 -0500
Subject: [PATCH] cleanup

---
 flake.lock               | 14 +++++++-------
 flake.nix                | 13 +++----------
 services/caddy.nix       |  7 ++-----
 services/qbittorrent.nix |  4 ++--
 4 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7e31cf5..b1c30ed 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731808593,
-        "narHash": "sha256-dyMU//DLz1Zs1bl7jAZA6d68bXCRzTYim4JyrLFfqME=",
+        "lastModified": 1731894859,
+        "narHash": "sha256-G8W50PtK+VkwnC/bYUWXy0Bg4+AX21Sg/wg8pjjE+yw=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "ada86c417801a44c32b59374b1e0b3141826291a",
+        "rev": "400994c4d85841549bcbdac9dd71fc5ce505cdf0",
         "type": "github"
       },
       "original": {
@@ -74,16 +74,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731816655,
-        "narHash": "sha256-55e1JMAuYvHZs9EICprWgJ4RmaWwDuSjzJ5K7S7zb6w=",
+        "lastModified": 1731676054,
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0a14706530dcb90acecb81ce0da219d88baaae75",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "master",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 94bccfb..1cf68f3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,8 @@
   description = "Flake for server muffin";
 
   inputs = {
-    # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs.url = "github:NixOS/nixpkgs/master";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    # nixpkgs.url = "github:NixOS/nixpkgs/master";
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
@@ -46,6 +46,7 @@
           certs = services_dir + "/http_certs";
           data_dir = services_dir + "/http";
           domain = "gardling.com";
+          wg_ip = "192.168.15.1";
         };
 
         gitea = {
@@ -66,10 +67,6 @@
           server_name = "main";
         };
 
-        gluetun = {
-          dir = services_dir + "/gluetun";
-        };
-
         torrent = {
           SavePath = hdd_path + "/torrents";
           TempPath = hdd_path + "/torrents/incomplete";
@@ -78,10 +75,6 @@
         jellyfin = {
           dir = services_dir + "/jellyfin";
         };
-
-        ollama = {
-          data_dir = services_dir + "/ollama";
-        };
       };
     in
     {
diff --git a/services/caddy.nix b/services/caddy.nix
index 5bcfdf4..5435caf 100644
--- a/services/caddy.nix
+++ b/services/caddy.nix
@@ -8,9 +8,6 @@
   services.caddy = {
     enable = true;
     email = "titaniumtown@proton.me";
-    globalConfig = ''
-      auto_https disable_redirects
-    '';
     virtualHosts = {
       ${service_configs.https.domain} = {
         extraConfig = ''
@@ -39,13 +36,13 @@
       "bitmagnet.${service_configs.https.domain}".extraConfig = ''
         tls internal
         ${import ../secrets/caddy_auth.nix}
-        reverse_proxy http://192.168.15.1:${builtins.toString service_configs.ports.bitmagnet}
+        reverse_proxy ${service_configs.https.wg_ip}:${builtins.toString service_configs.ports.bitmagnet}
       '';
 
       "torrent.${service_configs.https.domain}".extraConfig = ''
         tls internal
         ${import ../secrets/caddy_auth.nix}
-        reverse_proxy http://192.168.15.1:${builtins.toString service_configs.ports.torrent}
+        reverse_proxy ${service_configs.https.wg_ip}:${builtins.toString service_configs.ports.torrent}
       '';
     };
   };
diff --git a/services/qbittorrent.nix b/services/qbittorrent.nix
index eee5e67..55d490c 100644
--- a/services/qbittorrent.nix
+++ b/services/qbittorrent.nix
@@ -30,8 +30,8 @@
     serverConfig.Preferences.WebUI = {
       AlternativeUIEnabled = true;
       RootFolder = "${pkgs.fetchzip {
-        url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.17.0/vuetorrent.zip";
-        hash = "sha256-PpumQCgIZp9wENL1XZvf7CdUAW9W0pQP5wqtG9oOUpM=";
+        url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.18.0/vuetorrent.zip";
+        sha256 = "Z+N1RgcF67R6hWEfmfBls1+YLWkhEJQuOVqXXJCyptE=";
       }}";
 
       # disable auth because we use caddy for auth