hosts/hopper/default.nix

@@ -45,8 +45,6 @@
       nix.nix
       nix.gc
 
-      services.flatpak
-
       network.tailscale
       network.avahi
       network.networkd
@@ -57,6 +55,9 @@
       builtins.elem (lib.getName pkg) [
         "nvidia-x11"
         "nvidia-settings"
+
+        "stremio-shell"
+        "stremio-server"
       ];
   };
 

hosts/hopper/home.nix

@@ -29,6 +29,7 @@
     pwvucontrol
     qpwgraph
 
+    stremio
     moonlight-qt
   ];
 

hosts/hopper/profiles/lab/caddy.nix

@@ -21,9 +21,7 @@ in {
   services.caddy = {
     enable = true;
     globalConfig = ''
-      metrics {
+      metrics
-        per_host
-      }
       servers {
         trusted_proxies static 10.0.0.1
       }

hosts/hopper/profiles/lab/prometheus.nix

@@ -10,16 +10,9 @@
     scrapeConfigs = [
       {
         job_name = "node";
-        static_configs = [
+        static_configs = lib.singleton {
-          {
+          targets = ["127.0.0.1:${toString config.services.prometheus.exporters.node.port}"];
-            targets = ["127.0.0.1:9100"];
+        };
-            labels.alias = "hopper";
-          }
-          {
-            targets = ["rackserv:9100"];
-            labels.alias = "rackserv";
-          }
-        ];
       }
       {
         job_name = "tailscale_client";
@@ -29,16 +22,9 @@
       }
       {
         job_name = "caddy";
-        static_configs = [
+        static_configs = lib.singleton {
-          {
+          targets = ["${config.vpnNamespaces."wg".namespaceAddress}:2019"];
-            targets = ["${config.vpnNamespaces."wg".namespaceAddress}:2019"];
+        };
-            labels.alias = "hopper";
-          }
-          {
-            targets = ["rackserv:2019"];
-            labels.alias = "rackserv";
-          }
-        ];
       }
       {
         job_name = "slskd";
@@ -51,12 +37,6 @@
           action = "drop";
         };
       }
-      {
-        job_name = "forgejo";
-        static_configs = lib.singleton {
-          targets = ["rackserv:9615"];
-        };
-      }
     ];
   };
 

hosts/nixdesk/default.nix

@@ -118,6 +118,9 @@
         "idea-ultimate"
         "android-studio-stable"
         "krunker"
+
+        "stremio-shell"
+        "stremio-server"
       ];
     android_sdk.accept_license = true;
   };

hosts/nixdesk/home.nix

@@ -144,6 +144,7 @@
     picard
 
     # media
+    stremio
     feishin
     foliate
 

hosts/rackserv/default.nix

@@ -14,7 +14,6 @@
       ./profiles/backups.nix
       ./profiles/caddy.nix
       ./profiles/forgejo.nix
-      ./profiles/prometheus.nix
     ]
     ++ (with systemProfiles; [
       core.security

hosts/rackserv/profiles/caddy.nix

@@ -22,20 +22,9 @@ in {
     };
   };
 
-  # systemd.services.caddy.environment.CADDY_ADMIN = "${vars.tailnet.rackserv}:2019";
   services.caddy = {
     enable = true;
-    globalConfig = ''
+    virtualHosts = {
-      metrics {
-        per_host
-      }
-      admin :2019 {
-        origins 127.0.0.1 100.64.0.0/10
-      }
-    '';
-    virtualHosts = let
-      forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT;
-    in {
       misc = {
         hostName = "${domain}";
         serverAliases = ["*.${domain}"];
@@ -48,21 +37,12 @@ in {
         hostName = "git.${domain}";
         useACMEHost = domain;
         extraConfig = ''
-          respond /metrics 403
+          reverse_proxy localhost:${toString config.services.forgejo.settings.server.HTTP_PORT}
-          reverse_proxy localhost:${forgejoPort}
         '';
       };
-      forgejoMetrics = {
+      other = {
-        hostName = ":9615";
         extraConfig = ''
-          @blocked {
+          respond 404
-            not {
-              client_ip ${vars.tailnet.hopper}
-              path /metrics
-            }
-          }
-          respond @blocked 403
-          reverse_proxy localhost:${forgejoPort}
         '';
       };
     };

hosts/rackserv/profiles/forgejo.nix

@@ -11,11 +11,6 @@
         HTTP_PORT = 3000;
         HTTP_ADDR = "127.0.0.1";
       };
-      metrics = {
-        ENABLED = true;
-        ENABLED_ISSUE_BY_LABEL = true;
-        ENABLED_ISSUE_BY_REPOSITORY = true;
-      };
       service.DISABLE_REGISTRATION = true;
     };
   };

hosts/rackserv/profiles/prometheus.nix

@@ -1,8 +0,0 @@
-{
-  services.prometheus.exporters = {
-    node = {
-      enable = true;
-      enabledCollectors = ["systemd"];
-    };
-  };
-}