summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '.config')
-rw-r--r--.config/nvim/lazy-lock.json3
-rw-r--r--.config/nvim/lua/options.lua1
-rw-r--r--.config/nvim/lua/plugins/vim-tmux-navigator.lua7
-rw-r--r--.config/tmux/tmux.conf2
4 files changed, 11 insertions, 2 deletions
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index a28dd3e..df007bb 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -23,5 +23,6 @@
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
- "tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" }
+ "tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" },
+ "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }
} \ No newline at end of file
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index f1efff1..1941a5b 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -3,6 +3,7 @@ vim.g.maplocalleader = " "
vim.g.have_nerd_font = true
+-- Remove duplicate mode cuz lualine
vim.opt.showmode = false
vim.opt.number = true
diff --git a/.config/nvim/lua/plugins/vim-tmux-navigator.lua b/.config/nvim/lua/plugins/vim-tmux-navigator.lua
new file mode 100644
index 0000000..324e958
--- /dev/null
+++ b/.config/nvim/lua/plugins/vim-tmux-navigator.lua
@@ -0,0 +1,7 @@
+return {
+ "christoomey/vim-tmux-navigator",
+ vim.keymap.set('n', 'C-h', ':TmuxNavigatorLeft<CR>'),
+ vim.keymap.set('n', 'C-j', ':TmuxNavigatorDown<CR>'),
+ vim.keymap.set('n', 'C-k', ':TmuxNavigatorUp<CR>'),
+ vim.keymap.set('n', 'C-l', ':TmuxNavigatorRight<CR>'),
+}
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index c3376d2..6e913d4 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -31,7 +31,7 @@ bind-key l select-pane -R
# Load plugins
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible'
-#set -g @plugin 'christoomey/vim-tmux-navigator'
+set -g @plugin 'christoomey/vim-tmux-navigator'
set -g @plugin 'tmux-plugins/tmux-yank'
set -g @plugin 'catppuccin/tmux'