Merge branch 'master' into feat/multi-host-rtx-wsl

configuration.nix

@@ -262,6 +262,7 @@
 
     #tls ${config.sops.secrets.zerossl_cert.path} ${config.sops.secrets.zerossl_private_key.path}
     virtualHosts."centraldogma.site:".extraConfig = ''
+
       root * /srv/root/
       file_server
       encode zstd gzip
@@ -274,17 +275,21 @@
 
       redir /radarr /radarr/
       reverse_proxy /radarr/* 127.0.0.1:7878
+
     '';
     virtualHosts."jellyfin.centraldogma.site:".extraConfig = ''
       reverse_proxy /* 127.0.0.1:8096
     '';
-    virtualHosts."sonarr.centraldogma.site:".extraConfig = ''
-      redir /sonarr /sonarr/
-      reverse_proxy /sonarr/* 127.0.0.1:8989
+    virtualHosts."jellyfin2.centraldogma.site:".extraConfig = ''
+      redir /jellyfin /jellyfin/
+      reverse_proxy /jellyfin/* 127.0.0.1:8096
     '';
     virtualHosts."git.centraldogma.site:".extraConfig = ''
       reverse_proxy /* 127.0.0.1:3000
     '';
+    virtualHosts."spy.centraldogma.site:".extraConfig = ''
+      reverse_proxy /* 192.168.1.78:4444
+    '';
     # virtualHosts."blog.centraldogma.dedyn.io:".extraConfig = ''
     #   root * /srv/root/
     #   file_server

flake.lock

@@ -23,28 +23,6 @@
         "type": "github"
       }
     },
-    "configarr": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "configarr"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1789671926,
-        "narHash": "sha256-SYmuoortHANADEwaCo4aedvWg6QcJhm9cWSIQ4y6gFw=",
-        "owner": "raydak-labs",
-        "repo": "configarr",
-        "rev": "c9058492b390e54478ad1f4d7c35170041b5db3b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "raydak-labs",
-        "repo": "configarr",
-        "type": "github"
-      }
-    },
     "fenix": {
       "inputs": {
         "nixpkgs": [
@@ -83,27 +61,9 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1782949081,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -142,11 +102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790365885,
-        "narHash": "sha256-iQ0ebhiVo64NktTnwft9hNxlFu4j5cvljVxyJaEVIP4=",
+        "lastModified": 1790110821,
+        "narHash": "sha256-4vgPxAtYGryB/9SZVFMrcRKmNcOqcN3+MwRJPTVpb1o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7b4c5ec4bedaf1e062bbc1bcaeddbc6bd242aa1b",
+        "rev": "a5768f1a46942657352e58037b7891bdcbc0741f",
         "type": "github"
       },
       "original": {
@@ -212,28 +172,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1782614948,
-        "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1790578696,
-        "narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=",
+        "lastModified": 1790046670,
+        "narHash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f",
+        "rev": "6774f7bc253789b113a4f39285dc0fa100abeacc",
         "type": "github"
       },
       "original": {
@@ -246,7 +191,6 @@
     "root": {
       "inputs": {
         "alejandra": "alejandra",
-        "configarr": "configarr",
         "home-manager": "home-manager",
         "lazyvim": "lazyvim",
         "nixos-wsl": "nixos-wsl",
@@ -278,11 +222,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790498116,
-        "narHash": "sha256-rs9meAYxW3zzrh43yaW7htrqCD+X9+pupDPHN86fumI=",
+        "lastModified": 1789890976,
+        "narHash": "sha256-GKwH3zpy7tartuJMG0Rv/xUsdetG1QLmTVv8UKgJLmA=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5efb5a6f4f5ab192817d28557dd4d650fa14d866",
+        "rev": "7214124c20c1542c90deb54af50e2f53ae02711f",
         "type": "github"
       },
       "original": {
@@ -305,21 +249,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

hosts/common/server.nix

@@ -33,6 +33,8 @@
       redir /jellyfin /jellyfin/
       reverse_proxy /jellyfin/* 127.0.0.1:8096
 
+      redir /sonarr /sonarr/
+      reverse_proxy /sonarr/* 127.0.0.1:8989
 
       redir /radarr /radarr/
       reverse_proxy /radarr/* 127.0.0.1:7878
@@ -42,8 +44,8 @@
       reverse_proxy /* 127.0.0.1:8096
     '';
     virtualHosts."jellyfin2.centraldogma.site:".extraConfig = ''
-      redir /sonarr /sonarr/
-      reverse_proxy /sonarr/* 127.0.0.1:8989
+      redir /jellyfin /jellyfin/
+      reverse_proxy /jellyfin/* 127.0.0.1:8096
     '';
     virtualHosts."git.centraldogma.site:".extraConfig = ''
       reverse_proxy /* 127.0.0.1:3000