From 5206f1320f77eb7d22071a83212b4bcfbb8945cc Mon Sep 17 00:00:00 2001 From: Andre Ramnitz Date: Sun, 24 Nov 2024 23:15:11 +0100 Subject: [PATCH] hypr: disable the always crashing hypridle daemon return to 1:1 scaling; use kde file picker hypr: fix startup script --- dot-config/hypr/hyprland.conf | 8 ++-- dot-config/hypr/scripts/startup.sh | 46 ++++++++----------- dot-config/hypr/xdph.conf | 4 ++ .../xdg-desktop-portal/hyprland-portals.conf | 4 +- 4 files changed, 30 insertions(+), 32 deletions(-) create mode 100644 dot-config/hypr/xdph.conf diff --git a/dot-config/hypr/hyprland.conf b/dot-config/hypr/hyprland.conf index 6bfae759..d83d0714 100644 --- a/dot-config/hypr/hyprland.conf +++ b/dot-config/hypr/hyprland.conf @@ -11,7 +11,7 @@ debug:disable_logs = true # file logging. defaults to 1 for production # See https://wiki.hyprland.org/Configuring/Monitors/ # monitor=DP-2,preferred,auto,1.25,vrr,2,bitdepth,8 -monitor=DP-2,preferred,auto,1.25,vrr,2,bitdepth,8 +monitor=DP-2,preferred,auto,1.0,vrr,2,bitdepth,8 # unscale XWayland xwayland { @@ -24,7 +24,7 @@ env = XDG_CURRENT_DESKTOP,Hyprland env = XDG_SESSION_DESKTOP,Hyprland env = XDG_SESSION_TYPE,wayland exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-shutdown = setenv WAYLAND_DISPLAY= XDG_SESSION_TYPE= XDG_CURRENT_DESKTOP= +# exec-shutdown = setenv WAYLAND_DISPLAY= XDG_SESSION_TYPE= XDG_CURRENT_DESKTOP= # Some default env vars. env = QT_QPA_PLATFORM,wayland;xcb @@ -52,10 +52,10 @@ env = XCURSOR_SIZE,40 # env = HYPRCURSOR_SIZE,40 # Execute your favorite apps at launch -exec-once = hyprpm enable hyprbars exec-once = ~/.config/hypr/scripts/startup.sh -exec-once = hypridle +# exec-once = hypridle exec-once = foot -s +exec-once = hyprpm enable hyprbars exec-shutdown = pkill -f '/usr/lib/python-exec/python3.12/python /home/andy/.config/hypr/scripts/gammarelay-auto-temp.py' # exec = python ~/.config/hypr/scripts/macos_like_accel.py razer-razer-basilisk-v3 diff --git a/dot-config/hypr/scripts/startup.sh b/dot-config/hypr/scripts/startup.sh index 7379699c..92e58ba2 100755 --- a/dot-config/hypr/scripts/startup.sh +++ b/dot-config/hypr/scripts/startup.sh @@ -18,10 +18,12 @@ killall -e xdg-desktop-portal-gnome killall -e xdg-desktop-portal-wlr killall xdg-desktop-portal logger 'all xdg-desktop killed ' - -sleep 1 +sleep 2 # test -f /usr/libexec/xdg-desktop-portal-kde && sleep 1 && /usr/libexec/xdg-desktop-portal-kde & +test -f /usr/libexec/xdg-desktop-portal-gtk && /usr/libexec/xdg-desktop-portal-gtk & +sleep 1 test -f /usr/libexec/xdg-desktop-portal-hyprland && /usr/libexec/xdg-desktop-portal-hyprland & +sleep 2 test -f /usr/libexec/xdg-desktop-portal && /usr/libexec/xdg-desktop-portal & #------------------------------------------------------ polkit-kde @@ -38,44 +40,36 @@ else fi #------------------------------------------------------ legacy scaling -test -f ~/.Xresources && xrdb ~/.Xresources +test -f ~/.Xresources && xrdb ~/.Xresources & +logger '.Xresources merged' #------------------------------------------------------ waybar and tray apps -if [[ ! $(pidof pipewire) ]]; then - gentoo-pipewire-launcher & - logger 'gentoo-pipewire-launcher started' -else - gentoo-pipewire-launcher restart & - logger 'gentoo-pipewire-launcher (re-)started' -fi - -until [[ $(pidof pipewire) ]]; do - sleep 0.5 -done +gentoo-pipewire-launcher restart > /dev/null 2>&1 & +logger 'gentoo-pipewire-launcher (re-)started' +sleep 2 ! pidof mpd && mpd # does fork unless called with --no-daemon -! pidof mpd-mpris && mpd-mpris > /dev/null 2>&1 & +logger 'mpd is running' +pidof mpd-mpris && pkill mpd-mpris || mpd-mpris > /dev/null 2>&1 & +logger 'mpd-mpris is running' -! pidof waybar && waybar > /dev/null 2>&1 & +pidof waybar && pkill waybar || waybar > /dev/null 2>&1 & logger 'waybar started' -until [[ $(pidof waybar) ]]; do - sleep 0.5 -done -corectrl --minimize-systray & -openrgb -p default --startminimized & -udiskie --no-automount --no-notify --tray & +pidof openrgb && pkill openrgb || openrgb -p default --startminimized & +pidof udiskie && pkill udiskie || udiskie --no-automount --no-notify --tray & +pidof corectrl && pkill corectrl || corectrl --minimize-systray > /dev/null 2>&1 & -! pidof swaync && swaync > /dev/null 2>&1 & -! pidof kwalletmanager5 && /usr/libexec/pam_kwallet_init & +pidof swaync && pkill swaync || swaync > /dev/null 2>&1 & +# ! pidof kwalletmanager5 && /usr/libexec/pam_kwallet_init & -! pidof swww-daemon && /usr/bin/swww-daemon > /dev/null 2>&1 & +! pidof swww-daemon && nohup /usr/bin/swww-daemon > /dev/null 2>&1 sleep 0.5 && ~/.local/bin/rndwallpaper swww pkill -f '/usr/lib/python-exec/python3.12/python /home/andy/.config/hypr/scripts/gammarelay-auto-temp.py' sleep 1 && "/home/andy/.config/hypr/scripts/gammarelay-auto-temp.py" > /dev/null 2>&1 & -pidof wl-paste && killall wl-paste +pidof wl-paste && pkill wl-paste wl-paste --type text --watch cliphist store & wl-paste --type image --watch cliphist store & diff --git a/dot-config/hypr/xdph.conf b/dot-config/hypr/xdph.conf new file mode 100644 index 00000000..11c656a0 --- /dev/null +++ b/dot-config/hypr/xdph.conf @@ -0,0 +1,4 @@ +screencopy { + max_fps = 60 +} + diff --git a/dot-config/xdg-desktop-portal/hyprland-portals.conf b/dot-config/xdg-desktop-portal/hyprland-portals.conf index 7f01aca3..06aeb354 100644 --- a/dot-config/xdg-desktop-portal/hyprland-portals.conf +++ b/dot-config/xdg-desktop-portal/hyprland-portals.conf @@ -1,4 +1,4 @@ [preferred] -default=hyprland;kde;gtk -org.freedesktop.impl.portal.FileChooser=kde +default = hyprland;gtk +org.freedesktop.impl.portal.FileChooser = kde -- 2.51.2