diff --git a/modules/darwin/hammerspoon/init.lua b/modules/darwin/hammerspoon/init.lua index e52fa3b..b306e7e 100644 --- a/modules/darwin/hammerspoon/init.lua +++ b/modules/darwin/hammerspoon/init.lua @@ -57,7 +57,7 @@ end do -- HOTKEYS local super = { "cmd", "alt" } local super_ctrl = { "cmd", "alt", "ctrl" } - local super_alt = { "cmd", "alt", "shift" } + local super_shift = { "cmd", "alt", "shift" } hs.hotkey.bind(super, "left", PaperWM.actions.focus_left) hs.hotkey.bind(super, "down", PaperWM.actions.focus_down) @@ -80,27 +80,27 @@ do -- HOTKEYS hs.hotkey.bind(super_ctrl, "l", function() windowResize(100, 0) end) hs.hotkey.bind(super, "tab", function() spaceChange(1) end) - hs.hotkey.bind(super_alt, "tab", function() spaceChange(-1) end) + hs.hotkey.bind(super_shift, "tab", function() spaceChange(-1) end) for index = 1, 9 do hs.hotkey.bind(super, tostring(index), PaperWM.actions["switch_space_" .. index]) - hs.hotkey.bind(super_alt, tostring(index), PaperWM.actions["move_window_" .. index]) + hs.hotkey.bind(super_shift, tostring(index), PaperWM.actions["move_window_" .. index]) end - hs.hotkey.bind(super_alt, "left", PaperWM.actions.swap_left) - hs.hotkey.bind(super_alt, "down", PaperWM.actions.swap_down) - hs.hotkey.bind(super_alt, "up", PaperWM.actions.swap_up) - hs.hotkey.bind(super_alt, "right", PaperWM.actions.swap_right) + hs.hotkey.bind(super_shift, "left", PaperWM.actions.swap_left) + hs.hotkey.bind(super_shift, "down", PaperWM.actions.swap_down) + hs.hotkey.bind(super_shift, "up", PaperWM.actions.swap_up) + hs.hotkey.bind(super_shift, "right", PaperWM.actions.swap_right) - hs.hotkey.bind(super_alt, "h", PaperWM.actions.swap_left) - hs.hotkey.bind(super_alt, "j", PaperWM.actions.swap_down) - hs.hotkey.bind(super_alt, "k", PaperWM.actions.swap_up) - hs.hotkey.bind(super_alt, "l", PaperWM.actions.swap_right) + hs.hotkey.bind(super_shift, "h", PaperWM.actions.swap_left) + hs.hotkey.bind(super_shift, "j", PaperWM.actions.swap_down) + hs.hotkey.bind(super_shift, "k", PaperWM.actions.swap_up) + hs.hotkey.bind(super_shift, "l", PaperWM.actions.swap_right) hs.hotkey.bind(super, "q", windowClose) hs.hotkey.bind(super, "c", PaperWM.actions.center_window) hs.hotkey.bind(super, "f", PaperWM.actions.full_width) - hs.hotkey.bind(super_alt, "f", PaperWM.actions.toggle_floating) + hs.hotkey.bind(super_shift, "f", PaperWM.actions.toggle_floating) hs.hotkey.bind(super, "w", function() hs.application.launchOrFocus("Firefox") end) hs.hotkey.bind(super, "return", function() hs.application.launchOrFocus("Ghostty") end) diff --git a/modules/linux/hyprland/fuzzel.nix b/modules/linux/hyprland/fuzzel.nix index e4f9ea8..1502a20 100644 --- a/modules/linux/hyprland/fuzzel.nix +++ b/modules/linux/hyprland/fuzzel.nix @@ -16,7 +16,7 @@ in merge <| mkIf config.isDesktop { bind = [ "SUPER , SPACE, exec, pkill fuzzel; fuzzel" "SUPER , E , exec, pkill fuzzel; cat ${./emojis.txt} | fuzzel --no-fuzzy --dmenu | cut -d ' ' -f 1 | tr -d '\\n' | wl-copy" - "SUPER+ALT, E , exec, pkill fuzzel; cat ${./emojis.txt} | fuzzel --no-fuzzy --dmenu | cut -d ' ' -f 1 | tr -d '\\n' | wtype -" + "SUPER+SHIFT, E , exec, pkill fuzzel; cat ${./emojis.txt} | fuzzel --no-fuzzy --dmenu | cut -d ' ' -f 1 | tr -d '\\n' | wtype -" "SUPER , V , exec, pkill fuzzel; cliphist list | fuzzel --dmenu | cliphist decode | wl-copy" ]; }; diff --git a/modules/linux/hyprland/hyprland.nix b/modules/linux/hyprland/hyprland.nix index 4a70e0c..3a346e1 100644 --- a/modules/linux/hyprland/hyprland.nix +++ b/modules/linux/hyprland/hyprland.nix @@ -89,8 +89,8 @@ in merge <| mkIf config.isDesktop { ", XF86AudioMute , exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" - "SUPER+ALT, Insert, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - "SUPER+ALT, Delete, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" + "SUPER+SHIFT, Insert, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + "SUPER+SHIFT, Delete, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" ]; bindm = [ @@ -123,33 +123,33 @@ in merge <| mkIf config.isDesktop { bind = flatten [ "SUPER , TAB, workspace, e+1" - "SUPER+ALT, TAB, workspace, e-1" + "SUPER+SHIFT, TAB, workspace, e-1" "SUPER, mouse_up, workspace, e+1" "SUPER, mouse_down, workspace, e-1" (map (n: [ "SUPER , ${toString n}, workspace , ${toString n}" - "SUPER+ALT, ${toString n}, movetoworkspacesilent, ${toString n}" + "SUPER+SHIFT, ${toString n}, movetoworkspacesilent, ${toString n}" ]) <| range 1 9) "SUPER , 0, workspace , 10" - "SUPER+ALT, 0, movetoworkspacesilent, 10" + "SUPER+SHIFT, 0, movetoworkspacesilent, 10" - "SUPER+ALT, left , movewindow, l" - "SUPER+ALT, down , movewindow, d" - "SUPER+ALT, up , movewindow, u" - "SUPER+ALT, right, movewindow, r" + "SUPER+SHIFT, left , movewindow, l" + "SUPER+SHIFT, down , movewindow, d" + "SUPER+SHIFT, up , movewindow, u" + "SUPER+SHIFT, right, movewindow, r" - "SUPER+ALT, h, movewindow, l" - "SUPER+ALT, j, movewindow, d" - "SUPER+ALT, k, movewindow, u" - "SUPER+ALT, l, movewindow, r" + "SUPER+SHIFT, h, movewindow, l" + "SUPER+SHIFT, j, movewindow, d" + "SUPER+SHIFT, k, movewindow, u" + "SUPER+SHIFT, l, movewindow, r" "SUPER , Q, killactive" "SUPER , F, fullscreen" - "SUPER+ALT, F, togglefloating" + "SUPER+SHIFT, F, togglefloating" - "SUPER+ALT, RETURN, exec, kitty" + "SUPER+SHIFT, RETURN, exec, kitty" "SUPER , RETURN, exec, ghostty --gtk-single-instance=true" "SUPER , W , exec, firefox" "SUPER , D , exec, discord" @@ -159,7 +159,7 @@ in merge <| mkIf config.isDesktop { # "SUPER , C , exec, hyprpicker --autocopy" " , PRINT, exec, pkill grim; grim -g \"$(slurp -w 0)\" - | swappy -f - -o - | wl-copy --type image/png" - "ALT, PRINT, exec, pkill grim; grim - | swappy -f - -o - | wl-copy --type image/png" + "SHIFT, PRINT, exec, pkill grim; grim - | swappy -f - -o - | wl-copy --type image/png" ]; general = with config.theme; {