nxricelib

home-modules/waybar.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, rice, ... }:
 let
 in
 {
@@ -60,6 +60,7 @@ in
       bar = {
         height = 20;
         layer = "top";
+        # position = "top";
         position = "bottom";
         margin-top = 0;
         margin-left = 0;
@@ -153,30 +154,29 @@ in
           ];
         };
         network = {
-          format-wifi = "直 {essid}";
-          format-ethernet = " Wired";
-          format-disconnected = "睊 Disconnected";
+          format-wifi = " {essid}";
+          format-ethernet = "󰈀 Wired";
+          format-disconnected = "󰌙 Disconnected";
         };
         wireplumber = {
           format = "󰕾 {volume}%";
-          format-muted = "婢 Muted";
+          format-muted = " Muted";
         };
       };
     };
     style = ''
       * {
-        font-family: Atkinson Hyperlegible, Caskaydia Cove NF, Noto Sans;
-        font-weight: bold;
-        font-size: 1.01em;
+        font-family: ${rice.font.code.name2};
+        font-size: 1em;
         min-height: 0;
       }
 
       window#waybar {
-        background-color: rgba(0, 0, 0, 0.85);
+        background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.background},${builtins.toString rice.transparency});
         transition-duration: 0.5s;
         padding: 0.1em 1em;
         padding-top: 0.1em;
-        border: 0px solid transparent;
+        border: None;
       }
 
       #clock,
@@ -195,40 +195,34 @@ in
       #workspaces {
         padding: 0px 3px;
         margin-top: 0.3em;
-        border-radius: 0.8em;
-        color: white;
-      }
-
-      #window {
-        font-weight: normal;
+        border-radius: ${builtins.toString rice.rounding}px;
+        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.foreground});
       }
 
       #workspaces button {
-        color: grey;
+        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.bright-black});
         padding: 0px 10px;
         margin: 1px;
-        border-radius: 0.2em;
-        border: 0px solid transparent;
-      }
-
-      #workspaces button.focused {
-        background-color: darkred;
+        border-radius: ${builtins.toString rice.rounding}px;
+        border: None;
       }
 
       #workspaces button:hover {
-        background-color: green;
+        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.background});
+        background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.foreground},${builtins.toString rice.transparency});
       }
 
       #workspaces button.active {
-        color: white;
+        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.foreground});
+        background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.background},${builtins.toString rice.transparency});
       }
 
       #workspaces button.urgent {
-        background-color: darkorchid;
+        background-color:  rgba(${rice.lib.hex-to-rgb-comma-string rice.color.magenta},${builtins.toString rice.transparency});
       }
 
       #custom-mode {
-        color: crimson;
+        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red});
       }
 
       #cpu {