diff --git a/modules/nixos/desktop-environment/default.nix b/modules/nixos/desktop-environment/default.nix
index d9a48a2..3a2a6e1 100644
--- a/modules/nixos/desktop-environment/default.nix
+++ b/modules/nixos/desktop-environment/default.nix
@@ -5,6 +5,9 @@ let
 in {
 
   options.${namespace}.desktop-environment = {
+    cinnamon = {
+      enable = lib.mkEnableOption "Cinnamon desktop environment";
+    };
     xfce = {
       enable = lib.mkEnableOption "XFCE desktop environment";
     };
@@ -23,6 +26,16 @@ in {
   };
 
   config = lib.mkMerge [
+    (lib.mkIf cfg.xfce.enable {
+      services.xserver = {
+        enable = true;
+        desktopManager = {
+          cinnamon.enable = true;
+        };
+      };
+      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = 
+        lib.mkForce "${pkgs.gnome.nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+    })
     (lib.mkIf cfg.xfce.enable {
       services.xserver = {
         enable = true;
@@ -52,7 +65,7 @@ in {
       systemd.services.gnome-remote-desktop = { 
         wantedBy = [ "graphical.target" ]; # for starting the unit automatically at boot
       };
-      services.displayManager.autoLogin.enable = false;
+      # services.displayManager.autoLogin.enable = false;
       networking.firewall.allowedTCPPorts = [ 
         3389 
         3390