diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix
index 1049fda..cfd8481 100644
--- a/home/modules/hyprland.nix
+++ b/home/modules/hyprland.nix
@@ -43,7 +43,6 @@
       };
 
       general = {
-        "$mainMod" = "SUPER";
         layout = "dwindle";
         gaps_in = 4;
         gaps_out = 3;
@@ -83,127 +82,127 @@
 
       bind = [
         # keybindings
-        "$mainMod, Return, exec, foot"
-        "$mainMod, B, exec, zen"
-        "$mainMod, Q, killactive,"
-        "$mainMod, F, fullscreen, 0"
-        "$mainMod SHIFT, F, fullscreen, 1"
-        "$mainMod, W, togglefloating"
-        "$mainMod, A, exec, fuzzel"
-        "$mainMod, P, pseudo,"
-        "$mainMod, E, exec, thunar"
-        "$mainMod, C, exec, hyprpicker -a"
-        "$mainMod, code:23, swapsplit"
-        "$mainMod, code:66, togglesplit"
+        "SUPER, Return, exec, foot"
+        "SUPER, B, exec, zen"
+        "SUPER, Q, killactive,"
+        "SUPER, F, fullscreen, 0"
+        "SUPER SHIFT, F, fullscreen, 1"
+        "SUPER, W, togglefloating"
+        "SUPER, A, exec, fuzzel"
+        "SUPER, P, pseudo,"
+        "SUPER, E, exec, thunar"
+        "SUPER, C, exec, hyprpicker -a"
+        "SUPER, code:23, swapsplit"
+        "SUPER, code:66, togglesplit"
         "Alt, F4, exec, hyprctl kill"
-        "$mainMod, S, exec, hyprlock"
+        "SUPER, S, exec, hyprlock"
 
         # switch focus
-        "$mainMod, left,  movefocus, l"
-        "$mainMod, right, movefocus, r"
-        "$mainMod, up,    movefocus, u"
-        "$mainMod, down,  movefocus, d"
-        "$mainMod, h, movefocus, l"
-        "$mainMod, j, movefocus, d"
-        "$mainMod, k, movefocus, u"
-        "$mainMod, l, movefocus, r"
+        "SUPER, left,  movefocus, l"
+        "SUPER, right, movefocus, r"
+        "SUPER, up,    movefocus, u"
+        "SUPER, down,  movefocus, d"
+        "SUPER, h, movefocus, l"
+        "SUPER, j, movefocus, d"
+        "SUPER, k, movefocus, u"
+        "SUPER, l, movefocus, r"
 
-        "$mainMod, left,  alterzorder, top"
-        "$mainMod, right, alterzorder, top"
-        "$mainMod, up,    alterzorder, top"
-        "$mainMod, down,  alterzorder, top"
-        "$mainMod, h, alterzorder, top"
-        "$mainMod, j, alterzorder, top"
-        "$mainMod, k, alterzorder, top"
-        "$mainMod, l, alterzorder, top"
+        "SUPER, left,  alterzorder, top"
+        "SUPER, right, alterzorder, top"
+        "SUPER, up,    alterzorder, top"
+        "SUPER, down,  alterzorder, top"
+        "SUPER, h, alterzorder, top"
+        "SUPER, j, alterzorder, top"
+        "SUPER, k, alterzorder, top"
+        "SUPER, l, alterzorder, top"
 
         # switch workspace
-        "$mainMod, code:10, workspace, 1"
-        "$mainMod, code:11, workspace, 2"
-        "$mainMod, code:12, workspace, 3"
-        "$mainMod, code:13, workspace, 4"
-        "$mainMod, code:14, workspace, 5"
-        "$mainMod, code:15, workspace, 6"
-        "$mainMod, code:16, workspace, 7"
-        "$mainMod, code:17, workspace, 8"
-        "$mainMod, code:18, workspace, 9"
-        "$mainMod, code:19, workspace, 10"
+        "SUPER, code:10, workspace, 1"
+        "SUPER, code:11, workspace, 2"
+        "SUPER, code:12, workspace, 3"
+        "SUPER, code:13, workspace, 4"
+        "SUPER, code:14, workspace, 5"
+        "SUPER, code:15, workspace, 6"
+        "SUPER, code:16, workspace, 7"
+        "SUPER, code:17, workspace, 8"
+        "SUPER, code:18, workspace, 9"
+        "SUPER, code:19, workspace, 10"
 
         # same as above, but switch to the workspace
-        "$mainMod SHIFT, code:10, movetoworkspace, 1"
-        "$mainMod SHIFT, code:11, movetoworkspace, 2"
-        "$mainMod SHIFT, code:12, movetoworkspace, 3"
-        "$mainMod SHIFT, code:13, movetoworkspace, 4"
-        "$mainMod SHIFT, code:14, movetoworkspace, 5"
-        "$mainMod SHIFT, code:15, movetoworkspace, 6"
-        "$mainMod SHIFT, code:16, movetoworkspace, 7"
-        "$mainMod SHIFT, code:17, movetoworkspace, 8"
-        "$mainMod SHIFT, code:18, movetoworkspace, 9"
-        "$mainMod SHIFT, code:19, movetoworkspace, 10"
+        "SUPER SHIFT, code:10, movetoworkspace, 1"
+        "SUPER SHIFT, code:11, movetoworkspace, 2"
+        "SUPER SHIFT, code:12, movetoworkspace, 3"
+        "SUPER SHIFT, code:13, movetoworkspace, 4"
+        "SUPER SHIFT, code:14, movetoworkspace, 5"
+        "SUPER SHIFT, code:15, movetoworkspace, 6"
+        "SUPER SHIFT, code:16, movetoworkspace, 7"
+        "SUPER SHIFT, code:17, movetoworkspace, 8"
+        "SUPER SHIFT, code:18, movetoworkspace, 9"
+        "SUPER SHIFT, code:19, movetoworkspace, 10"
 
-        "$mainMod ALT, code:10, movetoworkspacesilent, 1"
-        "$mainMod ALT, code:11, movetoworkspacesilent, 2"
-        "$mainMod ALT, code:12, movetoworkspacesilent, 3"
-        "$mainMod ALT, code:13, movetoworkspacesilent, 4"
-        "$mainMod ALT, code:14, movetoworkspacesilent, 5"
-        "$mainMod ALT, code:15, movetoworkspacesilent, 6"
-        "$mainMod ALT, code:16, movetoworkspacesilent, 7"
-        "$mainMod ALT, code:17, movetoworkspacesilent, 8"
-        "$mainMod ALT, code:18, movetoworkspacesilent, 9"
-        "$mainMod ALT, code:19, movetoworkspacesilent, 10"
+        "SUPER ALT, code:10, movetoworkspacesilent, 1"
+        "SUPER ALT, code:11, movetoworkspacesilent, 2"
+        "SUPER ALT, code:12, movetoworkspacesilent, 3"
+        "SUPER ALT, code:13, movetoworkspacesilent, 4"
+        "SUPER ALT, code:14, movetoworkspacesilent, 5"
+        "SUPER ALT, code:15, movetoworkspacesilent, 6"
+        "SUPER ALT, code:16, movetoworkspacesilent, 7"
+        "SUPER ALT, code:17, movetoworkspacesilent, 8"
+        "SUPER ALT, code:18, movetoworkspacesilent, 9"
+        "SUPER ALT, code:19, movetoworkspacesilent, 10"
 
         # switch worspace
-        "$mainMod CTRL, code:10, workspace, 11"
-        "$mainMod CTRL, code:11, workspace, 12"
-        "$mainMod CTRL, code:12, workspace, 13"
-        "$mainMod CTRL, code:13, workspace, 14"
-        "$mainMod CTRL, code:14, workspace, 15"
-        "$mainMod CTRL, code:15, workspace, 16"
-        "$mainMod CTRL, code:16, workspace, 17"
-        "$mainMod CTRL, code:17, workspace, 18"
-        "$mainMod CTRL, code:18, workspace, 19"
-        "$mainMod CTRL, code:19, workspace, 20"
+        "SUPER CTRL, code:10, workspace, 11"
+        "SUPER CTRL, code:11, workspace, 12"
+        "SUPER CTRL, code:12, workspace, 13"
+        "SUPER CTRL, code:13, workspace, 14"
+        "SUPER CTRL, code:14, workspace, 15"
+        "SUPER CTRL, code:15, workspace, 16"
+        "SUPER CTRL, code:16, workspace, 17"
+        "SUPER CTRL, code:17, workspace, 18"
+        "SUPER CTRL, code:18, workspace, 19"
+        "SUPER CTRL, code:19, workspace, 20"
 
         # same as above, but switch to the workspace
-        "$mainMod CTRL SHIFT, code:10, movetoworkspace, 11"
-        "$mainMod CTRL SHIFT, code:11, movetoworkspace, 12"
-        "$mainMod CTRL SHIFT, code:12, movetoworkspace, 13"
-        "$mainMod CTRL SHIFT, code:13, movetoworkspace, 14"
-        "$mainMod CTRL SHIFT, code:14, movetoworkspace, 15"
-        "$mainMod CTRL SHIFT, code:15, movetoworkspace, 16"
-        "$mainMod CTRL SHIFT, code:16, movetoworkspace, 17"
-        "$mainMod CTRL SHIFT, code:17, movetoworkspace, 18"
-        "$mainMod CTRL SHIFT, code:18, movetoworkspace, 19"
-        "$mainMod CTRL SHIFT, code:19, movetoworkspace, 20"
-        "$mainMod CTRL ALT, code:10, movetoworkspacesilent, 11"
-        "$mainMod CTRL ALT, code:11, movetoworkspacesilent, 12"
-        "$mainMod CTRL ALT, code:12, movetoworkspacesilent, 13"
-        "$mainMod CTRL ALT, code:13, movetoworkspacesilent, 14"
-        "$mainMod CTRL ALT, code:14, movetoworkspacesilent, 15"
-        "$mainMod CTRL ALT, code:15, movetoworkspacesilent, 16"
-        "$mainMod CTRL ALT, code:16, movetoworkspacesilent, 17"
-        "$mainMod CTRL ALT, code:17, movetoworkspacesilent, 18"
-        "$mainMod CTRL ALT, code:18, movetoworkspacesilent, 19"
-        "$mainMod CTRL ALT, code:19, movetoworkspacesilent, 20"
+        "SUPER CTRL SHIFT, code:10, movetoworkspace, 11"
+        "SUPER CTRL SHIFT, code:11, movetoworkspace, 12"
+        "SUPER CTRL SHIFT, code:12, movetoworkspace, 13"
+        "SUPER CTRL SHIFT, code:13, movetoworkspace, 14"
+        "SUPER CTRL SHIFT, code:14, movetoworkspace, 15"
+        "SUPER CTRL SHIFT, code:15, movetoworkspace, 16"
+        "SUPER CTRL SHIFT, code:16, movetoworkspace, 17"
+        "SUPER CTRL SHIFT, code:17, movetoworkspace, 18"
+        "SUPER CTRL SHIFT, code:18, movetoworkspace, 19"
+        "SUPER CTRL SHIFT, code:19, movetoworkspace, 20"
+        "SUPER CTRL ALT, code:10, movetoworkspacesilent, 11"
+        "SUPER CTRL ALT, code:11, movetoworkspacesilent, 12"
+        "SUPER CTRL ALT, code:12, movetoworkspacesilent, 13"
+        "SUPER CTRL ALT, code:13, movetoworkspacesilent, 14"
+        "SUPER CTRL ALT, code:14, movetoworkspacesilent, 15"
+        "SUPER CTRL ALT, code:15, movetoworkspacesilent, 16"
+        "SUPER CTRL ALT, code:16, movetoworkspacesilent, 17"
+        "SUPER CTRL ALT, code:17, movetoworkspacesilent, 18"
+        "SUPER CTRL ALT, code:18, movetoworkspacesilent, 19"
+        "SUPER CTRL ALT, code:19, movetoworkspacesilent, 20"
 
         # window control
-        "$mainMod SHIFT, left, movewindow, l"
-        "$mainMod SHIFT, right, movewindow, r"
-        "$mainMod SHIFT, up, movewindow, u"
-        "$mainMod SHIFT, down, movewindow, d"
-        "$mainMod SHIFT, h, movewindow, l"
-        "$mainMod SHIFT, j, movewindow, d"
-        "$mainMod SHIFT, k, movewindow, u"
-        "$mainMod SHIFT, l, movewindow, r"
+        "SUPER SHIFT, left, movewindow, l"
+        "SUPER SHIFT, right, movewindow, r"
+        "SUPER SHIFT, up, movewindow, u"
+        "SUPER SHIFT, down, movewindow, d"
+        "SUPER SHIFT, h, movewindow, l"
+        "SUPER SHIFT, j, movewindow, d"
+        "SUPER SHIFT, k, movewindow, u"
+        "SUPER SHIFT, l, movewindow, r"
 
-        "$mainMod CTRL, left, resizeactive, -80 0"
-        "$mainMod CTRL, right, resizeactive, 80 0"
-        "$mainMod CTRL, up, resizeactive, 0 -80"
-        "$mainMod CTRL, down, resizeactive, 0 80"
-        "$mainMod CTRL, h, resizeactive, -80 0"
-        "$mainMod CTRL, j, resizeactive, 0 80"
-        "$mainMod CTRL, k, resizeactive, 0 -80"
-        "$mainMod CTRL, l, resizeactive, 80 0"
+        "SUPER CTRL, left, resizeactive, -80 0"
+        "SUPER CTRL, right, resizeactive, 80 0"
+        "SUPER CTRL, up, resizeactive, 0 -80"
+        "SUPER CTRL, down, resizeactive, 0 80"
+        "SUPER CTRL, h, resizeactive, -80 0"
+        "SUPER CTRL, j, resizeactive, 0 80"
+        "SUPER CTRL, k, resizeactive, 0 -80"
+        "SUPER CTRL, l, resizeactive, 80 0"
 
         # media and volume controls
         # ",XF86AudioMute,exec, pamixer -t"
@@ -215,8 +214,8 @@
 
       # mouse binding
       bindm = [
-        "$mainMod, mouse:272, movewindow"
-        "$mainMod, mouse:273, resizewindow"
+        "SUPER, mouse:272, movewindow"
+        "SUPER, mouse:273, resizewindow"
       ];
 
       windowrule = [