From 230471a01d3217b8ab194ba693feb6922dc63125 Mon Sep 17 00:00:00 2001
From: chaos <chaos@owo.monster>
Date: Mon, 12 Aug 2024 08:25:11 +0100
Subject: [PATCH] update & add obs

---
 flake.lock                                 | 18 ++++++++---------
 presets/home-manager/gaming.nix            | 23 +++++++++++++++-------
 profiles/home-manager/apps/obs.nix         | 11 +++++++++++
 profiles/home-manager/gaming/minecraft.nix | 10 ++++------
 4 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 profiles/home-manager/apps/obs.nix

diff --git a/flake.lock b/flake.lock
index ca418e4..611d983 100644
--- a/flake.lock
+++ b/flake.lock
@@ -65,11 +65,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721534365,
-        "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1721379653,
-        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
         "type": "github"
       },
       "original": {
@@ -168,11 +168,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1721673663,
-        "narHash": "sha256-FErVK9tYpb3fYDw4fQLKoebFVjkP8XcVGSiHrmC2UW0=",
+        "lastModified": 1723445320,
+        "narHash": "sha256-yeD890KJQ619ewaNMxYjvOB6Dx8pFaEBjCN+3W4DTY0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b7d763bbc9218b98314bed6d7495eed12ae84ef4",
+        "rev": "650e19ccfc2200e5f04dfd1766d206790ccf57bd",
         "type": "github"
       },
       "original": {
diff --git a/presets/home-manager/gaming.nix b/presets/home-manager/gaming.nix
index 593dfdf..32aedf9 100644
--- a/presets/home-manager/gaming.nix
+++ b/presets/home-manager/gaming.nix
@@ -1,8 +1,17 @@
-{tree, ...}: {
-  imports = with tree.profiles.home-manager.gaming; [
-    steam
-    lutris
-    arrpc
-    minecraft
-  ];
+{
+  tree,
+  lib,
+  ...
+}: let
+  inherit (lib.lists) flatten;
+in {
+  imports = flatten (with tree.profiles.home-manager; [
+    apps.obs
+    (with gaming; [
+      steam
+      lutris
+      arrpc
+      minecraft
+    ])
+  ]);
 }
diff --git a/profiles/home-manager/apps/obs.nix b/profiles/home-manager/apps/obs.nix
new file mode 100644
index 0000000..8da7d0a
--- /dev/null
+++ b/profiles/home-manager/apps/obs.nix
@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+  home.packages = [
+    (pkgs.wrapOBS.override {} {
+      plugins = with pkgs.obs-studio-plugins; [
+        obs-vkcapture
+        input-overlay
+        obs-pipewire-audio-capture
+      ];
+    })
+  ];
+}
diff --git a/profiles/home-manager/gaming/minecraft.nix b/profiles/home-manager/gaming/minecraft.nix
index c63ed84..22b171d 100644
--- a/profiles/home-manager/gaming/minecraft.nix
+++ b/profiles/home-manager/gaming/minecraft.nix
@@ -1,10 +1,8 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    prismlauncher
-
-    jdk8.jre
-    #jdk11.jre
-    #jdk21.jre
-    jdk22
+    (prismlauncher.override {
+      jdks = with pkgs; [ jdk8 jdk11 jdk17 jdk21 ];
+      withWaylandGLFW = true;
+    })
   ];
 }