From 32211d10cee560c9b597b60b54e6f820985dd9bd Mon Sep 17 00:00:00 2001 From: Jon Karlsen Date: Thu, 29 Feb 2024 09:04:31 +0100 Subject: [PATCH] tmux navigation --- init.lua | 21 +++++++++++++++++++++ lazy-lock.json | 2 ++ 2 files changed, 23 insertions(+) diff --git a/init.lua b/init.lua index a7a3806d..37997509 100644 --- a/init.lua +++ b/init.lua @@ -71,6 +71,24 @@ require('lazy').setup({ { 'echasnovski/mini.animate', version = false }, { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, + { "alexghergh/nvim-tmux-navigation" , lazy = false }, + { + "christoomey/vim-tmux-navigator", + cmd = { + "TmuxNavigateLeft", + "TmuxNavigateDown", + "TmuxNavigateUp", + "TmuxNavigateRight", + "TmuxNavigatePrevious", + }, + keys = { + { "", "TmuxNavigateLeft" }, + { "", "TmuxNavigateDown" }, + { "", "TmuxNavigateUp" }, + { "", "TmuxNavigateRight" }, + { "", "TmuxNavigatePrevious" }, + }, + }, -- Git related plugins 'tpope/vim-fugitive', @@ -592,6 +610,8 @@ vim.o.tabstop = 4 vim.o.softtabstop = 4 vim.o.shiftwidth = 4 vim.o.scrolloff = 8 +vim.o.expandtab = true +vim.o.relativenumber = true -- Set highlight on search vim.o.hlsearch = false @@ -655,6 +675,7 @@ vim.keymap.set('n', '', ':wincmd l') vim.keymap.set('n' , 'o', ':Neotree focus') vim.keymap.set('n' , 'e', ':Neotree toggle') + -- [[ Highlight on yank ]] -- See `:help vim.highlight.on_yank()` local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true }) diff --git a/lazy-lock.json b/lazy-lock.json index 5df7d4c6..06eb77b5 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -19,6 +19,7 @@ "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-lspconfig": { "branch": "master", "commit": "ec7d51a619049c7c597f469f81ea199db6794651" }, + "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" }, "nvim-treesitter": { "branch": "master", "commit": "6e2b56cbe75ddf18e6efecee44bc3936d70b0b3e" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, @@ -29,5 +30,6 @@ "vim-fugitive": { "branch": "master", "commit": "2e88f14a585c014691904ba8fe39e6ea851c9422" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, + "vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file