2 files changed, 26 insertions, 10 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 8332b38a..e855bbec 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -302,8 +302,15 @@ in {
               output = "eDP-1";
               modules-left = [ "hyprland/workspaces" ];
               modules-center = [ "hyprland/window" ];
-              modules-right = [ "privacy" "clock" "tray" "battery" "idle_inhibitor" ];
-
+              modules-right = [ "custom/weather" "clock" "privacy" "tray" "backlight" "battery" "idle_inhibitor" ];
+
+              "custom/weather" = {
+                format = "{}";
+                tooltip = true;
+                interval = 3600;
+                exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --custom-indicator \"{ICON} {temp_C}° ({FeelsLikeC}°)\"";
+                return-type = "json";
+              };
               "hyprland/workspaces" = {
                 all-outputs = true;
               };
@@ -355,6 +362,13 @@ in {
                 format = "{icon}";
                 format-icons = { activated = "󰈈"; deactivated = "󰈉"; };
               };
+              backlight = {
+                format = "{icon}";
+                tooltip-format = "{percent}%";
+                format-icons = ["󰃚" "󰃛" "󰃜" "󰃝" "󰃞" "󰃟" "󰃠"];
+                on-scroll-up = "brightnessctl s +1";
+                on-scroll-down = "brightnessctl s 1-";
+              };
             }
             {
               layer = "top";
@@ -429,7 +443,12 @@ in {
               color: @red;
             }
 
-            #battery, #idle_inhibitor {
+            #custom-weather {
+              color: @white;
+              opacity: 0.6;
+            }
+
+            #battery, #idle_inhibitor, #backlight {
               color: @grey;
             }
             #battery.warning {
@@ -444,6 +463,10 @@ in {
             #idle_inhibitor.activated {
               color: @white;
             }
+
+            #privacy {
+              color: @red;
+            }
           '';
               };
         wpaperd = {
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 30fd2d72..1397ca62 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -126,13 +126,6 @@ in {
         Environment = with pkgs; "PATH=${worktime}/bin:${systemd}/bin";
       };
     };
-    waybar = {
-      Service = {
-        Environment = [
-          "TZ=:/etc/localtime"
-        ];
-      };
-    };
     dunst = {
       Service = {
         ExecStart = lib.mkForce "${cfg.services.dunst.package}/bin/dunst";