diff --git a/modules/desktop.nix b/modules/desktop.nix
index b004687..16b9784 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -1,8 +1,13 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
-  services.desktopManager.cosmic.enable = true;
-  services.displayManager.cosmic-greeter.enable = true;
+  services.xserver.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
 
   services.printing.enable = true;
+
+  environment.gnome.excludePackages = with pkgs; [
+    epiphany
+  ];
 }
diff --git a/modules/home/cosmic.nix b/modules/home/cosmic.nix
index 1d57e20..deeee41 100644
--- a/modules/home/cosmic.nix
+++ b/modules/home/cosmic.nix
@@ -1,92 +1,49 @@
-{ config, cosmicLib, ... }:
+{ config, ... }:
 
 {
-  wayland.desktopManager.cosmic = {
-    enable = true;
+  dconf.settings = {
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-dark";
+      accent-color = "pink";
+      icon-theme = "Cosmic";
 
-    appearance = {
-      theme = {
-        mode = "dark";
-        dark = {
-          # Pink accent color
-          accent = cosmicLib.cosmic.mkRON "optional" {
-            red = 0.91;
-            green = 0.29;
-            blue = 0.60;
-          };
-        };
-      };
-      toolkit = {
-        apply_theme_global = true;
-        show_maximize = true;
-        show_minimize = true;
-        icon_theme = "Cosmic";
-        interface_density = cosmicLib.cosmic.mkRON "enum" "Standard";
-      };
+      clock-show-weekday = true;
+      clock-show-date = true;
+      clock-format = "12h";
     };
 
-    wallpapers = [
-      {
-        output = "all";
-        source = cosmicLib.cosmic.mkRON "enum" {
-          value = [ "${config.home.homeDirectory}/Assets/wallpapers/sound.png" ];
-          variant = "Path";
-        };
-        scaling_mode = cosmicLib.cosmic.mkRON "enum" "Zoom";
-        filter_method = cosmicLib.cosmic.mkRON "enum" "Lanczos";
-        filter_by_theme = false;
-        sampling_method = cosmicLib.cosmic.mkRON "enum" "Alphanumeric";
-        rotation_frequency = 0;
-      }
-    ];
-
-    compositor = {
-      autotile = false;
-      active_hint = true;
-
-      # Flat mouse acceleration (no accel)
-      input_default = {
-        acceleration = cosmicLib.cosmic.mkRON "optional" {
-          profile = cosmicLib.cosmic.mkRON "optional" (cosmicLib.cosmic.mkRON "enum" "Flat");
-          speed = 0.0;
-        };
-      };
+    "org/gnome/desktop/wm/preferences" = {
+      button-layout = "appmenu:minimize,maximize,close";
     };
 
-    shortcuts = [
-      {
-        # Super+B -> Open browser
-        action = cosmicLib.cosmic.mkRON "enum" {
-          variant = "Spawn";
-          value = [ "librewolf" ];
-        };
-        key = "Super+b";
-        description = cosmicLib.cosmic.mkRON "optional" "Open Browser";
-      }
-      {
-        # Super+E -> Open file manager
-        action = cosmicLib.cosmic.mkRON "enum" {
-          variant = "Spawn";
-          value = [ "cosmic-files" ];
-        };
-        key = "Super+e";
-        description = cosmicLib.cosmic.mkRON "optional" "Open File Manager";
-      }
-      {
-        action = cosmicLib.cosmic.mkRON "enum" {
-          value = [
-            (cosmicLib.cosmic.mkRON "enum" "WorkspaceOverview")
-          ];
-          variant = "System";
-        };
-        key = "Super";
-      }
-    ];
+    "org/gnome/desktop/background" = {
+      picture-uri = "file://${config.home.homeDirectory}/Assets/wallpapers/sound.png";
+      picture-uri-dark = "file://${config.home.homeDirectory}/Assets/wallpapers/sound.png";
+      picture-options = "zoom";
+    };
 
-    applets.time.settings = {
-      show_weekday = true;
-      show_date_in_top_panel = true;
-      military_time = false;
+    "org/gnome/desktop/peripherals/mouse" = {
+      accel-profile = "flat";
+    };
+
+    "org/gnome/settings-daemon/plugins/media-keys" = {
+      custom-keybindings = [
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
+      ];
+    };
+
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+      name = "Open Browser";
+      binding = "<Super>b";
+      command = "librewolf";
+    };
+
+    # Super+E -> Open File Manager
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
+      name = "Open File Manager";
+      binding = "<Super>e";
+      command = "nautilus";
     };
   };
 }