2 files changed, 24 insertions, 5 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 9f48a770..f6049307 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -334,8 +334,12 @@ in {
               };
               battery = {
                 format = "{icon}";
-                format-icons = ["" "" "" "" ""];
+                states = { warning = 30; critical = 15; };
+                format-icons = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
+                format-charging = "󰚄";
+                format-plugged = "󰚥";
                 tooltip-format = "{capacity}% {timeTo}";
+                interval = 20;
               };
               tray = {
                 icon-size = iconSize;
@@ -378,11 +382,12 @@ in {
             @define-color white #dddddd;
             @define-color blue #1a8fff;
             @define-color green #23fd00;
+            @define-color orange #f28a21;
             @define-color red #f2201f;
 
             * {
               border: none;
-              font-family: "Fira Sans";
+              font-family: "Fira Sans Nerd Font";
               font-size: 10pt;
               min-height: 0;
             }
@@ -392,6 +397,13 @@ in {
               color: @white;
             }
 
+            .modules-left {
+              margin-left: 9px;
+            }
+            .modules-right {
+              margin-right: 9px;
+            }
+
             label.module {
               margin: 0 5px;
             }
@@ -408,6 +420,13 @@ in {
             #workspaces button.empty {
               opacity: 0.5;
             }
+
+            #battery.warning {
+              color: @orange;
+            }
+            #battery.critical {
+              color: @red;
+            }
           '';
               };
         wpaperd = {
diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix
index 20f6df84..92dcb39f 100644
--- a/accounts/gkleen@sif/hyprland.nix
+++ b/accounts/gkleen@sif/hyprland.nix
@@ -55,8 +55,8 @@
 
       vibrancy = 0.1696;
 
-      special = true;
-      popups = true;
+      # special = true;
+      # popups = true;
     };
   };
 
@@ -232,7 +232,7 @@
   ];
 
   workspace = [
-    "s[true], gapsout:200"
+    "s[true], gapsout:100"
 
     "special:term, on-created-empty:kitty"
     "special:edit, on-created-empty:emacsclient -c"