Nvim configuration.

.config/nvim/init.lua

@@ -4,12 +4,16 @@ vim.g.maplocalleader = ' '
 vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
 
 -- Load modules
-require("utils.lazy").lazy_init()
+if vim.g.vscode then
-require("lazy").setup("plugins", {
+  require("config.mappings")
-  change_detection = {
+else
-    enabled = false,
+  require("utils.lazy").lazy_init()
-    notify = false,
+  require("lazy").setup("plugins", {
-  },
+    change_detection = {
-})
+      enabled = false,
+      notify = false,
+    },
+  })
 
-require("config")
+  require("config")
+end

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

@@ -1,5 +1,5 @@
-require("config.options")
-require("config.plugins")
-require("config.mappings")
 require("config.autocmd")
 require("config.lsp")
+require("config.mappings")
+require("config.options")
+require("config.plugins")

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

@@ -1,5 +1,8 @@
 local map = vim.keymap.set
 
+-- Unbind used keys
+map('n', '<C-q>', '<NOP>')
+
 -- Movements between splits
 map('n', '<C-h>', '<C-w>h')
 map('n', '<C-j>', '<C-w>j')
@@ -16,14 +19,15 @@ 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><C-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)

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

@@ -1,5 +1,6 @@
-require("config.plugins.treesitter")
+require("config.plugins.lualine")
-require("config.plugins.telescope")
+require("config.plugins.nvim-autopairs")
 require("config.plugins.nvim-cmp")
 require("config.plugins.nvim-tree")
-require("config.plugins.lualine")
+require("config.plugins.telescope")
+require("config.plugins.treesitter")

.config/nvim/lua/config/plugins/nvim-autopairs.lua

@@ -0,0 +1,4 @@
+require('nvim-autopairs').setup({
+  disable_filetype = { "TelescopePrompt" , "vim" },
+  enable_check_bracket_line = false,
+})

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

@@ -5,7 +5,10 @@ return {
   'nvim-tree/nvim-web-devicons',
   "nvim-tree/nvim-tree.lua",
   'nvim-lualine/lualine.nvim',
+  'tpope/vim-surround',
+  'tmux-plugins/vim-tmux',
   { 'numToStr/Comment.nvim', opts = {} },
   { 'ethanholz/nvim-lastplace', config = {} },
   { "akinsho/bufferline.nvim", config = {} },
+  { 'wakatime/vim-wakatime', event = 'VeryLazy' },
 }

.config/nvim/lua/plugins/nvim-autopairs.lua

@@ -0,0 +1,5 @@
+return {
+  'windwp/nvim-autopairs',
+  event = "InsertEnter",
+  opts = {}
+}

.config/nvim/lua/utils/close_buffer.lua

@@ -1,23 +1,31 @@
 local M = { }
 
-function M.close_buffer()
+local function try_quit(command)
-    local try_quit = function(command)
+  local success, errorMsg = pcall(vim.api.nvim_command, command)
-        local success, errorMsg = pcall(vim.api.nvim_command, command)
+  if not success then
-        if not success then
+    print("Failed to quit: " .. errorMsg)
-            print("Failed to quit: " .. errorMsg)
+  end
-        end
+end
-    end
 
-    local tree = require("nvim-tree.api").tree
+function M.close_buffer(force)
-    local buffer_count = #vim.fn.filter(vim.fn.range(1, vim.fn.bufnr '$'), 'buflisted(v:val)')
+  local buf_cmd = "bd"
+  local quit_cmd = "qa"
 
-    if buffer_count ~= 1 then
+  if force then
-      tree.toggle({ focus = false })
+    buf_cmd = "bd!"
-      try_quit("bd")
+    quit_cmd = "qa!"
-      tree.toggle({ focus = false })
+  end
-    else
+
-        try_quit("qa")
+  local tree = require("nvim-tree.api").tree
-    end
+  local buffer_count = #vim.fn.filter(vim.fn.range(1, vim.fn.bufnr '$'), 'buflisted(v:val)')
+
+  if buffer_count == 1 or buffer_count == 0 then
+    try_quit(quit_cmd)
+  else
+    tree.toggle({ focus = false })
+    try_quit(buf_cmd)
+    tree.toggle({ focus = false })
+  end
 end
 
 return M

.config/nvim/lua/utils/init.lua

@@ -1,4 +0,0 @@
-return {
-  require("utils.lazy"),
-  require("utils.close_buffer"),
-}

.gitignore

@@ -1,4 +1,3 @@
 # lazy.nvim lockfile
-lazy-lock.json
+.config/tmux/plugins/
-**/tmux/plugins/
 .zcompdump