Merge pull request #263 from JaKooLit/development

Development to main - For release of new dots

5 files changed, 33 insertions, 81 deletions

diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop_v2
index 31f3d6e5..9021f0b1 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v2
+++ b/config/waybar/configs/[TOP] Default Laptop_v2
@@ -33,7 +33,7 @@
 	"clock",
 	"custom/separator#line",
 	"hyprland/workspaces#roman",
-	"custom/separator#line",
+	"custom/separator#dot-line",
 	"idle_inhibitor",	
 	"custom/hint",	
 	], 
diff --git a/config/waybar/configs/[TOP] Default_v2 b/config/waybar/configs/[TOP] Default_v2
index 0b4c90d8..703cdee2 100644
--- a/config/waybar/configs/[TOP] Default_v2
+++ b/config/waybar/configs/[TOP] Default_v2
@@ -31,7 +31,7 @@
 	"clock",
 	"custom/separator#line",
 	"hyprland/workspaces#roman",
-	"custom/separator#line",
+	"custom/separator#dot-line",
 	"idle_inhibitor",	
 	"custom/hint",	
 	], 
diff --git a/config/waybar/modules b/config/waybar/modules
index 9956e30e..e7606c4c 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -196,17 +196,7 @@
 	"format-full": "{icon} Full",
 	"format-alt": "{icon} {time}",
 	"format-icons": [
-		"󰂎",
-		"󰁺",
-		"󰁻",
-		"󰁼",
-		"󰁽",
-		"󰁾",
-		"󰁿",
-		"󰂀",
-		"󰂁",
-		"󰂂",
-		"󰁹"
+		"󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
 	],
 	"format-time": "{H}h {M}min",
 	"tooltip": true,
@@ -257,14 +247,7 @@
 	"format-alt-click": "click",
 	"format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% 󰍛",
 	"format-icons": [
-		"▁",
-		"▂",
-		"▃",
-		"▄",
-		"▅",
-		"▆",
-		"▇",
-		"█"
+		"▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"
 	],
 	"on-click-right": "gnome-system-monitor",
 },
@@ -370,11 +353,7 @@
 	"tooltip-format-disconnected": "󰌙 Disconnected",
 	"max-length": 50,
 	"format-icons": [
-		"󰤯",
-		"󰤟",
-		"󰤢",
-		"󰤥",
-		"󰤨"
+		"󰤯", "󰤟", "󰤢", "󰤥", "󰤨"
 	]
 },
 "network#speed": {
@@ -390,11 +369,7 @@
 	"tooltip-format-disconnected": "󰌙 Disconnected",
 	"max-length": 50,
 	"format-icons": [
-		"󰤯",
-		"󰤟",
-		"󰤢",
-		"󰤥",
-		"󰤨"
+		"󰤯", "󰤟", "󰤢", "󰤥", "󰤨"
 	]
 },
 "pulseaudio": {
@@ -409,10 +384,7 @@
 		"portable": "",
 		"car": "",
 		"default": [
-			"",
-			"",
-			"󰕾",
-			""
+			"", "", "󰕾",  ""
 		],
 		"ignored-sinks": [
 			"Easy Effects Sink"
@@ -454,8 +426,8 @@
 	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
 },
 "tray": {
-	"icon-size": 15,
-	"spacing": 8,
+	"icon-size": 18,
+	"spacing": 4,
 },
 "wireplumber": {
 	"format": "{icon} {volume} %",
@@ -465,10 +437,7 @@
 	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
 	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
 	"format-icons": [
-		"",
-		"",
-		"󰕾",
-		""
+		"", "", "󰕾", ""
 	],
 },
 "wlr/taskbar": {
@@ -506,7 +475,7 @@
 	"on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh",
 },
 "custom/light_dark": {
-	"format": "{}",
+	"format": "󰔎{}",
 	"exec": "echo ; echo 󰔎 Dark-Light switcher",
 	"on-click": "~/.config/hypr/scripts/DarkLight.sh",
 	"on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh",
@@ -634,21 +603,7 @@
 	"format": "{icon}",
 	//"format-icons": ["󰃞", "󰃟", "󰃠"],
 	"format-icons": [
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		""
+		"", "", "", "", "", "", "", "", "", "", "", "", "", "", ""
 	],
 	"on-click": "",
 	"on-click-middle": "",
@@ -699,10 +654,7 @@
 		"portable": "",
 		"car": "",
 		"default": [
-			"",
-			"",
-			"󰕾",
-			""
+			"", "", "󰕾", ""
 		],
 		"tooltip-format": "{icon} {desc} | {volume}%",
 		"ignored-sinks": [
diff --git a/config/waybar/style.css b/config/waybar/style.css
index ab62339b..a62ad095 120000
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1 +1 @@
-/home/ja/.config/waybar/style/[Wallust] Chroma Tally.css
\ No newline at end of file
+/home/ja/.config/waybar/style/[Dark] Latte-Wallust combined.css
\ No newline at end of file
diff --git a/config/waybar/wallust/colors-waybar.css b/config/waybar/wallust/colors-waybar.css
index 60cca045..a9c70909 100644
--- a/config/waybar/wallust/colors-waybar.css
+++ b/config/waybar/wallust/colors-waybar.css
@@ -1,20 +1,20 @@
-@define-color foreground #E2FECE;
-@define-color background rgba(1,1,2,0.25);
-@define-color cursor #E2FECE;
+@define-color foreground #D1F8FD;
+@define-color background rgba(6,4,2,0.25);
+@define-color cursor #D1F8FD;
 
-@define-color color0 #010102;
-@define-color color1 #595213;
-@define-color color2 #9E2517;
-@define-color color3 #0E714C;
-@define-color color4 #08AC75;
-@define-color color5 #08BCB1;
-@define-color color6 #81BC57;
-@define-color color7 #CDF5B1;
-@define-color color8 #8FAB7C;
-@define-color color9 #776D19;
-@define-color color10 #D3311F;
-@define-color color11 #129766;
-@define-color color12 #0AE59C;
-@define-color color13 #0AFAEC;
-@define-color color14 #ACFB74;
-@define-color color15 #CDF5B1;
+@define-color color0 #060402;
+@define-color color1 #7A6835;
+@define-color color2 #677762;
+@define-color color3 #2586B5;
+@define-color color4 #998C72;
+@define-color color5 #94A7B8;
+@define-color color6 #5CB1BC;
+@define-color color7 #B5EDF4;
+@define-color color8 #7EA6AB;
+@define-color color9 #A38A46;
+@define-color color10 #899F83;
+@define-color color11 #31B2F1;
+@define-color color12 #CCBA98;
+@define-color color13 #C6DEF5;
+@define-color color14 #7BECFA;
+@define-color color15 #B5EDF4;