diff --git a/modules/nixos/desktop/gnome.nix b/modules/nixos/desktop/gnome.nix
index be87d21..67966d7 100644
--- a/modules/nixos/desktop/gnome.nix
+++ b/modules/nixos/desktop/gnome.nix
@@ -11,62 +11,69 @@ in {
     desktop.gnome.enable =
       mkEnableOption "enable gnome desktop";
   };
-  config = mkIf cfg.enable {
-    module.desktop.displayManager = "gdm";
-    sound.pipewire.enable = true;
-
-    services.desktopManager.gnome.enable = true;
-
-    environment.gnome.excludePackages = with pkgs; [
-      orca
-      evince
-      # file-roller
-      geary
-      # gnome-disk-utility
-      # seahorse
-      # sushi
-      # sysprof
-      #
-      # gnome-shell-extensions
-      #
-      # adwaita-icon-theme
-      # nixos-background-info
-      # gnome-backgrounds
-      # gnome-bluetooth
-      # gnome-color-manager
-      # gnome-control-center
-      # gnome-shell-extensions
-      gnome-tour # GNOME Shell detects the .desktop file on first log-in.
-      gnome-user-docs
-      # glib # for gsettings program
-      # gnome-menus
-      # gtk3.out # for gtk-launch program
-      # xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
-      # xdg-user-dirs-gtk # Used to create the default bookmarks
-      #
-      # baobab
-      # epiphany
-      # gnome-text-editor
-      # gnome-calculator
-      # gnome-calendar
-      # gnome-characters
-      # gnome-clocks
-      gnome-console
-      gnome-contacts
-      # gnome-font-viewer
-      gnome-logs
-      # gnome-maps
-      gnome-music
-      gnome-system-monitor
-      # gnome-weather
-      # loupe
-      # nautilus
-      gnome-connections
-      # simple-scan
-      # snapshot
-      totem
-      yelp
-      # gnome-software
-    ];
-  };
+  config = lib.mkMerge [
+    (mkIf cfg.enable {
+      module.desktop.displayManager = "gdm";
+      sound.pipewire.enable = true;
+      services.desktopManager.gnome.enable = true;
+      environment.gnome.excludePackages = with pkgs; [
+        orca
+        evince
+        # file-roller
+        geary
+        # gnome-disk-utility
+        # seahorse
+        # sushi
+        # sysprof
+        #
+        # gnome-shell-extensions
+        #
+        # adwaita-icon-theme
+        # nixos-background-info
+        # gnome-backgrounds
+        # gnome-bluetooth
+        # gnome-color-manager
+        # gnome-control-center
+        # gnome-shell-extensions
+        gnome-tour # GNOME Shell detects the .desktop file on first log-in.
+        gnome-user-docs
+        # glib # for gsettings program
+        # gnome-menus
+        # gtk3.out # for gtk-launch program
+        # xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
+        # xdg-user-dirs-gtk # Used to create the default bookmarks
+        #
+        # baobab
+        # epiphany
+        # gnome-text-editor
+        # gnome-calculator
+        # gnome-calendar
+        # gnome-characters
+        # gnome-clocks
+        gnome-console
+        gnome-contacts
+        # gnome-font-viewer
+        gnome-logs
+        # gnome-maps
+        gnome-music
+        gnome-system-monitor
+        # gnome-weather
+        # loupe
+        # nautilus
+        gnome-connections
+        # simple-scan
+        # snapshot
+        totem
+        yelp
+        # gnome-software
+      ];
+    })
+    # workaround for crashing autologin session
+    (mkIf (cfg.enable && config.services.displayManager.autoLogin.enable) {
+      systemd.services = {
+        "getty@tty1".enable = false;
+        "autovt@tty1".enable = false;
+      };
+    })
+  ];
 }