diff --git a/hosts/inspiron/default.nix b/hosts/inspiron/default.nix
index d25a1c7..fd8ede2 100644
--- a/hosts/inspiron/default.nix
+++ b/hosts/inspiron/default.nix
@@ -31,6 +31,7 @@
       enable = true;
       auto-gc.enable = true;
     };
+    night-light.enable = true;
   };
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
diff --git a/hosts/north/default.nix b/hosts/north/default.nix
index 7bba78e..3d959b5 100644
--- a/hosts/north/default.nix
+++ b/hosts/north/default.nix
@@ -27,6 +27,7 @@
       enable = true;
       auto-gc.enable = true;
     };
+    night-light.enable = true;
   };
 
   boot.kernelPackages = pkgs.linuxPackages_6_8;
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 043330e..c77b0b9 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -14,5 +14,6 @@
     ./printing.nix
     ./syncthing.nix
     ./nix-helper.nix
+    ./night-light.nix
   ];
 }
diff --git a/modules/system/night-light.nix b/modules/system/night-light.nix
new file mode 100644
index 0000000..5cda459
--- /dev/null
+++ b/modules/system/night-light.nix
@@ -0,0 +1,24 @@
+{ 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";
+        };
+      }
+    ];
+  };
+}