From c775fb987e17a89dfeb80e768177abb294b1c78f Mon Sep 17 00:00:00 2001 From: GeorgeSG Date: Sat, 6 Jul 2024 23:19:28 +0300 Subject: [PATCH] Update eww and hypr --- home/.config/eww/power-menu/shutdown.sh | 2 +- home/.config/hypr/autorun.conf | 5 +- home/.config/hypr/binds.conf | 66 ++++++++++++------------- home/.config/hypr/hyprland.conf | 29 +++-------- home/.config/hypr/rules.conf | 17 +++++++ home/.config/hypr/run-apps.sh | 8 +++ 6 files changed, 65 insertions(+), 62 deletions(-) create mode 100644 home/.config/hypr/rules.conf create mode 100755 home/.config/hypr/run-apps.sh diff --git a/home/.config/eww/power-menu/shutdown.sh b/home/.config/eww/power-menu/shutdown.sh index 05144a4..e0a7cde 100755 --- a/home/.config/eww/power-menu/shutdown.sh +++ b/home/.config/eww/power-menu/shutdown.sh @@ -1,3 +1,3 @@ #!/usr/bin/env sh -systemctl poweroff now +shutdown now diff --git a/home/.config/hypr/autorun.conf b/home/.config/hypr/autorun.conf index 4f24d52..2a11d48 100644 --- a/home/.config/hypr/autorun.conf +++ b/home/.config/hypr/autorun.conf @@ -2,11 +2,8 @@ ### AUTOSTART ### ################# -# exec-once = $terminal -# exec-once = nm-applet & -# exec-once = waybar & hyprpaper & firefox exec-once = eww open bar --id bar1 --arg monitor=0 --arg monitor-workspaces="[1,2]" exec-once = eww open bar --id bar2 --arg monitor=1 --arg monitor-workspaces="[3,4]" -exec-once = eww open monitor-bump +exec-once = eww open --toggle monitor-bump exec-once = swww-daemon --format xrgb & exec-once = swaync & diff --git a/home/.config/hypr/binds.conf b/home/.config/hypr/binds.conf index 522e721..9c1478a 100644 --- a/home/.config/hypr/binds.conf +++ b/home/.config/hypr/binds.conf @@ -9,47 +9,50 @@ $fileManager = nautilus $menu = rofi -show combi -combi-modes "window,run,ssh" -modes combi $emojiMenu = rofi -modi emoji -show emoji -windowrulev2 = float,class:(floatingTerm) +bind = $mainMod, E, exec, $fileManager # E - file manager +bind = $mainMod, F, fullscreen # F - fullscreen +bind = $mainMod, J, togglesplit, # J - toggle split +bind = $mainMod, L, exec, hyprlock # L - lock screen +bind = $mainMod, M, exit # M - exit +bind = $mainMod, N, exec, swaync-client --toggle-panel # N - toggle swaync panel +bind = $mainMod, Q, killactive # Q - kill active window +bind = alt, Q, killactive # alt + Q - kill active window +bind = $mainMod, S, swapactiveworkspaces, 0 1 # S - swap monitor workspaces +bind = $mainMod, T, exec, $terminal # T - terminal +bind = $mainMod, V, togglefloating # V - toggle floatin +bind = $mainMod, F1, exec, ~/.config/hypr/game-mode.sh # F1 - game mode +bind = $mainMod, F2, exec, eww open --toggle monitor-bump -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, T, exec, $terminal -bind = $mainMod, Q, killactive -bind = alt, Q, killactive -bind = $mainMod, M, exit -bind = $mainMod, E, exec, $fileManager -bind = $mainMod, V, togglefloating, -bind = $mainMod, L, exec, hyprlock -bind = $mainMod, N, exec, swaync-client --toggle-panel -bind = $mainMod, F, fullscreen -bind = alt, space, exec, $menu --class=floatingTerm -bind = alt win shift, e, exec, $emojiMenu -# bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle +bind = alt, space, exec, $menu # alt+space - rofi a la spotlight +bind = alt win shift, e, exec, $emojiMenu # alt+win+shift+e - emoji menu # eww -bind = $mainMod, F2, exec, eww open --toggle monitor-bump -bind = ctrl alt, Q, exec, eww open --toggle power-menu +bind = ctrl shift win, Q, exec, eww open --toggle power-menu bind = ctrl shift win, M, exec, eww open --toggle media-menu +bind = ctrl shift win, R, exec, ~/.config/hypr/run-apps.sh +bind = ctrl shift win, W, exec, ~/Scripts/wallpaper # change wallpapers + + +### Window Management # Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l +bind = $mainMod, left, movefocus, l bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d -bind = ctrl alt win, left, movewindow, mon:+1 +# move to prev / next monitor +bind = ctrl alt win, left, movewindow, mon:+1 bind = ctrl alt win, right, movewindow, mon:-1 -bind = SUPER, S, swapactiveworkspaces, 0 1 - # resize with ctrl win shift hjkl bind = $mainMod ctrl shift, L, resizeactive, 30 0 bind = $mainMod ctrl shift, H, resizeactive, -30 0 bind = $mainMod ctrl shift, K, resizeactive, 0 30 bind = $mainMod ctrl shift, J, resizeactive, 0 -30 -# move with ctrl alt hjkl +# move with ctrl win hjkl bind = ctrl win, H, movewindow, l bind = ctrl win, L, movewindow, r bind = ctrl win, K, movewindow, u @@ -67,7 +70,7 @@ bind = $mainMod, 8, workspace, 8 bind = $mainMod, 9, workspace, 9 bind = $mainMod, 0, workspace, 10 -# Move active window to a workspace with mainMod + shift + [0-9] +# Move active window to a workspace with ctrl + shift + alt + [0-9] bind = ctrl shift alt, 1, movetoworkspace, 1 bind = ctrl shift alt, 2, movetoworkspace, 2 bind = ctrl shift alt, 3, movetoworkspace, 3 @@ -79,28 +82,23 @@ bind = ctrl shift alt, 8, movetoworkspace, 8 bind = ctrl shift alt, 9, movetoworkspace, 9 bind = ctrl shift alt, 0, movetoworkspace, 10 +# go to next/prev workspace with ctrl alt hj bind = ctrl alt, H, workspace, -1 bind = ctrl alt, L, workspace, +1 +# move to next/prev workspace with ctrl alt shift hj bind = ctrl alt shift, H, movetoworkspace, -1 bind = ctrl alt shift, L, movetoworkspace, +1 - - # Example special workspace (scratchpad) # bind = $mainMod, S, togglespecialworkspace, magic # bind = $mainMod shift, S, movetoworkspace, special:magic +### Mouse # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 +bind = $mainMod, mouse_up, workspace, e-1 # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow - -# game mode -bind = $mainMod, F1, exec, ~/.config/hypr/game-mode.sh - - -bind = ctrl shift win, W, exec, /home/georgi/Scripts/wallpaper diff --git a/home/.config/hypr/hyprland.conf b/home/.config/hypr/hyprland.conf index 01e98d9..1172ad4 100644 --- a/home/.config/hypr/hyprland.conf +++ b/home/.config/hypr/hyprland.conf @@ -3,32 +3,15 @@ monitor=DP-1, 3840x1600@144, 0x0, 1, vrr, 1 monitor=DP-2, 2560x1440@144, 0x-1440, 1 +workspace = 1, monitor:DP-1 +workspace = 2, monitor:DP-1 +workspace = 3, monitor:DP-2 +workspace = 4, monitor:DP-2 + source = ~/.config/hypr/autorun.conf source = ~/.config/hypr/env.conf source = ~/.config/hypr/style.conf source = ~/.config/hypr/input.conf source = ~/.config/hypr/binds.conf - - - -workspace = 1, monitor:DP-1 -workspace = 2, monitor:DP-1 -workspace = 3, monitor:DP-2 -workspace = 4, monitor:DP-2 - -### Window rules - -windowrulev2 = suppressevent maximize, class:.* # You'll probably like this. - -windowrulev2 = workspace 3, class:(org.telegram.desktop) -windowrulev2 = workspace 3, class:(discord) -windowrulev2 = workspace 2, class:(steam) -windowrulev2 = float, class:(steam), title:(Friends List) -windowrulev2 = float, class:(steam), title:(Steam Settings) - -# blur eww windows -layerrule = blur, power-menu -layerrule = ignorezero, power-menu -layerrule = blur, media-menu -layerrule = ignorezero, media-menu +source = ~/.config/hypr/rules.conf diff --git a/home/.config/hypr/rules.conf b/home/.config/hypr/rules.conf new file mode 100644 index 0000000..c4d944b --- /dev/null +++ b/home/.config/hypr/rules.conf @@ -0,0 +1,17 @@ +### Window rules + +windowrulev2 = suppressevent maximize, class:.* # You'll probably like this. + +windowrulev2 = workspace 1, class:(firefox) +windowrulev2 = workspace 3, class:(org.telegram.desktop) +windowrulev2 = workspace 3, class:(Todoist) +windowrulev2 = workspace 3, class:(discord) +windowrulev2 = workspace 2, class:(steam) +windowrulev2 = float, class:(steam), title:(Friends List) +windowrulev2 = float, class:(steam), title:(Steam Settings) + +# blur eww windows +layerrule = blur, power-menu +layerrule = ignorezero, power-menu +layerrule = blur, media-menu +layerrule = ignorezero, media-menu diff --git a/home/.config/hypr/run-apps.sh b/home/.config/hypr/run-apps.sh new file mode 100755 index 0000000..efd48de --- /dev/null +++ b/home/.config/hypr/run-apps.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env sh + +hyprctl dispatch -- exec '[workspace 1]' firefox & +hyprctl dispatch -- exec '[workspace 3 silent]' telegram-desktop & +sleep 1 +hyprctl dispatch -- exec '[workspace 3 silent]' todoist & +sleep 1 +hyprctl dispatch -- exec '[workspace 3 silent]' alacritty -e btop &