diff --git a/homes/x86_64-linux/andreas@drivebystation-nix/default.nix b/homes/x86_64-linux/andreas@drivebystation-nix/default.nix
index 1c69975..0ab0ad2 100644
--- a/homes/x86_64-linux/andreas@drivebystation-nix/default.nix
+++ b/homes/x86_64-linux/andreas@drivebystation-nix/default.nix
@@ -12,20 +12,16 @@ in
   ];
   my-namespace.home = {
     stream-tools = enabled;
+    gnome-customizations = enabled;
     # networking = enabled;
     # personal-apps = enabled;
     # suites.laptop = enabled;
   };
   home = {
-    packages = [ 
+    packages = [
       pkgs.nil
       pkgs.steam
       pkgs.beeper
     ];
   };
-
-  # GNOME settings
-  dconf.settings."org/gnome/desktop/wm/preferences".button-layout = "appmenu:,minimize,maximize,close";
-  dconf.settings."org/gnome/mutter".experimental-features = ["scale-monitor-framebuffer"];
-
-}
+}
\ No newline at end of file
diff --git a/modules/home/gnome-customizations/default.nix b/modules/home/gnome-customizations/default.nix
new file mode 100644
index 0000000..0e42be7
--- /dev/null
+++ b/modules/home/gnome-customizations/default.nix
@@ -0,0 +1,19 @@
+{ pkgs
+, config
+, lib
+, ...
+}:
+let
+  inherit (lib) mkEnableOption mkIf;
+  cfg = config.my-namespace.home.gnome-customizations;
+in
+{
+  options.my-namespace.home.gnome-customizations = {
+    enable = mkEnableOption "Enable GNOME customizations";
+  };
+  config = mkIf cfg.enable {
+    # GNOME settings
+    dconf.settings."org/gnome/desktop/wm/preferences".button-layout = "appmenu:,minimize,maximize,close";
+    dconf.settings."org/gnome/mutter".experimental-features = [ "scale-monitor-framebuffer" ];
+  };
+}