diff --git a/.config/hypr/animations.conf b/.config/hypr/animations.conf index de475114..152d796c 100644 --- a/.config/hypr/animations.conf +++ b/.config/hypr/animations.conf @@ -4,7 +4,7 @@ general { gaps_in = 4 gaps_out = 10 border_size = 2 - col.active_border = $color1 + col.active_border = $color4 col.inactive_border = $color4 $color6 $color7 $color1 30deg resize_on_border = true @@ -22,7 +22,7 @@ decoration { blur { enabled = true - size = 2 + size = 5 passes = 3 new_optimizations = true ignore_opacity = on @@ -35,10 +35,10 @@ decoration { } - # drop_shadow = no - # shadow_range = 8 - # shadow_render_power = 1 - # col.shadow = $color4 + #drop_shadow = no + #shadow_range = 8 + #shadow_render_power = 1 + #col.shadow = $color4 active_opacity = 1 inactive_opacity = 1 diff --git a/.config/hypr/exec.conf b/.config/hypr/exec.conf index 189bbbe0..a67b6651 100644 --- a/.config/hypr/exec.conf +++ b/.config/hypr/exec.conf @@ -1,9 +1,9 @@ # Execute your favorite apps at launch # exec-once = waybar & hyprpaper & firefox exec-once = waybar -# exec-once = sleep 1 && swww init +#exec-once = sleep 1 && swww init exec-once = blueman-applet -exec-once = systemctl --user start hyprpolkitagent +exec-once = /usr/lib/polkit-kde-authentication-agent-1 exec-once = nm-applet --indicator exec-once = wal -r exec-once = swaync diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf index ec6cfb10..8c6605b9 100644 --- a/.config/hypr/hypridle.conf +++ b/.config/hypr/hypridle.conf @@ -1,5 +1,5 @@ -#listener { -# timeout = 600 # in seconds. -# on-timeout = hyprlock # command to run when timeout has passed. -# on-resume = notify-send "Welcome back, $USER!" # command to run when activity is detected after timeout has fired. -#} +listener { + timeout = 1000 # in seconds. + on-timeout = hyprlock # command to run when timeout has passed. + on-resume = notify-send "Welcome back, $USER!" # command to run when activity is detected after timeout has fired. +} diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index a83612ee..2f2a8309 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -8,26 +8,26 @@ source = ~/.cache/wal/colors-hyprland.conf #autogenerated = 1 # remove this line to remove the warning # See https://wiki.hyprland.org/Configuring/Monitors/ -#monitor = ,1920x1080,auto,1 +monitor = ,1920x1080,auto,1 #Desktop monitor = DP-2, 1920x1080@100, 0x250, 1 monitor = DP-1, 1920x1080@100, auto, 1 monitor = DP-1, transform, 3 -workspace = 1, persistent:true,monitor:DP-2,default:true -workspace = 2, persistent:true,monitor:DP-2 -workspace = 3, persistent:true,monitor:DP-2 -workspace = 4, persistent:true,monitor:DP-2 -workspace = 5, persistent:true,monitor:DP-2 -workspace = 6, persistent:true,monitor:DP-1 -workspace = 7, persistent:true,monitor:DP-1 -workspace = 8, persistent:true,monitor:DP-1 -workspace = 9, persistent:true,monitor:DP-1 -workspace = 0, persistent:true,monitor:DP-1 +#workspace = 1, persistent:true,monitor:DP-2,default:true +#workspace = 2, persistent:true,monitor:DP-2 +#workspace = 3, persistent:true,monitor:DP-2 +#workspace = 4, persistent:true,monitor:DP-2 +#workspace = 5, persistent:true,monitor:DP-2 +#workspace = 6, persistent:true,monitor:DP-1 +#workspace = 7, persistent:true,monitor:DP-1 +#workspace = 8, persistent:true,monitor:DP-1 +#workspace = 9, persistent:true,monitor:DP-1 +#workspace = 0, persistent:true,monitor:DP-1 # Laptop -#monitor = eDP-1, 1920x1080@144, auto, 1 +monitor = eDP-1, 1920x1080@144, auto, 1 workspace = 1, persistent:true,monitor:eDP-1,default:true workspace = 2, persistent:true,monitor:eDP-1 workspace = 3, persistent:true,monitor:eDP-1 @@ -57,16 +57,9 @@ env = LIBVA_DRIVER_NAME,nvidia env = XDG_SESSION_TYPE,wayland env = GBM_BACKEND,nvidia-drm env = __GLX_VENDOR_LIBRARY_NAME,nvidia +env = WLR_NO_HARDWARE_CURSORS,1 env = WLR_RENDERER_ALLOW_SOFTWARE,1 -cursor{ - no_hardware_cursors = true -} - -render{ - explicit_sync = 1 -} - # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { @@ -116,7 +109,7 @@ misc { plugin { hyprtrails { - color = $color6 + color = $color5 } hyprexpo { @@ -129,13 +122,6 @@ plugin { gesture_distance = 300 # how far is the "max" gesture_positive = true # positive = swipe down. Negative = swipe up. } - - hyprtasking { - rows = 3 - exit_behavior = original hovered interacted - gap_size = 8 - bg_color = $color3 - } } @@ -146,4 +132,4 @@ source = ~/.config/hypr/keybindings.conf source = ~/.config/hypr/windowrule.conf source = ~/.config/hypr/animations.conf source = ~/.config/hypr/exec.conf -source = ~/.config/hypr/monitors.conf +# source = ~/.config/hypr/monitors.conf diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 14c2b189..d3cfd58e 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,2 +1,3 @@ -preload = /home/crux/.config/wallpapers/wallhaven-2e2xyx.jpg -wallpaper = , /home/crux/.config/wallpapers/wallhaven-2e2xyx.jpg +preload = ~/.config/wallpapers/bench_hollow_hive.png + +wallpaper =, ~/.config/wallpapers/bench_hollow_hive.png diff --git a/.config/hypr/keybindings.conf b/.config/hypr/keybindings.conf index 7d822eef..bf189217 100644 --- a/.config/hypr/keybindings.conf +++ b/.config/hypr/keybindings.conf @@ -10,7 +10,7 @@ bind = $mainMod SHIFT, W, exec, wp bind = $mainMod SHIFT, F, fullscreen bind = $mainMod, N, exec, swaync-client -t -sw bind = $mainMod, L, exec, hyprlock -bind = $mainMod, W, exec, $HOME/wallpapertest.sh +bind = $mainMod, W, exec, $HOME/.config/hypr/scripts/wallpaperselect.sh bind = $mainMod, G, pin # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more @@ -116,7 +116,7 @@ bind = $mainMod, K, exec, $scrPath/keyboardswitch.sh # change keyboard layout bind = ALT,tab, exec, ags -t overview # Hyprexpo Keybinding -bind = ALT, grave,hyprexpo:expo, toggle on +# bind = ALT, grave,hyprexpo:expo, toggle on # Special Keys bind = , xf86monbrightnessup, exec, brightnessctl set 10%+ diff --git a/.config/hypr/monitors.conf b/.config/hypr/monitors.conf index 8605238f..0806a78c 100644 --- a/.config/hypr/monitors.conf +++ b/.config/hypr/monitors.conf @@ -1,6 +1,6 @@ # Generated by nwg-displays on 2024-05-21 at 17:25:37. Do not edit manually. -monitor=DP-2,1920x1080@100.0,0x438,1.0 -monitor=DP-1,1920x1080@100.0,1920x0,1.0 -monitor=DP-1,transform,3 +monitor=DP-1,1920x1080@100.0,0x438,1.0 +monitor=DP-2,1920x1080@100.0,1920x0,1.0 +monitor=DP-2,transform,3 monitor=HEADLESS-2,1920x1080@60.0,3000x840,1.0 diff --git a/.config/hypr/pyprland.toml b/.config/hypr/pyprland.toml index 3f1a20e3..c2b8f8f3 100644 --- a/.config/hypr/pyprland.toml +++ b/.config/hypr/pyprland.toml @@ -8,6 +8,3 @@ class = "kitty-dropterm" size = "60% 30%" max_size = "1920px 40%" margin = 60 - - - diff --git a/.config/hypr/scripts/wallpaperselect.sh b/.config/hypr/scripts/wallpaperselect.sh index 52531e91..d1dd12d2 100755 --- a/.config/hypr/scripts/wallpaperselect.sh +++ b/.config/hypr/scripts/wallpaperselect.sh @@ -1,4 +1,4 @@ - + #!/bin/bash scriptsDir="$HOME/.config/hypr/scripts" @@ -66,7 +66,7 @@ main() { done if [[ $pic_index -ne -1 ]]; then - swww img "${wallDIR}/${PICS[$pic_index]}" $SWWW_PARAMS + swww img "${wallDIR}/${PICS[$pic_index]}" $SWWW_PARAMS else echo "Image not found." exit 1 diff --git a/.config/hypr/scripts/wallpapertest.sh b/.config/hypr/scripts/wallpapertest.sh deleted file mode 100755 index 97833d12..00000000 --- a/.config/hypr/scripts/wallpapertest.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Directory containing wallpapers -#!/bin/bash - -WALLPAPER_DIR="$HOME/.config/wallpapers" -HYPERPAPER_CONFIG="$HOME/.config/hypr/hyprpaper.conf" - -# Check if the directory exists -if [ ! -d "$WALLPAPER_DIR" ]; then - echo "Wallpaper directory not found!" - exit 1 -fi - -# Ensure Hyprpaper is running -if ! pgrep -x "hyprpaper" > /dev/null; then - hyprpaper & - sleep 0.5 # Give it some time to start -fi - -# Function to format wallpapers for Rofi with previews -menu() { - find "$WALLPAPER_DIR" -type f \( -iname "*.png" -o -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.gif" \) | while read -r img; do - printf "$(basename "$img")\x00icon\x1f$img\n" - done -} - -# Show Rofi menu with image previews -WALLPAPER=$(menu | rofi -dmenu -theme $HOME/wallselect.rasi) - -# Check if the user pressed Escape (Rofi returns 1 when Escape is pressed) -if [ $? -eq 1 ]; then - echo "No wallpaper selected, exiting..." - exit 0 -fi - -# If user selected a wallpaper, preload and set it using Hyprpaper -if [ -n "$WALLPAPER" ]; then - FULL_PATH="$WALLPAPER_DIR/$WALLPAPER" - - # Check if the wallpaper file exists before applying it - if [ -f "$FULL_PATH" ]; then - # Preload the wallpaper - hyprctl hyprpaper preload "$FULL_PATH" - sleep 0.2 # Short delay to ensure it's loaded - - # Set the wallpaper using hyprpaper - hyprctl hyprpaper wallpaper ", $FULL_PATH" - - # Update Hyprpaper config file to persist wallpaper after reboot - echo "preload = $FULL_PATH" > "$HYPERPAPER_CONFIG" - echo "wallpaper = , $FULL_PATH" >> "$HYPERPAPER_CONFIG" - - # Restart Hyprpaper to apply changes - pkill hyprpaper - hyprpaper & - - # Create symlink to the selected wallpaper for Rofi access - ln -sf "$FULL_PATH" "$HOME/.config/rofi/.current_wallpaper" - - # Wait a moment to ensure the wallpaper is fully loaded before applying pywal - sleep 1 - - # Use pywal to generate color scheme from the current wallpaper - wal -i "$FULL_PATH" - sleep 1 # Wait a moment for pywal to finish executing - - # Run pywal-discord to update Discord (if applicable) - pywal-discord - else - echo "Selected wallpaper file not found." - fi -else - echo "No wallpaper selected." -fi - -# Kill any running Waybar process -pkill waybar - -# Call a script to refresh Hyprpaper settings (if applicable) -~/.config/hypr/scripts/refresh.sh - -# Relaunch waybar -waybar & - diff --git a/.config/rofi/.current_wallpaper b/.config/rofi/.current_wallpaper index bbef92ca..f80b02e7 120000 --- a/.config/rofi/.current_wallpaper +++ b/.config/rofi/.current_wallpaper @@ -1 +1 @@ -/home/crux/.config/wallpapers/wallhaven-2e2xyx.jpg \ No newline at end of file +/home/crux/.config/wallpapers/wallhaven-o5jv65.jpg \ No newline at end of file diff --git a/.config/rofi/themes/wallpaper-select.rasi b/.config/rofi/themes/wallpaper-select.rasi index 35a25e7b..4cb2a156 100644 --- a/.config/rofi/themes/wallpaper-select.rasi +++ b/.config/rofi/themes/wallpaper-select.rasi @@ -1,100 +1,145 @@ +/* config - Wallpaper select */ -/*****----- Configuration -----*****/ +/* ---- Configuration ---- */ configuration { modi: "drun"; show-icons: true; drun-display-format: "{name}"; + font: "JetBrainsMono Nerd Font 10"; + drun-display-format: "{name}"; + hover-select: true; + me-select-entry: "MouseSecondary"; + me-accept-entry: "MousePrimary"; + window-format: "{w} · {c} · {t}"; + dpi: 1; + font: "JetBrains Mono Nerd Font 10"; } -@theme "$HOME/.cache/wal/colors-rofi-dark.rasi" +/* ---- Load pywal colors ---- */ +@theme "~/.cache/wal/colors-rofi-dark.rasi" -/*****----- Global Properties -----*****/ +/* ---- Global Properties ---- */ * { - font: "JetBrains Mono Nerd Font 10.1"; - background: #11111b; - foreground: #eeeeee; - selected: #eba0ac; - active: #BD93F9; - urgent: #f38ba8; + + background-alt: @selected-active-background; // Buttons background + selected: @selected-normal-background; // Button selected + active: @selected-urgent-background; // Window activated + urgent: @selected-normal-background; // When hovering the activated window (maybe more?) + + text-selected: @background; + text-color: @foreground; + border-color: @selected; + } -/*****----- Main Window -----*****/ + +/* ---- Window ---- */ window { + // Default enabled: true; fullscreen: false; - width: 2000px; transparency: "real"; cursor: "default"; spacing: 0px; - padding: 0px; - border-radius: 0px; border: 2px; - border-color: @active; - background-color: transparent; + border-radius: 30px; + location: center; + anchor: center; + + // Style Values + width: 75%; + background-color: #00000088; } -/*****----- Main Box -----*****/ +/* ---- Mainbox ---- */ mainbox { enabled: true; children: [ "listview" ]; - background-color: @background; + background-color: transparent; } -/*****----- Listview -----*****/ +/* ---- List ---- */ listview { enabled: true; - columns: 6; - lines: 1; - spacing: 50px; - padding: 20px 150px; + columns: 4; + lines: 2; + padding: 26px 36px; cycle: true; - dynamic: false; + dynamic: true; scrollbar: false; layout: vertical; reverse: false; fixed-height: true; fixed-columns: true; - cursor: "default"; + background-color: transparent; - text-color: @foreground; + spacing: 20px; + + // Adapt rofi theme + border: 0px; + } -/*****----- Elements -----*****/ +/* ---- Elements ---- */ element { enabled: true; - orientation: horizontal; + orientation: vertical; + expand: false; spacing: 0px; - padding: 0px; - border-radius: 20px; + padding: 5px 10px; + border-radius: 26px; cursor: pointer; background-color: transparent; - text-color: @foreground; } -@media(max-aspect-ratio: 1.8) { - element { - orientation: vertical; - } + +element normal.normal { + background-color: inherit; + text-color: inherit; +} +element normal.urgent { + background-color: @urgent; + text-color: @foreground; +} +element normal.active { + background-color: @active; + text-color: @foreground; } element selected.normal { background-color: @selected; - text-color: @background; + text-color: @text-selected; } - -element-icon { - size: 33%; - cursor: inherit; - border-radius: 0px; +// Adapt rofi theme +element alternate.normal { background-color: transparent; text-color: inherit; } - +element alternate.urgent { + background-color: transparent; + text-color: inherit; +} +element alternate.active { + background-color: transparent; + text-color: inherit; +} +/* ---- Image Box ---- */ +element-icon { + size: 30%; + cursor: inherit; + expand: false; + padding: 0px; + background-color: inherit; +} element-text { vertical-align: 0.5; horizontal-align: 0.5; - padding: 20px; cursor: inherit; background-color: transparent; - text-color: inherit; } + +// Adapt rofi theme +element.alternate.normal { + background-color: inherit; + text-color: inherit; +} \ No newline at end of file diff --git a/.config/rofi/themes/wallselect.rasi b/.config/rofi/themes/wallselect.rasi deleted file mode 100644 index e9c16a8e..00000000 --- a/.config/rofi/themes/wallselect.rasi +++ /dev/null @@ -1,100 +0,0 @@ - -/*****----- Configuration -----*****/ -configuration { - modi: "drun"; - show-icons: true; - drun-display-format: "{name}"; -} - -@theme "~/.cache/wal/colors-rofi-dark.rasi" - -/*****----- Global Properties -----*****/ -* { - font: "JetBrains Mono Nerd Font 10.1"; - background: @selected-active-background; - foreground: @active-foreground; - selected: @selected-urgent-background; - active: @selected-urgent-background; - urgent: #f38ba8; -} - -/*****----- Main Window -----*****/ -window { - enabled: true; - fullscreen: false; - width: 2000px; - transparency: "real"; - cursor: "default"; - spacing: 0px; - padding: 0px; - border-radius: 0px; - border: 2px; - border-color: @active; - background-color: transparent; -} - -/*****----- Main Box -----*****/ -mainbox { - enabled: true; - children: [ "listview" ]; - background-color: @background; -} - -/*****----- Listview -----*****/ -listview { - enabled: true; - columns: 6; - lines: 1; - spacing: 50px; - padding: 20px 150px; - cycle: true; - dynamic: false; - scrollbar: false; - layout: vertical; - reverse: false; - fixed-height: true; - fixed-columns: true; - cursor: "default"; - background-color: transparent; - text-color: @foreground; -} - -/*****----- Elements -----*****/ -element { - enabled: true; - orientation: horizontal; - spacing: 0px; - padding: 0px; - border-radius: 20px; - cursor: pointer; - background-color: transparent; - text-color: @inherit; -} - -@media(max-aspect-ratio: 1.8) { - element { - orientation: vertical; - } -} - -element selected.normal { - background-color: @selected; - text-color: @background; -} - -element-icon { - size: 33%; - cursor: inherit; - border-radius: 0px; - background-color: transparent; - text-color: inherit; -} - -element-text { - vertical-align: 0.5; - horizontal-align: 0.5; - padding: 20px; - cursor: inherit; - background-color: transparent; - text-color: inherit; -} diff --git a/.config/wallpapers/1.png b/.config/wallpapers/1.png deleted file mode 100644 index b451f080..00000000 Binary files a/.config/wallpapers/1.png and /dev/null differ diff --git a/.config/wallpapers/2.png b/.config/wallpapers/2.png deleted file mode 100644 index 9d858f36..00000000 Binary files a/.config/wallpapers/2.png and /dev/null differ diff --git a/.config/wallpapers/3.png b/.config/wallpapers/3.png deleted file mode 100644 index a0bfd0bc..00000000 Binary files a/.config/wallpapers/3.png and /dev/null differ diff --git a/.config/wallpapers/3d.jpg b/.config/wallpapers/3d.jpg deleted file mode 100644 index ec8d0b47..00000000 Binary files a/.config/wallpapers/3d.jpg and /dev/null differ diff --git a/.config/wallpapers/4.png b/.config/wallpapers/4.png deleted file mode 100644 index 38dcbcf4..00000000 Binary files a/.config/wallpapers/4.png and /dev/null differ diff --git a/.config/wallpapers/5.png b/.config/wallpapers/5.png deleted file mode 100644 index 0b274cc0..00000000 Binary files a/.config/wallpapers/5.png and /dev/null differ diff --git a/.config/wallpapers/6.png b/.config/wallpapers/6.png deleted file mode 100644 index c75deb30..00000000 Binary files a/.config/wallpapers/6.png and /dev/null differ diff --git a/.config/wallpapers/7.png b/.config/wallpapers/7.png deleted file mode 100644 index 2c5d4bdb..00000000 Binary files a/.config/wallpapers/7.png and /dev/null differ diff --git a/.config/wallpapers/8.png b/.config/wallpapers/8.png deleted file mode 100644 index 94fa9260..00000000 Binary files a/.config/wallpapers/8.png and /dev/null differ diff --git a/.config/wallpapers/8wlaozbp6h8b1.jpg b/.config/wallpapers/8wlaozbp6h8b1.jpg deleted file mode 100644 index 91ba786e..00000000 Binary files a/.config/wallpapers/8wlaozbp6h8b1.jpg and /dev/null differ diff --git a/.config/wallpapers/9.png b/.config/wallpapers/9.png deleted file mode 100644 index 40cc691a..00000000 Binary files a/.config/wallpapers/9.png and /dev/null differ diff --git a/.config/wallpapers/IMG_8881.png b/.config/wallpapers/IMG_8881.png deleted file mode 100644 index 0a4ac626..00000000 Binary files a/.config/wallpapers/IMG_8881.png and /dev/null differ diff --git a/.config/wallpapers/backiee-298100-landscape.jpg b/.config/wallpapers/backiee-298100-landscape.jpg deleted file mode 100644 index 0cb9664e..00000000 Binary files a/.config/wallpapers/backiee-298100-landscape.jpg and /dev/null differ diff --git a/.config/wallpapers/forest-foggy-misty-cloudy.jpg b/.config/wallpapers/forest-foggy-misty-cloudy.jpg deleted file mode 100644 index 07e11433..00000000 Binary files a/.config/wallpapers/forest-foggy-misty-cloudy.jpg and /dev/null differ diff --git a/.config/wallpapers/img3.wallspic.com-neon-light-purple-leaf-petal-720x1280.jpg b/.config/wallpapers/img3.wallspic.com-neon-light-purple-leaf-petal-720x1280.jpg deleted file mode 100644 index 95ac87c5..00000000 Binary files a/.config/wallpapers/img3.wallspic.com-neon-light-purple-leaf-petal-720x1280.jpg and /dev/null differ diff --git a/.config/wallpapers/snake.png b/.config/wallpapers/snake.png deleted file mode 100644 index 977249bd..00000000 Binary files a/.config/wallpapers/snake.png and /dev/null differ diff --git a/.config/wallpapers/wallhaven-2e2xyx.jpg b/.config/wallpapers/wallhaven-2e2xyx.jpg deleted file mode 100644 index c85d62f4..00000000 Binary files a/.config/wallpapers/wallhaven-2e2xyx.jpg and /dev/null differ diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 3268008f..6b0f0f0c 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,6 +1,6 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: 'JetBrainsMono Nerd Font'; + font-family: 'RecMonoCasual Nerd Font'; font-size: 13px; } @@ -8,11 +8,10 @@ window#waybar { background-color: alpha(@background, 0.8); - border: 1.5px solid @color1; + border: 1.5px solid @color7; color: @color7; transition-property: background-color; transition-duration: .5s; - border-radius: 0px; } tooltip { background: @color1;