From eaf256511d4a6fd0b0125d276138b17e304e47c0 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Mon, 27 May 2024 19:18:30 +0100
Subject: [PATCH] Enable gamescope wayland/xwayland shell in desktop.nix by
 default

---
 configuration/Northstar.nix |  1 +
 configuration/Vanguard.nix  | 12 +++---------
 configuration/desktop.nix   |  4 ++++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/configuration/Northstar.nix b/configuration/Northstar.nix
index d3c34b5e..77d1b399 100644
--- a/configuration/Northstar.nix
+++ b/configuration/Northstar.nix
@@ -5,6 +5,7 @@
 }: {
   imports = [./laptop.nix];
   boot = {
+    initrd.kernelModules = ["amdgpu"];
     extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
     extraModprobeConfig = ''
       options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
diff --git a/configuration/Vanguard.nix b/configuration/Vanguard.nix
index 8b0cb703..99b2e25f 100644
--- a/configuration/Vanguard.nix
+++ b/configuration/Vanguard.nix
@@ -15,14 +15,8 @@
     steam-hardware.enable = true;
   };
   services.ollama.enable = true;
-  programs = {
-    gamescope = {
-      enable = true;
-      capSysNice = true;
-    };
-    steam = {
-      enable = true;
-      remotePlay.openFirewall = true;
-    };
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
   };
 }
diff --git a/configuration/desktop.nix b/configuration/desktop.nix
index 79ed56b5..42e0c1ca 100644
--- a/configuration/desktop.nix
+++ b/configuration/desktop.nix
@@ -62,6 +62,10 @@
         (old: {passthru.providedSessions = ["sway"];});
       wrapperFeatures.gtk = true;
     };
+    gamescope = {
+      enable = true;
+      capSysNice = true;
+    };
     xwayland.enable = true;
   };
   gtk.iconCache.enable = true;