Merge branch 'development' into main

9 files changed, 394 insertions, 27 deletions

diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css
new file mode 100644
index 00000000..f56f1a17
--- /dev/null
+++ b/config/waybar/style/[Dark] Latte-Wallust combined.css
@@ -0,0 +1,367 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Catppuccin Latte - Wallust */
+/* Original Design by DC user mannatsingh */
+
+@define-color white      	#F2F2F2;
+@define-color black      	#000000;
+@define-color text       	#FFFFFF;
+@define-color lightgray  	#686868;
+@define-color darkgray   	#353535;
+
+@define-color transparent	rgba(1, 1, 1, 0.5);
+@define-color teal-trans	rgba(1, 117, 84, 0.5);
+@define-color cyan			rgba(53, 140, 169, 1);
+
+@define-color background-module     @transparent;
+@define-color border-color          @color9;
+@define-color button-color          @color11;
+@define-color button-hover          @color12;
+
+@import '../../.config/waybar/wallust/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: 97%;
+    font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+    padding: 1px;
+}
+
+window#waybar {
+    background: transparent;
+    border-radius: 0px;
+    color: #cba6f7;
+}
+
+window#waybar.hidden {
+    opacity: 0;
+}
+
+window#waybar.empty {
+    /*background-color: #040406;*/
+    background-color: transparent;
+}
+
+window#waybar.empty #window {
+    padding: 0px;
+    border: 0px;
+    /*  background-color: rgba(66,66,66,0.5); */
+    /* transparent */
+    background-color: transparent;
+}
+
+
+tooltip {
+    background: #1e1e2e;
+    border-radius: 5px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: @border-color;
+    color: #ffffff;
+}
+
+/*-----module groups----*/
+.modules-right {
+    background-color: @background-module;
+    border-bottom:2px solid @border-color;
+    border-radius:15px;
+	padding-top: 2px;
+	padding-bottom: 0px;
+	padding-right: 4px;
+	padding-left: 4px;
+
+}
+
+.modules-center {
+    background-color: @background-module;
+    border-radius:15px;
+    border-bottom:2px solid @border-color;
+    /*border-right: 2px solid #ffd700;*/
+    /*border:@teal-trans;*/
+	padding-top: 2px;
+	padding-bottom: 4px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+
+.modules-left {
+    background-color: @background-module;
+    border-radius:15px;
+    border-bottom: 2px solid @border-color;
+	padding-top: 2px;
+	padding-bottom: 4px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+
+#workspaces {
+    padding: 0px 1px;
+    border-radius: 15px;
+    border:2px solid @border-color;
+    font-weight: bold;
+    font-style: normal;
+    opacity:0.8;
+    color:#FFFFFF;
+}   
+#workspaces button {
+    color: #6E6A86;
+    box-shadow: none;
+	text-shadow: none;
+    border-radius: 30px;
+    padding-left: 4px;
+    padding-right: 4px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#workspaces button.active {
+    color: #ffd700;
+    border-radius: 50%;
+    background-color: black;
+    border-radius: 15px 15px 15px 15px;
+    padding-left: 8px;
+    padding-right: 8px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#workspaces button.focused {
+    color: #d8dee9;
+}
+
+#workspaces button.urgent {
+    color: #11111b;
+    border-radius: 10px;
+}
+
+#workspaces button:hover {
+    color: #ffd700;
+    border-radius: 10px;
+ 	padding-left: 2px;
+    padding-right: 2px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#clock#2 {
+    color: #efe8f7;
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-cava_mviz,
+#custom-cycle_wall,
+#custom-keybinds,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-swaync,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default, 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
+    color: #e5d9f5;
+	padding-top: 1px;
+	padding-bottom: 1px;
+	padding-right: 6px;
+	padding-left: 6px;
+}
+
+#temperature.critical {
+    background-color: #ff0000;
+}
+
+@keyframes blink {
+    to {
+        color: #000000;
+    }
+}
+
+#taskbar button.active {
+    background-color: rgb(47, 46, 46);
+    padding-left: 12px;
+    padding-right: 12px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#taskbar button:hover {
+    padding-left: 3px;
+    padding-right: 3px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#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 slider {
+    min-width: 0px;
+    min-height: 0px;
+    opacity: 0;
+    background-image: none;
+    border: none;
+    box-shadow: none;
+}
+
+#pulseaudio-slider trough {
+    min-width: 80px;
+    min-height: 5px;
+    border-radius: 5px;
+    background-color: #22252a;
+}
+
+#pulseaudio-slider highlight {
+    min-height: 10px;
+    border-radius: 5px;
+    background-color: #ba5663;
+}
+
+#backlight-slider slider {
+    min-width: 0px;
+    min-height: 0px;
+    opacity: 0;
+    background-image: none;
+    border: none;
+    box-shadow: none;
+}
+
+#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;
+}
+#pulseaudio-slider,
+#pulseaudio {
+	color: @color13;
+}
+
+#pulseaudio.muted {
+    color: red;
+}
+
+#memory {
+	color: @sapphire;
+}
+
+#cpu {
+	color: @mauve;
+}
+
+#battery {
+	color: @rosewater;
+}
+
+#disk {
+	color: @sky;
+}
+
+#temperature.critical {
+    background-color: @red;
+}
+#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 slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#pulseaudio-slider trough {
+	min-width: 80px;
+	min-height: 5px;
+	border-radius: 5px;
+}
+
+#pulseaudio-slider highlight {
+	min-height: 10px;
+	border-radius: 5px;
+}
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#backlight-slider trough {
+	min-width: 80px;
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider highlight {
+	min-width: 10px;
+	border-radius: 5px;
+}
+#custom-lock,
+#idle_inhibitor {
+    color: @teal;
+}
+#clock {
+	color: @sapphire;
+    border-radius: 15px;
+    border:2px solid @border-color;
+}
+#custom-updates {
+    color: @yellow;
+}
+#swaync{
+    color: #ffd700;}
diff --git a/config/waybar/style/[Dark] Obsidian Edge.css b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
index a64649f2..526547f7 100644
--- a/config/waybar/style/[Dark] Obsidian Edge.css
+++ b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
@@ -1,7 +1,7 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Dark - Obsidian Edge */
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 * {
 font-family: "JetBrainsMono Nerd Font";
diff --git a/config/waybar/style/[Pywal Bordered] Chroma Fusion Edge.css b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
index 89977952..b9831707 100644
--- a/config/waybar/style/[Pywal Bordered] Chroma Fusion Edge.css
+++ b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
@@ -1,6 +1,6 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
 /* ....Chroma Fusion Edge .... */
-/* Pywal & Catppuccin - Bordered */
+/* Wallust & Catppuccin - Bordered */
 
 @define-color white      	#F2F2F2;
 @define-color black      	#000000;
@@ -13,11 +13,11 @@
 @define-color cyan			rgba(53, 140, 169, 1);
 
 @define-color background-module     @transparent;
-@define-color border-color          @color2;
+@define-color border-color          @color9;
 @define-color button-color          @color11;
 @define-color button-hover          @color12;
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 @import "../waybar/style/catppuccin-themes/latte.css";
 
 * {
diff --git a/config/waybar/style/[Pywal Transparent] Crystal Clear.css b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
index 9d6502f6..189be61f 100644
--- a/config/waybar/style/[Pywal Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
@@ -1,15 +1,15 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
 /* ..........................................*/
-/* .......Pywal - Transparent............... */
+/* ....Wallust - Clear Background........ */
 /* ......................................... */
-/* --- 👍 designed by https://github.com/Krautt  👍 --- */
+/* --- 👍 original designed by https://github.com/Krautt  👍 --- */
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 @define-color critical #ff0000; /* critical color */
 @define-color warning #f3f809;  /* warning color */
-@define-color text @color2;  /* text color */
-@define-color text-alt @color7;  /* text alternative color */
+@define-color text @color12;  /* text color */
+@define-color text-alt @color9;  /* text alternative color */
 @define-color bg @color7;  /* background color */
 
 *{
diff --git a/config/waybar/style/[Pywal] Chroma Edge.css b/config/waybar/style/[Wallust] Chroma Edge.css
index 600b72d0..9ee29a21 100644
--- a/config/waybar/style/[Pywal] Chroma Edge.css
+++ b/config/waybar/style/[Wallust] Chroma Edge.css
@@ -1,7 +1,7 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Pywal Chroma Edge */
+/* Wallust Chroma Edge */
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 * {
 font-family: "JetBrainsMono Nerd Font";
@@ -43,7 +43,7 @@ tooltip {
 	border-radius: 12px;
 	border-width: 2px;
 	border-style: solid;
-	border-color: @color2;
+	border-color: @color12;
 }
 
 tooltip label{
@@ -133,7 +133,7 @@ tooltip label{
 	/* color: #bf616a; */
 	border-radius: 12px;
 	background-color: rgba(50, 50, 50, 0.1);
-	border: 1px solid @color2;
+	border: 1px solid @color12;
 	padding: 5px;
 }
 
diff --git a/config/waybar/style/[Pywal] Chroma Fusion.css b/config/waybar/style/[Wallust] Chroma Fusion.css
index 00e50ef6..e8a04270 100644
--- a/config/waybar/style/[Pywal] Chroma Fusion.css
+++ b/config/waybar/style/[Wallust] Chroma Fusion.css
@@ -1,6 +1,6 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
 /* ....Chroma Fusion Edge .... */
-/* Pywal -Catpuccin */
+/* Wallust - Catpuccin */
 
 @define-color white      	#F2F2F2;
 @define-color black      	#000000;
@@ -13,11 +13,11 @@
 @define-color cyan			rgba(53, 140, 169, 1);
 
 @define-color background-module     @transparent;
-@define-color border-color          @color2;
+@define-color border-color          @color12;
 @define-color button-color          @color11;
 @define-color button-hover          @color12;
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 @import "../waybar/style/catppuccin-themes/latte.css";
 
 * {
diff --git a/config/waybar/style/[Pywal] Chroma Tally.css b/config/waybar/style/[Wallust] Chroma Tally.css
index fe3bc0f1..24f08dfd 100644
--- a/config/waybar/style/[Pywal] Chroma Tally.css
+++ b/config/waybar/style/[Wallust] Chroma Tally.css
@@ -1,7 +1,7 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Pywal - Chroma Tally */
+/* Wallust - Chroma Tally */
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 * {
 font-family: "JetBrainsMono Nerd Font";
@@ -18,7 +18,7 @@ window#waybar {
     border-radius: 12px;
 	border-bottom: 2px;
     border-style: solid;
-	border-color: @color2; 
+	border-color: @color12; 
 }
 
 #workspaces {
diff --git a/config/waybar/style/[Pywal] Colored.css b/config/waybar/style/[Wallust] Colored.css
index f52211bf..251f10ba 100644
--- a/config/waybar/style/[Pywal] Colored.css
+++ b/config/waybar/style/[Wallust] Colored.css
@@ -1,7 +1,7 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* pywal Colored*/
+/* Wallust Colored*/
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 * {
     font-family: "JetBrainsMono Nerd Font";
@@ -37,7 +37,7 @@ tooltip {
     border-radius: 10px;
     border-width: 1px;
     border-style: solid;
-    border-color: @color2;
+    border-color: @color15;
 }
 
 /*-----module groups----*/
@@ -85,7 +85,7 @@ tooltip {
 
 #workspaces button.active {
     color: @background;
-    background-color: @color2;
+    background-color: @color7;
     padding-left: 8px;
     padding-right: 8px;
     animation: gradient_f 20s ease-in infinite;
diff --git a/config/waybar/style/[Pywal] Simple.css b/config/waybar/style/[Wallust] Simple.css
index 835d2cac..77d39c60 100644
--- a/config/waybar/style/[Pywal] Simple.css
+++ b/config/waybar/style/[Wallust] Simple.css
@@ -1,5 +1,5 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* pywal - Simple */
+/* Wallust - Simple */
 
 *{
 font-family: "JetBrainsMono Nerd Font";
@@ -12,7 +12,7 @@ padding-top: 1px;
 padding-bottom: 1px;
 }
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 window#waybar {
 	background: transparent;
@@ -23,7 +23,7 @@ window#waybar {
 }
 
 tooltip {
-	color: @color2;
+	color: @color15;
 	background: @color0;
 	opacity: 0.8;
 	border-radius: 10px;
@@ -145,7 +145,7 @@ tooltip {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	color: @color2;
+	color: @color12;
 	padding-top: 3px;
 	padding-bottom: 3px;
 	padding-right: 6px;