Collected all extra modules, (except camellia) into waybar/modules for easy management. Same adjusted copy.sh to take effect all clock modules if 12H chosen by user

2 years ago · b1b25e670c
12 changed files with 182 additions and 713 deletions
--- a/config/waybar/configs/[BOT]
+++ b/config/waybar/configs/[BOT]
@ -25,91 +25,21 @@
 	"custom/separator#line",
 	"mpris",
 	"custom/swaync",
-	"tray#cam", 
+	"tray", 
 	"wlr/taskbar"],

-"modules-center": ["hyprland/window#cam"], 
+"modules-center": ["hyprland/window"], 
 	
 "modules-right": [
 	"custom/backlight",
 	"backlight/slider",
 	"custom/speaker",
 	"pulseaudio/slider",
-	"battery#cam",
-	"clock#cam", 
-	"network#cam"],
+	"battery",
+	"clock#3", 
+	"network"],

 // Additional modules //
-
-"hyprland/workspaces#cam": {
-	"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": {
-		"1": "Uno",
-		"2": "Due",
-		"3": "Tre",
-		"4": "Quattro",
-		"5": "Cinque",
-		"6":"Sei",
-		"7":"Sette",
-		"8":"Otto",
-		"9":"Nove",
-		"10":"Dieci"
-	}	
-},
-
-"hyprland/window#cam": {
-	"format": " {title}",
-	"max-length": 50,
-	"rewrite": {
-		"(.*) — Mozilla Firefox": " $1",
-		"(.*) - zsh": "> [$1]"
-},
-		"separate-outputs": true
-},
-
-"clock#cam": {
-	"interval": 60,
-	//"format": "{:%A, %I:%M %P}",
-	"format": "{:%A, %H:%M}",
-	"max-length": 25,
-	
-},
-
-"battery#cam": {
-	"interval": 60,
-	"align": 0,
-	"rotate": 0,
-	//"bat": "BAT1",
-	//"adapter": "ACAD",
-	"full-at": 100,
-	"design-capacity": false,
-	"states": {
-	  "critical": 15
-			 },
-	"format": "{capacity}% {icon}",
-	"format-charging": " {capacity}%",
-	"format-plugged": "󱘖 {capacity}%",
-	"format-full": "{icon} Full",
-	"format-alt": "{icon} {time}",
-	"format-icons": ["", "", "", "", ""],
-	"format-time": "{H}h {M}min",
-	"tooltip": true,
-	"tooltip-format": "{timeTo} {power}w"
-},
-
 "pulseaudio/slider": {
 	"min": 0,
 	"max": 100,
@ -135,42 +65,4 @@
 	"interval": 1,
 	"format": "{}"
 },
-
-"tray#cam": {
-	//"icon-size": 16,
-	"spacing": 10
-},
-
-"network#cam": {
-	"format": "{ifname}",
-	"format-wifi": "{icon}",
-	"format-ethernet": "󰌘",
-	"format-disconnected": "󰌙", 
-	"tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}",
-	"format-linked": "󰈁 {ifname} (No IP)",
-	"tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
-	"tooltip-format-ethernet": "{ifname} 󰌘",
-	"tooltip-format-disconnected": "󰌙 Disconnected",
-	"max-length": 50,
-	"format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-},
-
-"wlr/taskbar": {
-	"format": "{icon}",
-	//"icon-size": 14,
-	//"icon-theme": "Numix-Circle",
-	"tooltip-format": "{title}",
-	"on-click": "activate",
-	"on-click-middle": "close",
-	"ignore-list": [
-	    "kitty"
-		],
-		"app_ids-mapping": {
-		  "firefoxdeveloperedition": "firefox-developer-edition"
-		},
-		"rewrite": {
-			"Firefox Web Browser": "Firefox",
-			"Foot Server": "Terminal"
-		}
-}
 }
--- a/config/waybar/configs/[BOT]
+++ b/config/waybar/configs/[BOT]
@ -10,84 +10,27 @@
 //"mode": "dock",
 "exclusive": true,
 "passthrough": false,
