diff --git a/module/common/nvim/src/key/Navigation.lua b/module/common/nvim/src/key/Navigation.lua index 78e6a5d..2b08f39 100644 --- a/module/common/nvim/src/key/Navigation.lua +++ b/module/common/nvim/src/key/Navigation.lua @@ -17,7 +17,13 @@ rekey_normal("=", "=") -- Equalize split sizes. rekey_normal("c", "q") -- Close split. -- Resize splits. -rekey_normal("A", "4<") -rekey_normal("D", "4>") -rekey_normal("S", "2+") -rekey_normal("W", "2-") +rekey_normal("h", "4<") +rekey_normal("l", "4>") +rekey_normal("j", "2+") +rekey_normal("k", "2-") + +-- Move splits. +rekey_normal("A", "A") +rekey_normal("D", "D") +rekey_normal("S", "S") +rekey_normal("W", "W") diff --git a/module/common/tmux/tmux.conf b/module/common/tmux/tmux.conf index 647b517..301df87 100644 --- a/module/common/tmux/tmux.conf +++ b/module/common/tmux/tmux.conf @@ -31,10 +31,12 @@ set -g pane-active-border-style "fg=#504945" bind -n M-\\ split-window -h -c "#{pane_current_path}" bind -n M-- split-window -v -c "#{pane_current_path}" bind -n M-= select-layout tiled -bind -n M-W resize-pane -U 1 -bind -n M-S resize-pane -D 1 -bind -n M-A resize-pane -L 1 -bind -n M-D resize-pane -R 1 +bind -n M-k resize-pane -U 1 +bind -n M-j resize-pane -D 1 +bind -n M-h resize-pane -L 1 +bind -n M-l resize-pane -R 1 +bind -n M-A swap-pane -U +bind -n M-D swap-pane -D unbind '"' unbind % diff --git a/module/sway/module/20-Keybind b/module/sway/module/20-Keybind index e133e26..e02cef1 100644 --- a/module/sway/module/20-Keybind +++ b/module/sway/module/20-Keybind @@ -14,9 +14,6 @@ bindsym $mod+space exec $menu # mouse button for dragging. floating_modifier $mod normal -# Reload the configuration file. -bindsym $mod+Shift+c reload - # Exit sway (logs you out of your Wayland session). bindsym $mod+z exec '_twice 1 swaylock -F -c 000000 -k --font "SF Pro Display Medium" --font-size 14' bindsym $mod+Shift+z exec '_twice 1 swaymsg exit' diff --git a/module/sway/module/20-Resize b/module/sway/module/20-Resize index 7075985..b4e4421 100644 --- a/module/sway/module/20-Resize +++ b/module/sway/module/20-Resize @@ -1,21 +1,4 @@ -mode "resize" { - # Left will shrink the containers width. - # Right will grow the containers width. - # Up will shrink the containers height. - # Down will grow the containers height. - bindsym $down resize grow height 10px - bindsym $left resize shrink width 10px - bindsym $right resize grow width 10px - bindsym $up resize shrink height 10px - - bindsym Down resize grow height 10px - bindsym Left resize shrink width 10px - bindsym Right resize grow width 10px - bindsym Up resize shrink height 10px - - # Return to default mode - bindsym Escape mode "default" - bindsym Return mode "default" -} -bindsym $mod+r mode "resize" - +bindsym $mod+j resize grow height 10px +bindsym $mod+h resize shrink width 10px +bindsym $mod+l resize grow width 10px +bindsym $mod+k resize shrink height 10px diff --git a/module/sway/module/20-ScratchPad b/module/sway/module/20-ScratchPad index e96446b..3360989 100644 --- a/module/sway/module/20-ScratchPad +++ b/module/sway/module/20-ScratchPad @@ -3,11 +3,11 @@ # NOTE: Get id with `swaymsg -t get_tree`. # Move the currently focused window to the scratchpad -bindsym $mod+shift+return move scratchpad +bindsym $mod+shift+c move scratchpad # Show the next scratchpad window or hide the focused scratchpad window. # If there are multiple scratchpad windows, this command cycles through them. -bindsym $mod+return scratchpad show +bindsym $mod+c scratchpad show # Fix for a goddamn Firefox WebRTC indicator. for_window [app_id="firefox" title="Firefox — Sharing Indicator"] { diff --git a/module/sway/module/20-Tiling b/module/sway/module/20-Tiling index 0eb0697..42adf55 100644 --- a/module/sway/module/20-Tiling +++ b/module/sway/module/20-Tiling @@ -1,5 +1,5 @@ # Toggle tiling. -bindsym $mod+Tab floating toggle +bindsym $mod+return floating toggle # Swap focus between the tiling area and the floating area # bindsym $mod+space focus mode_toggle @@ -12,7 +12,7 @@ bindsym $mod+backslash splith bindsym $mod+minus splitv # Switch the current container between different layout styles. -bindsym $mod+c layout toggle split tabbed +bindsym $mod+Tab layout toggle split tabbed # Fullscreen. bindsym $mod+f fullscreen