some small changes

3 files changed, 157 insertions, 125 deletions

diff --git a/config/waybar/configs/default b/config/waybar/configs/default
index 379e3ba6..2f8678ff 100644
--- a/config/waybar/configs/default
+++ b/config/waybar/configs/default
@@ -37,24 +37,23 @@
 	"custom/light_dark",
 	"custom/separator#dot-line",	
 	"custom/lock",
-	],
-	//"custom/separator#dot-line",
-	//"custom/keybinds",	
-	//], 
+	//],
+	"custom/separator#dot-line",
+	"custom/keybinds",	
+	], 
 
 "modules-right": [
 	//"hyprland/window", 
 	"tray",
 	"custom/separator#dot-line",
-	//"bluetooth",
-	//"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line",
 	//"network",
-	//"custom/separator#dot-line",
-	//"cava", 
-	//"battery",
 	//"custom/separator#dot-line", 
-	//"backlight",
-	//"custom/separator#dot-line",
+	"battery",
+	"custom/separator#dot-line", 
+	"backlight",
+	"custom/separator#dot-line",
 	"pulseaudio",
 	"custom/separator#dot-line",
 	//"wireplumber", 
@@ -64,4 +63,4 @@
 	"custom/separator#dot-line",
 	"custom/power",
 	],
-}
+}
\ No newline at end of file
diff --git a/config/waybar/configs/default-Bottom b/config/waybar/configs/default-Bottom
index 68f54adc..512995df 100644
--- a/config/waybar/configs/default-Bottom
+++ b/config/waybar/configs/default-Bottom
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT-BOTTOM### //
+// ### DEFAULT ### //
 {
 "include": "~/.config/waybar/modules",
 "layer": "top",
@@ -11,12 +11,12 @@
 "spacing": 3,
 "fixed-center": true,
 "ipc": true,
-"margin-left": 6,
-"margin-right": 6,
-"margin-bottom": 4,
+//"margin-top": 6,
+"margin-left": 8,
+"margin-right": 8,
 
 "modules-left": [
-	"hyprland/workspaces",
+	"hyprland/workspaces#3",
 	"custom/separator#dot-line",
 	"cpu",
 	"custom/separator#dot-line", 
@@ -26,7 +26,7 @@
 	"custom/separator#dot-line",
 	"custom/weather",
 	],
-  
+
 "modules-center": [
 	"custom/menu",
 	"custom/separator#dot-line",
@@ -37,24 +37,23 @@
 	"custom/light_dark",
 	"custom/separator#dot-line",	
 	"custom/lock",
-	],
-	//"custom/separator#dot-line",
-	//"custom/keybinds",	
-	//], 
+	//],
+	"custom/separator#dot-line",
+	"custom/keybinds",	
+	], 
 
 "modules-right": [
 	//"hyprland/window", 
 	"tray",
 	"custom/separator#dot-line",
-	//"bluetooth",
-	//"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line",
 	//"network",
-	//"custom/separator#dot-line",
-	//"cava", 
-	//"battery",
 	//"custom/separator#dot-line", 
-	//"backlight",
-	//"custom/separator#dot-line",
+	"battery",
+	"custom/separator#dot-line", 
+	"backlight",
+	"custom/separator#dot-line",
 	"pulseaudio",
 	"custom/separator#dot-line",
 	//"wireplumber", 
diff --git a/config/waybar/style/pywal.css b/config/waybar/style/pywal.css
index bd933d0b..bbbbfcac 100644
--- a/config/waybar/style/pywal.css
+++ b/config/waybar/style/pywal.css
@@ -1,91 +1,107 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+/* ...........................................*/
+/* ...............Golden Noir................ */
+/* .......................................... */
+/* --- 👍 designed by https://github.com/Krautt  👍 --- */
+
+@import '../../.cache/wal/colors-waybar.css';
+@import "../waybar/style/catppuccin-themes/latte.css";
 
 * {
-font-family: "JetBrainsMono Nerd Font";
-font-weight: bold;
-min-height: 0;
-/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-font-size: 98%;
-font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
-padding: 1px;
-margin-top: 1px;
-margin-bottom: 1px;
+    font-family: "JetBrainsMono Nerd Font";
+    font-weight: bold;
+    min-height: 0;
+    /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+    font-size: 98%;
+    font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+    padding: 1px;
 }
 
-@import '../../.cache/wal/colors-waybar.css';
-
 window#waybar {
-	background: transparent;
+    background: transparent;
 }
 
-window#waybar.empty {
-	background-color: transparent;
+window#waybar.hidden {
+    opacity: 0.5;
 }
 
-window#waybar.empty #window {
-	padding: 0px;
-	margin: 0px;
-	border: 0px;
-	background-color: transparent;
+window#waybar.empty {
+    background-color: @background;
 }
 
-window > box {
-	background: rgba(0, 0, 0, 0);
-	border-bottom: 1px solid rgba(0, 0, 0, 0);
-	color: @foreground;
+window#waybar.empty #window {
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
+    /*  background-color: rgba(66,66,66,0.5); */
+    /* transparent */
+    background-color: transparent;
 }
 