-"position": "bottom",
+"position": "bottom
+",
 "spacing": 5,
 "fixed-center": true,
 "ipc": true,
 "margin-left": 5,
 "margin-right": 5,
+"margin-top": 0,
 	
-"modules-left": ["clock#gar", "mpris", "custom/swaync", "tray"],
+"modules-left": [
+	"clock#5", 
+	"mpris", 
+	"tray", 
+	"custom/swaync"
+	],
  
 "modules-center": ["hyprland/workspaces"], 
 	
-"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
-
-// M O D U L E S //
-"clock#gar": {
-  //"format": "{:%A, %I:%M %P}",
-	"format": "{:%a %d | %H:%M}",
-	"format-alt": "{:%A, %d %B, %Y (%R)}"
-},
-
-"hyprland/window#gar": {
-  "format": "{}",
-  "max-length": 60
-},
-
-"tray#gar": {
-  "icon-size": 15,
-  "spacing": 10
-},
-
-"pulseaudio#gar": {
-  "format": "{icon} {volume}%",
-  "format-bluetooth": "{icon} {volume}%",
-  "format-bluetooth-muted": " {icon}",
-  "format-muted": "󰸈",
-  "format-icons": {
-    "headphone": "",
-    "hands-free": "",
-    "headset": "",
-    "phone": "",
-    "portable": "",
-    "car": "",
-    "default": ["", "", ""]
-  },
-  "on-click": "pamixer --toggle-mute",
-  "on-click-right": "pavucontrol",
-  "tooltip": false
-},
-
-"backlight#gar": {
-  //"device": "intel_backlight",
-  "format": "{icon} {percent}%",
-  "format-icons": ["", ""]
-},
-
-"battery#gar": {
-  "interval": 60,
-  "align": 0,
-  "rotate": 0,
-  //"bat": "BAT1",
-  //"adapter": "ACAD",
-  "full-at": 100,
-  "design-capacity": false,
-  "states": {
-    "good": 95,
-    "warning": 30,
-    "critical": 15
-       },
-  "format": "{icon}  {capacity}%",
-  "format-charging": " {capacity}%",
-  "format-plugged": "󱘖 {capacity}%",
-  "format-full": "{icon} Full",
-  "format-alt": "{icon} {time}",
-  "format-icons": ["", "", "", "", ""],
-  "format-time": "{H}h {M}min",
-  "tooltip": true,
-  "tooltip-format": "{timeTo} {power}w",
-  "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
-  "on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
-},    
+"modules-right": [
+	"pulseaudio#1",
+	"backlight#2", 
+	"battery"],
+   
 }
--- a/config/waybar/configs/[BOT]
+++ b/config/waybar/configs/[BOT]
@ -6,7 +6,6 @@

 {
 
-
 "include": "~/.config/waybar/modules",
 "layer": "top",
 //"mode": "dock",
@ -16,84 +15,23 @@
 "spacing": 5,
 "fixed-center": false,
 "ipc": true,
-//"margin-top": 5,
-"margin-bottom": 5,
-"width": 768,
+"margin-top": 5,
+//"margin-bottom": 5,
+"width": 1000,
 	
-"modules-left": ["clock#gar", "mpris", "custom/swaync", "tray"],
+"modules-left": [
+	"clock#5", 
+	"mpris", 
+	"tray", 
+	"custom/swaync"
+	],
 	  
 "modules-center": ["hyprland/workspaces#kanji"], 
 	
-"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
-
-
-// M O D U L E S //
-
-"clock#gar": {
-  //"format": "{:%A, %I:%M %P}",
-	"format": "{:%a %d | %H:%M}",
-	"format-alt": "{:%A, %d %B, %Y (%R)}"
-},
-
-"hyprland/window#gar": {
-  "format": "{}",
-  "max-length": 60
-},
-
-"tray#gar": {
-  "icon-size": 15,
-  "spacing": 10
-},
-
-"pulseaudio#gar": {
-  "format": "{icon} {volume}%",
-  "format-bluetooth": "{icon} {volume}%",
-  "format-bluetooth-muted": " {icon}",
-  "format-muted": "󰸈",
-  "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", "", ""]
-    },
-  "on-click": "pamixer --toggle-mute",
-  "on-click-right": "pavucontrol",
-  "tooltip": false
-},
-
-"backlight#gar": {
-  "device": "intel_backlight",
-  "format": "{icon} {percent}%",
-  "format-icons": ["", ""]
-},
+"modules-right": [
+	"pulseaudio#1",
+	"backlight#2", 
+	"battery"
+	],

