Merge pull request #711 from JaKooLit/main

Main to Development

4 files changed, 33 insertions, 32 deletions

diff --git a/config/hypr/UserScripts/Weather.sh b/config/hypr/UserScripts/Weather.sh
index 0294e042..9bdaff4a 100755
--- a/config/hypr/UserScripts/Weather.sh
+++ b/config/hypr/UserScripts/Weather.sh
@@ -84,4 +84,4 @@ echo -e "{\"text\":\""$temperature $condition"\", \"alt\":\""${weather[0]}"\", \
 
 cached_weather=" $temperature  \n$condition ${weather[1]}"
 
-echo -e $cached_weather >  "$HOME/.cache/.weather_cache"
+echo -e $cached_weather >  "$HOME/.cache/.weather_cache"
\ No newline at end of file
diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf
index fbd24915..a0e105e0 100644
--- a/config/hypr/hyprlock-1080p.conf
+++ b/config/hypr/hyprlock-1080p.conf
@@ -66,7 +66,7 @@ label {
     color = $color12
     font_size = 200
     font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -320
+    position = 0, -340
     halign = center
     valign = top
 }
@@ -106,19 +106,7 @@ label {
     color = $color13
     font_size = 24
     font_family = Victor Mono Bold Oblique
-    position = 0, 150
-    halign = center
-    valign = bottom
-}
-
-# LAYOUT
-label {
-    monitor =
-    text = $LAYOUT
-    color = $color13
-    font_size = 24
-    font_family = Victor Mono Bold Oblique
-    position = 0, 120
+    position = 0, 220
     halign = center
     valign = bottom
 }
@@ -126,7 +114,7 @@ label {
 # INPUT FIELD
 input-field {
     monitor =
-    size = 300, 60
+    size = 200, 60
     outline_thickness = 2
     dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
     dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
@@ -139,7 +127,19 @@ input-field {
     font_family = Victor Mono Bold Oblique
     placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
     hide_input = false
-    position = 0, 50
+    position = 0, 100
+    halign = center
+    valign = bottom
+}
+
+# Keyboard LAYOUT
+label {
+    monitor =
+    text = $LAYOUT
+    color = $color13
+    font_size = 10
+    font_family = Victor Mono Bold Oblique
+    position = 0, 70
     halign = center
     valign = bottom
 }
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index a0d075cb..48b09b85 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -106,19 +106,7 @@ label {
     color = $color13
     font_size = 24
     font_family = Victor Mono Bold Oblique
-    position = 0, 250
-    halign = center
-    valign = bottom
-}
-
-# LAYOUT
-label {
-    monitor =
-    text = $LAYOUT
-    color = $color13
-    font_size = 24
-    font_family = Victor Mono Bold Oblique
-    position = 0, 200
+    position = 0, 280
     halign = center
     valign = bottom
 }
@@ -139,7 +127,20 @@ input-field {
     font_family = Victor Mono Bold Oblique
     placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
     hide_input = false
-    position = 0, 100
+    position = 0, 120
+    halign = center
+    valign = bottom
+}
+
+
+# Keyboard LAYOUT
+label {
+    monitor =
+    text = $LAYOUT
+    color = $color13
+    font_size = 12
+    font_family = Victor Mono Bold Oblique
+    position = 0, 80
     halign = center
     valign = bottom
 }
diff --git a/config/rofi/config-kitty-theme.rasi b/config/rofi/config-kitty-theme.rasi
index 5dc570be..f62fea12 100644
--- a/config/rofi/config-kitty-theme.rasi
+++ b/config/rofi/config-kitty-theme.rasi
@@ -32,7 +32,7 @@ inputbar {
 
 entry {
   expand: true;
-  placeholder: " 🐾  Search / Choose Kitty theme";
+  placeholder: " 🐾  Choose Kitty theme: Enter to Preview; CTRL S to Apply";
 }
 
 /* ---- Listview ---- */