diff --git a/hosts/raspberry-pi5/profiles/kodi.nix b/hosts/raspberry-pi5/profiles/kodi.nix
index 8ccbc73..4773d77 100644
--- a/hosts/raspberry-pi5/profiles/kodi.nix
+++ b/hosts/raspberry-pi5/profiles/kodi.nix
@@ -11,37 +11,17 @@
       visualization-starburst
       visualization-spectrum
     ]);
-
-  kodi-gamescope = pkgs.writeShellScriptBin "kodi-gamescope" ''
-    gamescope --expose-wayland --hdr-enabled -- ${kodiPackage}/bin/kodi $@
-  '';
-
-  kodiSessionFile =
-    (pkgs.writeTextDir "share/wayland-sessions/kodi.desktop" ''
-      [Desktop Entry]
-      Name=Kodi
-      Comment=Kodi
-      Exec=${kodi-gamescope}/bin/kodi-gamescope
-      Type=Application
-    '')
-    .overrideAttrs (_: {passthru.providedSessions = ["kodi"];});
 in {
   environment.systemPackages = [
     kodiPackage
-    kodi-gamescope
   ];
 
-  services.displayManager.sessionPackages = [kodiSessionFile];
-
-  security.wrappers.gamescope = {
-    owner = "root";
-    group = "root";
-    source = "${pkgs.gamescope}/bin/gamescope";
-    capabilities = "cap_sys_nice+pie";
-  };
-
   services.xserver = {
     enable = true;
+    desktopManager.kodi = {
+      enable = true;
+      package = kodiPackage;
+    };
     extraConfig = ''
       Section "OutputClass"
         Identifier "vc4"
diff --git a/hosts/raspberry-pi5/raspberry-pi5.nix b/hosts/raspberry-pi5/raspberry-pi5.nix
index 377553f..a8c2394 100644
--- a/hosts/raspberry-pi5/raspberry-pi5.nix
+++ b/hosts/raspberry-pi5/raspberry-pi5.nix
@@ -54,11 +54,13 @@ in {
   services.displayManager = {
     defaultSession = "kodi";
     autoLogin = {
-      enable = true;
+      enable = false;
       user = "chaos";
     };
   };
 
+  home-manager.users.chaos
+
   services.xserver.displayManager.gdm.autoLogin.delay = 5;
 
   networking.firewall = {