diff --git a/configs/games.nix b/configs/games.nix
index ad6df3c..7a7d25d 100755
--- a/configs/games.nix
+++ b/configs/games.nix
@@ -1,10 +1,19 @@
 { config, pkgs, lib, outputs, ... }:
 {
+
+  services.flatpak.enable = true;
   programs = {
     gamescope = {
       enable = true;
-      capSysNice = true;
+      capSysNice = false;
+      package = pkgs.unstable.gamescope;
     };
+
+    gamemode = {
+      enable = true;
+      enableRenice = true;
+    };
+
     steam = {
       enable = true;
       package = pkgs.unstable.steam.override {
@@ -19,13 +28,14 @@
   };
 
   environment.systemPackages = with pkgs.unstable; [
-    (lutris.override {
-      extraPkgs = pkgs: [
-        pkgs.gamescope
-        pkgs.mangohud
-      ];
-    })
+    # (lutris.override {
+    #   extraPkgs = pkgs: [
+    #     pkgs.gamescope
+    #     pkgs.mangohud
+    #   ];
+    # })
 
+    lutris
     heroic
 
     protontricks
@@ -38,7 +48,6 @@
     winetricks
     # proton-ge-bin
     pcsx2
-    gamescope
     mangohud
   ];
 }
diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix
index 3ff601b..deea1a2 100755
--- a/machine/desktop/configuration.nix
+++ b/machine/desktop/configuration.nix
@@ -29,7 +29,7 @@ in
     ../../configs/games.nix
     ../../configs/develop.nix
     ../../configs/libvirt.nix
-    ../../configs/plasma.nix
+    ../../configs/plasma-wayland.nix
     ../../configs/user-gui.nix
     ../../configs/user.nix
   ];
@@ -59,9 +59,14 @@ in
   nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-znver2" ];
 
   boot = {
-    initrd.systemd.enable = true;
     loader = {
-      systemd-boot.enable = true;
+      grub = {
+        enable = true;
+        efiSupport = true;
+        device = "nodev";
+        configurationLimit = 5;
+        useOSProber = true;
+      };
       efi = { canTouchEfiVariables = true; };
     };
 
@@ -145,11 +150,6 @@ in
     printing.enable = true;
     fwupd.enable = true;
 
-    displayManager.autoLogin = {
-      enable = true;
-      user = "alex";
-    };
-
     pipewire = {
       enable = true;
       alsa.enable = true;
diff --git a/machine/homeserver.nix b/machine/homeserver.nix
index 60afd98..ac6cafe 100755
--- a/machine/homeserver.nix
+++ b/machine/homeserver.nix
@@ -124,8 +124,6 @@ in {
   };
 
   services = {
-    netdata.enable = false;
-
     jellyfin = {
       enable = true;
       user = "alex";