-"battery#gar": {
-  "interval": 60,
-  "align": 0,
-  "rotate": 0,
-  //"bat": "BAT1",
-  //"adapter": "ACAD",
-  "full-at": 100,
-  "design-capacity": false,
-  "states": {
-    "good": 95,
-    "warning": 30,
-    "critical": 15
-       },
-  "format": "{icon}  {capacity}%",
-  "format-charging": " {capacity}%",
-  "format-plugged": "󱘖 {capacity}%",
-  "format-full": "{icon} Full",
-  "format-alt": "{icon} {time}",
-  "format-icons": ["", "", "", "", ""],
-  "format-time": "{H}h {M}min",
-  "tooltip": true,
-  "tooltip-format": "{timeTo} {power}w",
-  "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
-  "on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
-},
-   
 }
--- a/config/waybar/configs/[BOT]
+++ b/config/waybar/configs/[BOT]
@ -15,95 +15,28 @@
 "spacing": 4,
 "fixed-center": true,
 "ipc": true,
-//"margin-top": 5,
-"margin-bottom": 5,
+"margin-top": 5,
+//"margin-bottom": 5,
 "width": 1444,
 	
-"modules-left": ["hyprland/workspaces#roman", "mpris", "tray#peony"],
+"modules-left": [
+	"hyprland/workspaces#roman", 
+	"mpris", 
+	"custom/swaync", 
+	"tray"
+	],
  
-"modules-center": ["clock#peony"], 
+"modules-center": ["clock#4"], 
 	
 "modules-right": [
-	"battery#peony",
+	"battery",
 	"custom/separator#blank",
-	"backlight#peony",
+	"backlight",
 	"custom/separator#blank",
 	"pulseaudio",
 	"custom/separator#blank",
 	"temperature",
 	"custom/separator#blank",	
-	"network#peony",
-	"custom/swaync"],
+	"network"],

-
-//M O D U L E S //
-
-"clock#peony": {
-	"interval": 60,
-	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
-	//"format": "{:%B | %a %d, %Y | %I:%M %p}",
-	"format": "{:%B | %a %d, %Y | %H:%M}",
-	"format-alt": "{:%a %b %d, %G}",
-},
-
-"wireplumber#peony": {
-	"format": "{icon} {volume}",
-	"format-muted": " Mute",
-	"on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
-	"on-click-right": "pavucontrol -t 3",
-	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
-	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
-	"format-icons": ["", "", "󰕾", ""], 
-},
-
-"backlight#peony": {
-	"device": "intel_backlight",
-	"format": "{percent}% {icon}",
-	"format-icons": ["󰛩", "󱩎", "󱩏", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󰛨"],
-},
-
-"network#peony": {
-	"format": "{ifname}",
-	"format-wifi": "{icon}",
-	"format-ethernet": "󰌘",
-	"format-disconnected": "󰌙", 
-	"tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}",
-	"format-linked": "󰈁 {ifname} (No IP)",
-	"tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
-	"tooltip-format-ethernet": "{ifname} 󰌘",
-	"tooltip-format-disconnected": "󰌙 Disconnected",
-	"max-length": 50,
-	"format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-},
-
-"battery#peony": {
-	"interval": 60,
-	"align": 0,
-	"rotate": 0,
-	//"bat": "BAT1",
-	//"adapter": "ACAD",
-	"full-at": 100,
-	"design-capacity": false,
-	"states": {
-    "good": 95,
-    "warning": 30,
-    "critical": 15
-	},
-	"format": "{icon}  {capacity}%",
-	"format-charging": " {capacity}%",
-	"format-plugged": "󱘖 {capacity}%",
-	"format-full": "{icon} Full",
-	"format-alt": "{icon} {time}",
-	"format-icons": ["", "", "", "", ""],
-	"format-time": "{H}h {M}min",
-	"tooltip": true,
-	"tooltip-format": "{timeTo} {power}w",
-	"on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
-	"on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
-},
-
-"tray#peony": {
-	"icon-size": 17,
-	"spacing": 8,
-}
 }	
--- a/config/waybar/configs/[BOT]
+++ b/config/waybar/configs/[BOT]
@ -37,19 +37,4 @@
 	"custom/power",					
 	],

