diff --git a/configurations/home-manager/eve/gnomeconf.nix b/configurations/home-manager/eve/gnomeconf.nix
index 7cd3863..fbad391 100644
--- a/configurations/home-manager/eve/gnomeconf.nix
+++ b/configurations/home-manager/eve/gnomeconf.nix
@@ -1,39 +1,12 @@
-{
-  osConfig,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
   config = {
-    gnome = lib.mkMerge [
-      {
-        colorScheme = "prefer-dark";
-        accentColor = "slate";
-        clockFormat = "24h";
-        nightLight = {
-          enable = true;
-          automatic = false;
-          fromTime = 12.0;
-          toTime = 11.999999999999;
-          temperature = 2700;
-        };
-        extraWindowControls = true;
-        extensions = {
-          dash-to-panel = {
-            enable = true;
-          };
-        };
-      }
-
-      (lib.mkIf (osConfig.networking.hostName == "horizon") {
-        displayScaling = 125;
-        experimentalFeatures = {
-          scaleMonitorFramebuffer = true;
-        };
-      })
-    ];
-
     dconf = {
       enable = true;
+      settings = {
+        "org/gnome/shell".enabled-extensions = [
+          pkgs.gnomeExtensions.dash-to-panel.extensionUuid
+        ];
+      };
     };
   };
 }
