From f52a8e3efe5bff418fa3ff41004a3769e27f4863 Mon Sep 17 00:00:00 2001
From: Justin Garrison <justinleegarrison@gmail.com>
Date: Wed, 5 Aug 2026 16:28:23 -0700
Subject: [PATCH] add stuff

---
 home.nix     | 20 +++++++++++++++++++-
 hosts/s.nix  |  6 +++---
 packages.txt |  3 ++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/home.nix b/home.nix
index 2b384d1..7fd141f 100644
--- a/home.nix
+++ b/home.nix
@@ -51,12 +51,30 @@
       claude-code.packages.${pkgs.system}.default
       # Packages that need custom expressions
       (pkgs.google-cloud-sdk.withExtraComponents [ pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin ])
-      (pkgs.wrapOBS { plugins = with pkgs.obs-studio-plugins; [ obs-source-record obs-pipewire-audio-capture obs-vkcapture obs-backgroundremoval obs-vaapi obs-move-transition input-overlay ]; })
+      (let
+        obs-with-plugins = pkgs.wrapOBS {
+          plugins = with pkgs.obs-studio-plugins; [
+            obs-source-record obs-pipewire-audio-capture obs-vkcapture
+            obs-backgroundremoval obs-vaapi obs-move-transition input-overlay
+          ];
+        };
+      in pkgs.symlinkJoin {
+        name = "obs-studio";
+        paths = [ obs-with-plugins ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+        postBuild = ''
+          wrapProgram $out/bin/obs \
+            --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib"
+        '';
+      })
       # orca-slicer: GDK_BACKEND=x11 + MESA_GL_VERSION_OVERRIDE=3.3 fixes the 3D canvas
       # on NVIDIA Wayland. MakerWorld login crashes in orca's embedded WebView regardless
       # of WEBKIT_* env vars — use Bambu Studio for MakerWorld access instead (Bambu's
       # 3D canvas is blank on this machine but its WebKit panels work).
       (pkgs.symlinkJoin { name = "orca-slicer"; paths = [ pkgs.orca-slicer ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/orca-slicer --set GDK_BACKEND x11 --set MESA_GL_VERSION_OVERRIDE 3.3 ''; })
+      # discord: Electron's native Wayland backend crashes on NVIDIA (dmabufs/EGLImage import fails).
+      # Force XWayland so the GNOME launcher works the same as the terminal.
+      (pkgs.symlinkJoin { name = "discord"; paths = [ pkgs.discord ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/Discord --add-flags "--ozone-platform=x11" ''; })
 
       (pkgs.symlinkJoin { name = "moonlight-qt"; paths = [ pkgs.moonlight-qt ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/moonlight --set QT_QPA_PLATFORM wayland ''; })
       pkgs.losslesscut-bin
diff --git a/hosts/s.nix b/hosts/s.nix
index 1bb71da..6dc38bf 100644
--- a/hosts/s.nix
+++ b/hosts/s.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, unstable, ... }:
 
 {
   environment.etc."ctrld/config.toml" = {
@@ -42,8 +42,8 @@
   };
 
   environment.systemPackages = with pkgs; [
-    (davinci-resolve-studio.override {
-      buildFHSEnv = args: buildFHSEnv (args // {
+    (unstable.davinci-resolve-studio.override {
+      buildFHSEnv = args: unstable.buildFHSEnv (args // {
         targetPkgs = ps: (args.targetPkgs ps) ++ [ ps.pulseaudio ];
       });
     })
diff --git a/packages.txt b/packages.txt
index 8c64293..bf7ce41 100644
--- a/packages.txt
+++ b/packages.txt
@@ -25,6 +25,7 @@ rustc
 cargo
 shfmt
 yarn
+protobuf
 
 # CLI tools
 bat
@@ -69,6 +70,7 @@ gettext
 # Media tools
 ccextractor
 chafa
+easyeffects
 ffmpeg-full
 ffmpegthumbnailer
 gifsicle
@@ -125,7 +127,6 @@ chromium
 
 # Communication
 slack
-discord
 signal-desktop
 zoom-us
 thunderbird
-- 
2.51.2