From 7eb343286bb3bb23ae8dd9943f31ecf341b57311 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Sat, 6 Jan 2024 13:33:50 -0600
Subject: [PATCH] Use updated obs-streamfx

---
 flake.lock | 42 ++++++++++++++++++++++++++++++++++++++----
 flake.nix  | 16 ++++++++++------
 home.nix   |  4 ++--
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 58abecb..9a87dd9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -39,16 +57,17 @@
     },
     "obs-streamfx": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1680807394,
-        "narHash": "sha256-boKDhfgIEwXu1RyBe5jcnykLNE4NBJYPWLpUByq+Jyc=",
+        "lastModified": 1704569314,
+        "narHash": "sha256-C5HHxUdYLChKswe3VN9uTnbfYqbcfqLfpJiqGDaoQ7I=",
         "ref": "refs/heads/main",
-        "rev": "6ae0d7a6a79439f14793fd7354b8cba6ffbbd304",
-        "revCount": 7,
+        "rev": "6d42e7a78e689219a844e15ff4de61f9ac86f23c",
+        "revCount": 9,
         "type": "git",
         "url": "https://git.asonix.dog/asonix/nix-obs-streamfx"
       },
@@ -63,6 +82,21 @@
         "nixpkgs": "nixpkgs",
         "obs-streamfx": "obs-streamfx"
       }
+    },
+    "systems": {
+      "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",
diff --git a/flake.nix b/flake.nix
index 469dbde..b0145d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,16 +14,20 @@
     };
   };
 
-  outputs = { nixpkgs, home-manager, ... }@attrs:
+  outputs = { nixpkgs, home-manager, obs-streamfx, ... }@attrs:
     let
       system = "x86_64-linux";
       pkgs = import nixpkgs {
         inherit system;
-	overlays = [
+
+        overlays = [
           (final: prev: {
-	    keymapp = prev.callPackage ./wally-cli {};
-	  })
-	];
+            keymapp = prev.callPackage ./wally-cli {};
+            obs-studio-plugins = prev.obs-studio-plugins // {
+              obs-streamfx = obs-streamfx.packages.${system}.obs-streamfx;
+            };
+          })
+        ];
       };
     in
     {
@@ -39,7 +43,7 @@
 
         # Optionally use extraSpecialArgs
         # to pass through arguments to home.nix
-        extraSpecialArgs = attrs // { inherit system; };
+        # extraSpecialArgs = attrs // { inherit system; };
       };
     };
 }
diff --git a/home.nix b/home.nix
index f61936a..f38abbf 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, system, obs-streamfx, ... }:
+{ config, pkgs, system, ... }:
 
 let
   setIcon = ''
@@ -96,7 +96,7 @@ in
       obs-shaderfilter
       obs-source-record
       obs-source-switcher
-      obs-streamfx.obs-streamfx
+      obs-streamfx
       obs-teleport
       obs-text-pthread
       obs-transition-table