-
-
-// Additional format / customize modules
-
-"custom/power": {
-	"format": " ",
-	"icon-size": 20,
-	"tooltip": false,
-},
-	
-"clock": {
-	//"format": "{:%I:%M %p - %d/%b}", //for AM/PM
-    "format": "{:%H:%M - %d/%b}", // 24H
-	"tooltip": false
-},
 }
--- a/config/waybar/configs/[TOP]
+++ b/config/waybar/configs/[TOP]
@ -12,7 +12,7 @@
 "exclusive": true,
 "passthrough": false,
 "position": "top",
-"spacing": 3,
+"spacing": 4,
 "fixed-center": true,
 "ipc": true,
 //"margin-top": 0,
@ -22,100 +22,28 @@
 	
 "modules-left": [
 	"hyprland/workspaces#cam",
-	"custom/separator#line", 
+	"custom/separator#line",
 	"mpris",
-	"custom/swaync", 
-	"tray#cam", 
-	"wlr/taskbar"
-	],
+	"custom/swaync",
+	"tray", 
+	"wlr/taskbar"],

-"modules-center": ["hyprland/window#cam"], 
+"modules-center": ["hyprland/window"], 
 	
 "modules-right": [
 	"custom/backlight",
 	"backlight/slider",
 	"custom/speaker",
 	"pulseaudio/slider",
-	"battery#cam",
-	"clock#cam", 
-	"network#cam"
-	],
+	"battery",
+	"clock#3", 
+	"network"],

 // Additional modules //
-
-"hyprland/workspaces#cam": {
-	"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": {
-		"1": "Uno",
-		"2": "Due",
-		"3": "Tre",
-		"4": "Quattro",
-		"5": "Cinque",
-		"6":"Sei",
-		"7":"Sette",
-		"8":"Otto",
-		"9":"Nove",
-		"10":"Dieci"
-	}	
-},
-
-"hyprland/window#cam": {
-	"format": " {title}",
-	"max-length": 50,
-	"rewrite": {
-		"(.*) — Mozilla Firefox": " $1",
-		"(.*) - zsh": "> [$1]"
-},
-		"separate-outputs": true
-},
-
-"clock#cam": {
-	"interval": 60,
-	//"format": "{:%A, %I:%M %P}",
-	"format": "{:%A, %H:%M}",
-	"max-length": 25,
-	
-},
-
-"battery#cam": {
-	"interval": 60,
-	"align": 0,
-	"rotate": 0,
-	//"bat": "BAT1",
-	//"adapter": "ACAD",
-	"full-at": 100,
-	"design-capacity": false,
-	"states": {
-	  "critical": 15
-			 },
-	"format": "{capacity}% {icon}",
-	"format-charging": " {capacity}%",
-	"format-plugged": "󱘖 {capacity}%",
-	"format-full": "{icon} Full",
-	"format-alt": "{icon} {time}",
-	"format-icons": ["", "", "", "", ""],
-	"format-time": "{H}h {M}min",
-	"tooltip": true,
-	"tooltip-format": "{timeTo} {power}w"
-},
-
 "pulseaudio/slider": {
 	"min": 0,
 	"max": 100,
-	"orientation": "horizontal",
+	"orientation": "horizontal"
 	
 },

@ -129,7 +57,7 @@
 	"min": 0,
 	"max": 100,
 	"orientation": "horizontal",
-	//"device": "intel_backlight"
+	"device": "intel_backlight"
 },

 "custom/backlight": {
@ -137,42 +65,4 @@
 	"interval": 1,
 	"format": "{}"
 },
