Merge pull request #252 from JaKooLit/development-wallust

Merging - Wallust Branch to Development Branch..

10 files changed, 48 insertions, 28 deletions

diff --git a/config/waybar/config b/config/waybar/config
index 48604a06..079ec33f 100644..120000
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -1 +1 @@
-for symlink
\ No newline at end of file
+/home/ja/.config/waybar/configs/[TOP] Default Laptop_v2
\ No newline at end of file
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 48604a06..ab62339b 100644..120000
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1 +1 @@
-for symlink
\ No newline at end of file
+/home/ja/.config/waybar/style/[Wallust] Chroma Tally.css
\ No newline at end of file
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;
diff --git a/config/waybar/wallust/colors-waybar.css b/config/waybar/wallust/colors-waybar.css
new file mode 100644
index 00000000..60cca045
--- /dev/null
+++ b/config/waybar/wallust/colors-waybar.css
@@ -0,0 +1,20 @@
+@define-color foreground #E2FECE;
+@define-color background rgba(1,1,2,0.25);
+@define-color cursor #E2FECE;
+
+@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;