Merge pull request #527 from JaKooLit/main

main to development

5 files changed, 25 insertions, 39 deletions

diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index 2748d5e7..05502bd3 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -13,7 +13,7 @@ wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified
 waybar_style="$HOME/.config/waybar/style/[Dark] Latte-Wallust combined.css"
 kvantum_theme="catppuccin-mocha-blue"
 color_scheme="prefer-dark"
-gtk_theme="Kali-Dark"
+gtk_theme="Flat-Remix-GTK-Blue-Dark"
 icon_theme="Flat-Remix-Blue-Dark"
 cursor_theme="Bibata-Modern-Ice"
 
diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css
index 55fb7dfb..a31f68cf 100644
--- a/config/waybar/style/[Dark] Latte-Wallust combined.css
+++ b/config/waybar/style/[Dark] Latte-Wallust combined.css
@@ -15,7 +15,7 @@
 @define-color background-module     @transparent;
 @define-color border-color          @color12;
 @define-color button-color          @color11;
-@define-color button-hover          @color9;
+@define-color button-hover          @color13;
 
 @import '../../.config/waybar/wallust/colors-waybar.css';
 @import "../waybar/style/catppuccin-themes/latte.css";
@@ -48,7 +48,7 @@ window#waybar.empty #window {
 
 tooltip {
     background: #1e1e2e;
-    border-radius: 5px;
+    border-radius: 12px;
     border-width: 1px;
     border-style: solid;
     border-color: @border-color;
@@ -58,13 +58,12 @@ tooltip {
 /*-----module groups----*/
 .modules-right {
     background-color: @background-module;
-    border-bottom:2px solid @border-color;
     border-radius:15px;
+    border-bottom:2px solid @border-color;
 	padding-top: 2px;
 	padding-bottom: 0px;
 	padding-right: 4px;
 	padding-left: 4px;
-
 }
 
 .modules-center {
diff --git a/config/waybar/style/[WALLUST] ML4W-modern.css b/config/waybar/style/[WALLUST] ML4W-modern.css
index afd86c4a..e5ac5417 100644
--- a/config/waybar/style/[WALLUST] ML4W-modern.css
+++ b/config/waybar/style/[WALLUST] ML4W-modern.css
@@ -3,15 +3,15 @@
 
 @import '../../.config/waybar/wallust/colors-waybar.css';
 
-@define-color backgroundlight @color5;
+@define-color backgroundlight @color0;
 @define-color backgrounddark @color12;
-@define-color workspacesbackground1 @color5;
+@define-color workspacesbackground1 @color0;
 @define-color workspacesbackground2 @color12;
-@define-color bordercolor @color11;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
+@define-color bordercolor @color13;
+@define-color textcolor1 @foreground;
+@define-color textcolor2 @foreground;
+@define-color textcolor3 @foreground;
+@define-color iconcolor @foreground;
 
 * {
 	font-family: "JetBrainsMono Nerd Font";
@@ -39,9 +39,7 @@ window#waybar {
     padding: 0px 2px;
     border-radius: 5px 5px 5px 5px;
     border: 0px;
-    font-weight: bold;
     font-style: normal;
-    opacity: 0.8;
     color: @textcolor1;
 }
 
@@ -50,9 +48,8 @@ window#waybar {
     margin: 3px 2px;
     border-radius: 3px 3px 3px 3px;
     color: @textcolor1;
-    background-color: @workspacesbackground2;
+    background-color: @workspacesbackground1;
     transition: all 0.1s linear;
-    opacity: 0.4;
 }
 
 #workspaces button.active {
@@ -61,7 +58,6 @@ window#waybar {
     border-radius: 3px 3px 3px 3px;
     min-width: 30px;
     transition: all 0.1s linear;
-    opacity:1.0;
 }
 
 #workspaces button:hover {
@@ -89,7 +85,6 @@ tooltip label {
     border-radius: 5px 5px 5px 5px;
     color:white;
     font-weight:normal;
-    opacity:0.8;
 }
 
 window#waybar.empty #window {
@@ -103,7 +98,6 @@ window#waybar.empty #window {
     border-radius: 5px 5px 5px 5px;
     font-weight: normal;
     font-style: normal;
-    opacity:0.8;
     border: 3px solid @backgroundlight;
 }
 
@@ -184,7 +178,6 @@ window#waybar.empty #window {
     margin-right: 8px;
 	margin-left: 6px;
     font-size: 100%;
-    opacity: 0.8;
     color: @iconcolor;
 }
 
@@ -196,7 +189,6 @@ window#waybar.empty #window {
     margin-right: 15px;
     font-size: 102%;
     font-weight: bold;
