Clean up waybar modules and configs

17 files changed, 50 insertions, 147 deletions

diff --git a/config/waybar/configs/Bottom & Left b/config/waybar/configs/Bottom & Left
index da0bc68f..b3edeea7 100644
--- a/config/waybar/configs/Bottom & Left
+++ b/config/waybar/configs/Bottom & Left
@@ -26,7 +26,7 @@
     
 "modules-center": [
     //"hyprland/window",
-    "hyprland/workspaces#2",
+    "hyprland/workspaces#roman",
 	],
     
 "modules-right": [
diff --git a/config/waybar/configs/Bottom & Right b/config/waybar/configs/Bottom & Right
index a715706b..255ddf2f 100644
--- a/config/waybar/configs/Bottom & Right
+++ b/config/waybar/configs/Bottom & Right
@@ -26,7 +26,7 @@
     
 "modules-center": [
     //"hyprland/window",
-    "hyprland/workspaces#2",
+    "hyprland/workspaces#roman",
 	],
     
 "modules-right": [
diff --git a/config/waybar/configs/Camellia [TOP] b/config/waybar/configs/Camellia [TOP]
index dd8c87d7..601be63f 100644
--- a/config/waybar/configs/Camellia [TOP]
+++ b/config/waybar/configs/Camellia [TOP]
@@ -107,7 +107,7 @@
 "pulseaudio/slider": {
 	"min": 0,
 	"max": 100,
-	"orientation": "horizontal"
+	"orientation": "horizontal",
 	
 },
 
@@ -121,7 +121,7 @@
 	"min": 0,
 	"max": 100,
 	"orientation": "horizontal",
-	"device": "intel_backlight"
+	//"device": "intel_backlight"
 },
 
 "custom/backlight": {
diff --git a/config/waybar/configs/Chrysanthemum [Bottom] b/config/waybar/configs/Chrysanthemum [Bottom]
index 9f1f192a..8b2c5425 100644
--- a/config/waybar/configs/Chrysanthemum [Bottom]
+++ b/config/waybar/configs/Chrysanthemum [Bottom]
@@ -19,33 +19,11 @@
 	
 "modules-left": ["clock#gar","tray"],
   
-"modules-center": ["hyprland/workspaces#gar"], 
+"modules-center": ["hyprland/workspaces"], 
 	
 "modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
 
 // M O D U L E S //
-
-"hyprland/workspaces#gar": {
-  "active-only": false,
-  "all-outputs": true, 
-  "format": "{icon}",
-  "show-special": false,
-  "on-click": "activate",
-  "on-scroll-up": "hyprctl dispatch workspace e+1",
-  "on-scroll-down": "hyprctl dispatch workspace e-1",
-     "persistent_workspaces": {
-      "1": [],
-      "2": [],
-      "3": [],
-      "4": [],
-      "5": [],
-},
-    "format-icons": {
-      "active": "",
-      "default": "",
-    }
-},
-
 "clock#gar": {
   //"format": "{:%A, %I:%M %P}",
 	"format": "{:%a %d | %H:%M}",
diff --git a/config/waybar/configs/Chrysanthemum [TOP] b/config/waybar/configs/Chrysanthemum [TOP]
index 665eec5b..4f691b33 100644
--- a/config/waybar/configs/Chrysanthemum [TOP]
+++ b/config/waybar/configs/Chrysanthemum [TOP]
@@ -19,33 +19,12 @@
 	
 "modules-left": ["clock#gar","tray"],
   
-"modules-center": ["hyprland/workspaces#gar"], 
+"modules-center": ["hyprland/workspaces"], 
 	
 "modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
 
 // M O D U L E S //
 
-"hyprland/workspaces#gar": {
-  "active-only": false,
-  "all-outputs": true, 
-  "format": "{icon}",
-  "show-special": false,
-  "on-click": "activate",
-  "on-scroll-up": "hyprctl dispatch workspace e+1",
-  "on-scroll-down": "hyprctl dispatch workspace e-1",
-     "persistent_workspaces": {
-      "1": [],
-      "2": [],
-      "3": [],
-      "4": [],
-      "5": [],
-},
-    "format-icons": {
-      "active": "",
-      "default": "",
-    }
-},
-
 "clock#gar": {
   //"format": "{:%A, %I:%M %P}",
 	"format": "{:%a %d | %H:%M}",
diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom]
index 512995df..f2eb8d26 100644
--- a/config/waybar/configs/Default [Bottom]
+++ b/config/waybar/configs/Default [Bottom]
@@ -16,7 +16,7 @@
 "margin-right": 8,
 
 "modules-left": [
-	"hyprland/workspaces#3",
+	"hyprland/workspaces#pacman",
 	"custom/separator#dot-line",
 	"cpu",
 	"custom/separator#dot-line", 
diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/Default [TOP]
index 2f8678ff..6b620f63 100644
--- a/config/waybar/configs/Default [TOP]
+++ b/config/waybar/configs/Default [TOP]
@@ -16,7 +16,7 @@
 "margin-right": 8,
 
 "modules-left": [
-	"hyprland/workspaces#3",
+	"hyprland/workspaces#pacman",
 	"custom/separator#dot-line",
 	"cpu",
 	"custom/separator#dot-line", 
diff --git a/config/waybar/configs/Gardenia [Bottom] b/config/waybar/configs/Gardenia [Bottom]
index 8e0ce16c..5b5a089c 100644
--- a/config/waybar/configs/Gardenia [Bottom]
+++ b/config/waybar/configs/Gardenia [Bottom]
@@ -22,33 +22,13 @@
 	
 "modules-left": ["clock#gar","tray"],
 	  
-"modules-center": ["hyprland/workspaces#gar"], 
+"modules-center": ["hyprland/workspaces#kanji"], 
 	
 "modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
 
 
 // M O D U L E S //
 
-"hyprland/workspaces#gar": {
-  "disable-scroll": true,
-  "all-outputs": true,
-  "format": "{icon}",
-  "persistent_workspaces": {
-    "1": [],
-    "2": [],
-    "3": [],
-    "4": [],
-    "5": []
-    },
-  "format-icons": {
-    "1": "一",
-    "2": "二",
-    "3": "三",
-    "4": "四",
-    "5": "五"
-    }
-},
-
 "clock#gar": {
   //"format": "{:%A, %I:%M %P}",
 	"format": "{:%a %d | %H:%M}",
diff --git a/config/waybar/configs/Gardenia [TOP] b/config/waybar/configs/Gardenia [TOP]
index 6eedd780..358db1cf 100644
--- a/config/waybar/configs/Gardenia [TOP]
+++ b/config/waybar/configs/Gardenia [TOP]
@@ -21,33 +21,13 @@
 	
 "modules-left": ["clock#gar","tray"],
 	  
-"modules-center": ["hyprland/workspaces#gar"], 
+"modules-center": ["hyprland/workspaces#kanji"], 
 	
 "modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
 
 
 // M O D U L E S //
 
-"hyprland/workspaces#gar": {
-  "disable-scroll": true,
-  "all-outputs": true,
-  "format": "{icon}",
-  "persistent_workspaces": {
-    "1": [],
-    "2": [],
-    "3": [],
-    "4": [],
-    "5": []
-    },
-  "format-icons": {
-    "1": "一",
-    "2": "二",
-    "3": "三",
-    "4": "四",
-    "5": "五"
-    }
-},
-
 "clock#gar": {
   //"format": "{:%A, %I:%M %P}",
 	"format": "{:%a %d | %H:%M}",
diff --git a/config/waybar/configs/Peony [Bottom] b/config/waybar/configs/Peony [Bottom]
index 6e186a71..1ec4fb64 100644
--- a/config/waybar/configs/Peony [Bottom]
+++ b/config/waybar/configs/Peony [Bottom]
@@ -19,7 +19,7 @@
 "margin-bottom": 5,
 "width": 1444,
 	
-"modules-left": ["hyprland/workspaces#peony", "tray#peony"],
+"modules-left": ["hyprland/workspaces#roman", "tray#peony"],
   
 "modules-center": ["clock#peony"], 
 	
@@ -36,28 +36,6 @@
 
 //M O D U L E S //
 
-"hyprland/workspaces#peony": {
-	"active-only":false,
-	"all-outputs": true,
-	"format": "{icon}",
-	"on-click": "activate",
-	"persistent_workspaces":{
-		"1": [],
-		"2": [],
-		"3": [],
-		"4": [],
-		"5": []
-	},
-	"format-icons": {
-        "1": "I",
-	    "2": "II",
-	    "3": "III",
-	    "4": "IV",
-	    "5": "V"
-	  
-	}
-  },
-
 "clock#peony": {
 	"interval": 60,
 	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
diff --git a/config/waybar/configs/Peony [TOP] b/config/waybar/configs/Peony [TOP]
index 66dbc7df..d1246670 100644
--- a/config/waybar/configs/Peony [TOP]
+++ b/config/waybar/configs/Peony [TOP]
@@ -19,7 +19,7 @@
 //"margin-bottom": 5,
 "width": 1444,
 	
-"modules-left": ["hyprland/workspaces#peony", "tray#peony"],
+"modules-left": ["hyprland/workspaces#roman", "tray#peony"],
   
 "modules-center": ["clock#peony"], 
 	
@@ -36,28 +36,6 @@
 
 //M O D U L E S //
 
-"hyprland/workspaces#peony": {
-	"active-only":false,
-	"all-outputs": true,
-	"format": "{icon}",
-	"on-click": "activate",
-	"persistent_workspaces":{
-		"1": [],
-		"2": [],
-		"3": [],
-		"4": [],
-		"5": []
-	},
-	"format-icons": {
-        "1": "I",
-	    "2": "II",
-	    "3": "III",
-	    "4": "IV",
-	    "5": "V"
-	  
-	}
-  },
-
 "clock#peony": {
 	"interval": 60,
 	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
diff --git a/config/waybar/configs/Simple-L [TOP] b/config/waybar/configs/Simple-L [TOP]
index 4baf027b..a8184006 100644
--- a/config/waybar/configs/Simple-L [TOP]
+++ b/config/waybar/configs/Simple-L [TOP]
@@ -19,7 +19,7 @@
 "modules-left": [
 	"custom/menu",
 	"custom/separator#blank_2", 
-	"hyprland/workspaces",
+	"hyprland/workspaces#pacman",
 	"custom/separator#blank_2",
 	"tray",
 	],
diff --git a/config/waybar/configs/Simple-S [TOP] b/config/waybar/configs/Simple-S [TOP]
index ebeb9823..cb114497 100644
--- a/config/waybar/configs/Simple-S [TOP]
+++ b/config/waybar/configs/Simple-S [TOP]
@@ -15,7 +15,7 @@
 	],
 
 "modules-center": [
-	"hyprland/workspaces#2"
+	"hyprland/workspaces#roman"
 	],
 
 "modules-right": [
diff --git a/config/waybar/configs/Top & Bottom b/config/waybar/configs/Top & Bottom
index ae9c546a..18305151 100644
--- a/config/waybar/configs/Top & Bottom
+++ b/config/waybar/configs/Top & Bottom
@@ -61,7 +61,7 @@
 	 ],
 
 "modules-center": [
-	"hyprland/workspaces#2", 
+	"hyprland/workspaces#4", 
 	],
 
 "modules-right": [
diff --git a/config/waybar/configs/Top & Left b/config/waybar/configs/Top & Left
index 7c0532f3..7270079d 100644
--- a/config/waybar/configs/Top & Left
+++ b/config/waybar/configs/Top & Left
@@ -25,7 +25,7 @@
     
 "modules-center": [
     //"hyprland/window",
-    "hyprland/workspaces#3",
+    "hyprland/workspaces#pacman",
 	],
     
 "modules-right": [
diff --git a/config/waybar/configs/Top & Right b/config/waybar/configs/Top & Right
index 065a9958..1d23b026 100644
--- a/config/waybar/configs/Top & Right
+++ b/config/waybar/configs/Top & Right
@@ -25,7 +25,7 @@
     
 "modules-center": [
     //"hyprland/window",
-    "hyprland/workspaces#3",
+    "hyprland/workspaces#pacman",
 	],
     
 "modules-right": [
diff --git a/config/waybar/modules b/config/waybar/modules
index 31011cd3..016f368c 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -24,7 +24,7 @@
   },  
 },
 // ROMAN Numerals style
-"hyprland/workspaces#2": {
+"hyprland/workspaces#roman": {
   "active-only":false,
   "all-outputs": true,
   "format": "{icon}",
@@ -45,11 +45,16 @@
     "3": "III",
     "4": "IV",
     "5": "V",
+	"6": "VI",
+	"7": "VII",
+	"8": "VIII",
+	"9": "IX",
+	"10": "X",
     
   },
 },
 // PACMAN Style
-"hyprland/workspaces#3": {
+"hyprland/workspaces#pacman": {
   "active-only":false,
   "all-outputs": true,
   "format": "{icon}",
@@ -67,11 +72,36 @@
   "format": "{icon}",
   "format-icons": {
     "active": " 󰮯 ",
-    "default": "  ",
+    "default": "󰑊",
     "persistent":"󰑊",
   },
 },
 
+"hyprland/workspaces#kanji": {
+  "disable-scroll": true,
+  "all-outputs": true,
+  "format": "{icon}",
+  "persistent_workspaces": {
+    "1": [],
+    "2": [],
+    "3": [],
+    "4": [],
+    "5": [],
+    },
+  "format-icons": {
+    "1": "一",
+    "2": "二",
+    "3": "三",
+    "4": "四",
+    "5": "五",
+	"6": "六",
+	"7": "七",
+	"8": "八",
+	"9": "九",
+	"10": "十",
+    }
+},
+
 //  NUMBERS and ICONS style
 "hyprland/workspaces#4": {
   "format": "{name}",