From 9db8030c533aa45e37f2ee704730a9d459b4c8b5 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Thu, 26 May 2022 23:35:40 +0300
Subject: [PATCH] waybar: less WIP config

---
 conf/waybar/config      | 17 +----------------
 conf/waybar/config.json | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 20 deletions(-)
 mode change 100644 => 120000 conf/waybar/config

diff --git a/conf/waybar/config b/conf/waybar/config
deleted file mode 100644
index b649c909..00000000
--- a/conf/waybar/config
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "layer": "top",
-    "position": "left",
-    "modules-left": ["sway/workspaces", "sway/mode"],
-    "modules-right": ["battery", "clock"],
-    "sway/window": {
-        "max-length": 50
-    },
-    "battery": {
-        "format": "{capacity}% {icon}",
-        "format-icons": ["", "", "", "", ""]
-    },
-    "clock": {
-        "format-alt": "{:%a, %d. %b  %H:%M}"
-    }
-}
diff --git a/conf/waybar/config b/conf/waybar/config
new file mode 120000
index 00000000..0cffcb34
--- /dev/null
+++ b/conf/waybar/config
@@ -0,0 +1 @@
+config.json
\ No newline at end of file
diff --git a/conf/waybar/config.json b/conf/waybar/config.json
index b649c909..99c6054e 100644
--- a/conf/waybar/config.json
+++ b/conf/waybar/config.json
@@ -2,15 +2,24 @@
     "layer": "top",
     "position": "left",
     "modules-left": ["sway/workspaces", "sway/mode"],
-    "modules-right": ["battery", "clock"],
+    "modules-right": ["cpu", "memory", "battery", "pulseaudio", "tray", "clock"],
     "sway/window": {
         "max-length": 50
     },
+    "cpu": {
+        "format": "CPU {usage}%"
+    },
+    "memory": {
+        "format": "MEM {percentage}%"
+    },
+    "pulseaudio": {
+        "format": "AUX {volume}%",
+        "format-bluetooth": "BT {volume}%"
+    },
     "battery": {
-        "format": "{capacity}% {icon}",
-        "format-icons": ["", "", "", "", ""]
+        "format": "BAT {capacity}%"
     },
     "clock": {
-        "format-alt": "{:%a, %d. %b  %H:%M}"
+        "format": "{:%Y-%j\n%G-W%V-%u\n%F\n%H.%M.%S}"
     }
 }