diff --git a/configurations/home-manager/leyla/dconf.nix b/configurations/home-manager/leyla/dconf.nix
index 9aa61f7..ef75db6 100644
--- a/configurations/home-manager/leyla/dconf.nix
+++ b/configurations/home-manager/leyla/dconf.nix
@@ -1,43 +1,31 @@
-{...}: {
+{pkgs, ...}: {
   config = {
     gnome = {
       extraWindowControls = true;
       colorScheme = "prefer-dark";
       clockFormat = "24h";
-      nightLight = {
-        enable = true;
-        automatic = false;
-        fromTime = 12.0;
-        toTime = 11.999999999999;
-        temperature = 2700;
-      };
-      extensions = {
-        dash-to-dock = {
-          enable = true;
-          options = {
-            "dock-position" = "LEFT";
-            "intellihide-mode" = "ALL_WINDOWS";
-            "show-trash" = false;
-            "require-pressure-to-show" = false;
-            "show-mounts" = false;
-          };
-        };
-      };
+      extensions = [
+        pkgs.gnomeExtensions.dash-to-dock
+      ];
       hotkeys = {
         "Open Terminal" = {
           binding = "<Super>t";
           command = "kgx";
         };
-        "Open Firefox" = {
-          binding = "<Super>f";
-          command = "firefox";
-        };
       };
     };
 
     dconf = {
       enable = true;
       settings = {
+        "org/gnome/shell/extensions/dash-to-dock" = {
+          "dock-position" = "LEFT";
+          "intellihide-mode" = "ALL_WINDOWS";
+          "show-trash" = false;
+          "require-pressure-to-show" = false;
+          "show-mounts" = false;
+        };
+
         "org/gnome/shell" = {
           favorite-apps = ["org.gnome.Nautilus.desktop" "firefox.desktop" "codium.desktop" "steam.desktop" "org.gnome.Console.desktop"];
           # app-picker-layout =
diff --git a/modules/home-manager-modules/gnome.nix b/modules/home-manager-modules/gnome.nix
index ab56189..8c70cf6 100644
--- a/modules/home-manager-modules/gnome.nix
+++ b/modules/home-manager-modules/gnome.nix
@@ -1,16 +1,8 @@
 {
   lib,
   config,
-  pkgs,
   ...
-}: let
-  enabledExtensions =
-    []
-    ++ lib.optional config.gnome.extensions.dash-to-dock.enable pkgs.gnomeExtensions.dash-to-dock
-    ++ lib.optional config.gnome.extensions.dash-to-panel.enable pkgs.gnomeExtensions.dash-to-panel;
-
-  extensions = config.gnome.extraExtensions ++ enabledExtensions;
-in {
+}: {
   options.gnome = {
     extraWindowControls = lib.mkEnableOption "Should we add back in the minimize and maximize window controls?";
     clockFormat = lib.mkOption {
@@ -42,7 +34,7 @@ in {
       ];
       default = "blue";
     };
-    extraExtensions = lib.mkOption {
+    extensions = lib.mkOption {
       type = lib.types.listOf lib.types.package;
       default = [];
       description = "The set of extensions to install and enable in the user environment.";
@@ -68,80 +60,16 @@ in {
       }));
       default = {};
     };
-    displayScaling = lib.mkOption {
-      type = lib.types.nullOr (lib.types.enum [100 125 150 175 200]);
-      default = null;
-      description = "Display scaling percentage for GNOME";
-    };
-    experimentalFeatures = lib.mkOption {
-      type = lib.types.submodule {
-        options = {
-          scaleMonitorFramebuffer = lib.mkEnableOption "scale-monitor-framebuffer experimental feature";
-        };
-      };
-      default = {};
-      description = "GNOME experimental features to enable";
-    };
-
-    nightLight = lib.mkOption {
-      type = lib.types.submodule {
-        options = {
-          enable = lib.mkEnableOption "night light (blue light filter)";
-          automatic = lib.mkOption {
-            type = lib.types.bool;
-            default = true;
-            description = "Whether to automatically schedule night light based on sunset/sunrise";
-          };
-          fromTime = lib.mkOption {
-            type = lib.types.float;
-            default = 20.0;
-            description = "Start time for night light in 24-hour format (e.g., 20.0 for 8:00 PM)";
-          };
-          toTime = lib.mkOption {
-            type = lib.types.float;
-            default = 6.0;
-            description = "End time for night light in 24-hour format (e.g., 6.0 for 6:00 AM)";
-          };
-          temperature = lib.mkOption {
-            type = lib.types.int;
-            default = 4000;
-            description = "Color temperature for night light (1000-10000K, lower is warmer)";
-          };
-        };
-      };
-      default = {};
-      description = "Night light configuration";
-    };
-
-    extensions = {
-      dash-to-dock = {
-        enable = lib.mkEnableOption "Dash to Dock extension";
-        options = lib.mkOption {
-          type = lib.types.nullOr lib.types.attrs;
-          default = null;
-          description = "Dash to Dock configuration options. If null, no custom configuration will be applied.";
-        };
-      };
-
-      dash-to-panel = {
-        enable = lib.mkEnableOption "Dash to Panel extension";
-        options = lib.mkOption {
-          type = lib.types.nullOr lib.types.attrs;
-          default = null;
-          description = "Dash to Panel configuration options. If null, no custom configuration will be applied.";
-        };
-      };
-    };
   };
 
   config = {
-    home.packages = extensions;
+    home.packages = config.gnome.extensions;
     dconf = {
       settings = lib.mkMerge [
         {
           "org/gnome/shell" = {
             disable-user-extensions = false; # enables user extensions
-            enabled-extensions = builtins.map (extension: extension.extensionUuid) extensions;
+            enabled-extensions = builtins.map (extension: extension.extensionUuid) config.gnome.extensions;
           };
 
           "org/gnome/desktop/wm/preferences".button-layout = lib.mkIf config.gnome.extraWindowControls ":minimize,maximize,close";
@@ -149,23 +77,7 @@ in {
           "org/gnome/desktop/interface".color-scheme = config.gnome.colorScheme;
           "org/gnome/desktop/interface".accent-color = config.gnome.accentColor;
           "org/gnome/desktop/interface".clock-format = config.gnome.clockFormat;
-          "org/gnome/desktop/interface".text-scaling-factor = lib.mkIf (config.gnome.displayScaling != null) (config.gnome.displayScaling / 100.0);
-
-          "org/gnome/mutter".experimental-features = lib.mkIf (builtins.any (x: x) (builtins.attrValues config.gnome.experimentalFeatures)) (
-            lib.optional config.gnome.experimentalFeatures.scaleMonitorFramebuffer "scale-monitor-framebuffer"
-          );
         }
-
-        # Night light configuration
-        (lib.mkIf config.gnome.nightLight.enable {
-          "org/gnome/settings-daemon/plugins/color" = {
-            night-light-enabled = true;
-            night-light-schedule-automatic = config.gnome.nightLight.automatic;
-            night-light-schedule-from = lib.mkIf (!config.gnome.nightLight.automatic) config.gnome.nightLight.fromTime;
-            night-light-schedule-to = lib.mkIf (!config.gnome.nightLight.automatic) config.gnome.nightLight.toTime;
-            night-light-temperature = config.gnome.nightLight.temperature;
-          };
-        })
         (
           lib.mkMerge (
             builtins.map (value: let
@@ -188,15 +100,6 @@ in {
             )
           )
         )
-
-        # Extension configurations
-        (lib.mkIf (config.gnome.extensions.dash-to-dock.enable && config.gnome.extensions.dash-to-dock.options != null) {
-          "org/gnome/shell/extensions/dash-to-dock" = config.gnome.extensions.dash-to-dock.options;
-        })
-
-        (lib.mkIf (config.gnome.extensions.dash-to-panel.enable && config.gnome.extensions.dash-to-panel.options != null) {
-          "org/gnome/shell/extensions/dash-to-panel" = config.gnome.extensions.dash-to-panel.options;
-        })
       ];
     };
   };