diff --git a/roles/desktop-environment/files/.config/dunst/dunst.ini b/roles/desktop-environment/files/.config/dunst/dunst.ini deleted file mode 100644 index b2bd36b..0000000 --- a/roles/desktop-environment/files/.config/dunst/dunst.ini +++ /dev/null @@ -1,11 +0,0 @@ -[global] -follow = mouse -font = "JetBrainsMono Nerd Font" -background = "#1A1B26" -foreground = "#F3F4F5" -frame_color = "#FF8F40" -separator_color = frame -min_icon_size = 75 -max_icon_size = 75 -icon_corner_radius = 8 -text_icon_padding = 10 diff --git a/roles/desktop-environment/tasks/utils.yml b/roles/desktop-environment/tasks/utils.yml index c75845c..45c7dbd 100644 --- a/roles/desktop-environment/tasks/utils.yml +++ b/roles/desktop-environment/tasks/utils.yml @@ -24,9 +24,4 @@ - fonts-firacode - fonts-font-awesome - fonts-noto-color-emoji - - thunar - - dunst - - polkit-kde-agent-1 - - slurp - - grim - - swappy \ No newline at end of file + - thunar \ No newline at end of file diff --git a/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2 b/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2 index 60bf495..df2b8ab 100644 --- a/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2 +++ b/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2 @@ -105,15 +105,10 @@ workspace = {{ workspace['id'] }}{% if 'monitor' in workspace %}, monitor:desc:{ {% endfor %} -# Execute helper programs -exec-once = systemctl --user import-environment DISPLAY WAYLAND_DISPLAY && hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK -exec-once = systemctl --user start plasma-polkit-agent.service -exec-once = dunst -config ~/.config/dunst/dunst.ini -exec-once = waybar -exec-once = ~/.local/bin/hyprhelpr background & ~/.local/bin/hyprhelpr idle -exec-once = flatpak run com.tomjwatson.Emote - # Execute apps at launch +exec-once = systemctl --user import-environment DISPLAY WAYLAND_DISPLAY && hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK +exec-once = waybar & ~/.local/bin/hyprhelpr background & ~/.local/bin/hyprhelpr idle +exec-once = flatpak run com.tomjwatson.Emote {% if 'nextcloud' in role_names %} exec-once = nextcloud --background {% endif %} @@ -133,7 +128,6 @@ bind = $mainMod, F, fullscreen, 0 bind = $mainMod, V, togglefloating, bind = $mainMod, L, exec, ~/.local/bin/hyprhelpr lock bind = $mainMod, P, exec, ~/.local/bin/hyprhelpr powermenu -bind = $mainMod SHIFT, S, exec, ~/.local/bin/hyprhelpr screenshot bind = $mainMod, period, exec, flatpak run com.tomjwatson.Emote # Move focus with mainMod + arrow keys diff --git a/roles/desktop-environment/templates/.local/bin/hyprhelpr.j2 b/roles/desktop-environment/templates/.local/bin/hyprhelpr.j2 index 9180a3b..1753113 100644 --- a/roles/desktop-environment/templates/.local/bin/hyprhelpr.j2 +++ b/roles/desktop-environment/templates/.local/bin/hyprhelpr.j2 @@ -59,23 +59,6 @@ powermenu() { fi } -screenshot() { - ACTION=$(printf "Area\nWindow\nScreen" | wofi --show=dmenu -i --width 200 --height 150) - if [ -n "$ACTION" ]; then - case $ACTION in - Area) - grim -g "$(slurp)" - | swappy -f - - ;; - Window) - grim -g "$(hyprctl clients -j | jq -r ".[] | select(.workspace.id | IN(["$(hyprctl monitors -j | jq '.[].activeWorkspace.id' | xargs | sed -e 's/ /,/g')"][]))" | jq -r ".at,.size" | jq -s "add" | jq '_nwise(4)' | jq -r '"\(.[0]),\(.[1]) \(.[2])x\(.[3])"' | slurp)" - | swappy -f - - ;; - Screen) - grim -g "$(slurp -o)" - | swappy -f - - ;; - esac - fi -} - ACTION=$1 case $ACTION in background) @@ -96,9 +79,6 @@ case $ACTION in powermenu) powermenu ;; - screenshot) - screenshot - ;; help | -h | --help) echo "Usage: hyprhelpr <action> [parameters]" echo "Available actions:" @@ -108,7 +88,6 @@ case $ACTION in echo " shutdown Shut down the system." echo " reboot Reboot the system." echo " powermenu Show wofi in dmenu mode with different power options" - echo " screenshot Show wofi in dmenu mode with different screenshot options" echo " help Show this help text." ;; *)