diff --git a/nixos/home/desktop/wayland/config/hypr/keybinds.conf b/nixos/home/desktop/wayland/config/hypr/keybinds.conf
index e924dccd..aa918144 100644
--- a/nixos/home/desktop/wayland/config/hypr/keybinds.conf
+++ b/nixos/home/desktop/wayland/config/hypr/keybinds.conf
@@ -1,92 +1,87 @@
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-$mainMod = SUPER
-$term = wezterm
-$browser = librewolf
-
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Return, exec, $term
-bind = $mainMod, Q, killactive,
-bind = $mainMod, E, exec, neovide --multigrid --maximized
-# bind = $mainMod, E, exec, ~/.dotfiles/scripts/power-profiles
-# bind = $mainMod SHIFT, E, exit
-bind = $mainMod, P, exec, ~/.dotfiles/scripts/powermenu
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, Space, exec, rofi -show drun
-bind = $mainMod, S, togglegroup, # dwindle
-bind = $mainMod SHIFT, S, changegroupactive, # dwindle
-bind = $mainMod, G, togglesplit, # dwindle
-bind = $mainMod, F1, exec, swaylock
-bind = $mainMod, W, exec, $browser
-bind = $mainMod, F, exec, thunar
-bind = $mainMod, M, fullscreen, 1
+bind = SUPER, Return, exec, wezterm
+bind = SUPER SHIFT, Return, exec, [float] wezterm
+bind = SUPER, Q, killactive,
+bind = SUPER, E, exec, neovide --multigrid --maximized
+bind = SUPER SHIFT, E, exec, WINI_UNIX_BACKEND=x11 neovide --multigrid --maximized
+bind = SUPER, P, exec, ~/.dotfiles/scripts/powermenu
+bind = SUPER, V, togglefloating,
+bind = SUPER, Space, exec, rofi -show drun
+bind = SUPER, S, togglegroup, # dwindle
+bind = SUPER SHIFT, S, changegroupactive, # dwindle
+bind = SUPER, G, togglesplit, # dwindle
+bind = SUPER, F1, exec, swaylock
+bind = SUPER, W, exec, librewolf
+bind = SUPER, F, exec, thunar
+bind = SUPER, M, fullscreen, 1
 
 bind = , XF86AudioMute, exec, pamixer -t
 bind = , XF86AudioRaiseVolume, exec, pamixer -i 2
 bind = , XF86AudioLowerVolume, exec, pamixer -d 2
 
 # Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, H, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, L, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, K, movefocus, u
-bind = $mainMod, down, movefocus, d
-bind = $mainMod, J, movefocus, d
+bind = SUPER, left, movefocus, l
+bind = SUPER, H, movefocus, l
+bind = SUPER, right, movefocus, r
+bind = SUPER, L, movefocus, r
+bind = SUPER, up, movefocus, u
+bind = SUPER, K, movefocus, u
+bind = SUPER, down, movefocus, d
+bind = SUPER, J, movefocus, d
 
-bind = $mainMod SHIFT, left, movewindow, l
-bind = $mainMod SHIFT, H, movewindow, l
-bind = $mainMod SHIFT, right, movewindow, r
-bind = $mainMod SHIFT, L, movewindow, r
-bind = $mainMod SHIFT, up, movewindow, u
-bind = $mainMod SHIFT, K, movewindow, u
-bind = $mainMod SHIFT, down, movewindow, d
-bind = $mainMod SHIFT, J, movewindow, d
+bind = SUPER SHIFT, left, movewindow, l
+bind = SUPER SHIFT, H, movewindow, l
+bind = SUPER SHIFT, right, movewindow, r
+bind = SUPER SHIFT, L, movewindow, r
+bind = SUPER SHIFT, up, movewindow, u
+bind = SUPER SHIFT, K, movewindow, u
+bind = SUPER SHIFT, down, movewindow, d
+bind = SUPER SHIFT, J, movewindow, d
 
 # Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
+bind = SUPER, 1, workspace, 1
+bind = SUPER, 2, workspace, 2
+bind = SUPER, 3, workspace, 3
+bind = SUPER, 4, workspace, 4
+bind = SUPER, 5, workspace, 5
+bind = SUPER, 6, workspace, 6
+bind = SUPER, 7, workspace, 7
+bind = SUPER, 8, workspace, 8
+bind = SUPER, 9, workspace, 9
+bind = SUPER, 0, workspace, 10
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = SUPER SHIFT, 1, movetoworkspace, 1
+bind = SUPER SHIFT, 2, movetoworkspace, 2
+bind = SUPER SHIFT, 3, movetoworkspace, 3
+bind = SUPER SHIFT, 4, movetoworkspace, 4
+bind = SUPER SHIFT, 5, movetoworkspace, 5
+bind = SUPER SHIFT, 6, movetoworkspace, 6
+bind = SUPER SHIFT, 7, movetoworkspace, 7
+bind = SUPER SHIFT, 8, movetoworkspace, 8
+bind = SUPER SHIFT, 9, movetoworkspace, 9
 
-bind = $mainMod, period, workspace, m+1
-bind = $mainMod, comma, workspace, m-1
+bind = SUPER, period, workspace, m+1
+bind = SUPER, comma, workspace, m-1
 
-bind = $mainMod SHIFT, period, movetoworkspace, m+1
-bind = $mainMod SHIFT, comma, movetoworkspace, m-1
+bind = SUPER SHIFT, period, movetoworkspace, m+1
+bind = SUPER SHIFT, comma, movetoworkspace, m-1
 
-bind = $mainMod, bracketright, focusmonitor, +1
-bind = $mainMod, bracketleft, focusmonitor, +1
+bind = SUPER, bracketright, focusmonitor, +1
+bind = SUPER, bracketleft, focusmonitor, +1
 
-bind = $mainMod SHIFT, bracketright, movecurrentworkspacetomonitor, +1
-bind = $mainMod SHIFT, bracketleft, movecurrentworkspacetomonitor, +1
+bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1
+bind = SUPER SHIFT, bracketleft, movecurrentworkspacetomonitor, +1
 
-bind = $mainMod, N, workspace, empty
-bind = $mainMod SHIFT, N, movetoworkspace, empty
+bind = SUPER, N, workspace, empty
+bind = SUPER SHIFT, N, movetoworkspace, empty
 
-bind = $mainMod, C, togglespecialworkspace
-bind = $mainMod SHIFT, C, movetoworkspace, special
+bind = SUPER, C, togglespecialworkspace
+bind = SUPER SHIFT, C, movetoworkspace, special
 
-bind = $mainMod, tab, workspace, previous
-bind = $mainMod SHIFT, tab, movetoworkspace, previous
+bind = SUPER, tab, workspace, previous
+bind = SUPER SHIFT, tab, movetoworkspace, previous
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
+bindm = SUPER, mouse:272, movewindow
+bindm = SUPER, mouse:273, resizewindow