-
-"tray#cam": {
-	//"icon-size": 16,
-	"spacing": 10
-},
-
-"network#cam": {
-	"format": "{ifname}",
-	"format-wifi": "{icon}",
-	"format-ethernet": "󰌘",
-	"format-disconnected": "󰌙", 
-	"tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}",
-	"format-linked": "󰈁 {ifname} (No IP)",
-	"tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
-	"tooltip-format-ethernet": "{ifname} 󰌘",
-	"tooltip-format-disconnected": "󰌙 Disconnected",
-	"max-length": 50,
-	"format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-},
-
-"wlr/taskbar": {
-	"format": "{icon}",
-	//"icon-size": 14,
-	//"icon-theme": "Numix-Circle",
-	"tooltip-format": "{title}",
-	"on-click": "activate",
-	"on-click-middle": "close",
-	"ignore-list": [
-	    "kitty"
-		],
-		"app_ids-mapping": {
-		  "firefoxdeveloperedition": "firefox-developer-edition"
-		},
-		"rewrite": {
-			"Firefox Web Browser": "Firefox",
-			"Foot Server": "Terminal"
-		}
-}
 }
--- a/config/waybar/configs/[TOP]
+++ b/config/waybar/configs/[TOP]
@ -18,78 +18,18 @@
 "margin-right": 5,
 "margin-top": 0,
 	
-"modules-left": ["clock#gar", "mpris", "tray", "custom/swaync"],
+"modules-left": [
+	"clock#5", 
+	"mpris", 
+	"tray", 
+	"custom/swaync"
+	],
  
 "modules-center": ["hyprland/workspaces"], 
 	
-"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
-
-// M O D U L E S //
-
-"clock#gar": {
-  //"format": "{:%A, %I:%M %P}",
-	"format": "{:%a %d | %H:%M}",
-	"format-alt": "{:%A, %d %B, %Y (%R)}"
-},
-
-"hyprland/window#gar": {
-  "format": "{}",
-  "max-length": 60
-},
-
-"tray#gar": {
-  "icon-size": 15,
-  "spacing": 10
-},
-
-"pulseaudio#gar": {
-  "format": "{icon} {volume}%",
-  "format-bluetooth": "{icon} {volume}%",
-  "format-bluetooth-muted": " {icon}",
-  "format-muted": "󰸈",
-  "format-icons": {
-    "headphone": "",
-    "hands-free": "",
-    "headset": "",
-    "phone": "",
-    "portable": "",
-    "car": "",
-    "default": ["", "", ""]
-  },
-  "on-click": "pamixer --toggle-mute",
-  "on-click-right": "pavucontrol",
-  "tooltip": false
-},
-
-"backlight#gar": {
-  //"device": "intel_backlight",
-  "format": "{icon} {percent}%",
-  "format-icons": ["", ""]
-},
-
-"battery#gar": {
-  "interval": 60,
-  "align": 0,
-  "rotate": 0,
-  //"bat": "BAT1",
-  //"adapter": "ACAD",
-  "full-at": 100,
-  "design-capacity": false,
-  "states": {
-    "good": 95,
-    "warning": 30,
-    "critical": 15
-       },
-  "format": "{icon}  {capacity}%",
-  "format-charging": " {capacity}%",
-  "format-plugged": "󱘖 {capacity}%",
-  "format-full": "{icon} Full",
-  "format-alt": "{icon} {time}",
-  "format-icons": ["", "", "", "", ""],
-  "format-time": "{H}h {M}min",
-  "tooltip": true,
-  "tooltip-format": "{timeTo} {power}w",
-  "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
-  "on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
-},    
+"modules-right": [
+	"pulseaudio#1",
+	"backlight#2", 
+	"battery"],
+   
 }
--- a/config/waybar/configs/[TOP]
+++ b/config/waybar/configs/[TOP]
@ -17,82 +17,21 @@
 "ipc": true,
 "margin-top": 5,
 //"margin-bottom": 5,
-"width": 768,
+"width": 1000,
 	
-"modules-left": ["clock#gar", "mpris", "tray", "custom/swaync"],
+"modules-left": [
+	"clock#5", 
+	"mpris", 
+	"tray", 
+	"custom/swaync"
+	],
 	  
 "modules-center": ["hyprland/workspaces#kanji"], 
 	
