Set global location and changes uses of lat/lon to inherit from this

Remove opacity from waybar tooltips since they aren't blurred
This commit is contained in:
Evie Litherland-Smith 2024-10-29 09:15:07 +00:00
parent 35b60eafa9
commit 30fe4d0dc6
4 changed files with 18 additions and 10 deletions

View file

@ -203,6 +203,11 @@
}; };
security.rtkit.enable = true; security.rtkit.enable = true;
virtualisation.podman.enable = true; virtualisation.podman.enable = true;
location = {
latitude = 51.7;
longitude = -1.2;
provider = "manual";
};
time.timeZone = "Europe/London"; time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8"; i18n.defaultLocale = "en_GB.UTF-8";
console.useXkbConfig = true; console.useXkbConfig = true;

View file

@ -1,4 +1,9 @@
{ config, pkgs, ... }: {
config,
pkgs,
osConfig,
...
}:
{ {
imports = [ imports = [
./hyprland.nix ./hyprland.nix
@ -29,11 +34,9 @@
services = { services = {
syncthing.enable = true; syncthing.enable = true;
gammastep = { gammastep = {
inherit (osConfig.location) latitude longitude provider;
enable = true; enable = true;
tray = true; tray = true;
provider = "manual";
latitude = 51.7;
longitude = -1.2;
}; };
}; };
gtk = { gtk = {

View file

@ -2,6 +2,7 @@
config, config,
pkgs, pkgs,
inputs, inputs,
osConfig,
... ...
}: }:
{ {
@ -338,8 +339,8 @@
NightColor = { NightColor = {
Active = true; Active = true;
Mode = "Location"; Mode = "Location";
LatitudeFixed = "51.7"; LatitudeFixed = "${osConfig.location.latitude}";
LongitudeFixed = "-1.2"; LongitudeFixed = "${osConfig.location.longitude}";
}; };
"Effect-translucency" = { "Effect-translucency" = {
Inactive = 100; Inactive = 100;

View file

@ -262,10 +262,10 @@
"custom/weather" = "custom/weather" =
let let
date-format = "%Y-%m-%d"; date-format = "%Y-%m-%d";
custom-indicator = "{ICON}{temp_C}({FeelsLikeC})"; custom-indicator = "{ICON}{temp_C}°C({FeelsLikeC}°C)";
in in
{ {
format = "{}°"; format = "{}";
tooltip = true; tooltip = true;
interval = 900; # Every 15 minutes interval = 900; # Every 15 minutes
exec = ''${pkgs.wttrbar}/bin/wttrbar --location Didcot --date-format "${date-format}" --custom-indicator "${custom-indicator}"''; exec = ''${pkgs.wttrbar}/bin/wttrbar --location Didcot --date-format "${date-format}" --custom-indicator "${custom-indicator}"'';
@ -280,7 +280,6 @@
style = style =
let let
scheme = config.lib.stylix.scheme.withHashtag; scheme = config.lib.stylix.scheme.withHashtag;
alpha = "0.8";
in in
'' ''
* { * {
@ -305,7 +304,7 @@
} }
tooltip { tooltip {
background: alpha(${scheme.base00}, ${alpha}); background: ${scheme.base00};
border: 1px solid ${scheme.base0E}; border: 1px solid ${scheme.base0E};
border-radius: 5px; border-radius: 5px;
box-shadow: none; box-shadow: none;