From 89041539f078cab588d91f6356cbd4f6dffbfcb6 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 7 Aug 2026 19:04:15 -0400 Subject: Fix: migrate script edit UserConfigs/monitors.lua Also it mpw properly handles disabled monitors On branch development Your branch is up to date with 'origin/development'. Changes to be committed: modified: CHANGELOG.md deleted: config/hypr/hyprlock-1080p.conf modified: config/hypr/hyprlock-2k.conf modified: config/hypr/hyprlock.conf --- CHANGELOG.md | 3 +- config/hypr/hyprlock-1080p.conf | 182 ---------------------------------------- config/hypr/hyprlock-2k.conf | 72 ++++++++-------- config/hypr/hyprlock.conf | 68 +++++++-------- 4 files changed, 72 insertions(+), 253 deletions(-) delete mode 100644 config/hypr/hyprlock-1080p.conf diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cafd88c..797ecb94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,8 @@ ## Fixed: -- Lua migration script failed to translate disabled monitors to LUA format +- LUA migration script properly edits `~/.config/hypr/UserConfigs/monitors.lua` +- LUA migration script failed to translate disabled monitors to LUA format - I.e. for `eDP-1` laptop screens - Fixed `Spring-Curves.lua` - Hyprland v0.56+ changed springs timing diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf deleted file mode 100644 index b0a0279c..00000000 --- a/config/hypr/hyprlock-1080p.conf +++ /dev/null @@ -1,182 +0,0 @@ -# /* ---- 💫 https://github.com/LinuxBeginnings 💫 ---- */ # -# 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 { - fractional_scaling = 2 - immediate_render = true -} - -background { - monitor = - # NOTE: use only 1 path - #path = screenshot # screenshot of your desktop - #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_modified # by wallpaper effects - path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current # current wallpaper - - color = rgb(0,0,0) # color will be rendered initially until path is available - - # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations - blur_size = 3 - blur_passes = 2 # 0 disables blurring - noise = 0.0117 - contrast = 1.3000 # Vibrant!!! - brightness = 0.8000 - vibrancy = 0.2100 - vibrancy_darkness = 0.0 -} - - -# Date -label { - monitor = - text = cmd[update:18000000] echo " "$(date +'%A, %-d %B')" " - color = $color13 - font_size = 48 - font_family = Victor Mono Bold Italic - position = 0, -60 - halign = center - valign = center -} - -# Hour-Time -label { - monitor = -# text = cmd[update:1000] echo "$(date +"%H")" - text = cmd[update:1000] echo "$(date +"%I:%M %p")" #AM/PM - #color = rgba(255, 185, 0, .8) - color = $color8 - font_size = 130 - font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, -250 - halign = center - valign = top -} - -# Minute-Time -# label { -# monitor = -# text = cmd[update:1000] echo "$(date +"%M")" -# #color = rgba(15, 10, 222, .8) -# color = $color12 -# font_size = 150 -# font_family = JetBrainsMono Nerd Font ExtraBold -# position = 0, -340 -# 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 = $color11 -# font_size = 32 -# font_family = JetBrainsMono Nerd Font ExtraBold -# 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 -# } - -# USER -label { - monitor = - text =  $USER - color = $color9 - font_size = 36 - font_family = Victor Mono Bold Oblique - position = 0, 275 - halign = center - valign = bottom -} - -# INPUT FIELD -input-field { - monitor = - size = 230, 70 - 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 - dots_center = true - outer_color = $color8 - inner_color = rgba(255, 255, 255, 0.1) - capslock_color = rgb(255,255,255) - font_color = $color13 - fade_on_empty = false - font_family = Victor Mono Bold Oblique - placeholder_text = 🔒 Type Password - hide_input = false - position = 0, 100 - halign = center - valign = bottom -} - -# Keyboard LAYOUT -label { - monitor = - text = $LAYOUT - color = $color8 - font_size = 14 - font_family = Victor Mono Bold Oblique - position = 0, 70 - halign = center - valign = bottom -} - -# uptime -label { - monitor = - text = cmd[update:60000] echo " "$(uptime -p || $Scripts/UptimeNixOS.sh)" " - color = $color8 - font_size = 24 - font_family = Victor Mono Bold Oblique - position = 0, 0 - halign = right - valign = bottom -} - -# battery information -label { - monitor = - text = cmd[update:1000] echo " "$($Scripts/Battery.sh)" " - color = $color8 - font_size = 16 - font_family = Victor Mono Bold Oblique - position = 0, 30 - 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/LinuxBeginnings/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock -label { - monitor = - text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache" - color = $color8 - font_size = 14 - font_family = Victor Mono Bold Oblique - position = 50, 0 - halign = left - valign = bottom -} diff --git a/config/hypr/hyprlock-2k.conf b/config/hypr/hyprlock-2k.conf index 08fa8539..8c357d90 100644 --- a/config/hypr/hyprlock-2k.conf +++ b/config/hypr/hyprlock-2k.conf @@ -1,5 +1,5 @@ # /* ---- 💫 https://github.com/LinuxBeginnings 💫 ---- */ # -# Hyprlock config for < 1080p monitor resolutions +# Hyprlock config for => 2k monitor resolutions # Original config submitted by https://github.com/SherLock707 # Sourcing colors generated by wallust @@ -17,7 +17,7 @@ background { #path = screenshot # screenshot of your desktop #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_modified # by wallpaper effects path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current # current wallpaper - + color = rgb(0,0,0) # color will be rendered initially until path is available # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations @@ -36,64 +36,64 @@ label { monitor = text = cmd[update:18000000] echo " "$(date +'%A, %-d %B')" " color = $color13 - font_size = 48 + font_size = 64 font_family = Victor Mono Bold Italic - position = 0, -60 + position = 0, -20 halign = center valign = center } -# Hour-Time +# Hour-Time (single horizontal time like 1080p variant) label { monitor = -# text = cmd[update:1000] echo "$(date +"%H")" - text = cmd[update:1000] echo "$(date +"%I:%M %p")" #AM/PM +# text = cmd[update:1000] echo "$(date +"%H:%M")" # 24h option + text = cmd[update:1000] echo "$(date +"%I:%M %p")" # AM/PM #color = rgba(255, 185, 0, .8) color = $color8 - font_size = 130 - font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, -250 + font_size = 173 + font_family = JetBrainsMono Nerd Font ExtraBold + position = 0, -133 halign = center valign = top } -# Minute-Time +# Minute-Time (disabled; kept for reference) # label { # monitor = # text = cmd[update:1000] echo "$(date +"%M")" # #color = rgba(15, 10, 222, .8) # color = $color12 -# font_size = 150 +# font_size = 240 # font_family = JetBrainsMono Nerd Font ExtraBold -# position = 0, -340 +# position = 0, -450 # halign = center - # valign = top +# valign = top # } -# Seconds-Time +# Seconds-Time (disabled; kept for reference) # label { -# monitor = -## text = cmd[update:1000] echo "$(date +"%S")" - text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM -# color = $color11 -# font_size = 32 -# font_family = JetBrainsMono Nerd Font ExtraBold -# position = 0, -350 -# halign = center -# valign = top +# monitor = +# text = cmd[update:1000] echo "$(date +"%S")" +# # text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM +# color = $color11 +# font_size = 50 +# font_family = JetBrainsMono Nerd Font ExtraBold +# 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 +# #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 +# position = 0, 400 # halign = center # valign = bottom # } @@ -103,9 +103,9 @@ label { monitor = text =  $USER color = $color9 - font_size = 36 + font_size = 48 font_family = Victor Mono Bold Oblique - position = 0, 275 + position = 0, 300 halign = center valign = bottom } @@ -113,7 +113,7 @@ label { # INPUT FIELD input-field { monitor = - size = 230, 70 + size = 306, 93 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 @@ -136,9 +136,9 @@ label { monitor = text = $LAYOUT color = $color8 - font_size = 14 + font_size = 19 font_family = Victor Mono Bold Oblique - position = 0, 70 + position = 0, 53 halign = center valign = bottom } @@ -148,7 +148,7 @@ label { monitor = text = cmd[update:60000] echo " "$(uptime -p || $Scripts/UptimeNixOS.sh)" " color = $color8 - font_size = 24 + font_size = 32 font_family = Victor Mono Bold Oblique position = 0, 0 halign = right @@ -160,9 +160,9 @@ label { monitor = text = cmd[update:1000] echo " "$($Scripts/Battery.sh)" " color = $color8 - font_size = 16 + font_size = 21 font_family = Victor Mono Bold Oblique - position = 0, 30 + position = 0, 40 halign = right valign = bottom } @@ -172,9 +172,9 @@ label { # see https://github.com/LinuxBeginnings/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock label { monitor = - text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache" + text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache" color = $color8 - font_size = 14 + font_size = 19 font_family = Victor Mono Bold Oblique position = 50, 0 halign = left diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 8c357d90..c70b3ada 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -1,5 +1,5 @@ # /* ---- 💫 https://github.com/LinuxBeginnings 💫 ---- */ # -# Hyprlock config for => 2k monitor resolutions +# Hyprlock config for < 1080p monitor resolutions # Original config submitted by https://github.com/SherLock707 # Sourcing colors generated by wallust @@ -36,64 +36,64 @@ label { monitor = text = cmd[update:18000000] echo " "$(date +'%A, %-d %B')" " color = $color13 - font_size = 64 + font_size = 48 font_family = Victor Mono Bold Italic - position = 0, -20 + position = 0, -60 halign = center valign = center } -# Hour-Time (single horizontal time like 1080p variant) +# Hour-Time label { monitor = -# text = cmd[update:1000] echo "$(date +"%H:%M")" # 24h option - text = cmd[update:1000] echo "$(date +"%I:%M %p")" # AM/PM +# text = cmd[update:1000] echo "$(date +"%H")" + text = cmd[update:1000] echo "$(date +"%I:%M %p")" #AM/PM #color = rgba(255, 185, 0, .8) color = $color8 - font_size = 173 + font_size = 130 font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, -133 + position = 0, -250 halign = center valign = top } -# Minute-Time (disabled; kept for reference) +# Minute-Time # label { # monitor = # text = cmd[update:1000] echo "$(date +"%M")" # #color = rgba(15, 10, 222, .8) # color = $color12 -# font_size = 240 +# font_size = 150 # font_family = JetBrainsMono Nerd Font ExtraBold -# position = 0, -450 +# position = 0, -340 # halign = center -# valign = top + # valign = top # } -# Seconds-Time (disabled; kept for reference) +# Seconds-Time # label { -# monitor = -# text = cmd[update:1000] echo "$(date +"%S")" -# # text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM -# color = $color11 -# font_size = 50 -# font_family = JetBrainsMono Nerd Font ExtraBold -# position = 0, -450 -# halign = center -# valign = top +# monitor = +## text = cmd[update:1000] echo "$(date +"%S")" + text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM +# color = $color11 +# font_size = 32 +# font_family = JetBrainsMono Nerd Font ExtraBold +# 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 +# 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 +# position = 0, 280 # halign = center # valign = bottom # } @@ -103,9 +103,9 @@ label { monitor = text =  $USER color = $color9 - font_size = 48 + font_size = 36 font_family = Victor Mono Bold Oblique - position = 0, 300 + position = 0, 275 halign = center valign = bottom } @@ -113,7 +113,7 @@ label { # INPUT FIELD input-field { monitor = - size = 306, 93 + size = 230, 70 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 @@ -136,9 +136,9 @@ label { monitor = text = $LAYOUT color = $color8 - font_size = 19 + font_size = 14 font_family = Victor Mono Bold Oblique - position = 0, 53 + position = 0, 70 halign = center valign = bottom } @@ -148,7 +148,7 @@ label { monitor = text = cmd[update:60000] echo " "$(uptime -p || $Scripts/UptimeNixOS.sh)" " color = $color8 - font_size = 32 + font_size = 24 font_family = Victor Mono Bold Oblique position = 0, 0 halign = right @@ -160,9 +160,9 @@ label { monitor = text = cmd[update:1000] echo " "$($Scripts/Battery.sh)" " color = $color8 - font_size = 21 + font_size = 16 font_family = Victor Mono Bold Oblique - position = 0, 40 + position = 0, 30 halign = right valign = bottom } @@ -172,9 +172,9 @@ label { # see https://github.com/LinuxBeginnings/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock label { monitor = - text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache" + text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache" color = $color8 - font_size = 19 + font_size = 14 font_family = Victor Mono Bold Oblique position = 50, 0 halign = left -- cgit v1.2.3