4 files changed, 61 insertions, 51 deletions

diff --git a/.config/hypr/conf/gestures.conf b/.config/hypr/conf/gestures.conf
new file mode 100644
index 0000000..ac2ade3
--- /dev/null
+++ b/.config/hypr/conf/gestures.conf
@@ -0,0 +1,2 @@
+gesture = 3, horizontal, workspace
+gesture = 3, vertical, fullscreen
diff --git a/.config/hypr/conf/keybinds.conf b/.config/hypr/conf/keybinds.conf
index b192c5d..ecb142c 100644
--- a/.config/hypr/conf/keybinds.conf
+++ b/.config/hypr/conf/keybinds.conf
@@ -2,7 +2,7 @@
 
 # See https://wiki.hyprland.org/Configuring/Keywords/
 $mainMod = SUPER
-$terminal = kitty
+$terminal = foot
 $fileManager = thunar
 $menu = tofi-drun | xargs hyprctl dispatch exec --
 
@@ -10,10 +10,10 @@ $menu = tofi-drun | xargs hyprctl dispatch exec --
 bind = $mainMod+SHIFT, code:41, exec, $fileManager # f
 bind = $mainMod, RETURN, exec, $terminal
 bind = $mainMod, code:71, exec, $HOME/.local/bin/mailsync # f5
-bind = ,code:118, exec, copyq menu # ins
+bind = ,code:118, exec, copyq show # ins
 bind = $mainMod, 0, exec, swaync-client --hide-latest
 bind = $mainMod+SHIFT, 0, exec, swaync-client -t
-bindr = SUPER+SHIFT, escape, exec, wlogout
+bindr = $mainMod+SHIFT, escape, exec, wlogout
 bindr = $mainMod, code:42, exec, $HOME/.local/bin/done # g
 bindr = $mainMod, code:30, exec, $HOME/.local/bin/bukuadd_c # u
 bindr = $mainMod, code:35, exec, $HOME/.local/bin/td # ]
@@ -29,17 +29,17 @@ bindl = , XF86AudioPlay, exec, playerctl play-pause
 bindl = , XF86AudioNext, exec, playerctl next
 bindl = , XF86AudioPrev, exec, playerctl previous
 
+# Colour picker
+# https://wimpysworld.com/posts/fuzzel-hyprpicker/
+bind = $mainMod, code:32, exec, $HOME/.local/bin/fuzzel_hyprpicker.sh
+
 # Screenshots:
-# Super+P: Current window
-# Super+Shift+p: Select area
-# Super+Alt+p Current output
-# Super+Ctrl+p All outputs
 
 # Optionally, customize slurp's appearance
 env = SLURP_ARGS, -d -B F050F022 -b 10101022 -c ff00ff
 
-bind = ,Print, exec, ~/.local/bin/screenshot.sh
-bind = SHIFT, Print, exec, grimblast copy area
+bind = SHIFT, Print, exec, grimblast copysave area
+bind = ,Print, exec, grimblast copy area
 
 # Move focus
 bind = $mainMod, code:43, movefocus, l
diff --git a/.config/hypr/conf/monitor.conf b/.config/hypr/conf/monitor.conf
index e04dfb1..de07cbe 100644
--- a/.config/hypr/conf/monitor.conf
+++ b/.config/hypr/conf/monitor.conf
@@ -2,4 +2,4 @@
 monitor=eDP-1,highres,auto,1
 
 # # autoconfig any additional monitor
-monitor=HDMI-A-1,highres,auto-up,1.25
+monitor=HDMI-A-1,highres,auto-up,1
diff --git a/.config/hypr/conf/windowrules.conf b/.config/hypr/conf/windowrules.conf
index 9f3995c..ab0676b 100644
--- a/.config/hypr/conf/windowrules.conf
+++ b/.config/hypr/conf/windowrules.conf
@@ -1,73 +1,81 @@
 # See https://wiki.hyprland.org/Configuring/Window-Rules/
-windowrulev2 = suppressevent maximize, class:.*
+windowrule = suppressevent maximize, class:.*
 
 # polkit auth agent
-windowrulev2 = float, class:org.kde.polkit-kde-authentication-agent-1
+windowrule = float, class:org.kde.polkit-kde-authentication-agent-1
 
 # yad
-windowrulev2 = float, class:yad
+windowrule = float, class:yad
 
 # Libre Office
-windowrulev2 = size 800 600, class:soffice,title:Export
+windowrule = size 800 600, class:soffice,title:Export
 
 # Blueman
-windowrulev2 = float,class:^(blueman-manager)$
+windowrule = float,class:^(blueman-manager)$
 
 # NetworkManager
-windowrulev2 = float,class:^(nm-connection-editor)$
+windowrule = float,class:^(nm-connection-editor)$
 
 # Pavucontrol
-windowrulev2 = float,class:^(org.pulseaudio.pavucontrol)$
-windowrulev2 = size 800 600,class:^(org.pulseaudio.pavucontrol)$
+windowrule = float,class:^(org.pulseaudio.pavucontrol)$
+windowrule = size 800 600,class:^(org.pulseaudio.pavucontrol)$
 
 # copyq
