nixos/features/nvidia.nix

@@ -1,8 +1,9 @@
 { lib, config, pkgs, inputs, ... }: {
   
-  hardware.graphics = {
+  hardware.opengl = {
     enable = true;
-    enable32Bit = true;
+    driSupport = true;
+    driSupport32Bit = true;
     extraPackages = with pkgs; [
       vaapiVdpau
       libvdpau-va-gl

nixos/hosts/dis-sociat-ing/default.nix

@@ -30,7 +30,7 @@
 
   services.iceshrimp = {
     enable = true;
-    package = inputs.iceshrimp-withdrawal.packages.${pkgs.system}.iceshrimp.withdrawal;
+    # package = inputs.iceshrimp.packages.${pkgs.system}.iceshrimp;
     settings = {
       url = "https://dis.sociat.ing";
       enableMetrics = true;

nixos/hosts/ingress-proxy/default.nix

@@ -33,12 +33,10 @@ in rec {
       ps2l_aggpop.servers."${tsHost "ps2live" 8201}" = {};
       ps2l_metagame.servers."${tsHost "ps2live" 8301}" = {};
       pdr.servers."${tsHost "porcelain-doll-repair" 3000}" = {};
-      dsi.servers."${tsHost "dis-sociat-ing" 3000}" = {};
       se.servers."${tsHost "sapphic-engineer" 4000}" = {};
       git.servers."${tsHost "git" 3000}" = {};
       staticsites.servers."${tsHost "static-sites" 80}" = {};
       ldr.servers."${tsHost "live-doll-repair" 80}" = {};
-      jitsi.servers."${tsHost "jitsi" 443}" = {};
       plapkit-dev.servers."${tsHost "cider" 8555}" = {};
     };
 
@@ -101,11 +99,10 @@ in rec {
       "saerro.ps2.live" = ps2live "saerro";
       "metagame.ps2.live" = ps2live "metagame";
 
-      "flesh.doll.repair" = {
+      "live.doll.repair" = {
-        serverAliases = [ "conference.flesh.doll.repair" "auth.flesh.doll.repair" ];
         locations."/" = {
           recommendedProxySettings = true;
-          proxyPass = "https://jitsi";
+          proxyPass = "http://ldr";
           proxyWebsockets = true;
         };
       } // defaultConfig;
@@ -125,21 +122,6 @@ in rec {
         };
       } // defaultConfig // { forceSSL = false; };
 
-      "dis.sociat.ing" = {
-        # serverAliases = ["p.doll.repair"]; # Media Proxy
-        locations."/" = {
-          recommendedProxySettings = true;
-          proxyPass = "http://dsi";
-          proxyWebsockets = true;
-          extraConfig = ''
-            proxy_cache pdr;
-            proxy_cache_lock on;
-            proxy_cache_use_stale updating;
-            add_header X-Cache $upstream_cache_status;
-          '';
-        };
-      } // defaultConfig;
-
       "sapphic.engineer" = {
         # serverAliases = ["p.sapphic.engineer"];
 

nixos/hosts/jitsi/.target

@@ -1 +1 @@
-10.100.1.50
+10.100.1.42

nixos/hosts/jitsi/default.nix

@@ -8,48 +8,4 @@
   networking.hostName = "jitsi";
   system.stateVersion = "24.11";
   nixpkgs.hostPlatform = "x86_64-linux";
-
-  services.jitsi-meet = {
-    enable = true;
-    hostName = "flesh.doll.repair";
-    excalidraw.enable = true;
-    interfaceConfig = {
-      APP_NAME = "Doll Repair Hole??";
-      SHOW_JITSI_WATERMARK = false;
-      DISABLE_PRESENCE_STATUS = true;
-      SHOW_POWERED_BY = false;
-      SHOW_PROMOTIONAL_CLOSE_PAGE = false;
-      VIDEO_QUALITY_LABEL_DISABLED = false;
-    };
-    config = {
-      startAudioOnly = true;
-      startWithAudioMuted = true;
-      desktopSharingFrameRate = {
-        min = 30;
-        max = 60;
-      };
-      analytics.disabled = true;
-      useTurnUdp = true;
-    };
-  };
-
-  # services.nginx.virtualHosts."flesh.doll.repair" = {
-  #   enableACME = false;
-  #   forceSSL = false;
-  # };
-
-  services.jitsi-videobridge = {
-    nat = {
-      localAddress = "10.100.1.50";
-      publicAddress = "136.56.240.152";
-    };
-    openFirewall = true;
-  };
-
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
-
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "acme@kat.cafe";
-  };
 }

nixos/hosts/live-doll-repair/.target

@@ -0,0 +1 @@
+10.100.1.47

nixos/hosts/live-doll-repair/default.nix

@@ -0,0 +1,88 @@
+{ inputs, pkgs, config, lib, ... }: {
+  imports = [
+    ../../templates/proxmox-lxc.nix
+    ../../server.nix
+  ];
+
+  networking.hostName = "live-doll-repair";
+  system.stateVersion = "24.05";
+  nixpkgs.hostPlatform = "x86_64-linux";
+
+  services.nginx = {
+    enable = true;
+    additionalModules = [
+      pkgs.nginxModules.rtmp
+    ];
+
+    virtualHosts."live.doll.repair" = {
+      locations."/" = {
+        root = pkgs.writeTextDir "index.html" ''
+          <!doctype html>
+          <link href="https://vjs.zencdn.net/8.10.0/video-js.css" rel="stylesheet" />
+          <style>:root {margin: 0; padding: 0;} video { width: 100vw; height: 100vh; }</style>
+          <!-- Or if you want the latest version from the main branch -->
+          <!-- <script src="https://cdn.jsdelivr.net/npm/hls.js@canary"></script> -->
+          <video id="video" class="video-js" preload="auto" controls autoplay muted data-setup='{"liveui": true, "autoplay": "play", "fluid": true, "liveTracker": { "liveTolerance": 5 }}'>
+            <source src="https://live.doll.repair/stream/meow.m3u8">
+            <source src="https://live.doll.repair/stream-dash/meow.mpd">
+          </video>
+          <script src="https://vjs.zencdn.net/8.10.0/video.min.js"></script>
+          <script>
+            window.HELP_IMPROVE_VIDEOJS = false;
+          </script>
+        '';
+      };
+
+      locations."/stream" = {
+        root = "/tmp";
+        extraConfig = ''
+          autoindex on;
+          add_header Cache-Control no-cache;
+          types {
+            application/vnd.apple.mpegurl m3u8;
+            video/mp2t ts;
+            application/dash+xml mpd;
+          }
+        '';
+      };
+      locations."/stream-dash" = {
+        root = "/tmp";
+        extraConfig = ''
+          autoindex on;
+          add_header Cache-Control no-cache;
+          types {
+            application/vnd.apple.mpegurl m3u8;
+            video/mp2t ts;
+            application/dash+xml mpd;
+          }
+        '';
+      };
+    };
+
+    appendConfig = ''
+      rtmp {
+        server {
+          listen 1935;
+          chunk_size 4096;
+
+          application live {
+            live on;
+
+            allow publish 100.64.0.0/10;
+            deny publish all;
+            deny play all;
+
+            hls on;
+            hls_path /tmp/stream;
+            hls_playlist_length 2s;
+            hls_fragment 1s;
+            hls_continuous on;
+
+            dash on;
+            dash_path /tmp/stream-dash;
+          }
+        }
+      }
+    '';
+  };
+}

nixos/hosts/monitoring/default.nix

@@ -53,16 +53,12 @@
     in with ports; [
       (static "aerial" [ node ])
       (static "cider" [ node ])
-      (static "dis-sociat-ing" [ node ])
       (static "git" [ node ])
       (static "ingress-proxy" [ node nginx ])
-      (static "jitsi" [ node ])
       (static "keylime" [ node ])
       (static "live-doll-repair" [ node ])
       (static "monitoring" [ node ])
-      (static "mumble" [ node ])
       (static "nas0" [ node ])
-      (static "nextcloud" [ node ])
       (static "pihole" [ node ])
       (static "porcelain-doll-repair" [ node ])
       (static "ps2live" [ node ])
@@ -103,14 +99,6 @@
         metrics_path = "/metrics";
         scheme = "https";
       }
-      {
-        job_name = "dis-sociat-ing-iceshrimp";
-        static_configs = [
-          { targets = [ "dis.sociat.ing" ]; }
-        ];
-        metrics_path = "/metrics";
-        scheme = "https";
-      }
     ];
   };
 

nixos/hosts/mumble/.target

@@ -1 +1 @@
-10.100.1.49
+10.100.1.42

nixos/hosts/nextcloud/.target

@@ -1 +1 @@
-10.100.1.51
+10.100.1.42