Major config changes

Add alacritty config, as it is my main terminal now
Change **a lot** of nvim configs
Add tmux configuration
Update zsh configs
Add .gitconfig with custom pager
Include tmux-plugin-manager as a submodule

.config/nvim/lazy-lock.json

@@ -0,0 +1,34 @@
+{
+  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "LuaSnip": { "branch": "master", "commit": "f03089854a8e15594a01562fa7192d0009a6fbe7" },
+  "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
+  "bufferline.nvim": { "branch": "main", "commit": "1a3397556d194bb1f2cc530b07124ccc512c5501" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "fidget.nvim": { "branch": "main", "commit": "785efc604f6ffe3c3fdd2ea86262804d48863ee1" },
+  "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "dbd90bb689ff10d21fee6792eb8928f0584b5860" },
+  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
+  "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "4eb8e15e3c0757303d4c6dea64d2981fc679e990" },
+  "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
+  "neodev.nvim": { "branch": "main", "commit": "1676d2c24186fc30005317e0306d20c639b2351b" },
+  "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
+  "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
+  "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
+  "nvim-lspconfig": { "branch": "master", "commit": "694aaec65733e2d54d393abf80e526f86726c988" },
+  "nvim-tree.lua": { "branch": "master", "commit": "05f55c1fd6470b31627655c528245794e3cd4b2c" },
+  "nvim-treesitter": { "branch": "master", "commit": "0791b5ebb590a2d44e20640c52679df1fc42e8ab" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" },
+  "onedark.nvim": { "branch": "master", "commit": "e7c656ac6b6460aaab817cbd0c9d5c043eda4b43" },
+  "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
+  "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
+  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
+  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" },
+  "vim-wakatime": { "branch": "master", "commit": "87c6861ea81700ec4a6a27c81413cf07cb2c883c" }
+}

.config/nvim/lua/config/autocmd.lua

@@ -15,9 +15,9 @@ end
 vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
 
 -- Resotre cursor on exit
-vim.api.nvim_create_autocmd("VimLeave", {
-  pattern = "*",
-  callback = function()
-    vim.o.guicursor = "n:ver20-blinkwait700-blinkoff400-blinkon250"
-  end,
-})
+-- vim.api.nvim_create_autocmd("VimLeave", {
+--   pattern = "*",
+--   callback = function()
+--     vim.o.guicursor = "n:ver20-blinkwait700-blinkoff400-blinkon250"
+--   end,
+-- })

.config/nvim/lua/config/mappings.lua

@@ -1,39 +1,25 @@
 local map = vim.keymap.set
 
--- Unbind used keys
+-- Unbind keys
 map('n', '<C-q>', '<NOP>')
-
--- Movements between splits
-map('n', '<C-h>', '<C-w>h')
-map('n', '<C-j>', '<C-w>j')
-map('n', '<C-k>', '<C-w>k')
-map('n', '<C-l>', '<C-w>l')
+map('v', 'K', '<NOP>')
 
 -- Movement between buffers
-map({'n', 'v', 'i'}, '<A-h>', ':bp<CR>')
-map({'n', 'v', 'i'}, '<A-l>', ':bn<CR>')
+map({'n', 'v', 'i'}, '<A-u>', ':bp<CR>')
+map({'n', 'v', 'i'}, '<A-i>', ':bn<CR>')
 
 -- Remap for dealing with word wrap
-map('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
-map('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+map('n', 'k', 'v:count == 0 ? "gk" : "k"', { expr = true, silent = true })
+map('n', 'j', 'v:count == 0 ? "gj" : "j"', { expr = true, silent = true })
 
 -- Exit buffers/nvim with <leader>
-map("n", "<leader>q", function() require('utils.close_buffer').close_buffer() end)
-map("n", "<leader><C-q>", function() require('utils.close_buffer').close_buffer(true) end)
-map("n", "<leader>Q", ":%bd | quit<CR>")
-map("n", "<leader>w", ":write<CR>")
+map('n', '<leader>q', function() require('utils.close_buffer').close_buffer() end)
+map('n', '<leader><C-q>', function() require('utils.close_buffer').close_buffer(true) end)
+map('n', '<leader>Q', ':%bd | quit<CR>')
+map('n', '<leader>w', ':write<CR>')
 
 -- Copy and paste from clipboard
-map("n", "<leader>y", '"+yy')
-map("v", "<leader>y", '"+y')
-map({ "n", "v" }, "<leader>p", '"+p')
-map({ "n", "v" }, "<leader>P", '"+P')
-
--- Remap comments
-map("n", "<C-_>", require("Comment.api").toggle.linewise.current)
-map("i", "<C-_>", require("Comment.api").toggle.linewise.current)
-map("x", "<C-_>", function()
-    vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('<ESC>', true, false, true), 'nx', false)
-    require("Comment.api").toggle.linewise(vim.fn.visualmode())
-  end
-)
+map('n', '<leader>y', '"+yy<ESC>')
+map('v', '<leader>y', '"+y<ESC>')
+map({ 'n', 'v' }, '<leader>p', '"+p<ESC>')
+map({ 'n', 'v' }, '<leader>P', '"+P<ESC>')

.config/nvim/lua/config/options.lua

@@ -27,5 +27,8 @@ vim.o.timeoutlen = 300
 -- Set completeopt to have a better completion experience
 vim.o.completeopt = 'menuone,noselect'
 
--- NOTE: You should make sure your terminal supports this
+-- Enable TrueColor
 vim.o.termguicolors = true
+
+vim.o.splitbelow = true
+vim.o.splitright = true

.config/nvim/lua/config/plugins/cmake-tools.lua

@@ -0,0 +1,67 @@
+require("cmake-tools").setup {
+  cmake_command = "cmake", -- this is used to specify cmake command path
+  cmake_regenerate_on_save = true, -- auto generate when save CMakeLists.txt
+  cmake_generate_options = { "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" }, -- this will be passed when invoke `CMakeGenerate`
+  cmake_build_options = {}, -- this will be passed when invoke `CMakeBuild`
+  -- support macro expansion:
+  --       ${kit}
+  --       ${kitGenerator}
+  --       ${variant:xx}
+  cmake_build_directory = "cmake-build-${variant:buildType}", -- this is used to specify generate directory for cmake, allows macro expansion
+  cmake_soft_link_compile_commands = false, -- this will automatically make a soft link from compile commands file to project root dir
+  cmake_compile_commands_from_lsp = false, -- this will automatically set compile commands file location using lsp, to use it, please set `cmake_soft_link_compile_commands` to false
+  cmake_kits_path = nil, -- this is used to specify global cmake kits path, see CMakeKits for detailed usage
+  cmake_variants_message = {
+    short = { show = true }, -- whether to show short message
+    long = { show = true, max_length = 40 }, -- whether to show long message
+  },
+  cmake_dap_configuration = { -- debug settings for cmake
+    name = "cpp",
+    type = "codelldb",
+    request = "launch",
+    stopOnEntry = false,
+    runInTerminal = true,
+    console = "integratedTerminal",
+  },
+  cmake_executor = { -- executor to use
+    name = "quickfix", -- name of the executor
+    opts = {}, -- the options the executor will get, possible values depend on the executor type. See `default_opts` for possible values.
+    default_opts = { -- a list of default and possible values for executors
+      quickfix = {
+        show = "always", -- "always", "only_on_error"
+        position = "belowright", -- "bottom", "top"
+        size = 10,
+      },
+      overseer = {
+        new_task_opts = {}, -- options to pass into the `overseer.new_task` command
+        on_new_task = function(task) end, -- a function that gets overseer.Task when it is created, before calling `task:start`
+      },
+      terminal = {}, -- terminal executor uses the values in cmake_terminal
+    },
+  },
+  cmake_terminal = {
+    name = "terminal",
+    opts = {
+      name = "Main Terminal",
+      prefix_name = "[CMakeTools]: ", -- This must be included and must be unique, otherwise the terminals will not work. Do not use a simple spacebar " ", or any generic name
+      split_direction = "horizontal", -- "horizontal", "vertical"
+      split_size = 11,
+
+      -- Window handling
+      single_terminal_per_instance = true, -- Single viewport, multiple windows
+      single_terminal_per_tab = true, -- Single viewport per tab
+      keep_terminal_static_location = true, -- Static location of the viewport if avialable
+
+      -- Running Tasks
+      start_insert_in_launch_task = false, -- If you want to enter terminal with :startinsert upon using :CMakeRun
+      start_insert_in_other_tasks = false, -- If you want to enter terminal with :startinsert upon launching all other cmake tasks in the terminal. Generally set as false
+      focus_on_main_terminal = false, -- Focus on cmake terminal when cmake task is launched. Only used if executor is terminal.
+      focus_on_launch_terminal = false, -- Focus on cmake launch terminal when executable target in launched.
+    },
+  },
+  cmake_notifications = {
+    enabled = true, -- show cmake execution progress in nvim-notify
+    spinner = { "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" }, -- icons used for progress display
+    refresh_rate_ms = 100, -- how often to iterate icons
+  },
+}

.config/nvim/lua/config/plugins/comment.lua

@@ -0,0 +1,9 @@
+local map = vim.keymap.set
+
+map('n', '<C-_>', require('Comment.api').toggle.linewise.current)
+map('i', '<C-_>', require('Comment.api').toggle.linewise.current)
+map('x', '<C-_>', function()
+    vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('<ESC>', true, false, true), 'nx', false)
+    require('Comment.api').toggle.linewise(vim.fn.visualmode())
+  end
+)

.config/nvim/lua/config/plugins/init.lua

@@ -1,6 +1,9 @@
-require("config.plugins.lualine")
-require("config.plugins.nvim-autopairs")
-require("config.plugins.nvim-cmp")
-require("config.plugins.nvim-tree")
-require("config.plugins.telescope")
-require("config.plugins.treesitter")
+require('config.plugins.cmake-tools')
+require('config.plugins.comment')
+require('config.plugins.lualine')
+require('config.plugins.nvim-autopairs')
+require('config.plugins.nvim-cmp')
+require('config.plugins.nvim-tree')
+require('config.plugins.telescope')
+require('config.plugins.treesitter')
+require('config.plugins.navigator')

.config/nvim/lua/config/plugins/navigator.lua

@@ -0,0 +1,8 @@
+require('Navigator').setup()
+
+local map = vim.keymap.set
+
+map('n', '<A-h>', function () require("Navigator").left() end)
+map('n', '<A-j>', function () require("Navigator").down() end)
+map('n', '<A-k>', function () require("Navigator").up() end)
+map('n', '<A-l>', function () require("Navigator").right() end)

.config/nvim/lua/config/plugins/nvim-tree.lua

@@ -1,3 +1,6 @@
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
+
 require("nvim-tree").setup()
+
+vim.keymap.set('n', '<C-b>', ':NvimTreeToggle<CR>')

.config/nvim/lua/plugins/init.lua

@@ -1,14 +1,16 @@
 return {
+  'numToStr/Navigator.nvim',
   'tpope/vim-fugitive',
   'tpope/vim-rhubarb',
   'tpope/vim-sleuth',
-  'nvim-tree/nvim-web-devicons',
-  "nvim-tree/nvim-tree.lua",
-  'nvim-lualine/lualine.nvim',
   'tpope/vim-surround',
   'tmux-plugins/vim-tmux',
+  'nvim-lualine/lualine.nvim',
+  'nvim-tree/nvim-tree.lua',
+  'nvim-tree/nvim-web-devicons',
+  'Civitasv/cmake-tools.nvim',
   { 'numToStr/Comment.nvim', opts = {} },
+  { 'akinsho/bufferline.nvim', config = {} },
   { 'ethanholz/nvim-lastplace', config = {} },
-  { "akinsho/bufferline.nvim", config = {} },
   { 'wakatime/vim-wakatime', event = 'VeryLazy' },
 }

.config/nvim/lua/plugins/tmux-nvim.lua

@@ -0,0 +1,7 @@
+-- return {
+--   'aserowy/tmux.nvim',
+--   event = "VeryLazy",
+-- }
+return {
+  "numToStr/Navigator.nvim",
+}