Merge pull request #274 from JaKooLit/development

Development to main
JaKooLit · May 14, 2024 · e49d4a5 · e49d4a5
2 parents e53a9c3 + 0336380
commit e49d4a5
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 19 deletions.
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
@@ -17,7 +17,7 @@ background {
     color = $color7
 
     # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
-    blur_size = 4
+    blur_size = 6
     blur_passes = 2 # 0 disables blurring
     noise = 0.0117
     contrast = 1.3000 # Vibrant!!!
@@ -33,7 +33,7 @@ input-field {
     dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
     dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
     dots_center = true
-    outer_color = $color1
+    outer_color = $color5
     inner_color = $color0
     font_color = $color12
     fade_on_empty = true
@@ -49,7 +49,7 @@ input-field {
 label {
     monitor =
     text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B %Y')" </b>"
-    color = $color9
+    color = $color12
     font_size = 34
     font_family = JetBrains Mono Nerd Font 10
 
@@ -88,7 +88,7 @@ text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H
 label {
     monitor =
     text =    $USER
-    color = $color9
+    color = $color12
     font_size = 18
     font_family = Inter Display Medium
 
@@ -127,8 +127,8 @@ image {
     path = $HOME/.config/rofi/.current_wallpaper
     size = 230
     rounding = -1
-    border_size = 4
-    border_color = $color1
+    border_size = 2
+    border_color = $color11
     rotate = 0
     reload_time = -1
     position = 0, 300

diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
@@ -40,6 +40,7 @@ yad --width=$dynamic_width --height=$dynamic_height \
 "ESC" "close this app" "" "=" "SUPER KEY (Windows Key)" "(SUPER KEY)" \
 " enter" "Terminal" "(kitty)" \
 " SHIFT enter" "DropDown Terminal" "(kitty-pyprland)" \
+" A" "Desktop Overview" "(AGS Overview)" \
 " D" "App Launcher" "(rofi-wayland)" \
 " T" "Open File Manager" "(Thunar)" \
 " S" "Google Search" "(rofi)" \

diff --git a/config/swaync/style.css b/config/swaync/style.css
@@ -3,10 +3,10 @@
 
 @import '../../.config/waybar/wallust/colors-waybar.css';
 
-@define-color noti-border-color @color9;
+@define-color noti-border-color @color12;
 @define-color noti-bg rgba(0, 0, 0, 0.8);
 @define-color noti-bg-alt #111111;
-@define-color noti-bg-hover @color2;
+@define-color noti-bg-hover @color9;
 @define-color text-color @foreground;
 @define-color text-color-alt @foreground;
 @define-color text-color-disabled rgba(150, 150, 150, 0.8);

diff --git a/config/wallust/wallust.toml b/config/wallust/wallust.toml
@@ -1,6 +1,6 @@
 # wallust 3.0 beta.*
 
-backend = "resized"
+backend = "kmeans"
 color_space = "lch"
 
 # NOTE: All filters will fill 16 colors (from color0 to color15), 16 color
@@ -40,6 +40,9 @@ rofi.target = '~/.config/rofi/wallust/colors-rofi.rasi'
 waybar.template = 'templates/colors-waybar.css'
 waybar.target = '~/.config/waybar/wallust/colors-waybar.css'
 
+#kitty.template = 'templates/colors-kitty.conf'
+#kitty.target = '~/.config/kitty/kitty.conf'
+
 #swaync.template = 'templates/colors-swaync.css'
 #swaync.target = '~/.config/swaync/wallust/colors-wallust.css'
 

diff --git a/config/waybar/modules b/config/waybar/modules
@@ -413,7 +413,7 @@
 	"interval": 10,
 	"tooltip": true,
 	"hwmon-path": [
-		"/sys/class/hwmon/hwmon6/temp1_input",
+		"/sys/class/hwmon/hwmon1/temp1_input",
 		"/sys/class/thermal/thermal_zone0/temp"
 	],
 	//"thermal-zone": 0,
@@ -685,7 +685,7 @@
 	"interval": 10,
 	"tooltip": true,
 	"hwmon-path": [
-		"/sys/class/hwmon/hwmon6/temp1_input",
+		"/sys/class/hwmon/hwmon1/temp1_input",
 		"/sys/class/thermal/thermal_zone0/temp"
 	],
 	//"thermal-zone": 0,

diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css
@@ -13,9 +13,9 @@
 @define-color cyan			rgba(53, 140, 169, 1);
 
 @define-color background-module     @transparent;
-@define-color border-color          @color9;
+@define-color border-color          @color12;
 @define-color button-color          @color11;
-@define-color button-hover          @color12;
+@define-color button-hover          @color9;
 
 @import '../../.config/waybar/wallust/colors-waybar.css';
 @import "../waybar/style/catppuccin-themes/latte.css";

diff --git a/config/waybar/style/[Dark] Wallust Obsidian Edge.css b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
@@ -74,7 +74,7 @@ tooltip label {
 }
 
 #workspaces button {
-    color: @color2;
+    color: @color12;
     box-shadow: none;
 	text-shadow: none;
     padding: 0px;

diff --git a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
@@ -13,9 +13,9 @@
 @define-color cyan			rgba(53, 140, 169, 1);
 
 @define-color background-module     @transparent;
-@define-color border-color          @color9;
+@define-color border-color          @color12;
 @define-color button-color          @color11;
-@define-color button-hover          @color12;
+@define-color button-hover          @color9;
 
 @import '../../.config/waybar/wallust/colors-waybar.css';
 @import "../waybar/style/catppuccin-themes/latte.css";

diff --git a/config/waybar/style/[Wallust] Colored.css b/config/waybar/style/[Wallust] Colored.css
@@ -42,7 +42,7 @@ tooltip {
 
 /*-----module groups----*/
 .modules-right {
-	border: 3px solid @color14;
+	border: 3px solid @color12;
 	border-radius: 40px 0px 0px 0px;
 	background-color: @color1;
 	padding-top: 2px;
@@ -52,7 +52,7 @@ tooltip {
 }
 
 .modules-center {
-	border: 3px solid @color14;
+	border: 3px solid @color7;
 	border-radius: 60px 0px 60px 0px;
 	background-color: @background;
 	padding-top: 2px;
@@ -62,7 +62,7 @@ tooltip {
 }
 
 .modules-left {
-	border: 3px solid @color14;
+	border: 3px solid @color12;
 	border-radius: 0px 0px 40px 0px;
 	background-color: @color1;
 	padding-top: 2px;