Merge pull request #399 from JaKooLit/main

Main to Development

3 files changed, 194 insertions, 38 deletions

diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf
new file mode 100644
index 00000000..68409417
--- /dev/null
+++ b/config/hypr/hyprlock-1080p.conf
@@ -0,0 +1,150 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# Hyprlock config for =< 1080p monitor resolutions                                                        
+# Original config submitted by https://github.com/SherLock707
+
+# Sourcing colors generated by wallust
+source = $HOME/.config/hypr/wallust/wallust-hyprland.conf
+$Scripts = $HOME/.config/hypr/scripts
+
+general {
+    grace = 1
+}
+
+background {
+    monitor =
+	#path = screenshot   # screenshot of your desktop
+	path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_modified   # NOTE only png supported for now
+    #color = $color7
+
+    # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+    blur_size = 5
+    blur_passes = 1 # 0 disables blurring
+    noise = 0.0117
+    contrast = 1.3000 # Vibrant!!!
+    brightness = 0.8000
+    vibrancy = 0.2100
+    vibrancy_darkness = 0.0
+}
+
+input-field {
+    monitor =
+    size = 250, 50
+    outline_thickness = 3
+    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 = $color5
+    inner_color = $color0
+    font_color = $color12
+    fade_on_empty = true
+    placeholder_text = <i>Password...</i> # Text rendered in the input box when it's empty.
+    hide_input = false
+    
+    position = 0, 80
+    halign = center
+    valign = bottom
+}
+
+# Date
+label {
+    monitor =
+    text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B %Y')" </b>"
+    color = $color12
+    font_size = 34
+    font_family = JetBrains Mono Nerd Font 10
+    position = 0, -80
+    halign = center
+    valign = top
+}
+
+# Hour-Time
+label {
+    monitor =
+    text = cmd[update:1000] echo "$(date +"%H")"
+#    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
+    color = rgba(255, 185, 0, .6)
+    font_size = 150
+    font_family = JetBrains Mono Nerd Font Mono ExtraBold 
+    position = 0, -200
+    halign = center
+    valign = top
+}
+
+# Minute-Time
+label {
+    monitor =
+    text = cmd[update:1000] echo "$(date +"%M")"
+    color = rgba(255, 255, 255, .6)
+    font_size = 150
+    font_family = JetBrains Mono Nerd Font Mono ExtraBold
+    position = 0, -450
+    halign = center
+    valign = top
+}
+
+# Seconds-Time
+label {
+    monitor =
+    text = cmd[update:1000] echo "$(date +"%S")"
+#    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
+    color = $color12
+    font_size = 20
+    font_family = JetBrains Mono Nerd Font Mono ExtraBold
+    position = 0, -450
+    halign = center
+    valign = top
+}
+
+# User
+label {
+    monitor =
+    text =    $USER
+    color = $color10
+    font_size = 18
+    font_family = Inter Display Medium
+
+    position = 0, 20
+    halign = center
+    valign = bottom
+}
+
+# uptime
+label {
+    monitor =
+    text = cmd[update:60000] echo "<b> "$(uptime -p || $Scripts/UptimeNixOS.sh)" </b>"
+    color = $color10
+    font_size = 24
+    font_family = JetBrains Mono Nerd Font 10
+    position = 0, 0
+    halign = right
+    valign = bottom
+}
+
+# weather edit the scripts for locations
+# weather scripts are located in ~/.config/hypr/UserScripts Weather.sh and/or Weather.py
+# see https://github.com/JaKooLit/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock
+label {
+    monitor =
+    text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat  ~/.cache/.weather_cache
+    color = $color10
+    font_size = 24
+    font_family = JetBrains Mono Nerd Font 10
+    position = 50, 0
+    halign = left
+    valign = bottom
+}
+
+# Put a picture of choice here. Default is the current wallpaper
+image {
+    monitor =
+    path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
+    size = 150
+    rounding = -1
+    border_size = 2
+    border_color = $color11
+    rotate = 0
+    reload_time = -1
+    position = 0, 180
+    halign = center
+    valign = bottom
+}
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index af56bc18..e95da6dd 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -1,5 +1,5 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-# Hyprlock                                                          
+# Hyprlock config for => 2k monitor resolutions                                                         
 # Original config submitted by https://github.com/SherLock707
 
 # Sourcing colors generated by wallust
