diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 36004f4..65a8b97 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -20,7 +20,7 @@ input-field { dots_center = true dots_rounding = -1 # -1 default circle, -2 follow input-field rounding outer_color = rgb(151515) - inner_color = rgb(200, 200, 200) + inner_color = rgb(FFFFFF) font_color = rgb(10, 10, 10) fade_on_empty = true fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered. @@ -47,7 +47,7 @@ label { color = rgba(200, 200, 200, 1.0) font_size = 55 font_family = Fira Semibold - position = -100, -200 + position = -100, -40 halign = right valign = bottom shadow_passes = 5 @@ -65,4 +65,19 @@ label { valign = bottom shadow_passes = 5 shadow_size = 10 +} + +image { + monitor = + path = $HOME/.cache/square_wallpaper.png + size = 280 # lesser side if not 1:1 ratio + rounding = -1 # negative values mean circle + border_size = 4 + border_color = rgb(221, 221, 221) + rotate = 0 # degrees, counter-clockwise + reload_time = -1 # seconds between reloading, 0 to reload with SIGUSR2 +# reload_cmd = # command to get new path. if empty, old path will be used. don't run "follow" commands like tail -F + position = 0, 200 + halign = center + valign = center } \ No newline at end of file diff --git a/hypr/scripts/wallpaper.sh b/hypr/scripts/wallpaper.sh index f749345..68fa88a 100755 --- a/hypr/scripts/wallpaper.sh +++ b/hypr/scripts/wallpaper.sh @@ -12,6 +12,7 @@ # Cache file for holding the current wallpaper cache_file="$HOME/.cache/current_wallpaper" blurred="$HOME/.cache/blurred_wallpaper.png" +square="$HOME/.cache/square_wallpaper.png" rasi_file="$HOME/.cache/current_wallpaper.rasi" blur_file="$HOME/dotfiles/.settings/blur.sh" @@ -114,7 +115,7 @@ if [ "$1" == "init" ] ;then echo ":: Init" else sleep 1 - dunstify "Changing wallpaper ..." "with image $newwall" -h int:value:33 -h string:x-dunst-stack-tag:wallpaper + dunstify "Changing wallpaper ..." "with image $newwall" -h int:value:25 -h string:x-dunst-stack-tag:wallpaper sleep 2 fi @@ -124,7 +125,7 @@ fi if [ "$1" == "init" ] ;then echo ":: Init" else - dunstify "Creating blurred version ..." "with image $newwall" -h int:value:66 -h string:x-dunst-stack-tag:wallpaper + dunstify "Creating blurred version ..." "with image $newwall" -h int:value:50 -h string:x-dunst-stack-tag:wallpaper fi magick $wallpaper -resize 75% $blurred @@ -134,6 +135,17 @@ if [ ! "$blur" == "0x0" ] ;then echo ":: Blurred" fi +# ----------------------------------------------------- +# Created quare wallpaper +# ----------------------------------------------------- +if [ "$1" == "init" ] ;then + echo ":: Init" +else + dunstify "Creating square version ..." "with image $newwall" -h int:value:75 -h string:x-dunst-stack-tag:wallpaper +fi +magick $wallpaper -gravity Center -extent 1:1 $square +echo ":: Square version created" + # ----------------------------------------------------- # Write selected wallpaper into .cache files # ----------------------------------------------------- diff --git a/waybar/modules.json b/waybar/modules.json index 97439a4..d845ec0 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -338,7 +338,7 @@ // Pulseaudio "pulseaudio": { // "scroll-step": 1, // %, can be a float - "format": "{icon} {volume}%", + "format": "{icon} {volume}%", "format-bluetooth": "{volume}% {icon} {format_source}", "format-bluetooth-muted": " {icon} {format_source}", "format-muted": " {format_source}", diff --git a/waybar/themes/ml4w-blur/style.css b/waybar/themes/ml4w-blur/style.css index df362fa..4cb8e66 100644 --- a/waybar/themes/ml4w-blur/style.css +++ b/waybar/themes/ml4w-blur/style.css @@ -212,8 +212,8 @@ window#waybar.empty #window { * ----------------------------------------------------- */ #idle_inhibitor { - margin-right: 15px; - font-size: 22px; + margin-right: 17px; + font-size: 20px; font-weight: bold; opacity: 0.8; color: @iconcolor;