-"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
+"modules-right": [
+	"pulseaudio#1",
+	"backlight#2", 
+	"battery"
+	],

-
-// M O D U L E S //
-
-"clock#gar": {
-  //"format": "{:%A, %I:%M %P}",
-	"format": "{:%a %d | %H:%M}",
-	"format-alt": "{:%A, %d %B, %Y (%R)}"
-},
-
-"hyprland/window#gar": {
-  "format": "{}",
-  "max-length": 60
-},
-
-"tray#gar": {
-  "icon-size": 15,
-  "spacing": 10
-},
-
-"pulseaudio#gar": {
-  "format": "{icon} {volume}%",
-  "format-bluetooth": "{icon} {volume}%",
-  "format-bluetooth-muted": " {icon}",
-  "format-muted": "󰸈",
-  "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", "", ""]
-    },
-  "on-click": "pamixer --toggle-mute",
-  "on-click-right": "pavucontrol",
-  "tooltip": false
-},
-
-"backlight#gar": {
-  "device": "intel_backlight",
-  "format": "{icon} {percent}%",
-  "format-icons": ["", ""]
-},
-
-"battery#gar": {
-  "interval": 60,
-  "align": 0,
-  "rotate": 0,
-  //"bat": "BAT1",
-  //"adapter": "ACAD",
-  "full-at": 100,
-  "design-capacity": false,
-  "states": {
-    "good": 95,
-    "warning": 30,
-    "critical": 15
-       },
-  "format": "{icon}  {capacity}%",
-  "format-charging": " {capacity}%",
-  "format-plugged": "󱘖 {capacity}%",
-  "format-full": "{icon} Full",
-  "format-alt": "{icon} {time}",
-  "format-icons": ["", "", "", "", ""],
-  "format-time": "{H}h {M}min",
-  "tooltip": true,
-  "tooltip-format": "{timeTo} {power}w",
-  "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
-  "on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
-},
-   
 }
--- a/config/waybar/configs/[TOP]
+++ b/config/waybar/configs/[TOP]
@ -19,84 +19,24 @@
 //"margin-bottom": 5,
 "width": 1444,
 	
-"modules-left": ["hyprland/workspaces#roman", "mpris", "custom/swaync", "tray#peony"],
+"modules-left": [
+	"hyprland/workspaces#roman", 
+	"mpris", 
+	"custom/swaync", 
+	"tray"
+	],
  
-"modules-center": ["clock#peony"], 
+"modules-center": ["clock#4"], 
 	
 "modules-right": [
-	"battery#peony",
+	"battery",
 	"custom/separator#blank",
-	"backlight#peony",
+	"backlight",
 	"custom/separator#blank",
 	"pulseaudio",
 	"custom/separator#blank",
 	"temperature",
 	"custom/separator#blank",	
-	"network#peony"],
+	"network"],

-
-//M O D U L E S //
-
-"clock#peony": {
-	"interval": 60,
-	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
-	//"format": "{:%B | %a %d, %Y | %I:%M %p}",
-	"format": "{:%B | %a %d, %Y | %H:%M}",
-	"format-alt": "{:%a %b %d, %G}",
-},
-
-"wireplumber#peony": {
-	"format": "{icon} {volume}",
-	"format-muted": " Mute",
-	"on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
-	"on-click-right": "pavucontrol -t 3",
-	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
-	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
-	"format-icons": ["", "", "󰕾", ""], 
-},
-		
-"network#peony": {
-	"format": "{ifname}",
-	"format-wifi": "{icon}",
-	"format-ethernet": "󰌘",
-	"format-disconnected": "󰌙", 
-	"tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}",
-	"format-linked": "󰈁 {ifname} (No IP)",
-	"tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
-	"tooltip-format-ethernet": "{ifname} 󰌘",
-	"tooltip-format-disconnected": "󰌙 Disconnected",
-	"max-length": 50,
-	"format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-},
-
-"battery#peony": {
-	"interval": 60,
-	"align": 0,
-	"rotate": 0,
-	//"bat": "BAT1",
-	//"adapter": "ACAD",
-	"full-at": 100,
-	"design-capacity": false,
-	"states": {
-    "good": 95,
-    "warning": 30,
-    "critical": 15
-	},
-	"format": "{icon}  {capacity}%",
-	"format-charging": " {capacity}%",
-	"format-plugged": "󱘖 {capacity}%",
-	"format-full": "{icon} Full",
-	"format-alt": "{icon} {time}",
-	"format-icons": ["", "", "", "", ""],
-	"format-time": "{H}h {M}min",
-	"tooltip": true,
-	"tooltip-format": "{timeTo} {power}w",
-	"on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
-	"on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
-},
-
-"tray#peony": {
-	"icon-size": 17,
-	"spacing": 8,
-}
 }	
