hypr: quick refactor

1 files changed, 54 insertions, 58 deletions

diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf
index a09cb70..c66be30 100644
--- a/hypr/.config/hypr/hyprland.conf
+++ b/hypr/.config/hypr/hyprland.conf
@@ -7,8 +7,6 @@
 #
 # █▄▄ █░█ ▀ █▀   █▀▀ █▀█ █▄░█ █▀▀ █ █▀▀   █▀▀ █▀█ █▀█   █░█ █▄█ █▀█ █▀█ █░░ ▄▀█ █▄░█ █▀▄
 # █▄█ █▀█ ░ ▄█   █▄▄ █▄█ █░▀█ █▀░ █ █▄▄   █▀░ █▄█ █▀▄   █▀█ ░█░ █▀▀ █▀▄ █▄▄ █▀█ █░▀█ █▄▀
-#
-# 📎 Translated from bspwm + sxhkd configuration
 
 
 # ╔════════════════════════════════════════╗
@@ -183,84 +181,82 @@ device {
 # ║  ⌨  KEYBINDINGS                       ║
 # ╚════════════════════════════════════════╝
 
-$mainMod = SUPER
-
 # 🚀 Applications
-bind = $mainMod, Return, exec, $terminal
-bind = $mainMod ALT, Return, exec, kitty --class floating
-bind = $mainMod, W, exec, $browser
-bind = $mainMod, D, exec, $menu
-bind = $mainMod, E, exec, emacs
+bind = SUPER, Return, exec, $terminal
+bind = SUPER ALT, Return, exec, kitty --class floating
+bind = SUPER, W, exec, $browser
+bind = SUPER, D, exec, $menu
+bind = SUPER, E, exec, emacs
 
 # 📜 Scripts
-bind = $mainMod, V, exec, ~/Scripts/clipboard
-bind = $mainMod, R, exec, ~/Scripts/run
-bind = $mainMod, S, exec, ~/Scripts/screenshot
-bind = $mainMod SHIFT, S, exec, ~/Scripts/screenshot snip
+bind = SUPER, V, exec, ~/Scripts/clipboard
+bind = SUPER, R, exec, ~/Scripts/run
+bind = SUPER, S, exec, ~/Scripts/screenshot
+bind = SUPER SHIFT, S, exec, ~/Scripts/screenshot snip
 
 # 🪟 Window Management
-bind = $mainMod SHIFT, C, killactive,
-bind = $mainMod SHIFT, R, exec, hyprctl reload
-bind = $mainMod, F, fullscreen, 0
-bind = $mainMod, M, fullscreen, 1
+bind = SUPER SHIFT, C, killactive,
+bind = SUPER SHIFT, R, exec, hyprctl reload
+bind = SUPER, F, fullscreen, 0
+bind = SUPER, M, fullscreen, 1
 
 # 👁  Move Focus (Vim-style)
-bind = $mainMod, H, movefocus, l
-bind = $mainMod, L, movefocus, r
-bind = $mainMod, K, movefocus, u
-bind = $mainMod, J, movefocus, d
+bind = SUPER, H, movefocus, l
+bind = SUPER, L, movefocus, r
+bind = SUPER, K, movefocus, u
+bind = SUPER, J, movefocus, d
 
 # ↔  Swap Window (Vim-style)
-bind = $mainMod SHIFT, H, swapwindow, l
-bind = $mainMod SHIFT, L, swapwindow, r
-bind = $mainMod SHIFT, K, swapwindow, u
-bind = $mainMod SHIFT, J, swapwindow, d
+bind = SUPER SHIFT, H, swapwindow, l
+bind = SUPER SHIFT, L, swapwindow, r
+bind = SUPER SHIFT, K, swapwindow, u
+bind = SUPER SHIFT, J, swapwindow, d
 
 # ✂  Preselection / Split Direction (Ctrl+Super+hjkl)
-bind = $mainMod CTRL, H, layoutmsg, preselect l
-bind = $mainMod CTRL, L, layoutmsg, preselect r
-bind = $mainMod CTRL, K, layoutmsg, preselect u
-bind = $mainMod CTRL, J, layoutmsg, preselect d
+bind = SUPER CTRL, H, layoutmsg, preselect l
+bind = SUPER CTRL, L, layoutmsg, preselect r
+bind = SUPER CTRL, K, layoutmsg, preselect u
+bind = SUPER CTRL, J, layoutmsg, preselect d
 
 # 🔄 Swap with last window
-bind = $mainMod CTRL, M, swapnext, prev
+bind = SUPER CTRL, M, swapnext, prev
 
 # 🔢 Switch Workspaces (Dvorak layout keys)
 # Note: These keybinds match Dvorak layout from sxhkd config
-bind = $mainMod, ampersand, workspace, 1      # 一
-bind = $mainMod, bracketleft, workspace, 2    # 二
-bind = $mainMod, braceleft, workspace, 3      # 三
-bind = $mainMod, braceright, workspace, 4     # 四
-bind = $mainMod, parenleft, workspace, 5      # 五
-bind = $mainMod, equal, workspace, 6          # 六
-bind = $mainMod, asterisk, workspace, 7       # 七
-bind = $mainMod, parenright, workspace, 8     # 八
-bind = $mainMod, plus, workspace, 9           # 九
-bind = $mainMod, bracketright, workspace, 10  # 十
-bind = $mainMod, exclam, workspace, 11        
-bind = $mainMod, numbersign, workspace, 12        
+bind = SUPER, ampersand, workspace, 1      # 一
+bind = SUPER, bracketleft, workspace, 2    # 二
+bind = SUPER, braceleft, workspace, 3      # 三
+bind = SUPER, braceright, workspace, 4     # 四
+bind = SUPER, parenleft, workspace, 5      # 五
+bind = SUPER, equal, workspace, 6          # 六
+bind = SUPER, asterisk, workspace, 7       # 七
+bind = SUPER, parenright, workspace, 8     # 八
+bind = SUPER, plus, workspace, 9           # 九
+bind = SUPER, bracketright, workspace, 10  # 十
+bind = SUPER, exclam, workspace, 11        
+bind = SUPER, numbersign, workspace, 12        
 
 # 📦 Move to Workspace (Dvorak layout keys)
-bind = $mainMod SHIFT, ampersand, movetoworkspace, 1
-bind = $mainMod SHIFT, bracketleft, movetoworkspace, 2
-bind = $mainMod SHIFT, braceleft, movetoworkspace, 3
-bind = $mainMod SHIFT, braceright, movetoworkspace, 4
-bind = $mainMod SHIFT, parenleft, movetoworkspace, 5
-bind = $mainMod SHIFT, equal, movetoworkspace, 6
-bind = $mainMod SHIFT, asterisk, movetoworkspace, 7
-bind = $mainMod SHIFT, parenright, movetoworkspace, 8
-bind = $mainMod SHIFT, plus, movetoworkspace, 9
-bind = $mainMod SHIFT, bracketright, movetoworkspace, 10
-bind = $mainMod SHIFT, exclam, movetoworkspace, 11
-bind = $mainMod SHIFT, numbersign, movetoworkspace, 12
+bind = SUPER SHIFT, ampersand, movetoworkspace, 1
+bind = SUPER SHIFT, bracketleft, movetoworkspace, 2
+bind = SUPER SHIFT, braceleft, movetoworkspace, 3
+bind = SUPER SHIFT, braceright, movetoworkspace, 4
+bind = SUPER SHIFT, parenleft, movetoworkspace, 5
+bind = SUPER SHIFT, equal, movetoworkspace, 6
+bind = SUPER SHIFT, asterisk, movetoworkspace, 7
+bind = SUPER SHIFT, parenright, movetoworkspace, 8
+bind = SUPER SHIFT, plus, movetoworkspace, 9
+bind = SUPER SHIFT, bracketright, movetoworkspace, 10
+bind = SUPER SHIFT, exclam, movetoworkspace, 11
+bind = SUPER SHIFT, numbersign, movetoworkspace, 12
 
 # 🖱  Scroll Through Workspaces (mainMod + scroll)
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
+bind = SUPER, mouse_down, workspace, e+1
+bind = SUPER, mouse_up, workspace, e-1
 
 # 🖱  Move / Resize Windows (mainMod + LMB/RMB)
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
+bindm = SUPER, mouse:272, movewindow
+bindm = SUPER, mouse:273, resizewindow
 
 # 🎵 Media Keys
 bindel = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% && VOLUME=$(pactl get-sink-volume @DEFAULT_SINK@ | grep -Po '\d+%' | head -1) && dunstify " Volume: $VOLUME" -h int:value:"${VOLUME%\%}" -r 2593 -t 1000