diff --git a/config/hypr/config/keybindings/default.conf b/config/hypr/config/keybindings/default.conf index 4765c39..b05ba23 100644 --- a/config/hypr/config/keybindings/default.conf +++ b/config/hypr/config/keybindings/default.conf @@ -67,10 +67,10 @@ bindl = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- bindl = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ bindl = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- bindl = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -bindl = , XF86AudioPlay, exec, playerctl -p cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone play-pause -bindl = , XF86AudioPause, exec, playerctl -p cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone pause -bindl = , XF86AudioNext, exec, playerctl -p cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone next -bindl = , XF86AudioPrev, exec, playerctl -p cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone previous +bindl = , XF86AudioPlay, exec, playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone play-pause +bindl = , XF86AudioPause, exec, playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone pause +bindl = , XF86AudioNext, exec, playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone next +bindl = , XF86AudioPrev, exec, playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone previous bindl = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle bindl = , XF86Lock, exec, pkill -USR1 hyprlock || hyprlock diff --git a/config/hypr/config/keybindings/other.conf b/config/hypr/config/keybindings/other.conf index 0d18bba..19b60fe 100644 --- a/config/hypr/config/keybindings/other.conf +++ b/config/hypr/config/keybindings/other.conf @@ -20,8 +20,8 @@ bind = $mainMod CTRL SHIFT, PRINT, exec, bash ~/config/scripts/edit-last-screens bind = ALT, F9, pass, class:^(com\.obsproject\.Studio)$ # Music volume control -bindl = $mainMod, XF86AudioRaiseVolume, exec, playerctl -p cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02+ -bindl = $mainMod, XF86AudioLowerVolume, exec, playerctl -p cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02- +bindl = $mainMod, XF86AudioRaiseVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02+ +bindl = $mainMod, XF86AudioLowerVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02- # Screen locker and logout keybinds bind = CTRL ALT, DELETE, exec, wlogout diff --git a/config/hypr/config/permissions.conf b/config/hypr/config/permissions.conf index 650a4a5..3a3acee 100644 --- a/config/hypr/config/permissions.conf +++ b/config/hypr/config/permissions.conf @@ -5,7 +5,7 @@ ecosystem { permission = /nix/store/[A-Za-z0-9]+\-(wrapped-)?(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker)\-.*, screencopy, allow permission = /(usr/)?bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow permission = /run/current-system/sw/bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow - +permission = /usr/libexec/xdg-desktop-portal-hyprland, screencopy, allow # hyprlang noerror true @@ -16,4 +16,4 @@ source = ~/config/.hyprfail.conf # windowrulev2 = noscreenshare, class:^(equibop)$ -windowrulev2 = noscreenshare,title:.*(Swedbank|Checkout|Billing).* +windowrulev2 = noscreenshare,title:.*([S|s]wedbank|[Cc]heckout|[Bb]illing).* diff --git a/config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf index 4723921..883d33f 100644 --- a/config/hypr/hyprpaper.conf +++ b/config/hypr/hyprpaper.conf @@ -1,5 +1,5 @@ -# preload = ~/.config/hypr/wallpaper.png -# wallpaper = ,~/.config/hypr/wallpaper.png +preload = ~/.config/hypr/wallpaper.png +wallpaper = ,~/.config/hypr/wallpaper.png -preload = ~/Pictures/Wallpapers/kralsei.jpeg -wallpaper = ,~/Pictures/Wallpapers/kralsei.jpeg +# preload = ~/.cache/.wallpaper +# wallpaper = ,~/.cache/.wallpaper diff --git a/config/waybar/modules.json b/config/waybar/modules.json index c80b609..74526d6 100644 --- a/config/waybar/modules.json +++ b/config/waybar/modules.json @@ -15,14 +15,15 @@ }, "mpris": { - "players": ["cmus", "elisa", "cider", "OCbwoy3_s_iPhone"], + "players": ["chromium", "cmus", "elisa", "cider", "spotify", "OCbwoy3_s_iPhone"], "interval": 1, - "on-scroll-up": "playerctl -p cmus,elisa,cider,OCbwoy3_s_iPhone volume 0.05+", - "on-scroll-down": "playerctl -p cmus,elisa,cider,OCbwoy3_s_iPhone volume 0.05-", - "on-click": "playerctl -p cmus,elisa,cider,OCbwoy3_s_iPhone play-pause", - "on-click-right": "playerctl -p cmus,elisa,cider,OCbwoy3_s_iPhone next", - "on-click-middle": "playerctl -p cmus,elisa,cider,OCbwoy3_s_iPhone previous", + "on-scroll-up": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone volume 0.05+", + "on-scroll-down": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone volume 0.05-", + "on-click": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone play-pause", + "on-click-right": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone next", + "on-click-middle": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone previous", "format": " {artist} — {title}", + // "format": " {title}", "tooltip-format": "{album}", "tooltip-format-stopped": "", "format-stopped": "", diff --git a/scripts/gentoo-init.sh b/scripts/gentoo-init.sh old mode 100644 new mode 100755 index d45f380..b9994ed --- a/scripts/gentoo-init.sh +++ b/scripts/gentoo-init.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash if [[ "$(hostname)" == "gentoo" ]]; then - notify-send "ocbwoy3-gentoo-debug" "init" + notify-send "Hyprland" "Init gentoo stuff" hyprctl dispatch exec hyprpaper hyprctl dispatch exec pipewire hyprctl dispatch exec pipewire-pulse diff --git a/scripts/hot-reload.sh b/scripts/hot-reload.sh index b371658..fde2160 100755 --- a/scripts/hot-reload.sh +++ b/scripts/hot-reload.sh @@ -6,9 +6,18 @@ hyprctl dispatch exec "GTK_THEME=Adwaita LC_TIME=lv_LV.UTF-8 waybar -c ~/config/ hyprctl reload > /dev/null & ROBLOX_PID="$(pidof sober)" +HYPRPAPER_PID="$(pidof hyprpaper)" # echo ${#ROBLOX_PID} if [ ${#ROBLOX_PID} -lt 1 ]; then trap "rm /tmp/.regretevator_state" EXIT > /dev/null fi + +# shit + +if [ ${#HYPRPAPER_PID} -lt 1 ]; then + hyprctl dispatch exec hyprpaper + sleep 1 + bash ~/config/scripts/load-wallpaper.sh +fi diff --git a/scripts/load-wallpaper.sh b/scripts/load-wallpaper.sh old mode 100644 new mode 100755 index b6c91fa..a650979 --- a/scripts/load-wallpaper.sh +++ b/scripts/load-wallpaper.sh @@ -6,5 +6,14 @@ rm -r ~/.cache/wal # wal -stn -a 90 -i $HOME/wallpaper/$WALLPAPER -swww img $WALLPAPER --transition-fps 120 --transition-duration 2 -t wipe & -bash ~/dotfiles/scripts/hot-reload.sh +if [[ "$(hostname)" == "gentoo" ]]; then + hyprctl hyprpaper unload all + hyprctl hyprpaper preload $WALLPAPER + hyprctl hyprpaper wallpaper ,$WALLPAPER +fi + +if [[ "$(hostname)" != "gentoo" ]]; then + swww img $WALLPAPER --transition-fps 120 --transition-duration 2 -t wipe & +fi + +# bash ~/config/scripts/hot-reload.sh diff --git a/scripts/open-roblox-game.sh b/scripts/open-roblox-game.sh old mode 100644 new mode 100755 diff --git a/scripts/select-wallpaper.sh b/scripts/select-wallpaper.sh old mode 100644 new mode 100755 index 54b3771..e320231 --- a/scripts/select-wallpaper.sh +++ b/scripts/select-wallpaper.sh @@ -6,7 +6,7 @@ if [ ${#WALLPAPER} -gt 0 ] ; then rm -f $HOME/.cache/.wallpaper - echo "$HOME/Pictures/Wallpapers/$WALLPAPER" >> $HOME/.cache/.wallpaper + echo "$HOME/Pictures/Wallpapers/$WALLPAPER" > $HOME/.cache/.wallpaper rm -rf $HOME/.cache/wal @@ -14,7 +14,21 @@ if [ ${#WALLPAPER} -gt 0 ] ; then # wal -stn -a 90 -i $HOME/wallpaper/$WALLPAPER - swww img $HOME/Pictures/Wallpapers/$WALLPAPER --transition-fps 300 --transition-duration 2 --transition-type simple --transition-step 3 & + if [[ "$(hostname)" != "gentoo" ]]; then + swww img $HOME/Pictures/Wallpapers/$WALLPAPER --transition-fps 300 --transition-duration 2 --transition-type simple --transition-step 3 & + fi + + if [[ "$(hostname)" == "gentoo" ]]; then + HYPRPAPER_PID="$(pidof hyprpaper)" + if [ ${#HYPRPAPER_PID} -lt 1 ]; then + hyprctl dispatch exec hyprpaper + sleep 1 + fi + hyprctl hyprpaper unload all + hyprctl hyprpaper preload $HOME/Pictures/Wallpapers/$WALLPAPER + hyprctl hyprpaper wallpaper ,$HOME/Pictures/Wallpapers/$WALLPAPER + fi + # bash ~/dotfiles/scripts/hot-reload.sh else diff --git a/scripts/xdg.sh b/scripts/xdg.sh index 2ee48c5..3530b84 100755 --- a/scripts/xdg.sh +++ b/scripts/xdg.sh @@ -2,7 +2,7 @@ sleep 1 -notify-send "ocbwoy3-gentoo-debug" "ran xdg setup" +# notify-send "ocbwoy3" "ran xdg setup" # kill all possible running xdg-desktop-portals kill -9 $(pidof xdg-desktop-portal-hyprland) @@ -18,10 +18,10 @@ sleep 1 hyprctl dispatch exec /usr/lib/xdg-desktop-portal-hyprland & sleep 2 -notify-send "ocbwoy3-gentoo-debug" "xdph" +# notify-send "ocbwoy3" "xdph" # start xdg-desktop-portal hyprctl dispatch exec /usr/lib/xdg-desktop-portal & sleep 1 -notify-send "ocbwoy3-gentoo-debug" "xdp" \ No newline at end of file +# notify-send "ocbwoy3" "xdp" \ No newline at end of file