From 06c3442ea3a41bc8c41882637aa76d08d6ada04e Mon Sep 17 00:00:00 2001
From: cnst <cnst@cana.st>
Date: Sun, 30 Jun 2024 10:15:08 +0200
Subject: [PATCH] gamescope try again???

---
 flake.lock                    |  6 +++---
 hosts/cnix/default.nix        |  2 ++
 hosts/extra/steam/default.nix |  1 -
 hosts/services/cnix.nix       | 11 -----------
 hosts/services/pipewire.nix   | 11 +++++++++++
 5 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 hosts/services/pipewire.nix

diff --git a/flake.lock b/flake.lock
index 963c4a0f..73a2c5d6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -300,11 +300,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719683797,
-        "narHash": "sha256-sfE3ACZSo7I2ahByRsU66X+xmzAz4qSxl4IipSD7ObM=",
+        "lastModified": 1719733038,
+        "narHash": "sha256-kUG94JixUcSgkkJ0I1xo2rtXfSOmUJNbq+PKs9kDWWI=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "48f92fd7f42dd4b01e55dbe0baaf21c4a270a076",
+        "rev": "dace98a9b5ee51971cab74f7a00955b8b8089536",
         "type": "github"
       },
       "original": {
diff --git a/hosts/cnix/default.nix b/hosts/cnix/default.nix
index 84ab6c86..acf33606 100644
--- a/hosts/cnix/default.nix
+++ b/hosts/cnix/default.nix
@@ -30,11 +30,13 @@ in {
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ../core
+    ../extra/gnome
     ../extra/steam
     ../extra/nix-ld
     ../extra/gamescope
     ../extra/gamemode
     ../services/cnix.nix
+    ../services/pipewire.nix
     ../hardware/cnix.nix
     ../locale/cnix.nix
     ./hardware-configuration.nix
diff --git a/hosts/extra/steam/default.nix b/hosts/extra/steam/default.nix
index 08263edd..23969992 100644
--- a/hosts/extra/steam/default.nix
+++ b/hosts/extra/steam/default.nix
@@ -13,7 +13,6 @@
             xorg.libXinerama
             xorg.libXScrnSaver
             libpng
-            libpulseaudio
             libvorbis
             stdenv.cc.cc.lib
             libkrb5
diff --git a/hosts/services/cnix.nix b/hosts/services/cnix.nix
index ac05e86b..43a58f46 100644
--- a/hosts/services/cnix.nix
+++ b/hosts/services/cnix.nix
@@ -46,16 +46,5 @@
         options = "lv3:rwin_switch";
       };
     };
-    pipewire = {
-      enable = true;
-      alsa = {
-        enable = true;
-        support32Bit = true;
-      };
-      pulse.enable = true;
-      wireplumber.enable = true;
-      #jack.enable = true;
-      #media-session.enable = true;
-    };
   };
 }
diff --git a/hosts/services/pipewire.nix b/hosts/services/pipewire.nix
new file mode 100644
index 00000000..e35a7882
--- /dev/null
+++ b/hosts/services/pipewire.nix
@@ -0,0 +1,11 @@
+{
+  security.rtkit.enable = true;
+  hardware.pulseaudio.enable = false;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+}