From 3036b1b463b9919e04833bd42b4ca6ec81ceb665 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 13 Nov 2023 11:15:54 +0000
Subject: [PATCH] Last bit of waybar re-styling (for now), re-enable stylix
 chromium target

---
 flake.nix                        |  4 ++-
 home/hyprland/waybar/default.nix | 48 ++++++++++++++++----------------
 home/hyprland/waybar/style.css   | 37 ++++++++++--------------
 3 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8f77a627..e1d8e898 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,13 +121,15 @@
               stylix = {
                 autoEnable = false;
                 targets = {
+                  chromium.enable = true;
                   console.enable = true;
                   lightdm.enable = true;
                 };
                 image = ./wallpapers/tokyo-space.png;
                 base16Scheme = {
                   slug = "tokyonight";
-                  scheme = "My implementation of Enkia's TokyoNight theme";
+                  scheme =
+                    "My implementation of TokyoNight theme for Sublime, by Enkia";
                   author = "xenia";
                   base00 = "15161e";
                   base01 = "f7768e";
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index acf2d699..2c70ca4a 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -21,12 +21,13 @@
       "modules-right" = [
         "mpris"
         "pulseaudio"
-        "battery"
         "disk"
         "cpu"
         "memory"
         "temperature"
         "clock"
+        "backlight"
+        "battery"
         "tray"
       ];
       # Module config
@@ -79,7 +80,7 @@
       };
       pulseaudio = {
         scroll-step = 5;
-        format = "{format_source}/{icon}:{volume}%";
+        format = "{format_source}/{icon} {volume}%";
         format-muted = "{format_source}/󰝟";
         format-source = "󰍬";
         format-source-muted = "󰍭";
@@ -98,39 +99,22 @@
         on-scroll-up = "volumectl -u + 5";
         on-scroll-down = "volumectl -u - 5";
       };
-      backlight = {
-        format = "{icon}";
-        tooltip-format = "{percent}%";
-        format-icons = [ "" "" "" "" "" "" "" "" "" ];
-      };
-      battery = {
-        states = {
-          warning = 30;
-          critical = 15;
-        };
-        format = "{icon}:{capacity}%";
-        format-charging = "󰂄:{capacity}%";
-        format-plugged = "󰚥:{capacity}%";
-        tooltip-format = "{time}";
-        format-icons = [ "󱃍" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
-      };
       disk = {
-        format = "󰋊:{percentage_used}%";
+        format = "󰋊 {percentage_used}%";
         path = config.home.homeDirectory;
       };
       cpu = {
-        format = "󰻠:{usage}%";
+        format = "󰻠 {usage}%";
         tooltip = false;
       };
-      memory = { format = "󰍛:{}%"; };
+      memory = { format = "󰍛 {}%"; };
       temperature = {
         critical-threshold = 80;
-        format = "{icon}:{temperatureC}°C";
+        format = "{icon} {temperatureC}°C";
         format-icons = [ "󱃃" "󰔏" "󱃂" ];
       };
       clock = {
-        format = "{:%R}";
-        format-alt = "{:%a %d %b %R}";
+        format = "{:󰃭 %Y-%M-%d 󰥔 %R}";
         tooltip-format = "<tt><small>{calendar}</small></tt>";
         calendar = {
           mode = "month";
@@ -152,6 +136,22 @@
           on-scroll-down = "shift_down";
         };
       };
+      backlight = {
+        format = "{icon}";
+        tooltip-format = "{percent}%";
+        format-icons = [ "" "" "" "" "" "" "" "" "" ];
+      };
+      battery = {
+        states = {
+          warning = 30;
+          critical = 15;
+        };
+        format = "{icon}";
+        format-charging = "󰂄";
+        format-plugged = "󰚥";
+        tooltip-format = "{time} {capacity}%";
+        format-icons = [ "󱃍" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
+      };
       tray = {
         icon-size = 16;
         show-passive-items = true;
diff --git a/home/hyprland/waybar/style.css b/home/hyprland/waybar/style.css
index 3cf704c3..5eb7a6c5 100644
--- a/home/hyprland/waybar/style.css
+++ b/home/hyprland/waybar/style.css
@@ -27,6 +27,7 @@ tooltip {
 }
 
 #workspaces,
+#window,
 #mpris,
 #pulseaudio,
 #battery,
@@ -41,35 +42,25 @@ tooltip {
 }
 
 #workspaces,
+#window,
 #mpris,
+#battery,
+#backlight,
 #tray { color: #c0caf5; }
 
+#workspaces button {
+    background: transparent;
+    color: #c0caf5;
+    margin: 0px;
+    padding: 0px 5px;
+}
+#workspaces button.empty { color: #414868; }
+#workspaces button.active { color: #bb9af7; }
+#workspaces button.urgent { color: #f7768e; }
+
 #pulseaudio { color: #f7768e; }
-#battery { color: #e0af68; }
 #disk { color: #e0af68; }
 #cpu { color: #9ece6a; }
 #memory { color: #7dcfff; }
 #temperature { color: #7aa2f7; }
 #clock { color: #bb9af7; }
-
-#workspaces button {
-    background: transparent;
-    border: 1px solid transparent;
-    border-radius: 10px;
-    color: #c0caf5;
-    margin: 0px;
-    padding: 0px 5px;
-}
-
-#workspaces button.empty {
-    color: #414868;
-}
-
-#workspaces button.active {
-    color: #bb9af7;
-}
-
-#workspaces button.urgent {
-    border: 1px solid #f7768e;
-    color: #f7768e;
-}