I hope this is a final change before merging to main

2 files changed, 70 insertions, 66 deletions

diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf
index 7d2566a7..acd3258c 100755..100644
--- a/config/hypr/hyprlock-1080p.conf
+++ b/config/hypr/hyprlock-1080p.conf
@@ -8,6 +8,7 @@ $Scripts = $HOME/.config/hypr/scripts
 
 general {
     grace = 1
+	fractional_scaling = 2
 }
 
 background {
@@ -20,8 +21,8 @@ background {
     #color = $color7
 
     # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
-    blur_size = 2
-    blur_passes = 1 # 0 disables blurring
+    blur_size = 3
+    blur_passes = 2 # 0 disables blurring
     noise = 0.0117
     contrast = 1.3000 # Vibrant!!!
     brightness = 0.8000
@@ -34,12 +35,12 @@ background {
 label {
     monitor =
     text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B')" </b>"
-    color = $color12
-    font_size = 24
-    font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -50
+    color = $color13
+    font_size = 16
+    font_family = Victor Mono Bold Italic
+    position = 0, -120
     halign = center
-    valign = top
+    valign = center
 }
 
 # Hour-Time
@@ -49,9 +50,9 @@ label {
 #    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
 	#color = rgba(255, 185, 0, .8)
     color = $color13
-    font_size = 160
+    font_size = 200
     font_family = JetBrainsMono Nerd Font ExtraBold 
-    position = 0, -100
+    position = 0, -60
     halign = center
     valign = top
 }
@@ -62,7 +63,7 @@ label {
     text = cmd[update:1000] echo "$(date +"%M")"
     #color = rgba(15, 10, 222, .8)
     color = $color12
-    font_size = 160
+    font_size = 200
     font_family = JetBrainsMono Nerd Font ExtraBold
     position = 0, -320
     halign = center
@@ -77,24 +78,24 @@ label {
     color = $color11
     font_size = 35
     font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -325
+    position = 0, -350
     halign = center
     valign = top
 }
 
 # Put a picture of choice here. Default is the current wallpaper
-image {
-    monitor =
-    path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
-    size = 160
-    rounding = -1
-    border_size = 0
-    border_color = $color11
-    rotate = 0
-    reload_time = -1
-    position = 0, 280
-    halign = center
-    valign = bottom
+#image {
+#    monitor =
+#    path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
+#    size = 160
+#    rounding = -1
+#    border_size = 0
+#    border_color = $color11
+#    rotate = 0
+#    reload_time = -1
+#    position = 0, 280
+#    halign = center
+#    valign = bottom
 }
 
 # USER
@@ -107,8 +108,8 @@ label {
     dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
     dots_center = true
     font_size = 24
-    font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, 80
+    font_family = Victor Mono Bold Oblique
+    position = 0, 150
     halign = center
     valign = bottom
 }
@@ -122,14 +123,15 @@ input-field {
     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
     dots_center = true
-    outer_color = rgba(0, 0, 0, 0)
+    outer_color = $color11
     inner_color = rgba(255, 255, 255, 0.1)
-    font_color = $color11
+	capslock_color = rgba(255, 0, 0)
+    font_color = $color13
     fade_on_empty = false
-    font_family = JetBrainsMono Nerd Font ExtraBold
+    font_family = Victor Mono Bold Oblique
     placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
     hide_input = false
-    position = 0, 180
+    position = 0, 50
     halign = center
     valign = bottom
 }
@@ -139,8 +141,8 @@ label {
     monitor =
     text = cmd[update:60000] echo "<b> "$(uptime -p || $Scripts/UptimeNixOS.sh)" </b>"
     color = $color13
-    font_size = 18
-    font_family = JetBrainsMono Nerd Font ExtraBold
+    font_size = 16
+    font_family = Victor Mono Bold Oblique
     position = 0, 0
     halign = right
     valign = bottom
@@ -153,8 +155,8 @@ label {
     monitor =
     text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat  ~/.cache/.weather_cache
     color = $color13
-    font_size = 18
-    font_family = JetBrainsMono Nerd Font ExtraBold
+    font_size = 16
+    font_family = Victor Mono Bold Oblique
     position = 50, 0
     halign = left
     valign = bottom
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 975b5d62..9edb3088 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -8,6 +8,7 @@ $Scripts = $HOME/.config/hypr/scripts
 
 general {
     grace = 1
+    fractional_scaling = 2
 }
 
 background {
@@ -20,8 +21,8 @@ background {
     #color = $color7
 
     # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
-    blur_size = 2
-    blur_passes = 1 # 0 disables blurring
+    blur_size = 3
+    blur_passes = 2 # 0 disables blurring
     noise = 0.0117
     contrast = 1.3000 # Vibrant!!!
     brightness = 0.8000
@@ -34,12 +35,12 @@ background {
 label {
     monitor =
     text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B')" </b>"
-    color = $color12
-    font_size = 24
-    font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -100
+    color = $color13
+    font_size = 18
+    font_family = Victor Mono Bold Italic
+    position = 0, -120
     halign = center
-    valign = top
+    valign = center
 }
 
 # Hour-Time
@@ -49,9 +50,9 @@ label {
 #    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
 	#color = rgba(255, 185, 0, .8)
     color = $color13
-    font_size = 200
+    font_size = 240
     font_family = JetBrainsMono Nerd Font ExtraBold 
-    position = 0, -150
+    position = 0, -100
     halign = center
     valign = top
 }
@@ -62,9 +63,9 @@ label {
     text = cmd[update:1000] echo "$(date +"%M")"
     #color = rgba(15, 10, 222, .8)
     color = $color12
-    font_size = 200
+    font_size = 240
     font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -475
+    position = 0, -450
     halign = center
     valign = top
 }
@@ -75,26 +76,26 @@ label {
     text = cmd[update:1000] echo "$(date +"%S")"
 #    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
     color = $color11
-    font_size = 40
+    font_size = 50
     font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -460
+    position = 0, -450
     halign = center
     valign = top
 }
 
 # Put a picture of choice here. Default is the current wallpaper
-image {
-    monitor =
-    path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
-    size = 160
-    rounding = -1
-    border_size = 0
-    border_color = $color11
-    rotate = 0
-    reload_time = -1
-    position = 0, 400
-    halign = center
-    valign = bottom
+#image {
+#    monitor =
+#    #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
+#    size = 160
+#    rounding = -1
+#    border_size = 0
+#    border_color = $color11
+#    rotate = 0
+#    reload_time = -1
+#    position = 0, 400
+#    halign = center
+#    valign = bottom
 }
 
 # USER
@@ -107,8 +108,8 @@ label {
     dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
     dots_center = true
     font_size = 24
-    font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, 150
+    font_family = Victor Mono Bold Oblique
+    position = 0, 200
     halign = center
     valign = bottom
 }
@@ -122,14 +123,15 @@ input-field {
     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
     dots_center = true
-    outer_color = rgba(0, 0, 0, 0)
+    outer_color = $color11
     inner_color = rgba(255, 255, 255, 0.1)
-    font_color = $color11
+    font_color = $color13
+    capslock_color = rgba(255, 0, 0)
     fade_on_empty = false
-    font_family = JetBrainsMono Nerd Font ExtraBold
+    font_family = Victor Mono Bold Oblique
     placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
     hide_input = false
-    position = 0, 250
+    position = 0, 100
     halign = center
     valign = bottom
 }
@@ -140,7 +142,7 @@ label {
     text = cmd[update:60000] echo "<b> "$(uptime -p || $Scripts/UptimeNixOS.sh)" </b>"
     color = $color13
     font_size = 18
-    font_family = JetBrainsMono Nerd Font ExtraBold
+    font_family = Victor Mono Bold Oblique
     position = 0, 0
     halign = right
     valign = bottom
@@ -154,7 +156,7 @@ label {
     text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat  ~/.cache/.weather_cache
     color = $color13
     font_size = 18
-    font_family = JetBrainsMono Nerd Font ExtraBold
+    font_family = Victor Mono Bold Oblique
     position = 50, 0
     halign = left
     valign = bottom