diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf index c6bea01..ea4af03 100644 --- a/config/hypr/UserConfigs/ENVariables.conf +++ b/config/hypr/UserConfigs/ENVariables.conf @@ -38,6 +38,7 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto #env = NVD_BACKEND,direct # FOR VM and POSSIBLY NVIDIA +#env = WLR_NO_HARDWARE_CURSORS,1 #env = WLR_RENDERER_ALLOW_SOFTWARE,1 # nvidia firefox (for hardware acceleration on FF)? diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf index be8e484..8d137cc 100644 --- a/config/hypr/UserConfigs/UserSettings.conf +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -150,4 +150,4 @@ xwayland { # cursor section for Hyprland v0.41.0 or newer #cursor { # enable_hyprcursor = true -#} \ No newline at end of file +#} diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh new file mode 100755 index 0000000..9122da3 --- /dev/null +++ b/config/hypr/UserScripts/WallpaperEffects.sh @@ -0,0 +1,99 @@ +#!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # +# Wallpaper Effects using imagemagick +# Inspiration from ML4W - Stephan Raabe https://gitlab.com/stephan-raabe/dotfiles + +# variables +current_wallpaper="$HOME/.config/hypr/wallpaper_effects/.wallpaper_current" +wallpaper_output="$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified" +SCRIPTSDIR="$HOME/.config/hypr/scripts" +focused_monitor=$(hyprctl monitors | awk '/^Monitor/{name=$2} /focused: yes/{print name}') + +# Directory for swaync +iDIR="$HOME/.config/swaync/images" + +# swww transition config +FPS=60 +TYPE="wipe" +DURATION=2 +BEZIER=".43,1.19,1,.4" +SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION" + +# Define ImageMagick effects +# https://imagemagick.org/script/magick.php + +declare -A effects=( +["Black & White"]="magick $current_wallpaper -set colorspace Gray -separate -average $wallpaper_output" +["Blurred"]="magick $current_wallpaper -blur "20x30" $wallpaper_output" +["Solarize"]="magick $current_wallpaper -solarize 80% $wallpaper_output" +["Sepia Tone"]="magick $current_wallpaper -sepia-tone 65% $wallpaper_output" +["Negate"]="magick $current_wallpaper -negate $wallpaper_output" +["Charcoal"]="magick $current_wallpaper -charcoal "10x10" $wallpaper_output" +["No Effects"]="no-effects" +) + +# Function to apply no effects +no_effects() { + swww img -o "$focused_monitor" "$current_wallpaper" $SWWW_PARAMS & + # Wait for swww command to complete + wait $! + # Run other commands after swww + wallust run "$current_wallpaper" -s & + # Wait to complete + wait $! + # Refresh rofi, waybar, wallust palettes + "${SCRIPTSDIR}/Refresh.sh" + notify-send -u low -i "$iDIR/bell.png" "No wallpaper effects" + + # copying wallpaper for rofi menu + cp $current_wallpaper $wallpaper_output +} + +# Function to run rofi menu +main() { + # Populate rofi menu options + options="No Effects\n" + for effect in "${!effects[@]}"; do + if [ "$effect" != "No Effects" ]; then + options+="$effect\n" + fi + done + + # rofi + choice=$(echo -e "$options" | rofi -i -dmenu -config ~/.config/rofi/config-wallpaper-effect.rasi) + if [ ! -z "$choice" ]; then + # Check if the choice exists in the array + if [[ "${effects[$choice]+exists}" ]]; then + if [ "$choice" == "No Effects" ]; then + no_effects + else + # Apply selected effect + notify-send -u normal -i "$iDIR/bell.png" "Applying $choice effects" + eval "${effects[$choice]}" + # Wait for effects to be applied + sleep 1 + # Execute swww command after image conversion + swww img -o "$focused_monitor" "$wallpaper_output" $SWWW_PARAMS & + # Wait for swww command to complete + wait $! + # Run other commands after swww + wallust run "$wallpaper_output" -s & + # Wait for other commands to finish + wait $! + # Refresh rofi, waybar, wallust palettes + "${SCRIPTSDIR}/Refresh.sh" + notify-send -u low -i "$iDIR/bell.png" "$choice effects applied" + fi + else + echo "Effects not recognized." + fi + fi +} + +# Check if rofi is already running +if pidof rofi > /dev/null; then + pkill rofi + exit 0 +fi + +main diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index a270ab6..dbec4d1 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -34,6 +34,7 @@ bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings bind = $mainMod SHIFT, M, exec, $UserScripts/RofiBeats.sh # online music bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to apply +bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Effects by imagemagickWW bind = CTRL ALT, W, exec, $UserScripts/WallpaperRandom.sh # Random wallpapers # Waybar / Bar related diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index c763bc9..94dc637 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -12,13 +12,13 @@ general { background { monitor = - path = screenshot # screenshot of your desktop - # path = $HOME/.config/rofi/.current_wallpaper # NOTE only png supported for now - color = $color7 + #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 = 6 - blur_passes = 2 # 0 disables blurring + blur_size = 5 + blur_passes = 1 # 0 disables blurring noise = 0.0117 contrast = 1.3000 # Vibrant!!! brightness = 0.8000 @@ -124,7 +124,7 @@ label { # Put a picture of choice here. Default is the current wallpaper image { monitor = - path = $HOME/.config/rofi/.current_wallpaper + path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current size = 230 rounding = -1 border_size = 2 diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index 75d88c1..0e92263 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -7,8 +7,8 @@ # Variables scriptsDir=$HOME/.config/hypr/scripts -wallpaper=$HOME/Pictures/wallpapers/Lofi-Computer.png -waybar_style="$HOME/.config/waybar/style/[Colored] Chroma Glow.css" +wallpaper=$HOME/Pictures/wallpapers/Lofi-Anime-Room.png +waybar_style="$HOME/.config/waybar/[Wallust] Box type.css" kvantum_theme="Catppuccin-Mocha" color_scheme="prefer-dark" gtk_theme="Andromeda-dark" diff --git a/config/hypr/scripts/WallustSwww.sh b/config/hypr/scripts/WallustSwww.sh index 2a71102..dbf5c32 100755 --- a/config/hypr/scripts/WallustSwww.sh +++ b/config/hypr/scripts/WallustSwww.sh @@ -22,10 +22,12 @@ if [ -f "$cache_file" ]; then # Get the wallpaper path from the cache file wallpaper_path=$(cat "$cache_file") echo $wallpaper_path - # Copy the wallpaper to the location Rofi can access + # symlink the wallpaper to the location Rofi can access if ln -sf "$wallpaper_path" "$HOME/.config/rofi/.current_wallpaper"; then ln_success=true # Set the flag to true upon successful execution fi + # copy the wallpaper for wallpaper effects + cp -r "$wallpaper_path" "$HOME/.config/hypr/wallpaper_effects/.wallpaper_current" fi # Check the flag before executing further commands diff --git a/config/hypr/wallpaper_effects/.wallpaper_current b/config/hypr/wallpaper_effects/.wallpaper_current new file mode 100644 index 0000000..54ccecf Binary files /dev/null and b/config/hypr/wallpaper_effects/.wallpaper_current differ diff --git a/config/hypr/wallpaper_effects/.wallpaper_modified b/config/hypr/wallpaper_effects/.wallpaper_modified new file mode 100644 index 0000000..54ccecf Binary files /dev/null and b/config/hypr/wallpaper_effects/.wallpaper_modified differ diff --git a/config/hypr/wallust/wallust-hyprland.conf b/config/hypr/wallust/wallust-hyprland.conf index dbd7785..0b964a3 100644 --- a/config/hypr/wallust/wallust-hyprland.conf +++ b/config/hypr/wallust/wallust-hyprland.conf @@ -1,18 +1,18 @@ -$background = rgb(060402) -$foreground = rgb(D1F8FD) -$color0 = rgb(060402) -$color1 = rgb(7A6835) -$color2 = rgb(677762) -$color3 = rgb(2586B5) -$color4 = rgb(998C72) -$color5 = rgb(94A7B8) -$color6 = rgb(5CB1BC) -$color7 = rgb(B5EDF4) -$color8 = rgb(7EA6AB) -$color9 = rgb(A38A46) -$color10 = rgb(899F83) -$color11 = rgb(31B2F1) -$color12 = rgb(CCBA98) -$color13 = rgb(C6DEF5) -$color14 = rgb(7BECFA) -$color15 = rgb(B5EDF4) +$background = rgb(010001) +$foreground = rgb(FBF8ED) +$color0 = rgb(010001) +$color1 = rgb(020102) +$color2 = rgb(421C20) +$color3 = rgb(2C3034) +$color4 = rgb(475654) +$color5 = rgb(986356) +$color6 = rgb(B6B099) +$color7 = rgb(F1ECDD) +$color8 = rgb(A8A59B) +$color9 = rgb(030203) +$color10 = rgb(58252B) +$color11 = rgb(3B4045) +$color12 = rgb(5F7370) +$color13 = rgb(CB8473) +$color14 = rgb(F3EACC) +$color15 = rgb(F1ECDD) diff --git a/config/rofi/config-wallpaper-effect.rasi b/config/rofi/config-wallpaper-effect.rasi new file mode 100644 index 0000000..0a91915 --- /dev/null +++ b/config/rofi/config-wallpaper-effect.rasi @@ -0,0 +1,27 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ +/* Wallpaper Effects */ + +@import "~/.config/rofi/config-compact.rasi" + +/* ---- Entry ---- */ +entry { + width: 20%; + placeholder: "🏙️ Choose desired wallpaper effect"; +} + +/* ---- Window ---- */ +window { + width: 24%; +} + +/* ---- Listview ---- */ +listview { + fixed-columns: false; + colums: 1; + lines: 5; +} + +/* ---- Inputbar ---- */ +inputbar { + background-image: url("~/.config/hypr/wallpaper_effects/.wallpaper_modified", width); +} \ No newline at end of file diff --git a/config/rofi/wallust/colors-rofi.rasi b/config/rofi/wallust/colors-rofi.rasi index 0661756..8dbbd82 100644 --- a/config/rofi/wallust/colors-rofi.rasi +++ b/config/rofi/wallust/colors-rofi.rasi @@ -1,28 +1,28 @@ * { -active-background: #0B0E22; -active-foreground: #F7F0FA; -normal-background: #020206; -normal-foreground: #F7F0FA; -urgent-background: #805673; -urgent-foreground: #F7F0FA; +active-background: #030203; +active-foreground: #FBF8ED; +normal-background: #010001; +normal-foreground: #FBF8ED; +urgent-background: #5F7370; +urgent-foreground: #FBF8ED; -alternate-active-background: #737EA6; -alternate-active-foreground: #F7F0FA; -alternate-normal-background: #020206; -alternate-normal-foreground: #F7F0FA; -alternate-urgent-background: #020206; -alternate-urgent-foreground: #F7F0FA; +alternate-active-background: #986356; +alternate-active-foreground: #FBF8ED; +alternate-normal-background: #010001; +alternate-normal-foreground: #FBF8ED; +alternate-urgent-background: #010001; +alternate-urgent-foreground: #FBF8ED; -selected-active-background: #0B0E22; -selected-active-foreground: #F7F0FA; -selected-normal-background: #EBE1F0; -selected-normal-foreground: #F7F0FA; -selected-urgent-background: #805673; -selected-urgent-foreground: #F7F0FA; +selected-active-background: #030203; +selected-active-foreground: #FBF8ED; +selected-normal-background: #F1ECDD; +selected-normal-foreground: #FBF8ED; +selected-urgent-background: #5F7370; +selected-urgent-foreground: #FBF8ED; -background-color: #020206; +background-color: #010001; background: rgba(0,0,0,0.7); -foreground: #EBE1F0; -border-color: #0B0E22; +foreground: #F1ECDD; +border-color: #030203; } diff --git a/config/waybar/wallust/colors-waybar.css b/config/waybar/wallust/colors-waybar.css index eae738d..1f17268 100644 --- a/config/waybar/wallust/colors-waybar.css +++ b/config/waybar/wallust/colors-waybar.css @@ -1,20 +1,20 @@ -@define-color foreground #F7F0FA; -@define-color background rgba(2,2,6,0.25); -@define-color cursor #F7F0FA; +@define-color foreground #FBF8ED; +@define-color background rgba(1,0,1,0.25); +@define-color cursor #FBF8ED; -@define-color color0 #020206; -@define-color color1 #080A19; -@define-color color2 #1B2453; -@define-color color3 #1E295C; -@define-color color4 #604156; -@define-color color5 #737EA6; -@define-color color6 #AE9FB5; -@define-color color7 #EBE1F0; -@define-color color8 #A59EA8; -@define-color color9 #0B0E22; -@define-color color10 #24316E; -@define-color color11 #28367A; -@define-color color12 #805673; -@define-color color13 #99A8DD; -@define-color color14 #E8D4F1; -@define-color color15 #EBE1F0; +@define-color color0 #010001; +@define-color color1 #020102; +@define-color color2 #421C20; +@define-color color3 #2C3034; +@define-color color4 #475654; +@define-color color5 #986356; +@define-color color6 #B6B099; +@define-color color7 #F1ECDD; +@define-color color8 #A8A59B; +@define-color color9 #030203; +@define-color color10 #58252B; +@define-color color11 #3B4045; +@define-color color12 #5F7370; +@define-color color13 #CB8473; +@define-color color14 #F3EACC; +@define-color color15 #F1ECDD; diff --git a/copy.sh b/copy.sh index 9366ea3..36d056f 100755 --- a/copy.sh +++ b/copy.sh @@ -3,8 +3,8 @@ clear -wallpaper=$HOME/Pictures/wallpapers/Lofi-Computer.png -waybar_style="$HOME/.config/waybar/style/[Colored] Chroma Glow.css" +wallpaper=$HOME/Pictures/wallpapers/Lofi-Anime-Room.png +waybar_style="$HOME/.config/waybar/[Wallust] Box type.css" waybar_config="$HOME/.config/waybar/configs/[TOP] Default_v3" waybar_config_laptop="$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" diff --git a/wallpapers/Fantasy-Waterfall.png b/wallpapers/Fantasy-Waterfall.png deleted file mode 100644 index 91c58a4..0000000 Binary files a/wallpapers/Fantasy-Waterfall.png and /dev/null differ diff --git a/wallpapers/Lofi-Anime-Room.png b/wallpapers/Lofi-Anime-Room.png new file mode 100644 index 0000000..54ccecf Binary files /dev/null and b/wallpapers/Lofi-Anime-Room.png differ