Update nvim

dot_config/nvim/init.lua

@@ -1,6 +1,7 @@
 require("core.config")
-require("core.keymaps")
 vim.opt.runtimepath:prepend(vim.fn.stdpath("data") .. "/lazy/lazy.nvim")
-require("lazy").setup("plugins", {
+require("lazy").setup({
-    version = "*",
+    spec = {
+        { import = "plugins" },
+    },
 })

dot_config/nvim/lua/core/commands.lua

@@ -1,16 +0,0 @@
-vim.api.nvim_create_user_command("W", "write", {})
-vim.api.nvim_create_user_command("Q", "qall!", {})
-
--- Create a floating terminal
-vim.api.nvim_create_user_command("FloaTerm", require("core.lib.toggle_terminal"), {
-  desc = "Toggle a floating terminal",
-})
-
--- highlight text on copy
-vim.api.nvim_create_autocmd("TextYankPost", {
-  desc = "Highlight when yanking (copying) text",
-  callback = vim.highlight.on_yank,
-  group = vim.api.nvim_create_augroup("kickstart-highlight-yank", {
-    clear = true,
-  }),
-})

dot_config/nvim/lua/core/config.lua

@@ -1,7 +1,7 @@
 vim.g.mapleader = ","
 vim.g.maplocalleader = ","
 
-vim.opt.shell = 'bash'
+vim.opt.shell = "bash"
 vim.opt.fileformats = { "unix", "dos", "mac" }
 
 vim.opt.mouse = "a"
@@ -52,3 +52,43 @@ vim.opt.whichwrap:append {
   ["["] = true,
   ["]"] = true,
 }
+
+vim.api.nvim_create_user_command("W", "write", {})
+vim.api.nvim_create_user_command("Q", "qall!", {})
+
+-- Create a floating terminal
+vim.api.nvim_create_user_command("FloaTerm", require("core.toggle_terminal"), {
+  desc = "Toggle a floating terminal",
+})
+
+-- highlight text on copy
+vim.api.nvim_create_autocmd("TextYankPost", {
+  desc = "Highlight when yanking (copying) text",
+  callback = vim.highlight.on_yank,
+  group = vim.api.nvim_create_augroup("kickstart-highlight-yank", {
+    clear = true,
+  }),
+})
+
+local toggle_terminal = require("core.toggle_terminal")
+
+vim.keymap.set("n", "<leader>l", ":nohlsearch<CR>", { desc = "clear highlighted search" })
+vim.keymap.set("n", "<leader>ts", [[:%s/\s\s*$//g<CR>]], { desc = "[T]rim trailing [S]pace" })
+vim.keymap.set("n", "<leader>ss", ":setlocal spell!<CR>", { desc = "[S]et [S]pell" })
+vim.keymap.set("n", "<leader>p", ":set paste!<CR>", { desc = "[P]aste" })
+vim.keymap.set("n", "<leader>nn", ":set nonumber norelativenumber<CR>", { desc = "[N]o [N]umber removed number and relative number" })
+vim.keymap.set("n", "<leader>rn", ":set number relativenumber<CR>", { desc = "[R]elative [N]umber - set relative number and absolute number" })
+
+vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, { desc = "Go to previous [D]iagnostic message" })
+vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { desc = "Go to next [D]iagnostic message" })
+vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Show diagnostic [E]rror messages" })
+vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist, { desc = "Open diagnopstic [Q]uickfix list" })
+
+-- Use <Ctrl-h/j/k/l> to move between windows, no need for <Ctrl-w> first
+vim.keymap.set("n", "<C-j>", "<C-w><C-j>", { desc = "Move focus up window" })
+vim.keymap.set("n", "<C-k>", "<C-w><C-k>", { desc = "Move focus down window" })
+vim.keymap.set("n", "<C-h>", "<C-w><C-h>", { desc = "Move focus left window" })
+vim.keymap.set("n", "<C-l>", "<C-w><C-l>", { desc = "Move focus right window" })
+
+vim.keymap.set({ "n", "t" }, "<leader>tt", toggle_terminal)
+vim.keymap.set("t", "<esc><esc>", "<c-\\><c-n>")

dot_config/nvim/lua/core/keymaps.lua

@@ -1,23 +0,0 @@
-require("core.commands")
-local toggle_terminal = require("core.lib.toggle_terminal")
-
-vim.keymap.set("n", "<leader>l", ":nohlsearch<CR>", { desc = "clear highlighted search" })
-vim.keymap.set("n", "<leader>ts", [[:%s/\s\s*$//g<CR>]], { desc = "[T]rim trailing [S]pace" })
-vim.keymap.set("n", "<leader>ss", ":setlocal spell!<CR>", { desc = "[S]et [S]pell" })
-vim.keymap.set("n", "<leader>p", ":set paste!<CR>", { desc = "[P]aste" })
-vim.keymap.set("n", "<leader>nn", ":set nonumber norelativenumber<CR>", { desc = "[N]o [N]umber removed number and relative number" })
-vim.keymap.set("n", "<leader>rn", ":set number relativenumber<CR>", { desc = "[R]elative [N]umber - set relative number and absolute number" })
-
-vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, { desc = "Go to previous [D]iagnostic message" })
-vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { desc = "Go to next [D]iagnostic message" })
-vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Show diagnostic [E]rror messages" })
-vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist, { desc = "Open diagnopstic [Q]uickfix list" })
-
--- Use <Ctrl-h/j/k/l> to move between windows, no need for <Ctrl-w> first
-vim.keymap.set("n", "<C-j>", "<C-w><C-j>", { desc = "Move focus up window" })
-vim.keymap.set("n", "<C-k>", "<C-w><C-k>", { desc = "Move focus down window" })
-vim.keymap.set("n", "<C-h>", "<C-w><C-h>", { desc = "Move focus left window" })
-vim.keymap.set("n", "<C-l>", "<C-w><C-l>", { desc = "Move focus right window" })
-
-vim.keymap.set({ "n", "t" }, "<leader>tt", toggle_terminal)
-vim.keymap.set("t", "<esc><esc>", "<c-\\><c-n>")

dot_config/nvim/lua/plugins/base.lua

@@ -1,17 +1,16 @@
--- https://github.com/tpope/vim-surround
+return {
--- surround.vim: Delete/change/add parentheses/quotes/XML-tags/much more with ease
+  -- https://github.com/tpope/vim-surround
-local M = { "tpope/vim-surround" }
+  -- surround.vim: Delete/change/add parentheses/quotes/XML-tags/much more with ease
+  { "tpope/vim-surround", tag = "v2.2" },
 
-M.tag = "v2.2"
-M.dependencies = {
   -- https://github.com/tpope/vim-sleuth
   -- sleuth.vim: Heuristically set buffer options
-  { "tpope/vim-sleuth",      tag = "v2.0" },
+  { "tpope/vim-sleuth", tag = "v2.0" },
+
+  { "kchmck/vim-coffee-script" },
 
   -- https://github.com/numToStr/Comment.nvim
   -- 🧠 💪 // Smart and powerful comment plugin for neovim.
   -- Supports treesitter, dot repeat, left-right/up-down motions, hooks, and more
-  { "numToStr/Comment.nvim", opts = {},   lazy = false },
+  { "numToStr/Comment.nvim", opts = {}, lazy = false },
 }
-
-return M

dot_config/nvim/lua/plugins/snippets.lua

@@ -2,7 +2,7 @@
 -- Snippet Engine for Neovim written in Lua.
 local M = { "L3MON4D3/LuaSnip" }
 
-M.tag = "v2.3.0"
+M.tag = "v2.4.0"
 M.dependencies = {}
 
 function M.config()

dot_config/nvim/lua/plugins/telescope.lua

@@ -1,7 +1,6 @@
-local find_git_root = require("core.lib.find_git_root")
+local find_git_root = require("core.find_git_root")
 local M = { "nvim-telescope/telescope.nvim" }
 
-M.branch = "0.1.x"
 M.event = "VimEnter"
 M.dependencies = {
   "nvim-lua/plenary.nvim",

dot_config/nvim/lua/plugins/tree.lua

@@ -4,7 +4,7 @@ vim.opt.termguicolors = true
 
 local M = { "nvim-tree/nvim-tree.lua" }
 
-M.tag = "nvim-tree-v1.10.0"
+M.tag = "nvim-tree-v1.13.0"
 
 M.keys = {
     { "<leader>nt", ":NvimTreeToggle<CR>", desc = "toggle nvim tree" }

dot_config/nvim/lua/plugins/treesitter.lua

@@ -1,4 +1,4 @@
-local M = {"nvim-treesitter/nvim-treesitter" }
+local M = { "nvim-treesitter/nvim-treesitter" }
 
 M.name = "treesitter"
 M.build = ":TSUpdate"