diff --git a/modules/desktop/addons/gammastep/default.nix b/modules/desktop/addons/gammastep/default.nix
new file mode 100644
index 0000000..297113c
--- /dev/null
+++ b/modules/desktop/addons/gammastep/default.nix
@@ -0,0 +1,25 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.aa.desktop.addons.gammastep;
+in {
+  options.aa.desktop.addons.gammastep = with types; {
+    enable = mkEnableOption "gammastep";
+  };
+
+  config = mkIf cfg.enable {
+    services.geoclue2.enable = true;
+
+    aa.home.extraOptions = {
+      services.gammastep = {
+        enable = true;
+        provider = "geoclue2";
+      };
+    };
+  };
+}
diff --git a/modules/desktop/sway/default.nix b/modules/desktop/sway/default.nix
index 852c3e8..8813c81 100644
--- a/modules/desktop/sway/default.nix
+++ b/modules/desktop/sway/default.nix
@@ -27,9 +27,11 @@ in {
     aa.desktop.addons = {
       alacritty.enable = true;
       fonts.enable = true;
+      gammastep.enable = true;
+      mako.enable = true;
       rofi.enable = true;
       waybar.enable = true;
-      mako.enable = true;
+
 
       # TODO
       # playerctl
diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix
index ee7e183..fc99e1b 100644
--- a/systems/x86_64-linux/gospel/default.nix
+++ b/systems/x86_64-linux/gospel/default.nix
@@ -87,8 +87,6 @@
     file
   ];
 
-  services.geoclue2.enable = true;
-
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;