diff --git a/modules/nixos/services/sunshine/default.nix b/modules/nixos/services/sunshine/default.nix
index d3882bf..56ac246 100644
--- a/modules/nixos/services/sunshine/default.nix
+++ b/modules/nixos/services/sunshine/default.nix
@@ -23,7 +23,30 @@ let
         applications.apps = with pkgs; [
           steam
         ];
+        settings = {
+          port = 47989;
+        };
       };
+      # systemd.user.services.sunshine = {
+      #   description = "Self-hosted game stream host for Moonlight";
+
+      #   wantedBy = [ "graphical-session.target" ];
+      #   partOf = [ "graphical-session.target" ];
+      #   wants = [ "graphical-session.target" ];
+      #   after = [ "graphical-session.target" ];
+
+      #   startLimitIntervalSec = 500;
+      #   startLimitBurst = 5;
+
+      #   environment.PATH = lib.mkForce null; # don't use default PATH, needed for tray icon menu links to work
+
+      #   serviceConfig = {
+      #     # only add configFile if an application or a setting other than the default port is set to allow configuration from web UI
+      #     ExecStart = lib.mkForce "${config.security.wrapperDir}/sunshine port:47989";
+      #     Restart = "on-failure";
+      #     RestartSec = "5s";
+      #   };
+      # };
     };
   };
 in
diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix
index 6f2a6b9..58277f3 100755
--- a/systems/x86_64-linux/jallen-nas/default.nix
+++ b/systems/x86_64-linux/jallen-nas/default.nix
@@ -17,7 +17,7 @@ in
     ./sops.nix
   ];
 
-  services.kmscon.enable = true;
+  services.kmscon = disabled;
 
   powerManagement.cpuFreqGovernor = "powersave";
 
@@ -32,7 +32,7 @@ in
     # #                   Desktop                     # #
     # ###################################################
 
-    desktop.cosmic = disabled;
+    desktop.cosmic = enabled;
 
     # ###################################################
     # #                 Development                   # #
@@ -47,6 +47,8 @@ in
       includeContainers = true;
     };
 
+    gaming.enable = true;
+
     # ###################################################
     # #                   Hardware                    # #
     # ###################################################