Separated waybar workspaces modules to "shorten" a bit the main waybar modules file

30 files changed, 140 insertions, 36 deletions

diff --git a/config/waybar/configs/[BOT & Left] SouthWest b/config/waybar/configs/[BOT & Left] SouthWest
index 14377d57..87be19f0 100644
--- a/config/waybar/configs/[BOT & Left] SouthWest
+++ b/config/waybar/configs/[BOT & Left] SouthWest
@@ -3,7 +3,10 @@
 // ### BOTTOM and LEFT PANEL
 
 [{
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
@@ -44,7 +47,10 @@
 },
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "left",
 "height": 650,
diff --git a/config/waybar/configs/[BOT & Right] SouthEast b/config/waybar/configs/[BOT & Right] SouthEast
index 7d684c85..db367b9c 100644
--- a/config/waybar/configs/[BOT & Right] SouthEast
+++ b/config/waybar/configs/[BOT & Right] SouthEast
@@ -3,7 +3,10 @@
 // ### BOTTOM and RIGHT PANEL
 
 [{
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
@@ -44,7 +47,10 @@
 },
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "right",
 "height": 650,
diff --git a/config/waybar/configs/[BOT] Camellia b/config/waybar/configs/[BOT] Camellia
index 91595848..4fabb931 100644
--- a/config/waybar/configs/[BOT] Camellia
+++ b/config/waybar/configs/[BOT] Camellia
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Chrysanthemum b/config/waybar/configs/[BOT] Chrysanthemum
index 7aaad0d5..f3368015 100644
--- a/config/waybar/configs/[BOT] Chrysanthemum
+++ b/config/waybar/configs/[BOT] Chrysanthemum
@@ -5,7 +5,10 @@
 //* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Default b/config/waybar/configs/[BOT] Default
index c396277e..d2638258 100644
--- a/config/waybar/configs/[BOT] Default
+++ b/config/waybar/configs/[BOT] Default
@@ -2,7 +2,10 @@
 
 // ### DEFAULT Bottom ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Default Laptop b/config/waybar/configs/[BOT] Default Laptop
index 501e0c85..11e12da8 100644
--- a/config/waybar/configs/[BOT] Default Laptop
+++ b/config/waybar/configs/[BOT] Default Laptop
@@ -2,7 +2,10 @@
 
 // ### DEFAULT Bottom - Laptop### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Gardenia b/config/waybar/configs/[BOT] Gardenia
index 9ba6d3b5..9025edfc 100644
--- a/config/waybar/configs/[BOT] Gardenia
+++ b/config/waybar/configs/[BOT] Gardenia
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Peony b/config/waybar/configs/[BOT] Peony
index 4b548b89..306ff4f9 100644
--- a/config/waybar/configs/[BOT] Peony
+++ b/config/waybar/configs/[BOT] Peony
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Simple b/config/waybar/configs/[BOT] Simple
index f2c0b883..ef5c30eb 100644
--- a/config/waybar/configs/[BOT] Simple
+++ b/config/waybar/configs/[BOT] Simple
@@ -2,7 +2,10 @@
 // ### TOP Simple ## //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top", 
 "position": "bottom", 
 //"mode": "dock",
diff --git a/config/waybar/configs/[BOT] Sleek b/config/waybar/configs/[BOT] Sleek
index 6bb595bc..c79fd71f 100644
--- a/config/waybar/configs/[BOT] Sleek
+++ b/config/waybar/configs/[BOT] Sleek
@@ -3,7 +3,10 @@
 // Sleek 
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "bottom",
 "height": 14,
diff --git a/config/waybar/configs/[Left] WestWing b/config/waybar/configs/[Left] WestWing
index a3381e8c..f44b97b2 100644
--- a/config/waybar/configs/[Left] WestWing
+++ b/config/waybar/configs/[Left] WestWing
@@ -3,7 +3,10 @@
 // ### LEFT PANEL ### //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "left",
 "margin-top": 8,
diff --git a/config/waybar/configs/[Right] EastWing b/config/waybar/configs/[Right] EastWing
index 5ce7be2e..c9860298 100644
--- a/config/waybar/configs/[Right] EastWing
+++ b/config/waybar/configs/[Right] EastWing
@@ -3,7 +3,10 @@
 // ### RIGHT PANEL ### //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "right",
 "margin-top": 8,
diff --git a/config/waybar/configs/[TOP & BOT] SummitSplit b/config/waybar/configs/[TOP & BOT] SummitSplit
index 6e9cac28..3d419c22 100644
--- a/config/waybar/configs/[TOP & BOT] SummitSplit
+++ b/config/waybar/configs/[TOP & BOT] SummitSplit
@@ -3,7 +3,10 @@
 // ### DUAL TOP and BOTTOM ### //
 
 [{
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
@@ -42,7 +45,10 @@
 },
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP & Left] NorthWest b/config/waybar/configs/[TOP & Left] NorthWest
index 81f23066..dd03fd92 100644
--- a/config/waybar/configs/[TOP & Left] NorthWest
+++ b/config/waybar/configs/[TOP & Left] NorthWest
@@ -3,7 +3,10 @@
 // ### TOP and LEFT PANEL ## //
 
 [{
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "width": 1200,
@@ -41,7 +44,10 @@
 },
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "left",
 "height": 650,
diff --git a/config/waybar/configs/[TOP & Right] NorthEast b/config/waybar/configs/[TOP & Right] NorthEast
index 21bcb2c8..442c7886 100644
--- a/config/waybar/configs/[TOP & Right] NorthEast
+++ b/config/waybar/configs/[TOP & Right] NorthEast
@@ -3,7 +3,10 @@
 // ### TOP and Right PANEL ## //
 
 [{
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "width": 1200,
@@ -41,7 +44,10 @@
 },
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "right",
 "height": 650,
diff --git a/config/waybar/configs/[TOP] Camellia b/config/waybar/configs/[TOP] Camellia
index ccb078fb..6cd1ee96 100644
--- a/config/waybar/configs/[TOP] Camellia
+++ b/config/waybar/configs/[TOP] Camellia
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Chrysanthemum b/config/waybar/configs/[TOP] Chrysanthemum
index 9d1c1050..a37ce210 100644
--- a/config/waybar/configs/[TOP] Chrysanthemum
+++ b/config/waybar/configs/[TOP] Chrysanthemum
@@ -5,7 +5,10 @@
 //* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default b/config/waybar/configs/[TOP] Default
index 79ac0995..747fd9fe 100644
--- a/config/waybar/configs/[TOP] Default
+++ b/config/waybar/configs/[TOP] Default
@@ -2,7 +2,10 @@
 
 // ### DEFAULT - Top ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop
index 1521b824..02dd6169 100644
--- a/config/waybar/configs/[TOP] Default Laptop
+++ b/config/waybar/configs/[TOP] Default Laptop
@@ -2,7 +2,10 @@
 
 // ### DEFAULT Top -Laptop ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop_v2
index 6ddab7d8..24d1a58b 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v2
+++ b/config/waybar/configs/[TOP] Default Laptop_v2
@@ -2,7 +2,10 @@
 
 // ### DEFAULT v2 (Laptop)  - Top ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default Laptop_v3 b/config/waybar/configs/[TOP] Default Laptop_v3
index 84280402..80f4539b 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v3
+++ b/config/waybar/configs/[TOP] Default Laptop_v3
@@ -2,7 +2,10 @@
 
 // ### DEFAULT v2 (Laptop)  - Top ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default_v2 b/config/waybar/configs/[TOP] Default_v2
index 703cdee2..8a0b7a29 100644
--- a/config/waybar/configs/[TOP] Default_v2
+++ b/config/waybar/configs/[TOP] Default_v2
@@ -2,7 +2,10 @@
 
 // ### DEFAULT v2 - Top ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default_v3 b/config/waybar/configs/[TOP] Default_v3
index cf0fc80d..0575aba1 100644
--- a/config/waybar/configs/[TOP] Default_v3
+++ b/config/waybar/configs/[TOP] Default_v3
@@ -2,7 +2,10 @@
 
 // ### DEFAULT v3  - Top ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Everforest b/config/waybar/configs/[TOP] Everforest
index 326764cb..67cf09c4 100644
--- a/config/waybar/configs/[TOP] Everforest
+++ b/config/waybar/configs/[TOP] Everforest
@@ -3,7 +3,10 @@
 // ### Everforest ### //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
@@ -24,7 +27,6 @@
 //	"mpris",
 	"custom/swaync",
 	"tray",
-	"mpris",
 	],
 "modules-center": [
 	"clock#forest",
diff --git a/config/waybar/configs/[TOP] Gardenia b/config/waybar/configs/[TOP] Gardenia
index fff39648..b8aa3b70 100644
--- a/config/waybar/configs/[TOP] Gardenia
+++ b/config/waybar/configs/[TOP] Gardenia
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Minimal - Long b/config/waybar/configs/[TOP] Minimal - Long
index 5e2e5425..e5ff1e28 100644
--- a/config/waybar/configs/[TOP] Minimal - Long
+++ b/config/waybar/configs/[TOP] Minimal - Long
@@ -3,7 +3,10 @@
 // ### Minimal - Long ### //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Minimal - Short b/config/waybar/configs/[TOP] Minimal - Short
index 99616d84..e080fbd5 100644
--- a/config/waybar/configs/[TOP] Minimal - Short
+++ b/config/waybar/configs/[TOP] Minimal - Short
@@ -3,7 +3,10 @@
 // ### Minimal -SHORT ### //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "top",
 "width": 1050,
diff --git a/config/waybar/configs/[TOP] Peony b/config/waybar/configs/[TOP] Peony
index f35979d3..2ceb6473 100644
--- a/config/waybar/configs/[TOP] Peony
+++ b/config/waybar/configs/[TOP] Peony
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Simple b/config/waybar/configs/[TOP] Simple
index 16b78ea3..fd51a06f 100644
--- a/config/waybar/configs/[TOP] Simple
+++ b/config/waybar/configs/[TOP] Simple
@@ -2,7 +2,10 @@
 // ### TOP Simple ## //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top", 
 "position": "top", 
 //"mode": "dock",
diff --git a/config/waybar/configs/[TOP] Sleek b/config/waybar/configs/[TOP] Sleek
index c5d66fa8..12227bf5 100644
--- a/config/waybar/configs/[TOP] Sleek
+++ b/config/waybar/configs/[TOP] Sleek
@@ -2,7 +2,10 @@
 // Sleek
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "top",
 "height": 14,