diff --git a/system/default.nix b/system/default.nix index f67bfb2a..629f59ba 100644 --- a/system/default.nix +++ b/system/default.nix @@ -203,6 +203,11 @@ }; security.rtkit.enable = true; virtualisation.podman.enable = true; + location = { + latitude = 51.7; + longitude = -1.2; + provider = "manual"; + }; time.timeZone = "Europe/London"; i18n.defaultLocale = "en_GB.UTF-8"; console.useXkbConfig = true; diff --git a/system/home/desktop/default.nix b/system/home/desktop/default.nix index dd9ca080..4b15bc50 100644 --- a/system/home/desktop/default.nix +++ b/system/home/desktop/default.nix @@ -1,4 +1,9 @@ -{ config, pkgs, ... }: +{ + config, + pkgs, + osConfig, + ... +}: { imports = [ ./hyprland.nix @@ -29,11 +34,9 @@ services = { syncthing.enable = true; gammastep = { + inherit (osConfig.location) latitude longitude provider; enable = true; tray = true; - provider = "manual"; - latitude = 51.7; - longitude = -1.2; }; }; gtk = { diff --git a/system/home/desktop/plasma.nix b/system/home/desktop/plasma.nix index 13fe430f..8629bb09 100644 --- a/system/home/desktop/plasma.nix +++ b/system/home/desktop/plasma.nix @@ -2,6 +2,7 @@ config, pkgs, inputs, + osConfig, ... }: { @@ -338,8 +339,8 @@ NightColor = { Active = true; Mode = "Location"; - LatitudeFixed = "51.7"; - LongitudeFixed = "-1.2"; + LatitudeFixed = "${osConfig.location.latitude}"; + LongitudeFixed = "${osConfig.location.longitude}"; }; "Effect-translucency" = { Inactive = 100; diff --git a/system/home/desktop/waybar.nix b/system/home/desktop/waybar.nix index 3ddbdeea..4a238482 100644 --- a/system/home/desktop/waybar.nix +++ b/system/home/desktop/waybar.nix @@ -262,10 +262,10 @@ "custom/weather" = let date-format = "%Y-%m-%d"; - custom-indicator = "{ICON}{temp_C}({FeelsLikeC})"; + custom-indicator = "{ICON}{temp_C}°C({FeelsLikeC}°C)"; in { - format = "{}°"; + format = "{}"; tooltip = true; interval = 900; # Every 15 minutes exec = ''${pkgs.wttrbar}/bin/wttrbar --location Didcot --date-format "${date-format}" --custom-indicator "${custom-indicator}"''; @@ -280,7 +280,6 @@ style = let scheme = config.lib.stylix.scheme.withHashtag; - alpha = "0.8"; in '' * { @@ -305,7 +304,7 @@ } tooltip { - background: alpha(${scheme.base00}, ${alpha}); + background: ${scheme.base00}; border: 1px solid ${scheme.base0E}; border-radius: 5px; box-shadow: none;