diff --git a/bin/omarchy-pkg-aur-install b/bin/omarchy-pkg-aur-install index 41710e0e..da0d5884 100755 --- a/bin/omarchy-pkg-aur-install +++ b/bin/omarchy-pkg-aur-install @@ -3,7 +3,7 @@ fzf_args=( --multi --preview 'yay -Siia {1}' - --preview-label='alt-p: toggle description, alt-b/B: toggle PKGBUILD, alt-j/k: scroll, tab: multi-select, F11: maximize' + --preview-label='alt-p: toggle description, alt-b/B: toggle PKGBUILD, alt-j/k: scroll, tab: multi-select' --preview-label-pos='bottom' --preview-window 'down:65%:wrap' --bind 'alt-p:toggle-preview' diff --git a/bin/omarchy-pkg-install b/bin/omarchy-pkg-install index c654e17e..49f7b33b 100755 --- a/bin/omarchy-pkg-install +++ b/bin/omarchy-pkg-install @@ -3,7 +3,7 @@ fzf_args=( --multi --preview 'pacman -Sii {1}' - --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize' + --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select' --preview-label-pos='bottom' --preview-window 'down:65%:wrap' --bind 'alt-p:toggle-preview' diff --git a/bin/omarchy-pkg-remove b/bin/omarchy-pkg-remove index 63c6147e..1da761f9 100755 --- a/bin/omarchy-pkg-remove +++ b/bin/omarchy-pkg-remove @@ -3,7 +3,7 @@ fzf_args=( --multi --preview 'yay -Qi {1}' - --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize' + --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select' --preview-label-pos='bottom' --preview-window 'down:65%:wrap' --bind 'alt-p:toggle-preview' diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml index f7a4df9a..ee1fb6fc 100644 --- a/config/alacritty/alacritty.toml +++ b/config/alacritty/alacritty.toml @@ -16,7 +16,6 @@ decorations = "None" [keyboard] bindings = [ -{ key = "F11", action = "ToggleFullscreen" }, { key = "Insert", mods = "Shift", action = "Paste" }, { key = "Insert", mods = "Control", action = "Copy" } ] diff --git a/config/ghostty/config b/config/ghostty/config index b4a85836..f714edb3 100644 --- a/config/ghostty/config +++ b/config/ghostty/config @@ -20,7 +20,6 @@ cursor-style-blink = false shell-integration-features = no-cursor # Keyboard bindings -keybind = f11=toggle_fullscreen keybind = shift+insert=paste_from_clipboard keybind = control+insert=copy_to_clipboard diff --git a/config/hypr/bindings.conf b/config/hypr/bindings.conf index cb114aba..ad897f91 100644 --- a/config/hypr/bindings.conf +++ b/config/hypr/bindings.conf @@ -2,28 +2,28 @@ $terminal = uwsm-app -- $TERMINAL $browser = omarchy-launch-browser -bindd = SUPER, RETURN, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)" -bindd = SUPER, F, File manager, exec, uwsm-app -- nautilus --new-window -bindd = SUPER, B, Browser, exec, $browser -bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private -bindd = SUPER, M, Music, exec, omarchy-launch-or-focus spotify -bindd = SUPER, N, Editor, exec, omarchy-launch-editor -bindd = SUPER, T, Activity, exec, $terminal -e btop -bindd = SUPER, D, Docker, exec, $terminal -e lazydocker -bindd = SUPER, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop" -bindd = SUPER, O, Obsidian, exec, omarchy-launch-or-focus "^obsidian$" "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime" -bindd = SUPER, SLASH, Passwords, exec, uwsm-app -- 1password +bindd = SUPER SHIFT, RETURN, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)" +bindd = SUPER SHIFT, F, File manager, exec, uwsm app -- nautilus --new-window +bindd = SUPER SHIFT, B, Browser, exec, $browser +bindd = SUPER SHIFT ALT, B, Browser (private), exec, $browser --private +bindd = SUPER SHIFT, M, Music, exec, omarchy-launch-or-focus spotify +bindd = SUPER SHIFT, N, Editor, exec, omarchy-launch-editor +bindd = SUPER SHIFT, T, Activity, exec, $terminal -e btop +bindd = SUPER SHIFT, D, Docker, exec, $terminal -e lazydocker +bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus signal "uwsm app -- signal-desktop" +bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus "^obsidian$" "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime" +bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm app -- 1password -# If your web app url contains #, type it as ## to prevent hyprland from treating it as a comment -bindd = SUPER, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com" -bindd = SUPER SHIFT, A, Grok, exec, omarchy-launch-webapp "https://grok.com" +# If your web app url contains #, type it as ## to prevent hyperland treat it as comments +bindd = SUPER SHIFT, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com" +bindd = SUPER SHIFT ALT, A, Grok, exec, omarchy-launch-webapp "https://grok.com" bindd = SUPER SHIFT, C, Calendar, exec, omarchy-launch-webapp "https://app.hey.com/calendar/weeks/" -bindd = SUPER, E, Email, exec, omarchy-launch-webapp "https://app.hey.com" -bindd = SUPER, Y, YouTube, exec, omarchy-launch-or-focus-webapp YouTube "https://youtube.com/" -bindd = SUPER SHIFT, G, WhatsApp, exec, omarchy-launch-or-focus-webapp WhatsApp "https://web.whatsapp.com/" -bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-or-focus-webapp "Google Messages" "https://messages.google.com/web/conversations" -bindd = SUPER, X, X, exec, omarchy-launch-webapp "https://x.com/" -bindd = SUPER SHIFT, X, X Post, exec, omarchy-launch-webapp "https://x.com/compose/post" +bindd = SUPER SHIFT, E, Email, exec, omarchy-launch-webapp "https://app.hey.com" +bindd = SUPER SHIFT, Y, YouTube, exec, omarchy-launch-webapp "https://youtube.com/" +bindd = SUPER SHIFT ALT, G, WhatsApp, exec, omarchy-launch-or-focus-webapp WhatsApp "https://web.whatsapp.com/" +bindd = SUPER SHIFT CTRL, G, Google Messages, exec, omarchy-launch-or-focus-webapp "Google Messages" "https://messages.google.com/web/conversations" +bindd = SUPER SHIFT, X, X, exec, omarchy-launch-webapp "https://x.com/" +bindd = SUPER SHIFT ALT, X, X Post, exec, omarchy-launch-webapp "https://x.com/compose/post" # Overwrite existing bindings, like putting Omarchy Menu on Super + Space # unbind = SUPER, SPACE diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 3a91c979..f9c7221b 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -3,7 +3,8 @@ # Use defaults Omarchy defaults (but don't edit these directly!) source = ~/.local/share/omarchy/default/hypr/autostart.conf source = ~/.local/share/omarchy/default/hypr/bindings/media.conf -source = ~/.local/share/omarchy/default/hypr/bindings/tiling.conf +source = ~/.local/share/omarchy/default/hypr/bindings/clipboard.conf +source = ~/.local/share/omarchy/default/hypr/bindings/tiling-v2.conf source = ~/.local/share/omarchy/default/hypr/bindings/utilities.conf source = ~/.local/share/omarchy/default/hypr/envs.conf source = ~/.local/share/omarchy/default/hypr/looknfeel.conf diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 75be766a..feb09fd3 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -13,7 +13,6 @@ show_window_resize_notification no confirm_os_window_close 0 # Keybindings -map F11 toggle_fullscreen map ctrl+insert copy_to_clipboard # Allow remote access diff --git a/default/hypr/bindings/clipboard.conf b/default/hypr/bindings/clipboard.conf new file mode 100644 index 00000000..1b4e3ab7 --- /dev/null +++ b/default/hypr/bindings/clipboard.conf @@ -0,0 +1,4 @@ +# Copy / Paste +bind = SUPER, C, sendshortcut, CTRL, Insert, +bind = SUPER, V, sendshortcut, SHIFT, Insert, +bindd = SUPER CTRL, V, Clipboard, exec, omarchy-launch-walker -m clipboard diff --git a/default/hypr/bindings/tiling-v2.conf b/default/hypr/bindings/tiling-v2.conf new file mode 100644 index 00000000..47fd76bd --- /dev/null +++ b/default/hypr/bindings/tiling-v2.conf @@ -0,0 +1,92 @@ +# Close windows +bindd = SUPER, W, Close active window, killactive, +bindd = CTRL ALT, DELETE, Close all Windows, exec, omarchy-cmd-close-all-windows + +# Control tiling +bindd = SUPER, J, Toggle split, togglesplit, # dwindle +bindd = SUPER, P, Pseudo window, pseudo, # dwindle +bindd = SUPER, T, Toggle floating, togglefloating, +bindd = SUPER, F, Force full screen, fullscreen, 0 +bindd = SUPER ALT, F, Full width, fullscreen, 1 + +# Move focus with SUPER + arrow keys +bindd = SUPER, LEFT, Move focus left, movefocus, l +bindd = SUPER, RIGHT, Move focus right, movefocus, r +bindd = SUPER, UP, Move focus up, movefocus, u +bindd = SUPER, DOWN, Move focus down, movefocus, d + +# Switch workspaces with SUPER + [0-9] +bindd = SUPER, code:10, Switch to workspace 1, workspace, 1 +bindd = SUPER, code:11, Switch to workspace 2, workspace, 2 +bindd = SUPER, code:12, Switch to workspace 3, workspace, 3 +bindd = SUPER, code:13, Switch to workspace 4, workspace, 4 +bindd = SUPER, code:14, Switch to workspace 5, workspace, 5 +bindd = SUPER, code:15, Switch to workspace 6, workspace, 6 +bindd = SUPER, code:16, Switch to workspace 7, workspace, 7 +bindd = SUPER, code:17, Switch to workspace 8, workspace, 8 +bindd = SUPER, code:18, Switch to workspace 9, workspace, 9 +bindd = SUPER, code:19, Switch to workspace 10, workspace, 10 + +# Move active window to a workspace with SUPER + SHIFT + [0-9] +bindd = SUPER SHIFT, code:10, Move window to workspace 1, movetoworkspace, 1 +bindd = SUPER SHIFT, code:11, Move window to workspace 2, movetoworkspace, 2 +bindd = SUPER SHIFT, code:12, Move window to workspace 3, movetoworkspace, 3 +bindd = SUPER SHIFT, code:13, Move window to workspace 4, movetoworkspace, 4 +bindd = SUPER SHIFT, code:14, Move window to workspace 5, movetoworkspace, 5 +bindd = SUPER SHIFT, code:15, Move window to workspace 6, movetoworkspace, 6 +bindd = SUPER SHIFT, code:16, Move window to workspace 7, movetoworkspace, 7 +bindd = SUPER SHIFT, code:17, Move window to workspace 8, movetoworkspace, 8 +bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9 +bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10 + +# TAB between workspaces +bindd = SUPER, TAB, Next workspace, workspace, e+1 +bindd = SUPER SHIFT, TAB, Previous workspace, workspace, e-1 +bindd = SUPER CTRL, TAB, Former workspace, workspace, previous + +# Swap active window with the one next to it with SUPER + SHIFT + arrow keys +bindd = SUPER SHIFT, LEFT, Swap window to the left, swapwindow, l +bindd = SUPER SHIFT, RIGHT, Swap window to the right, swapwindow, r +bindd = SUPER SHIFT, UP, Swap window up, swapwindow, u +bindd = SUPER SHIFT, DOWN, Swap window down, swapwindow, d + +# Cycle through applications on active workspace +bindd = ALT, TAB, Cycle to next window, cyclenext +bindd = ALT SHIFT, TAB, Cycle to prev window, cyclenext, prev +bindd = ALT, TAB, Reveal active window on top, bringactivetotop +bindd = ALT SHIFT, TAB, Reveal active window on top, bringactivetotop + +# Resize active window +bindd = SUPER, code:20, Expand window left, resizeactive, -100 0 # - key +bindd = SUPER, code:21, Shrink window left, resizeactive, 100 0 # = key +bindd = SUPER SHIFT, code:20, Shrink window up, resizeactive, 0 -100 +bindd = SUPER SHIFT, code:21, Expand window down, resizeactive, 0 100 + +# Scroll through existing workspaces with SUPER + scroll +bindd = SUPER, MOUSE_DOWN, Scroll active workspace forward, workspace, e+1 +bindd = SUPER, MOUSE_UP, Scroll active workspace backward, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindmd = SUPER, mouse:272, Move window, movewindow +bindmd = SUPER, mouse:273, Resize window, resizewindow + +# Toggle groups +bindd = SUPER ALT, RETURN, Toggle window grouping, togglegroup +bindd = SUPER ALT, BACKSPACE, Move active window out of group, moveoutofgroup + +# Join groups +bindd = SUPER ALT, LEFT, Move window to group on left, moveintogroup, l +bindd = SUPER ALT, RIGHT, Move window to group on right, moveintogroup, r +bindd = SUPER ALT, UP, Move window to group on top, moveintogroup, u +bindd = SUPER ALT, DOWN, Move window to group on bottom, moveintogroup, d + +# Navigate a single set of grouped windows +bindd = SUPER ALT, TAB, Next window in group, changegroupactive, f +bindd = SUPER ALT SHIFT, TAB, Previous window in group, changegroupactive, b + +# Activate window in a group by number +bindd = SUPER ALT, 1, Switch to group window 1, changegroupactive, 1 +bindd = SUPER ALT, 2, Switch to group window 2, changegroupactive, 2 +bindd = SUPER ALT, 3, Switch to group window 3, changegroupactive, 3 +bindd = SUPER ALT, 4, Switch to group window 4, changegroupactive, 4 +bindd = SUPER ALT, 5, Switch to group window 5, changegroupactive, 5 diff --git a/default/hypr/bindings/tiling.conf b/default/hypr/bindings/tiling.conf index efbc1c73..8630a059 100644 --- a/default/hypr/bindings/tiling.conf +++ b/default/hypr/bindings/tiling.conf @@ -1,3 +1,6 @@ +# This is now a deprecated file meant for those who did not wish to learn the latest Omarchy hotkeys. +# Do not make changes here, but bring them to tiling-v2.conf instead. + # Close windows bindd = SUPER, W, Close active window, killactive, bindd = CTRL ALT, DELETE, Close all Windows, exec, omarchy-cmd-close-all-windows diff --git a/default/hypr/bindings/utilities.conf b/default/hypr/bindings/utilities.conf index 67c99e61..01577fab 100644 --- a/default/hypr/bindings/utilities.conf +++ b/default/hypr/bindings/utilities.conf @@ -1,7 +1,6 @@ # Menus bindd = SUPER, SPACE, Launch apps, exec, omarchy-launch-walker bindd = SUPER CTRL, E, Emoji picker, exec, omarchy-launch-walker -m symbols -bindd = SUPER CTRL, V, Clipboard, exec, omarchy-launch-walker -m clipboard bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu bindd = SUPER, ESCAPE, Power menu, exec, omarchy-menu system bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system @@ -43,7 +42,3 @@ bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a # File sharing bindd = CTRL SUPER, S, Share, exec, omarchy-menu share - -# Copy / Paste -bind = SUPER, C, sendshortcut, CTRL, Insert, -bind = SUPER, V, sendshortcut, SHIFT, Insert,