diff --git a/copy.sh b/copy.sh
index 609d09d7..f1e1d257 100755
--- a/copy.sh
+++ b/copy.sh
@@ -192,6 +192,49 @@ if command -v asusctl >/dev/null 2>&1; then
     sed -i '/exec-once = rog-control-center &/s/^#//' config/hypr/UserConfigs/Startup_Apps.conf
 fi
 
+printf "\n"
+
+# Action to do for better rofi and kitty appearance
+while true; do
+  echo "$ORANGE Select monitor resolution for better config appearance and fonts:"
+  echo "$YELLOW 1. Equal to or less than 1080p (≤ 1080p)"
+  echo "$YELLOW 2. Equal to or higher than 1440p (≥ 1440p)"
+  read -p "$CAT Enter the number of your choice: " choice
+
+  case $choice in
+    1)
+        resolution="≤ 1080p"
+        break
+        ;;
+    2)
+        resolution="≥ 1440p"
+        break
+        ;;
+    *)
+        echo "Invalid choice. Please enter 1 for ≤ 1080p or 2 for ≥ 1440p."
+        ;;
+  esac
+done
+
+# Use the selected resolution in your existing script
+echo "You chose $resolution resolution." 2>&1 | tee -a "$LOG"
+
+# Add your commands based on the resolution choice
+if [ "$resolution" == "≤ 1080p" ]; then
+  cp -r config/rofi/resolution/1080p/* config/rofi/
+  sed -i 's/font_size 16.0/font_size 12.0/' config/kitty/kitty.conf
+  sed -i 's/font_size 16.0/font_size 12.0/' config/wallust/templates/colors-kitty.conf
+
+  # hyprlock matters
+  mv config/hypr/hyprlock.conf config/hypr/hyprlock-2k.conf
+  mv config/hypr/hyprlock-1080p.conf config/hypr/hyprlock.conf
+
+elif [ "$resolution" == "≥ 1440p" ]; then
+  cp -r config/rofi/resolution/1440p/* config/rofi/
+fi
+
+printf "\n%.0s" {1..2}
+
 # Ask whether to change to 12hr format
 while true; do
   echo -e "$ORANGE By default, configs are in 24H format."
@@ -262,43 +305,6 @@ done
 
 printf "\n"
 
-# Action to do for better rofi and kitty appearance
-while true; do
-  echo "$ORANGE Select monitor resolution for better Rofi and kitty appearance:"
-  echo "$YELLOW 1. Equal to or less than 1080p (≤ 1080p)"
-  echo "$YELLOW 2. Equal to or higher than 1440p (≥ 1440p)"
-  read -p "$CAT Enter the number of your choice: " choice
-
-  case $choice in
-    1)
-        resolution="≤ 1080p"
-        break
-        ;;
-    2)
-        resolution="≥ 1440p"
-        break
-        ;;
-    *)
-        echo "Invalid choice. Please enter 1 for ≤ 1080p or 2 for ≥ 1440p."
-        ;;
-  esac
-done
-
-# Use the selected resolution in your existing script
-echo "You chose $resolution resolution." 2>&1 | tee -a "$LOG"
-
-# Add your commands based on the resolution choice
-if [ "$resolution" == "≤ 1080p" ]; then
-  cp -r config/rofi/resolution/1080p/* config/rofi/
-  sed -i 's/font_size 16.0/font_size 12.0/' config/kitty/kitty.conf
-  sed -i 's/font_size 16.0/font_size 12.0/' config/wallust/templates/colors-kitty.conf
-
-elif [ "$resolution" == "≥ 1440p" ]; then
-  cp -r config/rofi/resolution/1440p/* config/rofi/
-fi
-
-printf "\n%.0s" {1..2}
-
 # Rainbow Borders
 # Check if the user wants to disable Rainbow borders
 # Print message about Rainbow Borders