Skip to content

Commit

Permalink
updating nvim config
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron Motevasselani committed Jun 4, 2024
1 parent ccbc503 commit 8ff9a4f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
8 changes: 4 additions & 4 deletions config/nvim/lua/plugins/tmux-navigation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ return {
"alexghergh/nvim-tmux-navigation",
config = function()
require("nvim-tmux-navigation").setup({})
vim.keymap.set("n", "<C-h>", "<Cmd>NvimTmuxNavigateLeft<CR>", {})
vim.keymap.set("n", "<C-j>", "<Cmd>NvimTmuxNavigateDown<CR>", {})
vim.keymap.set("n", "<C-k>", "<Cmd>NvimTmuxNavigateUp<CR>", {})
vim.keymap.set("n", "<C-l>", "<Cmd>NvimTmuxNavigateRight<CR>", {})
vim.keymap.set("n", "<M-h>", "<Cmd>NvimTmuxNavigateLeft<CR>", {})
vim.keymap.set("n", "<M-j>", "<Cmd>NvimTmuxNavigateDown<CR>", {})
vim.keymap.set("n", "<M-k>", "<Cmd>NvimTmuxNavigateUp<CR>", {})
vim.keymap.set("n", "<M-l>", "<Cmd>NvimTmuxNavigateRight<CR>", {})
end,
}
19 changes: 10 additions & 9 deletions config/nvim/lua/vim-options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ vim.cmd("map s <Nop>")
vim.keymap.set("n", "<Space>", "<Nop>", { silent = true, remap = false })
vim.g.mapleader = " "

-- vim.cmd("let g:tmux_navigator_no_mappings = 1")
-- vim.cmd("nnoremap <silent> <M-h> :TmuxNavigateLeft<cr>")
-- vim.cmd("nnoremap <silent> <M-j> :TmuxNavigateDown<cr>")
-- vim.cmd("nnoremap <silent> <M-k> :TmuxNavigateUp<cr>")
-- vim.cmd("nnoremap <silent> <M-l> :TmuxNavigateRight<cr>")

-- was not able to get meta key working for nvim
-- vim.keymap.set("n", "<M-h>", "<Nop>", { silent = true, remap = true })

-- vim.cmd("nnoremap <M-p> :echom 'p'<cr>")
Expand All @@ -17,15 +23,10 @@ vim.g.mapleader = " "
-- vim.cmd("nnoremap <M-k> :wincmd k<cr>")
-- vim.cmd("nnoremap <M-l> :wincmd l<cr>")


vim.keymap.set('n', '<C-h>', ':wincmd h<CR>')
vim.keymap.set('n', '<C-j>', ':wincmd j<CR>')
vim.keymap.set('n', '<C-k>', ':wincmd k<CR>')
vim.keymap.set('n', '<C-l>', ':wincmd l<CR>')
-- vim.keymap.set('n', '<M-h>', ':wincmd h<CR>')
-- vim.keymap.set('n', '<M-j>', ':wincmd j<CR>')
-- vim.keymap.set('n', '<M-k>', ':wincmd k<CR>')
-- vim.keymap.set('n', '<M-l>', ':wincmd l<CR>')
vim.keymap.set('n', '<M-h>', ':wincmd h<CR>')
vim.keymap.set('n', '<M-j>', ':wincmd j<CR>')
vim.keymap.set('n', '<M-k>', ':wincmd k<CR>')
vim.keymap.set('n', '<M-l>', ':wincmd l<CR>')

vim.keymap.set('n', '<leader>h', ':nohlsearch<CR>')

Expand Down

0 comments on commit 8ff9a4f

Please sign in to comment.