-windowrulev2 = float, class:com.github.hluk.copyq
-windowrulev2 = noborder, class:com.github.hluk.copyq
-windowrulev2 = noblur, class:com.github.hluk.copyq
-windowrulev2 = dimaround, class:com.github.hluk.copyq
-windowrulev2 = move 70% 10%, class:com.github.hluk.copyq
+windowrule = float, class:com.github.hluk.copyq
+windowrule = noborder, class:com.github.hluk.copyq
+windowrule = noblur, class:com.github.hluk.copyq
+windowrule = dimaround, class:com.github.hluk.copyq
+windowrule = move 55% 15%, class:com.github.hluk.copyq
+windowrule = size 35% 65%, class:com.github.hluk.copyq
 
 # Firefox
-windowrulev2 = workspace name:browser silent, class:firefox
+windowrule = workspace name:browser silent, class:firefox
 
 # Browser Picture in Picture
-windowrulev2 = float, title:^(Picture-in-Picture)$
-windowrulev2 = pin, title:^(Picture-in-Picture)$
-windowrulev2 = move 72% 40%, title:^(Picture-in-Picture)$
-windowrulev2 = size 520 390, title:^(Picture-in-Picture)$
+windowrule = float, title:^(Picture-in-Picture)$
+windowrule = pin, title:^(Picture-in-Picture)$
+windowrule = move 72% 40%, title:^(Picture-in-Picture)$
+windowrule = size 520 390, title:^(Picture-in-Picture)$
 
 # Discord Popout
-windowrulev2 = float, title:^(Discord Popout)$
-windowrulev2 = pin, title:^(Discord Popout)$
-windowrulev2 = move 72% 40%, title:^(Discord Popout)$
-windowrulev2 = size 573 354, title:^(Discord Popout)$
+windowrule = float, title:^(Discord Popout)$
+windowrule = pin, title:^(Discord Popout)$
+windowrule = move 72% 40%, title:^(Discord Popout)$
+windowrule = size 573 354, title:^(Discord Popout)$
 
 # Xwaylandvideobridge
-windowrulev2 = opacity 0.0 override,class:^(xwaylandvideobridge)$
-windowrulev2 = noanim,class:^(xwaylandvideobridge)$
-windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
-windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$
-windowrulev2 = noblur,class:^(xwaylandvideobridge)$
+windowrule = opacity 0.0 override,class:^(xwaylandvideobridge)$
+windowrule = noanim,class:^(xwaylandvideobridge)$
+windowrule = noinitialfocus,class:^(xwaylandvideobridge)$
+windowrule = maxsize 1 1,class:^(xwaylandvideobridge)$
+windowrule = noblur,class:^(xwaylandvideobridge)$
 
 # Zotero
-windowrulev2 = workspace name:zotero silent, class:Zotero
+windowrule = workspace name:zotero silent, class:Zotero
 
-windowrulev2 = float, class:^(Zotero)$,title:^(Progress)$
-windowrulev2 = noinitialfocus, class:^(Zotero)$,title:^(Progress)$
-windowrulev2 = move 1579 954, class:^(Zotero)$,title:^(Progress)$
-windowrulev2 = size 300 72, class:^(Zotero)$,title:^(Progress)$
-windowrulev2 = size 445 195, class:^(Zotero)$,title:^(New Collection)$
+windowrule = float, class:^(Zotero)$,title:^(Progress)$
+windowrule = noinitialfocus, class:^(Zotero)$,title:^(Progress)$
+windowrule = move 1579 954, class:^(Zotero)$,title:^(Progress)$
+windowrule = size 300 72, class:^(Zotero)$,title:^(Progress)$
+windowrule = size 445 195, class:^(Zotero)$,title:^(New Collection)$
 
 # Thunar
-windowrulev2 = float, class:^(Thunar)$,title:^(File Operation Progress)$
-windowrulev2 = noinitialfocus, class:^(Thunar)$,title:^(File Operation Progress)$
-windowrulev2 = size 505 100, class:^(Thunar)$,title:^(File Operation Progress)$
+windowrule = float, class:^(Thunar)$,title:^(File Operation Progress)$
+windowrule = noinitialfocus, class:^(Thunar)$,title:^(File Operation Progress)$
+windowrule = size 505 100, class:^(Thunar)$,title:^(File Operation Progress)$
+windowrule = float, class:^(Thunar)$,title:^(Rename).*$
+
+# engrampa
+windowrule = float, class:^(engrampa)$,title:^(Extract archive)$
 
 # Spotify
-windowrulev2 = workspace name:music silent, class:^(Spotify)$
+windowrule = workspace name:music silent, class:^(Spotify)$
 
 # Thunderbird
-windowrulev2 = float, class:^(thunderbird)$,title:^(Edit Item)$
-windowrulev2 = size 720 790, class:^(thunderbird)$,title:^(Edit Item)$
-windowrulev2 = float, class:^(thunderbird)$,title:^(TbSync account manager)$
-windowrulev2 = size 1100 880, class:^(thunderbird)$,title:^(Edit Item)$
+windowrule = float, class:^(thunderbird)$,title:^(Edit Item)$
+windowrule = size 720 790, class:^(thunderbird)$,title:^(Edit Item)$
+windowrule = float, class:^(thunderbird)$,title:^(TbSync account manager)$
+windowrule = size 1100 880, class:^(thunderbird)$,title:^(Edit Item)$
+
+# Zoom
+windowrule=stayfocused,class:(zoom),initialTitle:(menu window)