From ed6f478dc3edeff5f116f3a9f612760e692b1bf3 Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Mon, 25 May 2020 22:55:48 +0200
Subject: [PATCH] refactor: major changes to waybar config

---
 .config/waybar/config | 48 ++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/.config/waybar/config b/.config/waybar/config
index 43fc37e..d7eb575 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,22 +1,22 @@
 {
-	"layer": "bottom",
+	"layer": "top",
 	"position": "top",
 	"height": 28,
 
 	"modules-left": ["sway/workspaces", "sway/mode"],
 	"modules-center": ["sway/window"],
-	"modules-center": "",
-	"modules-right": ["tray", "custom/storage", "pulseaudio", "network", "idle_inhibitor", "battery", "clock#date", "clock#time"],
+	"modules-right": ["tray", "pulseaudio", "network", "custom/storage", "memory", "cpu", "idle_inhibitor", "battery", "clock#date", "clock#time"],
 	"sway/workspaces": {
 	"format": "{name}",
-	"disable-scroll": true
+	"disable-scroll": true,
+	"disable-markup" : false
 	},
 	"sway/mode": {
 	"format": "<span style=\"italic\">{}</span>", // Icon: expand-arrows-alt
 	"tooltip": false
 	},
 	"sway/window": {
-	"max-length": 80,
+	"max-length": 120,
 	"tooltip": false
 	},
 	"clock#time": {
@@ -29,6 +29,14 @@
 	"format": " {:%a %d %b} ",
 	"tooltip": false
 	},
+	"memory": {
+		"interval": 5,
+		"format": "{}% "
+	},
+	"cpu": {
+		"interval": 5,
+		"format": "{usage:2}% "
+	},
 	"battery": {
 	"format": "{capacity}% {icon}",
 	"format-alt": "{time} {icon}",
@@ -44,6 +52,7 @@
 	"network": {
 	"format-wifi": "{icon} {essid} ({signalStrength}%) ",
 	"format-ethernet": "{icon} {ifname}: {ipaddr}/{cidr}",
+	"format-linked": "{ifname} (No IP)",
 	"format-icons": {
 	"wifi": [""],
 	"ethernet": ["🖧"],
@@ -54,21 +63,28 @@
 	"tooltip": false
 	},
 	"pulseaudio": {
-	"format": "{icon}",
-	"format-alt": "{volume} {icon}",
-	"format-alt-click": "click-right",
-	"format-muted": "muted",
+	"format": "{icon} {volume}% {format_source}",
+	"format-bluetooth": "{volume}% {icon} {format_source}",
+	"format-bluetooth-muted": "🔇 {icon} {format_source}",
+	"format-muted": "✖ {format_source}",
+	"format-source": " {volume}%",
+	"format-source-muted": "",
 	"format-icons": {
-	"phone": [" ", " ", " "],
+	"headphone": "",
+	"hands-free": "",
+	"headset": "",
+	"phone": "",
+	"portable": "",
+	"car": "",
 	"default": ["", "", ""]
 	},
-	"scroll-step": 10,
-	"on-click": "qterminal -e alsamixer",
+	"scroll-step": 1,
+	"on-click": "pavucontrol",
 	"tooltip": false
 	},
 	"custom/storage": {
-	"format": "{} ",
-	"format-alt": "{percentage}% ",
+	"format": "{percentage}% ",
+	"format-alt": "{} ",
 	"format-alt-click": "click",
 	"return-type": "json",
 	"interval": 60,
@@ -77,8 +93,8 @@
 	"idle_inhibitor": {
 	"format": "{icon}",
 	"format-icons": {
-	"activated": "👁️",
-	"deactivated": ""
+		"activated": "",
+		"deactivated": ""
 	},
 	"tooltip": false
 	},