2 files changed, 51 insertions, 12 deletions
diff --git a/waybar/config b/waybar/config
index 26b3f75..0b50c66 100644
--- a/waybar/config
+++ b/waybar/config
@@ -2,19 +2,39 @@
     "layer": "bottom",
     "position": "top",
     "height": 36,
-    //"output": "%%DISPLAY%%",
+    "output": "eDP-1",
     "spacing": 4,
     //"margin-top": 5,
     //"margin-bottom":5,
 
     // Choose the order of the modules
 
-    "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"],
+    "modules-left":[ "sway/workspaces", "custom/launcher", "sway/window"],
     "modules-center":[],
-    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "network", "clock", "custom/power"],
+    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "battery", "network", "clock", "custom/power"],
 
     // Modules configuration
 
+    "sway/workspaces": {
+      "all-outputs": false,
+      "persistent-workspaces": {
+        "1": ["eDP-1"],
+        "2": ["eDP-1"],
+        "3": ["eDP-1"],
+        "4": ["eDP-1"],
+        "5": ["eDP-1"],
+        "6": ["eDP-1"],
+        "7": ["eDP-1"],
+        "8": ["eDP-1"],
+        "9": ["eDP-1"],
+      },
+      "format": "{value}",
+    },
+    "niri/workspaces": {
+      "format": "{value}",
+      "all-outputs": false,
+      "on-click": "activate"
+    },
     "hyprland/workspaces": {
       "format": "{icon}",
       "active-only": false,
@@ -42,13 +62,27 @@
       "persistent-workspaces": {
         "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
       },
-      "on-scroll-up": "hyprctl dispatch split-workspace e+1",
-      "on-scroll-down": "hyprctl dispatch split-workspace e-1",
+      "on-scroll-up": "hyprctl dispatch split:workspace r+1",
+      "on-scroll-down": "hyprctl dispatch split:workspace r-1",
       "on-click": "activate"
     },
+    "sway/window": {
+      "separate-outputs": true,
+      "icon": true,
+      "format": "{title}",
+      "expand": true
+    },
+    "niri/window": {
+      "separate-outputs": true,
+      "icon": true,
+      "format": "{title}",
+      "expand": true
+    },
     "hyprland/window": {
       "separate-outputs": true,
-      "format": "{}"
+      "icon": true,
+      "format": "{title}",
+      "expand": true,
     },
     "keyboard-state": {
         "numlock": true,
@@ -105,16 +139,16 @@
     },
     "temperature#cpu": {
         "thermal-zone": 0,
-        // "hwmon-path": "cat /sys/class/hwmon/hwmon5/temp1_input",
-        "critical-threshold": 110,
+        // "hwmon-path": "cat /sys/class/hwmon/hwmon4/temp1_input",
+        "critical-threshold": 90,
         "format-critical": "{temperatureC}°C",
         "format": "",
         "format-icons": ["", "", ""]
     },
     "temperature#gpu": {
         "thermal-zone": 1,
-        // "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
-        "critical-threshold": 126,
+        // "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input",
+        "critical-threshold": 90,
         "format-critical": "{temperatureC}°C",
         "format": "",
         "format-icons": ["", "", ""]
@@ -144,7 +178,7 @@
         "scroll-step": 0.1
     },
     "custom/launcher":{
-        "format": ">",
+        "format": ">_",
         "on-click": "rofi -show drun",
         //"on-click-right": "killall rofi"
     },
diff --git a/waybar/style.css b/waybar/style.css
index fefb890..9398381 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -56,6 +56,10 @@ window#waybar.hidden {
     background: #198844;
 }
 
+#workspaces button.focused {
+    background: #198844;
+}
+
 /*
 #workspaces button.active:hover {
     background: #6e3c85;
@@ -278,7 +282,8 @@ label:focus {
 }
 
 #tray {
-    background-color: transparent;
+    border-radius: 20px;
+    background-color: black;
     color: #ffffff;
 }