From ccc3d17747b56d49fbf99942a29011e8a034dd09 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 29 Mar 2024 10:51:39 -0500
Subject: [PATCH] Plasma, steam, hot stuff is hot

---
 modules/nixos/kde-plasma.nix |  8 +++++---
 modules/nixos/steam.nix      | 12 ++++++------
 nixos/foxtrot.nix            |  8 +-------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/modules/nixos/kde-plasma.nix b/modules/nixos/kde-plasma.nix
index 9a495c5..08e272f 100644
--- a/modules/nixos/kde-plasma.nix
+++ b/modules/nixos/kde-plasma.nix
@@ -19,11 +19,13 @@
 
   # qt.platformTheme = "gnome";
 
-  services.xserver.displayManager.defaultSession = "plasma";
-  services.xserver.enable = lib.mkDefault true;
+  services.desktopManager.plasma6.enable = true;
 
   services.xserver.displayManager.sddm.enable = true;
-  services.desktopManager.plasma6.enable = true;
+  services.xserver.displayManager.sddm.wayland.enable = true;
+
+  services.xserver.displayManager.defaultSession = "plasma";
+  services.xserver.enable = lib.mkDefault true;
 
   hardware.pulseaudio.enable = false;
 
diff --git a/modules/nixos/steam.nix b/modules/nixos/steam.nix
index e25061f..a5b43d9 100644
--- a/modules/nixos/steam.nix
+++ b/modules/nixos/steam.nix
@@ -1,7 +1,7 @@
-{
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-    gamescopeSession.enable = true;
-  };
+{pkgs, ...}: {
+  programs.steam.enable = true;
+  programs.steam.gamescopeSession.enable = true;
+  # programs.steam.package = inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.steam;
+  programs.steam.remotePlay.openFirewall = true;
+  services.udev.packages = with pkgs; [steam];
 }
diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix
index 5229fc9..2f26cef 100644
--- a/nixos/foxtrot.nix
+++ b/nixos/foxtrot.nix
@@ -29,13 +29,7 @@ in {
     # postgres
     wifi
     hyprland
-    {
-      programs.steam.enable = true;
-      programs.steam.gamescopeSession.enable = true;
-      # programs.steam.package = inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.steam;
-      programs.steam.remotePlay.openFirewall = true;
-      services.udev.packages = with pkgs; [steam];
-    }
+    steam
     {
       # laptop power management
       services.upower.enable = true;