diff --git a/nvim/m-housh/lazy-lock.json b/nvim/m-housh/lazy-lock.json index c9cef18..316d83f 100644 --- a/nvim/m-housh/lazy-lock.json +++ b/nvim/m-housh/lazy-lock.json @@ -38,6 +38,7 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" }, "toggleterm.nvim": { "branch": "main", "commit": "61e8ad370d4da5d84c77e31671027bc094ac06ca" }, + "vim-tmux-navigator": { "branch": "master", "commit": "7db70e08ea03b3e4d91f63713d76134512e28d7e" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, "wrapping.nvim": { "branch": "master", "commit": "e1ce68aae5ea729fc20e5bc17fb569314f76b9bb" }, "zen-mode.nvim": { "branch": "main", "commit": "68f554702de63f4b7b6b6d4bcb10178f41a0acc7" } diff --git a/nvim/m-housh/lua/user/plugins.lua b/nvim/m-housh/lua/user/plugins.lua index 9c8ff79..4b972ba 100644 --- a/nvim/m-housh/lua/user/plugins.lua +++ b/nvim/m-housh/lua/user/plugins.lua @@ -50,5 +50,9 @@ require("lazy").setup({ "folke/zen-mode.nvim", opts = { } }, + { + "christoomey/vim-tmux-navigator", + lazy = false, + }, }) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 48bb462..bcf413f 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -7,6 +7,8 @@ set -g window-status-current-style "underscore" set -g status-bg red %endif +TMUX_FZF_OPTIONS="-p -w 60% -h 80% -m" + # Enable RGB colour if running in xterm(1) set-option -sa terminal-overrides ",xterm*:Tc" @@ -59,15 +61,18 @@ bind -n M-Left select-pane -L bind -n M-Right select-pane -R bind -n M-Up select-pane -U bind -n M-Down select-pane -D -bind -T prefix j select-pane -D -bind -T prefix k select-pane -U -bind -T prefix h select-pane -L -bind -T prefix l select-pane -R +# bind -T prefix j select-pane -D +# bind -T prefix k select-pane -U +# bind -T prefix h select-pane -L +# bind -T prefix l select-pane -R bind-key -r K kill-pane # Use Shift-arrow keys to navigate windows. bind -n S-Left previous-window bind -n S-Right next-window +bind -n M-h previous-window +bind -n M-L next-window +bind C-l send-keys 'C-l' bind-key -r f run-shell "tmux neww ~/.local/scripts/tmux-sessionator" bind-key -r C run-shell "tmux neww ~/.local/scripts/tmux-sessionator ~/.dotfiles" @@ -81,6 +86,7 @@ set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'sainnhe/tmux-fzf' set -g @plugin 'erikw/tmux-powerline' +set -g @plugin 'christoomey/vim-tmux-navigator' # Needs to stay at the bottom. run '~/.config/tmux/plugins/tpm/tpm'