-window {
-	/*font-weight: bold;*/
-}
 
 tooltip {
-	background: rgba(0, 0, 0, 0.4);
-	opacity: 0.8;
-	border-radius: 10px;
-	border-width: 2px;
+    background: @background;
+    border-radius: 10px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: @foreground;
 }
 
-tooltip label{
-	color: @foreground;
-}
 /*-----module groups----*/
 .modules-right {
-	background-color: rgba(0, 0, 0, 0.4);
-	border: 0.5px solid @color15;
-	border-radius: 10px;
+	border: 5px solid @color14;
+	border-radius: 100px 0px 0px 0px;
+	background-color: @color1;
+    padding-right: 5px;
+    padding-left: 5px;
+
 }
+
 .modules-center {
-	background-color: rgba(0, 0, 0, 0.4);
-	border: 0.5px solid @color15;
-	border-radius: 10px;
+	border: 5px solid @color14;
+	border-radius: 100px 0px 100px 0px;
+	background-color: @color1;
+
+
 }
+
 .modules-left {
-	background-color: rgba(0, 0, 0, 0.4);
-	border: 0.5px solid @color15;
-	border-radius: 10px;
+    padding-right: 5px;
+    padding-left: 5px;
+	border: 5px solid @color14;
+	border-radius: 0px 0px 100px 0px;
+	background-color: @color1;
+
 }
-/*-----modules indv----*/
 
 #workspaces button {
-	color: @color1;
-	padding: 0px 0px;
-	background-color: rgba(0, 0, 0, 0);
-	transition: all 0.3s ease-in-out;
+    padding: 2px;
+    color: #6E6A86;
+    margin-right: 5px;
 }
-#workspaces button:hover {
-	box-shadow: inherit;
-	background-color: @color2;
+
+#workspaces button.active {
+    color: @foreground;
+    border-radius: 40%;
+    background-color: @color0;
 }
 
 #workspaces button.focused {
-	background-color: rgba(0,85,102,0);
+    color: @color4;
 }
-#workspaces button.active {
-	color: @foreground;
-	/*background-color: rgba(0,85,102,0.3);*/
-	transition: all 0.3s ease-in-out;
 
+#workspaces button.urgent {
+    color: #11111b;
+    border-radius: 10px;
+}
+
+#workspaces button:hover {
+    color: @color4;
+    border-radius: 15px;
+}
+
+#clock#2 {
+    color: @color6;
 }
 
 #backlight,
@@ -124,62 +140,80 @@ tooltip label{
 #custom-weather.clearNight,
 #custom-weather.cloudyFoggyDay,
 #custom-weather.cloudyFoggyNight,
-#custom-weather.default 
-#custom-weather.rainyDay,
+#custom-weather.default #custom-weather.rainyDay,
 #custom-weather.rainyNight,
 #custom-weather.severe,
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding: 0px 6px;
-}
-#mode {
-	color: #cc3436;
-	font-weight: bold;
-}
-#custom-power {
-	/*background-color: rgba(0,119,179,0.6);*/
-	/*border-radius: 50px;*/
-	margin: 5px 5px;
-	padding: 1px 3px;
+	color: @foreground;
+    padding-right: 10px;
+    padding-left: 15px;
 }
-/*-----Indicators----*/
-#idle_inhibitor.activated {
-	color: #2dcc36;
+
+#temperature.critical {
+    background-color: #ff0000;
 }
-#pulseaudio.muted {
-	color: #cc3436;
+
+@keyframes blink {
+    to {
+        color: #000000;
+    }
 }
-#pulseaudio-microphone.muted {
-	color: #cc3436;
+
+#taskbar button.active {
+    background-color: rgb(47, 46, 46);
 }
-#temperature.critical {
-	color: #cc3436;
+
+#battery.critical:not(.charging) {
+    color: #f53c3c;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
 }
 
-#waybar {
-	background-color: @color14;
-	color: @color3;
+#pulseaudio-slider slider {
+    min-width: 0px;
+    min-height: 0px;
+    opacity: 0;
+    background-image: none;
+    border: none;
+    box-shadow: none;
 }
 
-@keyframes blink {
-	to {
-		color: #000000;
-	}
+#pulseaudio-slider trough {
+    min-width: 80px;
+    min-height: 5px;
+    border-radius: 5px;
+    background-color: #22252a;
 }
 
-#battery.critical:not(.charging) {
-	color: #f53c3c;
-	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
-	animation-iteration-count: infinite;
-	animation-direction: alternate;
+#pulseaudio-slider highlight {
+    min-height: 10px;
+    border-radius: 5px;
+    background-color: #ba5663;
 }
 
-#taskbar button.active {
-	background-color: #7f849c;
+#backlight-slider slider {
+    min-width: 0px;
+    min-height: 0px;
+    opacity: 0;
+    background-image: none;
+    border: none;
+    box-shadow: none;
 }
-#waybar.empty, #waybar.tiled, #waybar.floating {
-	background-color: transparent;
+
+#backlight-slider trough {
+    min-width: 80px;
+    min-height: 10px;
+    border-radius: 5px;
+    background-color: #22252a;
 }
+
+#backlight-slider highlight {
+    min-width: 10px;
+    border-radius: 5px;
+    background-color: #ba5663;
+}
\ No newline at end of file