diff --git a/home/common/programs/ghostty/config b/home/common/programs/ghostty/config
index 9b3c21b..b08146d 100644
--- a/home/common/programs/ghostty/config
+++ b/home/common/programs/ghostty/config
@@ -1,6 +1,6 @@
 # style
 theme = catppuccin-mocha
-window-decoration = false
+# window-decoration = false
 window-padding-x = 0
 window-padding-y = 0
 window-padding-color = extend
diff --git a/hosts/common/features/greetd.nix b/hosts/common/features/greetd.nix
index 92debe4..78c53fc 100644
--- a/hosts/common/features/greetd.nix
+++ b/hosts/common/features/greetd.nix
@@ -48,7 +48,7 @@ in
         *) export XDG_SESSION_TYPE=x11; export DISPLAY=:0 ;;
       esac
 
-      exec "$1"
+      exec ${pkgs.dbus}/bin/dbus-run-session "$1"
     '';
     mode = "0755";
   };
diff --git a/hosts/common/features/x11.nix b/hosts/common/features/x11.nix
index 09c6aba..1174fbd 100644
--- a/hosts/common/features/x11.nix
+++ b/hosts/common/features/x11.nix
@@ -1,21 +1,70 @@
 { inputs, pkgs, ... }:
+let hyprland-session = pkgs.makeDesktopItem {
+  name = "Hyprland";
+  comment = "Hyprland (custom desktop file)";
+  desktopNames = "Hyprland";
+  exec = "Hyprland";
+  type = "Application";
+};
 {
 
   services.xserver.enable = true;
-  services.desktopManager.gnome.enable = true;
+  services.xserver.displayManager.startx.enable = true;
+  # services.xserver.displayManager.sessionPackages = [ hyprland-session ];
+
+  # services.xserver.windowManager.gnome.enable = true;
+  # services.xserver.windowManager.gnome.wayland = false;
+  # hardware.opengl.enable = true;
+  #
+  # environment.systemPackages = with pkgs; [
+  #   xorg.xhost
+  #   xorg.xrandr
+  #   xorg.xinit
+  #   gnome-session
+  #   gnome-shell
+  # ];
+  #
+  # xdg = {
+  #   portal = {
+  #     enable = true;
+  #   };
+  # };
+
   services.displayManager.gdm.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    xorg.xhost
-    xorg.xrandr
-    xorg.xinit
-    gnome-session
-    gnome-shell
-  ];
-
-  xdg = {
-    portal = {
-      enable = true;
+  services.desktopManager.gnome.enable = true;
+  programs.dconf.enable = true;
+  services = {
+    sysprof.enable = true;
+    gnome = {
+      evolution-data-server.enable = true;
+      glib-networking.enable = true;
+      gnome-keyring.enable = true;
+      gnome-online-accounts.enable = true;
     };
   };
+  environment.gnome.excludePackages =
+    (with pkgs; [
+      gnome-photos
+      gnome-tour
+      gnome-console
+      gnome-text-editor
+      gedit
+    ])
+    ++ (with pkgs; [
+      cheese # webcam tool
+      gnome-music
+      gnome-terminal
+      epiphany # web browser
+      geary # email reader
+      evince # document viewer
+      totem # video player
+      tali # poker game
+      iagno # go game
+      hitori # sudoku game
+      atomix # puzzle game
+      gnome-contacts
+      gnome-initial-setup
+      gnome-shell-extensions
+    ]);
+
 }
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 43fb630..b1ae765 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -12,7 +12,7 @@
     ../common/features/nvidia.nix
     ../common/features/wayland.nix
     ../common/features/x11.nix
-    ../common/features/greetd.nix
+    # ../common/features/greetd.nix
     ../common/features/pipewire.nix
     ../common/features/docker.nix
     ../common/features/fonts.nix