diff --git a/flake.nix b/flake.nix
index 3b6637d..9da8c01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -356,7 +356,7 @@
               ./modules/nixos/users/tiziano.nix
 
               ./modules/nixos/server
-              ./modules/nixos/plasma6.nix
+              # ./modules/nixos/plasma6.nix
               ./modules/nixos/steam.nix
             ] ++ homeManagerUModules ++ [{
               home-manager.users.bertof = import ./instances/odin/hm.nix;
diff --git a/instances/odin/configuration.nix b/instances/odin/configuration.nix
index b5b086d..f112109 100644
--- a/instances/odin/configuration.nix
+++ b/instances/odin/configuration.nix
@@ -134,14 +134,19 @@ in
   users.users.zigbee2mqtt.extraGroups = [ "dialout" ];
 
   services = {
+    xserver = {
+      enable = true;
+      desktopManager.mate.enable = true;
+      videoDrivers = [ "nvidia" ];
+    };
     desktopManager = {
-      cosmic.enable = true;
+      # cosmic.enable = true;
       # plasma6 = { enable = true; enableQt5Integration = true; };
     };
     displayManager = {
       autoLogin = { enable = true; user = "tiziano"; };
-      cosmic-greeter.enable = true;
-      # sddm.enable = true;
+      # cosmic-greeter.enable = true;
+      sddm.enable = true;
     };
 
     avahi = {
@@ -160,7 +165,6 @@ in
       };
     };
     blueman.enable = true;
-    xserver.enable = true;
     mosquitto = {
       enable = true;
       listeners = [{
@@ -456,7 +460,6 @@ in
     };
     smartd.enable = true;
     thermald.enable = true;
-    xserver.videoDrivers = [ "nvidia" ];
   };
 
   time.timeZone = "Europe/Rome";