-    opacity: 0.8;
     color: @iconcolor;
 }
 
@@ -204,7 +196,6 @@ window#waybar.empty #window {
     margin-right: 15px;
     font-size: 100%;
     font-weight: bold;
-    opacity: 0.8;
     color: #dc2f2f;
 }
 
@@ -214,7 +205,6 @@ window#waybar.empty #window {
     border-radius: 5px 5px 5px 5px;
     padding: 0px 10px 0px 10px;
     margin: 2px 17px 2px 0px;
-    opacity:0.8;
     border:3px solid @bordercolor;
 }
 
@@ -223,7 +213,6 @@ window#waybar.empty #window {
     color: @textcolor1;
     border-radius: 5px 5px 5px 5px;
     padding: 0px 0px 0px 6px;
-    opacity:0.8;
     border:3px solid @bordercolor;
 }
 
@@ -231,7 +220,6 @@ window#waybar.empty #window {
     margin: 0px 13px 0px 0px;
     padding:0px;
     color: @iconcolor;
-    opacity: 0.8;
 }
 
 #custom-updater {
@@ -240,7 +228,6 @@ window#waybar.empty #window {
     border-radius: 5px 5px 5px 5px;
     padding: 2px 10px 0px 10px;
     margin: 3px 15px 3px 0px;
-    opacity:0.8;
 }
 
 #custom-updates.green {
@@ -267,7 +254,6 @@ window#waybar.empty #window {
     border-radius: 3px 5px 3px 5px;
     padding: 1px 10px 0px 10px;
     margin: 3px 0px 3px 0px;
-    opacity:0.8;
     border:3px solid @bordercolor;   
 }
 
@@ -278,7 +264,6 @@ window#waybar.empty #window {
     border-radius: 5px 5px 5px 5px;
     padding: 2px 10px 0px 10px;
     margin: 3px 15px 3px 0px;
-    opacity:0.8;
 }
 
 #pulseaudio {
@@ -287,7 +272,6 @@ window#waybar.empty #window {
     border-radius: 5px 5px 5px 5px;
     padding: 2px 10px 0px 10px;
     margin: 3px 15px 3px 0px;
-    opacity:0.8;
 }
 
 #pulseaudio.muted {
@@ -301,7 +285,6 @@ window#waybar.empty #window {
     border-radius: 5px 5px 5px 5px;
     padding: 2px 10px 0px 10px;
     margin: 3px 15px 3px 0px;
-    opacity:0.8;
 }
 
 #network.ethernet {
@@ -320,7 +303,6 @@ window#waybar.empty #window {
     border-radius: 5px 5px 5px 5px;
     padding: 2px 10px 0px 10px;
     margin: 3px 15px 3px 0px;
-    opacity:0.8;
 }
 
 #bluetooth.off {
@@ -335,7 +317,6 @@ window#waybar.empty #window {
     border-radius: 5px 5px 5px 5px;
     padding: 2px 15px 0px 10px;
     margin: 3px 15px 3px 0px;
-    opacity:0.8;
 }
 
 #battery.charging, #battery.plugged {
diff --git a/config/waybar/style/[Wallust Transparent] Crystal Clear.css b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
index 52cfec67..d8f21d29 100644
--- a/config/waybar/style/[Wallust Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
@@ -7,7 +7,7 @@
 @define-color critical #ff0000; /* critical color */
 @define-color warning #f3f809;  /* warning color */
 @define-color text @color12;  /* text color */
-@define-color text-alt @color9;  /* text alternative color */
+@define-color text-alt @color13;  /* text alternative color */
 @define-color bg @color7;  /* background color */
 
 *{
@@ -51,6 +51,15 @@ window#waybar.empty #window {
 	   
 }
 
+tooltip {
+	color: @color12;
+	background: @color10;
+	opacity: 0.8;
+	border-radius: 10px;
+	border-width: 1px;
+	border-style: solid;
+}
+
 #workspaces button {
 	color: @text-alt;
    	box-shadow: none;
diff --git a/config/waybar/style/[Wallust] Simple.css b/config/waybar/style/[Wallust] Simple.css
index a5d122f3..830d8f60 100644
--- a/config/waybar/style/[Wallust] Simple.css
+++ b/config/waybar/style/[Wallust] Simple.css
@@ -25,13 +25,10 @@ window#waybar.empty #window {
 }
 
 tooltip {
-	color: @color15;
-	background: @color0;
-	opacity: 0.8;
+	color: @color13;
+	background: @color10;
+	opacity: 1.0;
 	border-radius: 10px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: @color15;
 }
 
 /*-----module groups----*/