diff --git a/.bashrc b/.bashrc index 54d6346..a58af1e 100644 --- a/.bashrc +++ b/.bashrc @@ -1,5 +1,6 @@ # ~/.bashrc eval "$(starship init bash)" +clear && nerdfetch [[ $- != *i* ]] && return alias ls='ls --color=auto' alias pacup='sudo pacman -Rns $(pacman -Qdtq)' diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf index de23ee6..993b2db 100644 --- a/.config/hypr/hypridle.conf +++ b/.config/hypr/hypridle.conf @@ -1,3 +1,6 @@ +# Source the colors-hyprland file to load environment variables +source /home/eli/.cache/wal/colors-hyprland + general { lock_cmd = pidof hyprlock || hyprlock ignore_dbus_inhibit = /opt/spotify/spotify @@ -5,18 +8,18 @@ general { listener { timeout = 270 - on-timeout = notify-send "System" "You are about to be locked out!" -i ~/wallpapers/hyprland-notify.jpg + on-timeout = source /home/eli/.cache/wal/colors.sh && notify-send "System" "You are about to be locked out!" -i $wallpaper } listener { timeout = 300 on-timeout = loginctl lock-session - on-resume = sleep 2 && notify-send "System" "Unlocked! Hey $USER" -i ~/wallpapers/hyprland-notify.jpg - + on-resume = sleep 2 && source /home/eli/.cache/wal/colors.sh && notify-send "System" "Unlocked! Hey $USER" -i $wallpaper } listener { timeout = 1200 on-timeout = hyprctl dispatch dpms off - on-resume = hyprctl dispatch dpms on + on-resume = hyprctl dispatch dpms on } + diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 2b98634..6579ac4 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -50,7 +50,7 @@ $menu = wofi --show drun # exec-once = nm-applet & exec-once = hypridle exec-once = waybar -exec-once = hyprpaper +exec-once = swww-daemon exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = swaync @@ -237,7 +237,8 @@ bind = ALT, up, movewindow, u bind = ALT, down, movewindow, d bind = CTRL, Print, exec, hyprshot -m region -o ~/Screenshots/ bind = , Print, exec, hyprshot -m window -o ~/Screenshots/ -bind = CTRL, l, exec, hyprlock +bind = ALT, Print, exec, hyprshot -m active -m output -o ~/Screenshots/ +bind = $mainMod, l, exec, hyprlock # Example special workspace (scratchpad) bind = $mainMod, S, togglespecialworkspace, magic @@ -248,7 +249,6 @@ bind = $mainMod SHIFT, S, movetoworkspace, special:magic # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow - # Sound config #bind = $mainMod, F8, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle && gBar audio #bind = $mainMod, F9, exec, gBar audio && pactl set-sink-volume @DEFAULT_SINK@ -5% diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index d9fbff4..291b4e4 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -2,7 +2,7 @@ source = /home/eli/.cache/wal/colors-hyprland background { monitor = - path = /home/eli/wallpapers/walls/wp9052004-3369484529.jpg + path = $wallpaper blur_size = 7 blur_passes = 2 brightness = .4 diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf deleted file mode 100644 index 40d936a..0000000 --- a/.config/hypr/hyprpaper.conf +++ /dev/null @@ -1,3 +0,0 @@ -preload = ~/wallpapers/lock.jpg -wallpaper = , ~/wallpapers/lock.jpg - diff --git a/.config/hypr/wallpaper.sh b/.config/hypr/wallpaper.sh index a468232..a57dfcb 100755 --- a/.config/hypr/wallpaper.sh +++ b/.config/hypr/wallpaper.sh @@ -1,22 +1,7 @@ #!/bin/bash - -systemctl --user enable --now hyprpaper.service WALLPAPER_DIR="/home/eli/wallpapers/walls" SPECIFIC_IMAGE=$(find "$WALLPAPER_DIR" -type f \( -iname "*.jpg" -o -iname "*.png" -o -iname "*.jpeg" \) | shuf -n 1) -hyprctl hyprpaper unload all -hyprctl hyprpaper preload "$SPECIFIC_IMAGE" -hyprctl hyprpaper wallpaper ",$SPECIFIC_IMAGE" - -# Set colorscheme using wal with the random image -wal -i "$SPECIFIC_IMAGE" - -# Verify and update the hyprlock configuration file -CONFIG_FILE="/home/eli/.config/hypr/hyprlock.conf" -if [ -f "$CONFIG_FILE" ]; then - sed -i "s|path =.*|path = $SPECIFIC_IMAGE|" "$CONFIG_FILE" -else - echo "Configuration file not found at $CONFIG_FILE" -fi +swww img "$SPECIFIC_IMAGE" --transition-type outer --transition-pos "$(hyprctl cursorpos)" --transition-fps 60 --transition-duration 1 +wal -i "$SPECIFIC_IMAGE" -not-set --cols16 swaync-client --reload-css - cat ~/.cache/wal/colors-kitty.conf > ~/.config/kitty/current-theme.conf diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf index 8271fb3..a6c4c5d 100644 --- a/.config/kitty/current-theme.conf +++ b/.config/kitty/current-theme.conf @@ -1,30 +1,30 @@ -foreground #bfc4cb -background #021430 +foreground #c2c2c2 +background #0d0d0d background_opacity 1.0 -cursor #bfc4cb +cursor #c2c2c2 -active_tab_foreground #021430 -active_tab_background #bfc4cb -inactive_tab_foreground #bfc4cb -inactive_tab_background #021430 +active_tab_foreground #0d0d0d +active_tab_background #c2c2c2 +inactive_tab_foreground #c2c2c2 +inactive_tab_background #0d0d0d -active_border_color #bfc4cb -inactive_border_color #021430 -bell_border_color #F69471 +active_border_color #c2c2c2 +inactive_border_color #0d0d0d +bell_border_color #942436 -color0 #021430 -color8 #5e6673 -color1 #F69471 -color9 #F69471 -color2 #275A9C -color10 #275A9C -color3 #5C6794 -color11 #5C6794 -color4 #2F75C8 -color12 #2F75C8 -color5 #94728E -color13 #94728E -color6 #6083BB -color14 #6083BB -color7 #bfc4cb -color15 #bfc4cb +color0 #0d0d0d +color8 #6a5757 +color1 #942436 +color9 #C63049 +color2 #5b5e60 +color10 #7A7E81 +color3 #965b63 +color11 #C87A85 +color4 #5e6163 +color12 #7E8285 +color5 #696c6f +color13 #8D9195 +color6 #747779 +color14 #9B9FA2 +color7 #978c8c +color15 #c2c2c2 diff --git a/.config/wal/templates/colors-hyprland b/.config/wal/templates/colors-hyprland index 5822cf5..81c73de 100644 --- a/.config/wal/templates/colors-hyprland +++ b/.config/wal/templates/colors-hyprland @@ -1,3 +1,4 @@ + $wallpaper = /{wallpaper.strip} $foregroundCol = 0xff{foreground.strip} $backgroundCol = 0xff{background.strip} $color0 = 0xff{color0.strip} diff --git a/wallpapers/walls/601846.jpg b/wallpapers/walls/601846.jpg deleted file mode 100644 index 4d9675d..0000000 Binary files a/wallpapers/walls/601846.jpg and /dev/null differ diff --git a/wallpapers/walls/1337527.png b/wallpapers/walls2/1337527.png similarity index 100% rename from wallpapers/walls/1337527.png rename to wallpapers/walls2/1337527.png diff --git a/wallpapers/walls/1358310.png b/wallpapers/walls2/1358310.png similarity index 100% rename from wallpapers/walls/1358310.png rename to wallpapers/walls2/1358310.png diff --git a/wallpapers/walls2/296373.jpg b/wallpapers/walls2/296373.jpg new file mode 100644 index 0000000..1a7176d Binary files /dev/null and b/wallpapers/walls2/296373.jpg differ diff --git a/wallpapers/walls/568499.jpg b/wallpapers/walls2/568499.jpg similarity index 100% rename from wallpapers/walls/568499.jpg rename to wallpapers/walls2/568499.jpg diff --git a/wallpapers/walls/IMG_2543.png b/wallpapers/walls2/IMG_2543.png similarity index 100% rename from wallpapers/walls/IMG_2543.png rename to wallpapers/walls2/IMG_2543.png diff --git a/wallpapers/walls2/IMG_2551.JPG b/wallpapers/walls2/IMG_2551.JPG new file mode 100644 index 0000000..ea6ba93 Binary files /dev/null and b/wallpapers/walls2/IMG_2551.JPG differ diff --git a/wallpapers/walls/evgeny-tchebotarev-aiwuLjLPFnU-unsplash.jpg b/wallpapers/walls2/evgeny-tchebotarev-aiwuLjLPFnU-unsplash.jpg similarity index 100% rename from wallpapers/walls/evgeny-tchebotarev-aiwuLjLPFnU-unsplash.jpg rename to wallpapers/walls2/evgeny-tchebotarev-aiwuLjLPFnU-unsplash.jpg diff --git a/wallpapers/walls/flowers.png b/wallpapers/walls2/flowers.png similarity index 100% rename from wallpapers/walls/flowers.png rename to wallpapers/walls2/flowers.png diff --git a/wallpapers/walls/goodview.jpg b/wallpapers/walls2/goodview.jpg similarity index 100% rename from wallpapers/walls/goodview.jpg rename to wallpapers/walls2/goodview.jpg diff --git a/wallpapers/lock.jpg b/wallpapers/walls2/lock.jpg similarity index 100% rename from wallpapers/lock.jpg rename to wallpapers/walls2/lock.jpg diff --git a/wallpapers/walls2/rs6.jpg b/wallpapers/walls2/rs6.jpg new file mode 100644 index 0000000..552c8ee Binary files /dev/null and b/wallpapers/walls2/rs6.jpg differ diff --git a/wallpapers/walls2/slammed.jpg b/wallpapers/walls2/slammed.jpg new file mode 100644 index 0000000..c288d7d Binary files /dev/null and b/wallpapers/walls2/slammed.jpg differ diff --git a/wallpapers/walls2/stairs.jpg b/wallpapers/walls2/stairs.jpg new file mode 100644 index 0000000..17fa814 Binary files /dev/null and b/wallpapers/walls2/stairs.jpg differ diff --git a/wallpapers/walls2/wp11031060-2590091791.jpg b/wallpapers/walls2/wp11031060-2590091791.jpg new file mode 100644 index 0000000..19f0129 Binary files /dev/null and b/wallpapers/walls2/wp11031060-2590091791.jpg differ diff --git a/wallpapers/walls/wp9052004-3369484529.jpg b/wallpapers/walls2/wp9052004-3369484529.jpg similarity index 100% rename from wallpapers/walls/wp9052004-3369484529.jpg rename to wallpapers/walls2/wp9052004-3369484529.jpg diff --git a/wallpapers/Monochrome/a_black_and_white_image_of_a_room.jpeg b/wallpapers/walls3/a_black_and_white_image_of_a_room.jpeg similarity index 100% rename from wallpapers/Monochrome/a_black_and_white_image_of_a_room.jpeg rename to wallpapers/walls3/a_black_and_white_image_of_a_room.jpeg diff --git a/wallpapers/Monochrome/sand.jpg b/wallpapers/walls3/sand.jpg similarity index 100% rename from wallpapers/Monochrome/sand.jpg rename to wallpapers/walls3/sand.jpg diff --git a/wallpapers/Monochrome/wallpaper1.jpg b/wallpapers/walls3/wallpaper1.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper1.jpg rename to wallpapers/walls3/wallpaper1.jpg diff --git a/wallpapers/Monochrome/wallpaper10.jpg b/wallpapers/walls3/wallpaper10.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper10.jpg rename to wallpapers/walls3/wallpaper10.jpg diff --git a/wallpapers/Monochrome/wallpaper11.jpg b/wallpapers/walls3/wallpaper11.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper11.jpg rename to wallpapers/walls3/wallpaper11.jpg diff --git a/wallpapers/Monochrome/wallpaper12.jpg b/wallpapers/walls3/wallpaper12.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper12.jpg rename to wallpapers/walls3/wallpaper12.jpg diff --git a/wallpapers/Monochrome/wallpaper13.jpg b/wallpapers/walls3/wallpaper13.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper13.jpg rename to wallpapers/walls3/wallpaper13.jpg diff --git a/wallpapers/Monochrome/wallpaper14.jpg b/wallpapers/walls3/wallpaper14.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper14.jpg rename to wallpapers/walls3/wallpaper14.jpg diff --git a/wallpapers/Monochrome/wallpaper16.jpg b/wallpapers/walls3/wallpaper16.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper16.jpg rename to wallpapers/walls3/wallpaper16.jpg diff --git a/wallpapers/Monochrome/wallpaper17.jpg b/wallpapers/walls3/wallpaper17.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper17.jpg rename to wallpapers/walls3/wallpaper17.jpg diff --git a/wallpapers/Monochrome/wallpaper18.jpg b/wallpapers/walls3/wallpaper18.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper18.jpg rename to wallpapers/walls3/wallpaper18.jpg diff --git a/wallpapers/Monochrome/wallpaper19.jpg b/wallpapers/walls3/wallpaper19.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper19.jpg rename to wallpapers/walls3/wallpaper19.jpg diff --git a/wallpapers/Monochrome/wallpaper2.jpg b/wallpapers/walls3/wallpaper2.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper2.jpg rename to wallpapers/walls3/wallpaper2.jpg diff --git a/wallpapers/Monochrome/wallpaper21.jpg b/wallpapers/walls3/wallpaper21.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper21.jpg rename to wallpapers/walls3/wallpaper21.jpg diff --git a/wallpapers/Monochrome/wallpaper22.jpg b/wallpapers/walls3/wallpaper22.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper22.jpg rename to wallpapers/walls3/wallpaper22.jpg diff --git a/wallpapers/Monochrome/wallpaper23.jpg b/wallpapers/walls3/wallpaper23.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper23.jpg rename to wallpapers/walls3/wallpaper23.jpg diff --git a/wallpapers/Monochrome/wallpaper3.jpg b/wallpapers/walls3/wallpaper3.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper3.jpg rename to wallpapers/walls3/wallpaper3.jpg diff --git a/wallpapers/Monochrome/wallpaper4.jpg b/wallpapers/walls3/wallpaper4.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper4.jpg rename to wallpapers/walls3/wallpaper4.jpg diff --git a/wallpapers/Monochrome/wallpaper5.jpg b/wallpapers/walls3/wallpaper5.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper5.jpg rename to wallpapers/walls3/wallpaper5.jpg diff --git a/wallpapers/Monochrome/wallpaper6.jpg b/wallpapers/walls3/wallpaper6.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper6.jpg rename to wallpapers/walls3/wallpaper6.jpg diff --git a/wallpapers/Monochrome/wallpaper7.jpg b/wallpapers/walls3/wallpaper7.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper7.jpg rename to wallpapers/walls3/wallpaper7.jpg diff --git a/wallpapers/Monochrome/wallpaper8.jpg b/wallpapers/walls3/wallpaper8.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper8.jpg rename to wallpapers/walls3/wallpaper8.jpg diff --git a/wallpapers/Monochrome/wallpaper9.jpg b/wallpapers/walls3/wallpaper9.jpg similarity index 100% rename from wallpapers/Monochrome/wallpaper9.jpg rename to wallpapers/walls3/wallpaper9.jpg