Fix weather display, remove arrows from waybar

This commit is contained in:
notgne2 2021-12-17 02:16:23 -07:00
parent da62a58fb4
commit 9e9aeb3b40
No known key found for this signature in database
GPG Key ID: BB661E172B42A7F8

View File

@ -368,52 +368,24 @@ in
position = "left"; position = "left";
height = null; height = null;
modules-left = [ "sway/workspaces" "custom/right-arrow-dark" "custom/right-arrow-light" "custom/weather-temp" "custom/weather-precip" "custom/weather-wind" "custom/right-arrow-dark" ]; modules-left = [ "sway/workspaces" "custom/weather-temp" "custom/weather-precip" "custom/weather-wind" ];
modules-center = [ "custom/left-arrow-dark" "clock#1" "clock#2" "custom/left-arrow-light" "custom/left-arrow-dark" "mpd" "custom/right-arrow-dark" "custom/right-arrow-light" "clock#3" "custom/right-arrow-dark" ]; modules-center = [ "clock#1" "clock#2" "mpd" "clock#3" ];
modules-right = [ "custom/left-arrow-dark" "pulseaudio" "custom/left-arrow-light" "custom/left-arrow-dark" "memory" "custom/left-arrow-light" "custom/left-arrow-dark" "cpu" "custom/left-arrow-light" "custom/left-arrow-dark" ] ++ lib.optionals cfg.battery [ "battery" "custom/left-arrow-light" "custom/left-arrow-dark" ] ++ [ "tray" ]; modules-right = [ "pulseaudio" "memory" "cpu" ] ++ lib.optionals cfg.battery [ "battery" ] ++ [ "tray" ];
modules =
let
checkWttr = "${pkgs.bash}/bin/bash -c '! (${pkgs.curl}/bin/curl wttr.in/${cfg.location}?format=+ | ${pkgs.gnugrep}/bin/grep \\'^Unknown location;\\')'";
in
{
"custom/left-arrow-dark" = {
format = "";
tooltip = false;
rotate = 270;
};
"custom/left-arrow-light" = {
format = "";
tooltip = false;
rotate = 270;
};
"custom/right-arrow-dark" = {
format = "";
tooltip = false;
rotate = 270;
};
"custom/right-arrow-light" = {
format = "";
tooltip = false;
rotate = 270;
};
modules = {
"custom/weather-temp" = { "custom/weather-temp" = {
exec-if = checkWttr;
exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=%c+%t' || echo ERR"; exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=%c+%t' || echo ERR";
on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://weather.com/weather/today/l/85625'"; on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://weather.com/weather/today/l/85625'";
on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'"; on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
interval = 900; interval = 900;
}; };
"custom/weather-precip" = { "custom/weather-precip" = {
exec-if = checkWttr;
exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌧+%p'"; exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌧+%p'";
on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://www.lightningmaps.org/'"; on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://www.lightningmaps.org/'";
on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'"; on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
interval = 900; interval = 900;
}; };
"custom/weather-wind" = { "custom/weather-wind" = {
exec-if = checkWttr;
exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌬+%w'"; exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌬+%w'";
on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://www.ventusky.com/"; on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://www.ventusky.com/";
on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'"; on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
@ -495,18 +467,6 @@ in
color: #${config.colors.base16.base06}; color: #${config.colors.base16.base06};
} }
#custom-right-arrow-dark,
#custom-left-arrow-dark {
color: #${config.colors.base16.base00};
font-size: 15px;
}
#custom-right-arrow-light,
#custom-left-arrow-light {
color: #${config.colors.base16.base01};
background: #${config.colors.base16.base00};
font-size: 15px;
}
#workspaces, #workspaces,
#clock.1, #clock.1,
#clock.2, #clock.2,