--- a/config/waybar/configs/[TOP]
+++ b/config/waybar/configs/[TOP]
@ -22,7 +22,7 @@
 "modules-center": [
 	"idle_inhibitor",
 	"custom/separator#blank",
-	"clock",
+	"clock#3",
 	"custom/separator#blank",
 	"custom/swaync"
 ],
@ -35,19 +35,4 @@
 	"custom/separator#blank",
 	"custom/power",					
 	],
-
-
-// Additional format / customize modules
-
-"custom/power": {
-	"format": " ",
-	"icon-size": 20,
-	"tooltip": false,
-},
-	
-"clock": {
-	//"format": "{:%I:%M %p - %d/%b}", //for AM/PM
-    "format": "{:%H:%M - %d/%b}", // 24H
-	"tooltip": false
-},
 }
--- a/config/waybar/modules
+++ b/config/waybar/modules
@ -160,6 +160,34 @@
 		"class<libreoffice-startcenter>": "󰏆 "
 		}   
 },
+"hyprland/workspaces#cam": {
+	"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": {
+		"1": "Uno",
+		"2": "Due",
+		"3": "Tre",
+		"4": "Quattro",
+		"5": "Cinque",
+		"6":"Sei",
+		"7":"Sette",
+		"8":"Otto",
+		"9":"Nove",
+		"10":"Dieci"
+	}	
+},
 // GROUP
 "group/motherboard": {
 	"orientation": "horizontal",
@ -241,6 +269,11 @@
 	"on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
 	"smooth-scrolling-threshold": 1,
 },
