From 6f7b0fb4a585c8bb09e0628dbf75ed47fdacfa72 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:20:33 +0000 Subject: Added Hyprland.conf for =<1080p resolutions --- config/hypr/hyprlock-1080p.conf | 161 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 config/hypr/hyprlock-1080p.conf diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf new file mode 100644 index 00000000..726bb19e --- /dev/null +++ b/config/hypr/hyprlock-1080p.conf @@ -0,0 +1,161 @@ +# /* ---- 💫 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 = Password... # 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 " "$(date +'%A, %-d %B %Y')" " + color = $color12 + font_size = 34 + font_family = JetBrains Mono Nerd Font 10 + + position = 0, -80 + halign = center + valign = top +} + +# Week +label { + monitor = + text = cmd[update:18000000] echo " "$(date +'Week %U')" " + color = $color5 + font_size = 24 + font_family = JetBrains Mono Nerd Font 10 + position = 0, -150 + halign = center + valign = top +} + +# Hour-Time +label { + monitor = + text = cmd[update:1000] echo -e "$(date +"%H")" +# text = cmd[update:1000] echo -e "$(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 -e "$(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 -e "$(date +"%S")" +# text = cmd[update:1000] echo -e "$(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 " "$(uptime -p || $Scripts/UptimeNixOS.sh)" " + color = $color10 + font_size = 24 + font_family = JetBrains Mono Nerd Font 10 + position = 0, 0 + halign = right + valign = bottom +} + +# weather edit specific location. Note, this cause a 2-4 seconds delay in locking +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 +} \ No newline at end of file -- cgit v1.2.3 From cb1f152b823e166e949b23a58404ad893488d154 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:23:04 +0000 Subject: Update hyprlock-1080p.conf (removed -e) --- config/hypr/hyprlock-1080p.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf index 726bb19e..65d49c89 100644 --- a/config/hypr/hyprlock-1080p.conf +++ b/config/hypr/hyprlock-1080p.conf @@ -73,8 +73,8 @@ label { # Hour-Time label { monitor = - text = cmd[update:1000] echo -e "$(date +"%H")" -# text = cmd[update:1000] echo -e "$(date +"%I")" #AM/PM + 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 @@ -86,7 +86,7 @@ label { # Minute-Time label { monitor = - text = cmd[update:1000] echo -e "$(date +"%M")" + text = cmd[update:1000] echo "$(date +"%M")" color = rgba(255, 255, 255, .6) font_size = 150 font_family = JetBrains Mono Nerd Font Mono ExtraBold @@ -98,8 +98,8 @@ label { # Seconds-Time label { monitor = - text = cmd[update:1000] echo -e "$(date +"%S")" -# text = cmd[update:1000] echo -e "$(date +"%S %p")" #AM/PM + 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 @@ -158,4 +158,4 @@ image { position = 0, 180 halign = center valign = bottom -} \ No newline at end of file +} -- cgit v1.2.3 From 0fb1b47f2be1e6911b166a0ac050515eba0e1b6d Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:42:24 +0000 Subject: updated copy.sh for =<1080p resolutions --- config/hypr/hyprlock.conf | 2 +- copy.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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..ad8bec95 100755 --- a/copy.sh +++ b/copy.sh @@ -293,6 +293,10 @@ if [ "$resolution" == "≤ 1080p" ]; then 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 -- cgit v1.2.3 From 9756abcd1d2903dee4cebd54c9cc1429d35e03c9 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:53:07 +0000 Subject: updated copy.sh - moved the resolution question first before time format --- copy.sh | 84 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/copy.sh b/copy.sh index ad8bec95..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,47 +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 - - # 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} - # Rainbow Borders # Check if the user wants to disable Rainbow borders # Print message about Rainbow Borders -- cgit v1.2.3 From daf6d332b89d6a6485508a25778dd06038d2a0e7 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Sat, 10 Aug 2024 13:49:11 +0000 Subject: Update hyprlock-1080p.conf --- config/hypr/hyprlock-1080p.conf | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf index 65d49c89..68409417 100644 --- a/config/hypr/hyprlock-1080p.conf +++ b/config/hypr/hyprlock-1080p.conf @@ -52,24 +52,11 @@ label { color = $color12 font_size = 34 font_family = JetBrains Mono Nerd Font 10 - position = 0, -80 halign = center valign = top } -# Week -label { - monitor = - text = cmd[update:18000000] echo " "$(date +'Week %U')" " - color = $color5 - font_size = 24 - font_family = JetBrains Mono Nerd Font 10 - position = 0, -150 - halign = center - valign = top -} - # Hour-Time label { monitor = @@ -133,7 +120,9 @@ label { valign = bottom } -# weather edit specific location. Note, this cause a 2-4 seconds delay in locking +# 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 -- cgit v1.2.3