From e14ab1ddf1c86ab7522288724acc51d5a22062e3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 15 Aug 2024 16:09:28 +0200
Subject: ...

---
 accounts/gkleen@sif/default.nix | 34 ++++++++++++++++------------------
 accounts/gkleen@sif/systemd.nix | 16 ++++++++++++++++
 2 files changed, 32 insertions(+), 18 deletions(-)

(limited to 'accounts/gkleen@sif')

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index e3267fc7..e85f816d 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -311,7 +311,7 @@ in {
               "(.*) - Mozilla Thunderbird" = "$1";
               "(.*) - mpv" = "$1";
             };
-            iconSize = 14;
+            iconSize = 11;
           in [
             {
               layer = "top";
@@ -326,7 +326,7 @@ in {
                 format = "{}";
                 tooltip = true;
                 interval = 3600;
-                exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --custom-indicator \"{ICON} {FeelsLikeC}°\"";
+                exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\">{ICON}</span> {FeelsLikeC}°\"";
                 return-type = "json";
               };
               "custom/keymap" = {
@@ -371,7 +371,7 @@ in {
               "hyprland/window" = {
                 separate-outputs = true;
                 icon = true;
-                icon-size = iconSize;
+                icon-size = 14;
                 rewrite = windowRewrites;
               };
               clock = {
@@ -394,7 +394,8 @@ in {
                   };
               };
               battery = {
-                format = "{icon}";
+                format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
+                icon-size = iconSize - 2;
                 states = { warning = 30; critical = 15; };
                 format-icons = ["&#xf008e;" "&#xf007a;" "&#xf007b;" "&#xf007c;" "&#xf007d;" "&#xf007e;" "&#xf007f;" "&#xf0080;" "&#xf0081;" "&#xf0082;" "&#xf0079;" ];
                 format-charging = "&#xf0084;";
@@ -408,25 +409,26 @@ in {
                 spacing = 1;
               };
               privacy = {
-                icon-spacing = 6;
-                icon-size = 11;
+                icon-spacing = 7;
+                icon-size = iconSize;
                 modules = [ { type = "screenshare"; } { type = "audio-in"; } ];
               };
               idle_inhibitor = {
-                format = "{icon}";
-                icon-size = 16;
+                format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
+                icon-size = iconSize;
                 format-icons = { activated = "&#xf0208;"; deactivated = "&#xf0209;"; };
               };
               backlight = {
-                format = "{icon}";
+                format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
+                icon-size = iconSize;
                 tooltip-format = "{percent}%";
                 format-icons = ["&#xf00da;" "&#xf00db;" "&#xf00dc;" "&#xf00dd;" "&#xf00de;" "&#xf00df;" "&#xf00e0;"];
                 on-scroll-up = "lightctl -d up";
                 on-scroll-down = "lightctl -d down";
               };
               pulseaudio = {
-                format = "{icon}";
-                icon-size = 16;
+                format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
+                icon-size = iconSize;
                 tooltip-format = "{volume}% {desc}";
                 format-icons = ["&#xf057f;" "&#xf0580;" "&#xf057e;"];
                 format-muted = "&#xf075f;";
@@ -451,7 +453,7 @@ in {
               "hyprland/window" = {
                 separate-outputs = true;
                 icon = true;
-                icon-size = iconSize;
+                icon-size = 14;
                 rewrite = windowRewrites;
               };
               clock = {
@@ -514,17 +516,14 @@ in {
             }
 
             #tray {
-              margin: 0 2px;
+              margin: 0;
             }
             #battery, #idle_inhibitor, #backlight, #pulseaudio {
               color: @grey;
             }
-            #battery, #pulseaudio {
+            #battery, #pulseaudio, #backlight, #idle_inhibitor {
               margin: 0 5px 0 2px;
             }
-            #backlight {
-              margin: 0 9px 0 3px;
-            }
             #battery.discharging {
               color: @white;
             }
@@ -543,7 +542,6 @@ in {
 
             #idle_inhibitor {
               padding-top: 1px;
-              margin: 0 9px 0 2px;
             }
 
             #privacy {
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 92404b61..be016b09 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -188,6 +188,22 @@ in {
         RuntimeDirectory = "swayidle";
       };
     };
+    psi-notify = {
+      Install = {
+        WantedBy = ["graphical-session.target"];
+      };
+      Unit = {
+        Requires = ["graphical-session-pre.target"];
+        After = ["graphical-session-pre.target"];
+      };
+      Service = {
+        ExecStart = lib.getExe pkgs.psi-notify;
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        Type = "notify";
+        Restart = "always";
+        WatchdogSec = "2s";
+      };
+    };
   } // listToAttrs (map ({host, port}: nameValuePair "proxy-to-autossh-socks@${toString port}" {
       Unit = {
         Requires = ["autossh-socks@${host}:${toString (port + 1)}.service" "proxy-to-autossh-socks@${toString port}.socket"];
-- 
cgit v1.2.3