+"backlight#2": {
+  "device": "intel_backlight",
+  "format": "{icon} {percent}%",
+  "format-icons": ["", ""]
+},
 "battery": {
 	//"interval": 5,
 	"align": 0,
@ -282,7 +315,7 @@
 "clock": {
 	"interval": 1,
    //"format": " {:%I:%M %p}", // AM PM format
-    "format": " {:%H:%M:%S}",
+    "format": " {:%H:%M:%S}", // 24H
 	"format-alt": " {:%H:%M   %Y, %d %B, %A}",
 	"tooltip-format": "<tt><small>{calendar}</small></tt>",
 	"calendar": {
@ -307,12 +340,28 @@
 	"on-scroll-down": "shift_down"
 },
 "clock#2": {
-	// "timezone": "America/New_York",
-	//"format": " {:%I:%M %p}", // AM PM format
-	"format": "  {:%H:%M}",
+    //"format": " {:%I:%M %p}", // AM PM format
+    "format": "  {:%H:%M}", // 24H
    "format-alt": "{:%A  |  %H:%M  |  %e %B}",
    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
 },
+"clock#3": {
+    //"format": "{:%I:%M %p - %d/%b}", //for AM/PM
+    "format": "{:%H:%M - %d/%b}", // 24H
+	"tooltip": false
+},
+"clock#4": {
+	"interval": 60,
+    //"format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format
+    "format": "{:%B | %a %d, %Y | %H:%M}", // 24H
+	"format-alt": "{:%a %b %d, %G}",
+	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
+},
+"clock#5": {
+    //"format": "{:%A, %I:%M %P}", // AM PM format
+    "format": "{:%a %d | %H:%M}", // 24H
+	"format-alt": "{:%A, %d %B, %Y (%R)}"
+},
 "cpu": {
 	"format": "{usage}% 󰍛",
 	"interval": 1,
@ -482,6 +531,24 @@
 	"tooltip-format": "{icon} {desc} | {volume}%",
 	"smooth-scrolling-threshold": 1,
 },
+"pulseaudio#1": {
+  "format": "{icon} {volume}%",
+  "format-bluetooth": "{icon} {volume}%",
+  "format-bluetooth-muted": " {icon}",
+  "format-muted": "󰸈",
+  "format-icons": {
+      "headphone": "",
+      "hands-free": "",
+      "headset": "",
+      "phone": "",
+      "portable": "",
+      "car": "",
+      "default": ["", "", ""]
+    },
+  "on-click": "pamixer --toggle-mute",
+  "on-click-right": "pavucontrol",
+  "tooltip": false
+},
 "pulseaudio#microphone": {
 	"format": "{format_source}",
 	"format-source": " {volume}%",
@ -525,7 +592,7 @@
 	],
 },
 "wlr/taskbar": {
-	"format": "{icon} {name} ",
+	"format": "{icon}",
 	"icon-size": 15,
 	"all-outputs": false,
 	"tooltip-format": "{title}",
@ -534,7 +601,8 @@
 	"ignore-list": [
 		"wofi",
 		"rofi",
-	]
+		"kitty"
+		],
 },
 "custom/cycle_wall": {
 	"format": " ",
--- a/copy.sh
+++ b/copy.sh
@ -126,9 +126,25 @@ while true; do
  # Check if the answer is valid
  if [[ "$answer" == "y" ]]; then
    # Modify waybar config if 12hr is selected
-    sed -i 's/^    \/\/"format": " {:%I:%M %p}"/    "format": " {:%I:%M %p}"/' config/waybar/modules 2>&1 | tee -a "$LOG"
-    sed -i 's/^    "format": " {:%H:%M:%S}"/    \/\/"format": " {:%H:%M:%S}"/' config/waybar/modules 2>&1 | tee -a "$LOG"
+    # Clock 1
+    sed -i 's#^    \/\/"format": " {:%I:%M %p}", // AM PM format#    "format": " {:%I:%M %p}", // AM PM format#' config/waybar/modules 2>&1 | tee -a "$LOG"
+    sed -i 's#^    "format": " {:%H:%M:%S}", // 24H#    \/\/"format": " {:%H:%M:%S}", // 24H#' config/waybar/modules 2>&1 | tee -a "$LOG"
    
+    # Clock 2
+    sed -i 's#^    "format": "  {:%H:%M}", // 24H#    \/\/"format": "  {:%H:%M}", // 24H#' config/waybar/modules 2>&1 | tee -a "$LOG"
+    
+    # Clock 3
+    sed -i 's#^    \/\/"format": "{:%I:%M %p - %d/%b}", //for AM/PM#    "format": "{:%I:%M %p - %d/%b}", //for AM/PM#' config/waybar/modules 2>&1 | tee -a "$LOG"
+    sed -i 's#^    "format": "{:%H:%M - %d/%b}", // 24H#    \/\/"format": "{:%H:%M - %d/%b}", // 24H#' config/waybar/modules 2>&1 | tee -a "$LOG"
+    
+    # Clock 4
+    sed -i 's#^    \/\/"format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format#    "format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format#' config/waybar/modules 2>&1 | tee -a "$LOG"
+    sed -i 's#^    "format": "{:%B | %a %d, %Y | %H:%M}", // 24H#    \/\/"format": "{:%B | %a %d, %Y | %H:%M}", // 24H#' config/waybar/modules 2>&1 | tee -a "$LOG"
+
+    # Clock 5
+    sed -i 's#^    \/\/"format": "{:%A, %I:%M %P}", // AM PM format#    "format": "{:%A, %I:%M %P}", // AM PM format#' config/waybar/modules 2>&1 | tee -a "$LOG"
+    sed -i 's#^    "format": "{:%a %d | %H:%M}", // 24H#    \/\/"format": "{:%a %d | %H:%M}", // 24H#' config/waybar/modules 2>&1 | tee -a "$LOG"
+            
    # for hyprlock
    sed -i 's|^    #text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|    text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
    sed -i 's|^    text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|    #text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"