[machi] store configs for river + machi + waybar

2 files changed, 32 insertions, 86 deletions

diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 3922b89..7831670 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -4,75 +4,62 @@
   "spacing": 0,
   "margin-bottom": 0,
   "modules-left": [
-    "sway/workspaces",
-    "sway/window"
+      "custom/machi"
   ],
   "modules-center": [
   ],
   "modules-right": [
-    "pulseaudio",
-    "backlight",
     "network#vpn",
     "network#wifi",
+    "pulseaudio",
+    "backlight",
     "temperature",
     "battery",
     "clock",
     "tray",
   ],
-  "sway/workspaces": {
-    "persistent-workspaces": {
-      "F": [],
-      "O": [],
-      "U": [],
-      "B": [],
-      "L": [],
-      "D": [],
-      "C": []
-    },
-    "alphabetical_sort": false,
-  },
-  "sway/window": {
-    "max-length": 48,
-    "min-length": 48,
-    "align": 0,
+  "custom/machi": {
+    "exec": "machi_status"
   },
   "tray": {
     "icon-size": 32,
     "spacing": 10
   },
   "clock": {
-    "format": "{:%H:%M %Y/%m/%d}",
+    "format": "| {:%a %H:%M %d/%m/%Y}",
     "tooltip-format": "<tt><big>{calendar}</big></tt>",
   },
   "temperature": {
     "interval": 10,
     "hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
-    "format": "{temperatureC}°C",
+    "format": "| {temperatureC}°C",
   },
   "backlight": {
-    "format": "{icon} {percent}%",
+    "format": "| {icon} {percent}%",
     "format-icons": ["", "", "", "", "", "", "", "", ""]
   },
   "battery": {
-    "format": "D{capacity}% {time}",
     "interval": 10,
-    "format-charging": "C{capacity}% {time}",
+    "format": "| U{capacity}%",
+    "format-plugged": "",
+    "format-not-charging": "| N{capacity}%",
+    "format-discharging": "| D{capacity}% {time}",
+    "format-charging": "| C{capacity}% {time}",
     "format-time": "{H}h{M}m",
-    "format-icons": ["", "", "", "", ""]
   },
   "network#vpn": {
     "interface": "wg0-mullvad",
-    "format-disconnected": "VPN ⚠",
+    "format-disconnected": "| VPN ⚠",
     "format": "",
   },
   "network#wifi": {
     "interface": "wlp1s0",
-    "format-wifi": "{essid}",
+    "format-wifi": "| {essid}",
     "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
   },
   "pulseaudio": {
     "scroll-step": 1,
-    "format": "{volume}% {icon} {format_source} ",
+    "format": "| {volume}% {icon} {format_source} ",
     "format-bluetooth": "{volume}% {icon} {format_source}",
     "format-bluetooth-muted": " {icon} {format_source}",
     "format-muted": " {format_source}",
diff --git a/waybar/style.css b/waybar/style.css
index c752399..1195817 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,17 +1,21 @@
+window#waybar {
+    border: 2px solid black;
+    background-color: black;
+}
+
 * {
     /* `otf-font-awesome` is required to be installed for icons */
     font-family: "BQN386 Unicode DZ";
     /* font-family: "PxPlus IBM VGA 9x16"; */
-    font-size: 28px;
+    font-size: 26px;
     padding-top: 0px;
     padding-bottom: 0px;
-    margin-top: 2px;
-    min-height: 46px;
-}
-
-window#waybar {
-    background-color: black;
-    color: #ffffff;
+    padding-left: 2px;
+    padding-right: 2px;
+    min-height: 36px;
+    margin: 2px;
+    color: black;
+    background-color: #DAEFEF;
 }
 
 button {
@@ -22,62 +26,17 @@ button {
     border-radius: 0;
 }
 
-#workspaces button{
-    padding-right: 6px;
-    padding-left: 6px;
-    color: #FF8C00;
-}
-
-#workspaces button:hover {
-    background: #FF8;
-}
-
-#workspaces button.focused {
-    background-color: #FF8C00;
-    color: black;
-}
-
-#workspaces button.empty {
-    background-color: black;
-    color: grey;
-}
-
-#window {
-    padding-left: 16px;
-    background-color: #FF8C00;
-    color: black;
-}
-
-#tags button.urgent {
-    background-color: #eb4d4b;
-}
-
-#tray,
-#clock {
-    padding-left: 8px;
-    background-color: black;
-    color: #FF8C00;
-}
-
+#custom-machi,
+#network,
+#network.wifi,
 #battery,
 #temperature,
 #backlight,
-#network,
 #pulseaudio,
+#clock,
 #wireplumber {
-    padding-right: 8px;
-    padding-left: 8px;
-    border-right: 2px solid #FF8C00;
-    background-color: black;
-    color: #FF8C00;
-}
-
-label:focus {
-    background-color: #000000;
 }
 
-#tray {
-}
 
 #tray > .passive {
     -gtk-icon-effect: dim;