diff --git a/hosts/inspiron/default.nix b/hosts/inspiron/default.nix
index d0a768b..95299b8 100644
--- a/hosts/inspiron/default.nix
+++ b/hosts/inspiron/default.nix
@@ -28,7 +28,7 @@
     syncthing.enable = true;
     nix-helper.enable = true;
     auto-gc.enable = true;
-    night-light.enable = true;
+    geoclue.enable = true;
     tailscale.enable = true;
   };
 
diff --git a/hosts/inspiron/secrets.yaml b/hosts/inspiron/secrets.yaml
index cce53e9..e309621 100644
--- a/hosts/inspiron/secrets.yaml
+++ b/hosts/inspiron/secrets.yaml
@@ -1,5 +1,6 @@
 seb-password: ENC[AES256_GCM,data:LlW1njlY0tVfYne/NFM2KJbAPb4eAQgy0mPMIZAIPH5mdr7cSCaPYhc+WF5ZlrlL//mh8WHhsHbEBuA6P7oabSeP6ZczCmTV6w==,iv:oWQj47oxjxR3DBHhFwUD/Emj5ziZHwcbXzD69ChRmHU=,tag:cuTloyd4HW6behF8fmWdxw==,type:str]
 tailscale-auth-key: ENC[AES256_GCM,data:P63hQK6x6OjKQFZmoDXK2+ffUNd6wCzxot+d9GOsplbLMI1Dlvknt+Qq1GHaaziFgvGoQbLLha6RmORD1w==,iv:L9tKkJHuGuN6hzBcPum4giYInpn6+DuAq1zthTRSB/U=,tag:FDCnHCYY/vBYgf1xNiYyMg==,type:str]
+geoclue-location-service: ENC[AES256_GCM,data:eNtzXHhgdhYbGkcIoPk8gkoj2puxebdWC7QData8Ze1/M9+HITDVEDWcxUjXj2oUuXvfJT3dHjEky4b0vAib8odDBBl/+2o4rqjrflGpCUyPU2Qjb8c72w9eYPlekuqeZ7RhOrc2J3LPsQI=,iv:AapFoiKZ/NGBheBhqp5Ei3zzg9yT3rtZVObB5fbIulU=,tag:+k67dDHjQMLsk9KWwboUaA==,type:str]
 iwd:
     WLAN-233151: ENC[AES256_GCM,data:qnP47hqkVVAWycWaradtJQ/AUu6Jqhh281az4lHp9Vo6bmRLWNga2vG0Sg==,iv:+pC6EVtgzxR//bMJCDyzmsBrT25pcGZ5sAEkUkohU5Y=,tag:tAokgFEzr2S5B4UreB5lPA==,type:str]
     Fairphone4: ENC[AES256_GCM,data:BUSZHUxLNPCVc+h8VvcGo11ZHt04s7HVDOh0oaSOl/oB4dQ=,iv:YGbX6sF2FtjPwuGQGcQutWz7TD4Lg8DG0zi7ddXCkas=,tag:cNKu8xvrLOGy4Vq7WIBFTg==,type:str]
@@ -27,8 +28,8 @@ sops:
             WlU1TjFDSHFzVU9TVWlNZVBJNkZabTQKkkgMlCEN84e1Syf9wB06CwToxZoE3CZi
             h369oefzYx06hEde06tU9UP7FtXRP0ktgZps4d+Fx4IkNJxoP6Ucuw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-19T20:13:42Z"
-    mac: ENC[AES256_GCM,data:VFOq0mHozaFdWgXYZgxzqFBpX798iXT+wLZh4ymMy0PCBcxG2iEbGkluHW+Z9GAZKeH6m34+XcpFqQ7TVHagLJ2yzf8LfUCjDdm6YFRcEfEmJ/TtGAoWxzzn+TW0oTgRn/nT1PboSf3QPCCaFrnNlcFidNQsaIGwlqGulDR6JUc=,iv:Bm9fIqesVgZ4/4TlghLE0N/IkctOhbKvbAKvXc9fQyQ=,tag:/ZNJOr0PTcMpbH7Hi5AwgA==,type:str]
+    lastmodified: "2024-06-25T17:41:16Z"
+    mac: ENC[AES256_GCM,data:aPpJ8bvF0Xr0MCKgTpQ6IDZ3LEWCnQPBZl/qSWmZ4lG9YTCZwW/0mFgnYPdYGDsGMYswPPJemphj7Krggi4BvdhfmsA9HEp4oDx4OtKbCgU66VraZ5HDHYh8BTJABAmR0vtEYeo9BhddBBEreSlA6Wul9tsFTlpUXbe03ZNWY6M=,iv:38dMQH7jKT9JnMbnOJagGgXTiqknFTWQVtWuGVH7HBQ=,tag:hd6Z7oX8EmXwOiGSB1GB2A==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/hosts/north/default.nix b/hosts/north/default.nix
index 40c1ca8..7aa2fec 100644
--- a/hosts/north/default.nix
+++ b/hosts/north/default.nix
@@ -24,7 +24,7 @@
     syncthing.enable = true;
     nix-helper.enable = true;
     auto-gc.enable = true;
-    night-light.enable = true;
+    geoclue.enable = true;
     tailscale = {
       enable = true;
       ssh.enable = true;
diff --git a/hosts/north/secrets.yaml b/hosts/north/secrets.yaml
index ffc3c24..e790ad5 100644
--- a/hosts/north/secrets.yaml
+++ b/hosts/north/secrets.yaml
@@ -1,5 +1,6 @@
 seb-password: ENC[AES256_GCM,data:vZml/awD9ieBCQQwYs9zZveqjDDzMxFH1PFKQ8qLlaiUgaWL2BmKf4RbuS/pkjNLHr/UkPM3d3rlW6WAlNvhZiMRE+naGwD1Mw==,iv:vORmRgBgZvdafRa8vFF4LL3fw44yZV3yNq3L8eOcQRI=,tag:B7jX2LV/vKpzFlvG0bnCVA==,type:str]
 tailscale-auth-key: ENC[AES256_GCM,data:fFiUzrcS6KWhu+BjFgOfW9YmC/T7V4cebJT209lxScV6UKsUD6Pih5Kq7wOoajSH6fR+JorZwSowi6nXBg==,iv:0PEC9oOWrlZoALGu/KVD1dV1X3YVe9cIkiXWqoynxX8=,tag:ISyeO06FdgqoqNpi5jlg5w==,type:str]
+geoclue-location-service: ENC[AES256_GCM,data:3/PmcfCtqLB1tIHnY8bcISoFKckc1zeSK1+g4oavMMsW0OF4Bh9HlSz3KEiu0F3QdQQeT5vlWwAXHwwmSiVKiU+T+JiDYLbJphFErLzDy8G0z9LknoALFyFv/aCUgZ4QfnCztbBv/erG6Og=,iv:pevsZNa+1F2Kf345yJYsW1SUy/5q/63mKbhu/qF+lZ8=,tag:LDBzC/ZK6UVT5RvjYtQi/g==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -24,8 +25,8 @@ sops:
             S04zMkpXT21GYTBSRFI2c1gyalZCK1UKtD6FA5BLLqnMAtVqYIujkM5qqMD524ck
             GipN/XwBhXSL98xrgaNmnN+Q46SNX0s41maGO624xvZMKZhObjxHIw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-19T20:13:00Z"
-    mac: ENC[AES256_GCM,data:J/g9kTpY0kpX0deHz8xNFxVHr+gBogkdHVQ0ri2AGZsDegn1y7MT89nQqKiRLysaJoQWSlEELhtBr4lph2pBcczWQZPUJ8tIDKeQaz6QsxKC88WkalgpG53YNRhar1B3BPoOmc22Kxj2p6xZQbbbth7HtK3//jgse3gDenLBqmQ=,iv:0BBZ0G47KzOirZ4ONtAEXlCfDkRHWZGDWoZv8eyZkBw=,tag:+YCOurwv6/efjRzeH+ZHSw==,type:str]
+    lastmodified: "2024-06-25T15:59:15Z"
+    mac: ENC[AES256_GCM,data:WmMkOUz6fC20y+bxjGcP1SJXMpIuE8h21SNYybKuZLl9azAClvqvD0xPaHTLfZI9mvJhHInTA616dDV0W9EAjgHjmna+jj2/6xZ9WY/skjNbXe4SSYJW7xxWvwsft92KKvNobqC25qm1BPvCWyDYcVS3h3Uh5BSf4UnYCOnM72A=,iv:FejTJW6AY4hx5SGSMKlzWoeNvZonOM5ESHzH7eLp1U4=,tag:yAiyRErSKJQYW4y+XsQUaA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 3ce4dd1..feb2c40 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -8,5 +8,6 @@
     ./git.nix
     ./equalizer
     ./sops.nix
+    ./night-light.nix
   ];
 }
diff --git a/modules/home/night-light.nix b/modules/home/night-light.nix
new file mode 100644
index 0000000..fdfb89b
--- /dev/null
+++ b/modules/home/night-light.nix
@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+{
+  options.myConfig.night-light.enable = lib.mkEnableOption "";
+
+  config = lib.mkIf config.myConfig.night-light.enable {
+    services.gammastep = {
+      enable = true;
+      provider = "geoclue2";
+      settings.general.adjustment-method = "wayland";
+    };
+  };
+}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index c24b27a..c49b09e 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -14,7 +14,7 @@
     ./syncthing.nix
     ./nix-helper.nix
     ./auto-gc.nix
-    ./night-light.nix
+    ./geoclue.nix
     ./tailscale.nix
   ];
 }
diff --git a/modules/system/geoclue.nix b/modules/system/geoclue.nix
new file mode 100644
index 0000000..250ff69
--- /dev/null
+++ b/modules/system/geoclue.nix
@@ -0,0 +1,20 @@
+{ config, lib, ... }:
+{
+  options.myConfig.geoclue.enable = lib.mkEnableOption "";
+
+  config = lib.mkIf config.myConfig.geoclue.enable {
+    sops.secrets.geoclue-location-service = {
+      owner = "geoclue";
+      path = "/etc/geoclue/conf.d/location-service.conf";
+    };
+
+    services.geoclue2 = {
+      enable = true;
+
+      appConfig.gammastep = {
+        isAllowed = true;
+        isSystem = false;
+      };
+    };
+  };
+}
diff --git a/modules/system/night-light.nix b/modules/system/night-light.nix
deleted file mode 100644
index 5cda459..0000000
--- a/modules/system/night-light.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, lib, ... }:
-{
-  options.myConfig.night-light.enable = lib.mkEnableOption "";
-
-  config = lib.mkIf config.myConfig.night-light.enable {
-    services.geoclue2 = {
-      enable = true;
-      appConfig.gammastep = {
-        isAllowed = true;
-        isSystem = false;
-      };
-    };
-
-    home-manager.sharedModules = [
-      {
-        services.gammastep = {
-          enable = true;
-          provider = "geoclue2";
-          settings.general.adjustment-method = "wayland";
-        };
-      }
-    ];
-  };
-}
diff --git a/users/seb/home.nix b/users/seb/home.nix
index 0e2a8ed..6430ad7 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -13,6 +13,7 @@
     vscode.enable = true;
     equalizer.enable = true;
     sops.enable = false;
+    night-light.enable = true;
   };
 
   home.packages = [