fix(modules/yambar): Don't treat numbers as strings

This also includes casting the colour to a longer stretch of zeros, to
ensure that it is treated as a colour and not as a string.

1 files changed, 28 insertions, 24 deletions

diff --git a/modules/by-name/ya/yambar/settings/default.nix b/modules/by-name/ya/yambar/settings/default.nix
index 041ac88e..52c3d1f7 100644
--- a/modules/by-name/ya/yambar/settings/default.nix
+++ b/modules/by-name/ya/yambar/settings/default.nix
@@ -9,7 +9,7 @@
   mkUnderline = color: {
     underline = {
       inherit color;
-      size = "3";
+      size = 3;
     };
   };
 
@@ -22,7 +22,7 @@
       green = "a6e3a1dd";
       lavendar = "b4befedd";
       mauve = "cba6f7dd";
-      none = "0";
+      none = "00000000";
       normal = "c6ceefff";
       peach = "fab387dd";
       sapphire = "74c7ecdd";
@@ -30,14 +30,18 @@
     };
     font = {
       main = "Source Code Pro:pixelsize=${
-        if laptop
-        then "22"
-        else "26"
+        builtins.toString (
+          if laptop
+          then 22
+          else 26
+        )
       }";
       aws = "Font Awesome 5 Free:style=solid:pixelsize=${
-        if laptop
-        then "20"
-        else "23"
+        builtins.toString (
+          if laptop
+          then 20
+          else 23
+        )
       }";
     };
     background = {
@@ -91,19 +95,19 @@ in {
     font = values.font.main;
     height =
       if laptop
-      then "25"
-      else "45";
+      then 25
+      else 45;
     margin =
       if laptop
-      then "5"
-      else "10";
+      then 5
+      else 10;
     location = "top";
     layer = "bottom";
-    spacing = "0";
+    spacing = 0;
 
     border = {
-      margin = "0";
-      top-margin = "10";
+      margin = 0;
+      top-margin = 10;
     };
 
     left = [
@@ -113,7 +117,7 @@ in {
             map = let
               normal = {
                 string = {
-                  margin = "10";
+                  margin = 10;
                   text = "{id}";
                 };
               };
@@ -128,7 +132,7 @@ in {
                         values.underline.focused
                       ];
                     };
-                    margin = "10";
+                    margin = 10;
                     text = "{id}";
                   };
                 };
@@ -138,7 +142,7 @@ in {
                       occupied = {
                         string = {
                           deco = {background = {color = values.background.tag2;};};
-                          margin = "10";
+                          margin = 10;
                           text = "{id}";
                         };
                       };
@@ -149,7 +153,7 @@ in {
                 "state == unfocused" = {
                   string = {
                     deco = {background = {color = values.background.tag2;};};
-                    margin = "10";
+                    margin = 10;
                     text = "{id}";
                   };
                 };
@@ -161,7 +165,7 @@ in {
                         values.underline.urgent
                       ];
                     };
-                    margin = "10";
+                    margin = 10;
                     text = "{id}";
                   };
                 };
@@ -194,10 +198,10 @@ in {
               conditions = {"title == \"\"" = {string = {text = "";};};};
               default = {
                 string = {
-                  max = "35";
+                  max = 35;
                   deco = values.underline.title;
-                  left-margin = "12";
-                  right-margin = "12";
+                  left-margin = 12;
+                  right-margin = 12;
                   text = "{title}";
                 };
               };
@@ -317,7 +321,7 @@ in {
         {
           battery = {
             name = "BAT0";
-            poll-interval = "300";
+            poll-interval = 300;
             content.list.items = [
               {
                 ramp = {