From cae95f99af5b0e3f548f8ef1dfce96abedaf487c Mon Sep 17 00:00:00 2001
From: Andreas Schaafsma <andreas@subsonics.nl>
Date: Mon, 11 Nov 2024 21:49:11 +0100
Subject: [PATCH] commit working state to prevent future breakage

---
 .../andreas@drivebystation-nix/default.nix    |  3 +-
 .../gaming@drivebystation-nix/.gitkeep        |  0
 .../gaming@drivebystation-nix/default.nix     | 31 +++++++++++++++++++
 .../drivebystation-nix/acer-monitor-edid.nix  |  5 +--
 .../drivebystation-nix/configuration.nix      |  3 ++
 .../drivebystation-nix/default.nix            |  1 +
 .../drivebystation-nix/nvidia.nix             | 16 +++++++++-
 7 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 homes/x86_64-linux/gaming@drivebystation-nix/.gitkeep
 create mode 100644 homes/x86_64-linux/gaming@drivebystation-nix/default.nix

diff --git a/homes/x86_64-linux/andreas@drivebystation-nix/default.nix b/homes/x86_64-linux/andreas@drivebystation-nix/default.nix
index 45691a1..302be0e 100644
--- a/homes/x86_64-linux/andreas@drivebystation-nix/default.nix
+++ b/homes/x86_64-linux/andreas@drivebystation-nix/default.nix
@@ -21,10 +21,11 @@ in
     packages = [
       pkgs.nil
       pkgs.steam
+      pkgs.gamemode
       pkgs.beeper
       pkgs.my-namespace.udev-steelseries
       pkgs.qbittorrent
-      pkgs.discord
+      pkgs.vesktop
     ];
   };
 }
\ No newline at end of file
diff --git a/homes/x86_64-linux/gaming@drivebystation-nix/.gitkeep b/homes/x86_64-linux/gaming@drivebystation-nix/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/homes/x86_64-linux/gaming@drivebystation-nix/default.nix b/homes/x86_64-linux/gaming@drivebystation-nix/default.nix
new file mode 100644
index 0000000..302be0e
--- /dev/null
+++ b/homes/x86_64-linux/gaming@drivebystation-nix/default.nix
@@ -0,0 +1,31 @@
+{ config
+, lib
+, pkgs
+, ...
+}:
+let
+  inherit (lib.my-namespace) enabled;
+in
+{
+  imports = [
+    # ../modules.nix
+  ];
+  my-namespace.home = {
+    stream-tools = enabled;
+    gnome-customizations = enabled;
+    # networking = enabled;
+    # personal-apps = enabled;
+    # suites.laptop = enabled;
+  };
+  home = {
+    packages = [
+      pkgs.nil
+      pkgs.steam
+      pkgs.gamemode
+      pkgs.beeper
+      pkgs.my-namespace.udev-steelseries
+      pkgs.qbittorrent
+      pkgs.vesktop
+    ];
+  };
+}
\ No newline at end of file
diff --git a/systems/x86_64-linux/drivebystation-nix/acer-monitor-edid.nix b/systems/x86_64-linux/drivebystation-nix/acer-monitor-edid.nix
index 1c7a044..9aa9c5d 100644
--- a/systems/x86_64-linux/drivebystation-nix/acer-monitor-edid.nix
+++ b/systems/x86_64-linux/drivebystation-nix/acer-monitor-edid.nix
@@ -1,5 +1,4 @@
 { config, lib, pkgs, ... }:
-
 {
   boot.kernelParams = [ "drm.edid_firmware=DP-3:edid/edid.bin" ];
 
@@ -10,6 +9,4 @@
       cp ${./firmware/KG271-edid.bin} $out/lib/firmware/edid/edid.bin
     ''
   )];
-
-
-}
+}
\ No newline at end of file
diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix
index c42a495..20a4051 100644
--- a/systems/x86_64-linux/drivebystation-nix/configuration.nix
+++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix
@@ -49,6 +49,9 @@
   # Enable the GNOME Desktop Environment.
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.desktopManager.gnome.enable = true;
+  services.desktopManager.plasma6.enable = true;
+
+  programs.ssh.askPassword = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
 
   # Configure keymap in X11
   services.xserver.xkb = {
diff --git a/systems/x86_64-linux/drivebystation-nix/default.nix b/systems/x86_64-linux/drivebystation-nix/default.nix
index 0fc525f..16bab04 100644
--- a/systems/x86_64-linux/drivebystation-nix/default.nix
+++ b/systems/x86_64-linux/drivebystation-nix/default.nix
@@ -60,6 +60,7 @@ in
         remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
         dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
         localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
+        gamescopeSession.enable = true; 
       };
 
       # Open ports in the firewall.
diff --git a/systems/x86_64-linux/drivebystation-nix/nvidia.nix b/systems/x86_64-linux/drivebystation-nix/nvidia.nix
index 0952181..200f03e 100644
--- a/systems/x86_64-linux/drivebystation-nix/nvidia.nix
+++ b/systems/x86_64-linux/drivebystation-nix/nvidia.nix
@@ -7,7 +7,18 @@
   };
 
   # Load nvidia driver for Xorg and Wayland
-  services.xserver.videoDrivers = ["nvidia"];
+  #boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
+  #boot.kernelParams = [
+  #  "nvidia-drm.fbdev=1"
+  #];
+  boot.blacklistedKernelModules = [ 
+  #  "i915" 
+  #  "amdgpu"
+     "nouveau"   
+  ];
+  services.xserver.videoDrivers = [ "nvidia" ];
+  #boot.initrd.kernelModules = [ "nvidia" ];
+  
 
   hardware.nvidia = {
 
@@ -40,4 +51,7 @@
     # Optionally, you may need to select the appropriate driver version for your specific GPU.
     package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
+  #users.users.andreas = {
+  #  extraGroups = [ "video" "render" ];
+  #};
 }