From 9d70e6d876dd1da5e633923b147f8d597bfc7c7c Mon Sep 17 00:00:00 2001 From: Tim Keller Date: Sun, 28 Dec 2025 17:48:42 -0600 Subject: replace redshift for gammastep --- archetypes/collections/desktop/utilities.nix | 2 +- archetypes/profiles/desktop/default.nix | 4 ++-- home-manager/default.nix | 2 +- home-manager/gammastep.nix | 18 ++++++++++++++++++ home-manager/redshift.nix | 18 ------------------ hosts/piframe/configuration.nix | 15 +++++++-------- 6 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 home-manager/gammastep.nix delete mode 100644 home-manager/redshift.nix diff --git a/archetypes/collections/desktop/utilities.nix b/archetypes/collections/desktop/utilities.nix index e2a61af..88e9d25 100644 --- a/archetypes/collections/desktop/utilities.nix +++ b/archetypes/collections/desktop/utilities.nix @@ -10,6 +10,7 @@ in { arandr dex # Execute .desktop files dmenu + gammastep libnotify lowbat mpv @@ -17,7 +18,6 @@ in { pavolctld pavucontrol pcmanfm - redshift scrot st wpa_supplicant_gui diff --git a/archetypes/profiles/desktop/default.nix b/archetypes/profiles/desktop/default.nix index 8f66693..66e1bf7 100644 --- a/archetypes/profiles/desktop/default.nix +++ b/archetypes/profiles/desktop/default.nix @@ -104,7 +104,7 @@ }; services = { - _redshift.enable = true; + _gammastep.enable = true; #polkit-gnome.enable = mkDesktop true; # Doesn't work on X }; @@ -112,7 +112,7 @@ autostart = { enable = mkDesktop true; entries = mkDesktop [ - "${pkgs.redshift}/share/applications/redshift-gtk.desktop" + "${pkgs.gammastep}/share/applications/gammastep-indicator.desktop" "${pkgs.unclutter-desktop-entry}/share/applications/unclutter.desktop" ]; }; diff --git a/home-manager/default.nix b/home-manager/default.nix index 2e1ed72..226552a 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -2,12 +2,12 @@ imports = [ ./firefox.nix ./fontconfig.nix + ./gammastep.nix ./home-cleanup.nix ./htop.nix ./mint-theme.nix ./pcmanfm.nix ./qt-gtk-theme.nix - ./redshift.nix ./theme-st.nix ./wallpapers.nix ./xdg-mime.nix diff --git a/home-manager/gammastep.nix b/home-manager/gammastep.nix new file mode 100644 index 0000000..f7ea3b3 --- /dev/null +++ b/home-manager/gammastep.nix @@ -0,0 +1,18 @@ +{ config, lib, ... }: let + cfg = config.services._gammastep; +in { + options.services._gammastep = { + enable = lib.mkEnableOption "configure gammastep"; + }; + + config = lib.mkIf cfg.enable { + services.gammastep = { + enable = true; + provider = lib.mkDefault "geoclue2"; + temperature = { + day = lib.mkDefault 6500; # gammastep default, the hm module defaults to 5500 + night = lib.mkDefault 3600; + }; + }; + }; +} diff --git a/home-manager/redshift.nix b/home-manager/redshift.nix deleted file mode 100644 index 4bae599..0000000 --- a/home-manager/redshift.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, ... }: let - cfg = config.services._redshift; -in { - options.services._redshift = { - enable = lib.mkEnableOption "configure redshift"; - }; - - config = lib.mkIf cfg.enable { - services.redshift = { - enable = true; - provider = lib.mkDefault "geoclue2"; - temperature = { - day = lib.mkDefault 6500; # Redshift default, the hm module defaults to 5500 - night = lib.mkDefault 3600; - }; - }; - }; -} diff --git a/hosts/piframe/configuration.nix b/hosts/piframe/configuration.nix index a78313b..b45a293 100644 --- a/hosts/piframe/configuration.nix +++ b/hosts/piframe/configuration.nix @@ -43,15 +43,14 @@ # Configure piframe home home-manager.users.piframe = { - services.gammastep = { - enable = true; - temperature = { - day = 6500; - night = 3600; - }; + services = { + _gammastep.enable = true; # Manual location to avoid having to mess with geoclue - latitude = 41.881832; - longitude = -87.623177; + gammastep = { + provider = "manual"; + latitude = 41.881832; + longitude = -87.623177; + }; }; programs.bash = { enable = true; -- cgit v1.2.3