Merge branch 'master' into cas

2 files changed, 30 insertions, 4 deletions

diff --git a/waybar/config b/waybar/config
index b34ef33..18e3dc4 100644
--- a/waybar/config
+++ b/waybar/config
@@ -15,6 +15,21 @@
 
     // 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,
@@ -47,10 +62,16 @@
       "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,
@@ -61,7 +82,7 @@
       "separate-outputs": true,
       "icon": true,
       "format": "{title}",
-      "espand": true,
+      "expand": true,
     },
     "keyboard-state": {
         "numlock": true,
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;
 }