feat(nvim): migrate to lazy

alexiszamanidis · Jan 18, 2024 · e71cc63 · e71cc63
1 parent d0d9267
commit e71cc63
Show file tree

Hide file tree

Showing 23 changed files with 843 additions and 132 deletions.
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
@@ -1,9 +1,3 @@
-vim.cmd("set expandtab")
-vim.cmd("set tabstop=2")
-vim.cmd("set softtabstop=2")
-vim.cmd("set shiftwidth=2")
-vim.g.mapleader = " "
-
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
   vim.fn.system({

diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
@@ -1,16 +1,154 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
-  "LazyVim": { "branch": "main", "commit": "879e29504d43e9f178d967ecc34d482f902e5a91" },
-  "bufferline.nvim": { "branch": "main", "commit": "e48ce1805697e4bb97bc171c081e849a65859244" },
-  "codeium.vim": { "branch": "main", "commit": "4063291e335e74e9ee2be04beb47d40b376312fa" },
-  "dracula.nvim": { "branch": "main", "commit": "8fc749e2479d62829c9c627867770035b74529a4" },
-  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" },
-  "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
-  "nvim-tree.lua": { "branch": "master", "commit": "f24afa2cef551122b8bd53bb2e4a7df42343ce2e" },
-  "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" },
-  "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" },
-  "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
-  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }
-}
+    "Comment.nvim": {
+        "branch": "master",
+        "commit": "0236521ea582747b58869cb72f70ccfa967d2e89"
+    },
+    "LazyVim": {
+        "branch": "main",
+        "commit": "879e29504d43e9f178d967ecc34d482f902e5a91"
+    },
+    "LuaSnip": {
+        "branch": "master",
+        "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f"
+    },
+    "bufferline.nvim": {
+        "branch": "main",
+        "commit": "e48ce1805697e4bb97bc171c081e849a65859244"
+    },
+    "cloak.nvim": {
+        "branch": "main",
+        "commit": "951b163e55ce7639eb320c450bde9283c4fe968b"
+    },
+    "cmp-nvim-lsp": {
+        "branch": "main",
+        "commit": "5af77f54de1b16c34b23cba810150689a3a90312"
+    },
+    "cmp_luasnip": {
+        "branch": "master",
+        "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843"
+    },
+    "codeium.vim": {
+        "branch": "main",
+        "commit": "4063291e335e74e9ee2be04beb47d40b376312fa"
+    },
+    "diffview.nvim": {
+        "branch": "main",
+        "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f"
+    },
+    "dracula.nvim": {
+        "branch": "main",
+        "commit": "8fc749e2479d62829c9c627867770035b74529a4"
+    },
+    "friendly-snippets": {
+        "branch": "main",
+        "commit": "69a2c1675b66e002799f5eef803b87a12f593049"
+    },
+    "git.nvim": {
+        "branch": "main",
+        "commit": "741696687486f25f8b73d9e4c76ab2ede9998f39"
+    },
+    "gitsigns.nvim": {
+        "branch": "main",
+        "commit": "4aaacbf5e5e2218fd05eb75703fe9e0f85335803"
+    },
+    "impatient.nvim": {
+        "branch": "main",
+        "commit": "47302af74be7b79f002773011f0d8e85679a7618"
+    },
+    "lazy.nvim": {
+        "branch": "main",
+        "commit": "96584866b9c5e998cbae300594d0ccfd0c464627"
+    },
+    "lua-async-await": {
+        "branch": "main",
+        "commit": "645ad2bc4432d455e84eae6ebdc7e5cbdf337b95"
+    },
+    "lualine.nvim": {
+        "branch": "master",
+        "commit": "566b7036f717f3d676362742630518a47f132fff"
+    },
+    "mason-lspconfig.nvim": {
+        "branch": "main",
+        "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364"
+    },
+    "mason.nvim": {
+        "branch": "main",
+        "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134"
+    },
+    "neo-tree.nvim": {
+        "branch": "v3.x",
+        "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8"
+    },
+    "nui.nvim": {
+        "branch": "main",
+        "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418"
+    },
+    "null-ls.nvim": {
+        "branch": "main",
+        "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7"
+    },
+    "nvim-cmp": {
+        "branch": "main",
+        "commit": "538e37ba87284942c1d76ed38dd497e54e65b891"
+    },
+    "nvim-dap": {
+        "branch": "master",
+        "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5"
+    },
+    "nvim-java": {
+        "branch": "main",
+        "commit": "b9ef7dfb31428eaf2ebbbf332e9d0c9a73fedef0"
+    },
+    "nvim-java-core": {
+        "branch": "main",
+        "commit": "295161308d57cc4c7a69daeeee6951e74080c661"
+    },
+    "nvim-java-dap": {
+        "branch": "main",
+        "commit": "55c90c5d2414f6e66f843f38e111bee284d71e61"
+    },
+    "nvim-java-test": {
+        "branch": "main",
+        "commit": "a3fe70c48936e1c143ed366e127e9c3db4791716"
+    },
+    "nvim-lspconfig": {
+        "branch": "master",
+        "commit": "7eed8b2150192e5ad05e1886fdf133493ddf2928"
+    },
+    "nvim-tree.lua": {
+        "branch": "master",
+        "commit": "f24afa2cef551122b8bd53bb2e4a7df42343ce2e"
+    },
+    "nvim-treesitter": {
+        "branch": "master",
+        "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e"
+    },
+    "nvim-ts-autotag": {
+        "branch": "main",
+        "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18"
+    },
+    "nvim-web-devicons": {
+        "branch": "master",
+        "commit": "db0c864375c198cacc171ff373e76bfce2a85045"
+    },
+    "plenary.nvim": {
+        "branch": "master",
+        "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0"
+    },
+    "telescope.nvim": {
+        "branch": "master",
+        "commit": "d90956833d7c27e73c621a61f20b29fdb7122709"
+    },
+    "todo-comments.nvim": {
+        "branch": "main",
+        "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872"
+    },
+    "vim-illuminate": {
+        "branch": "master",
+        "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86"
+    },
+    "which-key.nvim": {
+        "branch": "main",
+        "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a"
+    }
+}
diff --git a/nvim/.config/nvim/lazyvim.json b/nvim/.config/nvim/lazyvim.json
@@ -1,9 +1,7 @@
 {
-  "extras": [
-
-  ],
-  "news": {
-    "NEWS.md": "2123"
-  },
-  "version": 2
-}
+    "extras": [],
+    "news": {
+        "NEWS.md": "2123"
+    },
+    "version": 2
+}
diff --git a/nvim/.config/nvim/lua/.luarc.json b/nvim/.config/nvim/lua/.luarc.json
@@ -0,0 +1,3 @@
+{
+    "diagnostics.globals": ["vim"]
+}
diff --git a/nvim/.config/nvim/lua/keymaps.lua b/nvim/.config/nvim/lua/keymaps.lua
@@ -1,89 +1,94 @@
 -- Increment/Decrement
-vim.api.nvim_set_keymap('n', '+', '<C-a>', { noremap = true })
-vim.api.nvim_set_keymap('n', '-', '<C-x>', { noremap = true })
+vim.api.nvim_set_keymap("n", "+", "<C-a>", { noremap = true })
+vim.api.nvim_set_keymap("n", "-", "<C-x>", { noremap = true })
 
 -- Make file executable
-vim.api.nvim_set_keymap('n', '<leader>x', ':!chmod +x %<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<leader>x", ":!chmod +x %<CR>", { noremap = true, silent = true })
 
 -- Behave like the rest of the CAPITAL letters
-vim.api.nvim_set_keymap('n', 'Y', 'yg$', { noremap = true })
+vim.api.nvim_set_keymap("n", "Y", "yg$", { noremap = true })
 
 -- Keep cursor at the beginning
-vim.api.nvim_set_keymap('n', 'J', 'mzJ`z', { noremap = true })
+vim.api.nvim_set_keymap("n", "J", "mzJ`z", { noremap = true })
 
 -- Quit
-vim.api.nvim_set_keymap('n', '<C-q>', ':q<CR>', { noremap = true })
-vim.api.nvim_set_keymap('i', '<C-c>', '<Esc>', { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-q>", ":q<CR>", { noremap = true })
+vim.api.nvim_set_keymap("i", "<C-c>", "<Esc>", { noremap = true })
 
 -- Keep same paste
-vim.api.nvim_set_keymap('x', 'p', '"_dP', { noremap = true })
-vim.api.nvim_set_keymap('n', 'p', '"_dP', { noremap = true })
+vim.api.nvim_set_keymap("x", "p", '"_dP', { noremap = true })
+-- vim.api.nvim_set_keymap("n", "p", '"_dP', { noremap = true })
 
 -- Keeping it centered
-vim.api.nvim_set_keymap('n', 'n', 'nzzzv', { noremap = true })
-vim.api.nvim_set_keymap('n', 'N', 'Nzzzv', { noremap = true })
-vim.api.nvim_set_keymap('n', '<C-d>', '<C-d>zz', { noremap = true })
-vim.api.nvim_set_keymap('n', '<C-u>', '<C-u>zz', { noremap = true })
+vim.api.nvim_set_keymap("n", "n", "nzzzv", { noremap = true })
+vim.api.nvim_set_keymap("n", "N", "Nzzzv", { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-d>", "<C-d>zz", { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-u>", "<C-u>zz", { noremap = true })
 
 -- Do NOT lose your yank when you use
 -- x
-vim.api.nvim_set_keymap('n', 'x', '"_x', { noremap = true })
+vim.api.nvim_set_keymap("n", "x", '"_x', { noremap = true })
 -- d
-vim.api.nvim_set_keymap('n', 'd', '"_d', { noremap = true })
-vim.api.nvim_set_keymap('n', 'D', '"_D', { noremap = true })
-vim.api.nvim_set_keymap('v', 'd', '"_d', { noremap = true })
-vim.api.nvim_set_keymap('v', 'D', '"_D', { noremap = true })
+vim.api.nvim_set_keymap("n", "d", '"_d', { noremap = true })
+vim.api.nvim_set_keymap("n", "D", '"_D', { noremap = true })
+vim.api.nvim_set_keymap("v", "d", '"_d', { noremap = true })
+vim.api.nvim_set_keymap("v", "D", '"_D', { noremap = true })
 -- c
-vim.api.nvim_set_keymap('n', 'c', '"_c', { noremap = true })
-vim.api.nvim_set_keymap('n', 'C', '"_C', { noremap = true })
-vim.api.nvim_set_keymap('v', 'c', '"_c', { noremap = true })
-vim.api.nvim_set_keymap('v', 'C', '"_C', { noremap = true })
+vim.api.nvim_set_keymap("n", "c", '"_c', { noremap = true })
+vim.api.nvim_set_keymap("n", "C", '"_C', { noremap = true })
+vim.api.nvim_set_keymap("v", "c", '"_c', { noremap = true })
+vim.api.nvim_set_keymap("v", "C", '"_C', { noremap = true })
 
 -- Save
-vim.api.nvim_set_keymap('n', '<C-s>', ':w<CR>', { noremap = true })
-vim.api.nvim_set_keymap('v', '<C-s>', '<Esc>:w<CR>', { noremap = true })
-vim.api.nvim_set_keymap('i', '<C-s>', '<Esc>:w<CR>', { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-s>", ":w<CR>", { noremap = true })
+vim.api.nvim_set_keymap("v", "<C-s>", "<Esc>:w<CR>", { noremap = true })
+vim.api.nvim_set_keymap("i", "<C-s>", "<Esc>:w<CR>", { noremap = true })
 
 -- Stay in indent mode
-vim.api.nvim_set_keymap('v', '<S-Tab>', '<gv', { noremap = true })
-vim.api.nvim_set_keymap('v', '<Tab>', '>gv', { noremap = true })
+vim.api.nvim_set_keymap("v", "<S-Tab>", "<gv", { noremap = true })
+vim.api.nvim_set_keymap("v", "<Tab>", ">gv", { noremap = true })
 
 -- Move text up and down
 -- Normal
-vim.api.nvim_set_keymap('n', '<A-j>', ':m .+1<CR>==', { noremap = true })
-vim.api.nvim_set_keymap('n', '<A-k>', ':m .-2<CR>==', { noremap = true })
+vim.api.nvim_set_keymap("n", "<A-j>", ":m .+1<CR>==", { noremap = true })
+vim.api.nvim_set_keymap("n", "<A-k>", ":m .-2<CR>==", { noremap = true })
 -- Visual
-vim.api.nvim_set_keymap('v', '<A-j>', ':m .+1<CR>==', { noremap = true })
-vim.api.nvim_set_keymap('v', '<A-Down>', ':m .+1<CR>==', { noremap = true })
-vim.api.nvim_set_keymap('v', '<A-k>', ':m .-2<CR>==', { noremap = true })
-vim.api.nvim_set_keymap('v', '<A-Up>', ':m .-2<CR>==', { noremap = true })
+vim.api.nvim_set_keymap("v", "<A-j>", ":m .+1<CR>==", { noremap = true })
+vim.api.nvim_set_keymap("v", "<A-Down>", ":m .+1<CR>==", { noremap = true })
+vim.api.nvim_set_keymap("v", "<A-k>", ":m .-2<CR>==", { noremap = true })
+vim.api.nvim_set_keymap("v", "<A-Up>", ":m .-2<CR>==", { noremap = true })
 -- Visual Block
-vim.api.nvim_set_keymap('x', 'J', ':move \'>+1<CR>gv-gv', { noremap = true })
-vim.api.nvim_set_keymap('x', 'K', ':move \'<-2<CR>gv-gv', { noremap = true })
-vim.api.nvim_set_keymap('x', '<A-j>', ':move \'>+1<CR>gv-gv', { noremap = true })
-vim.api.nvim_set_keymap('x', '<A-Down>', ':move \'>+1<CR>gv-gv', { noremap = true })
-vim.api.nvim_set_keymap('x', '<A-k>', ':move \'<-2<CR>gv-gv', { noremap = true })
-vim.api.nvim_set_keymap('x', '<A-Up>', ':move \'<-2<CR>gv-gv', { noremap = true })
+vim.api.nvim_set_keymap("x", "J", ":move '>+1<CR>gv-gv", { noremap = true })
+vim.api.nvim_set_keymap("x", "K", ":move '<-2<CR>gv-gv", { noremap = true })
+vim.api.nvim_set_keymap("x", "<A-j>", ":move '>+1<CR>gv-gv", { noremap = true })
+vim.api.nvim_set_keymap("x", "<A-Down>", ":move '>+1<CR>gv-gv", { noremap = true })
+vim.api.nvim_set_keymap("x", "<A-k>", ":move '<-2<CR>gv-gv", { noremap = true })
+vim.api.nvim_set_keymap("x", "<A-Up>", ":move '<-2<CR>gv-gv", { noremap = true })
 
 -- Move between splits
 -- Vim
-vim.api.nvim_set_keymap('n', '<C-h>', '<C-w>h', { noremap = true })
-vim.api.nvim_set_keymap('n', '<C-j>', '<C-w>j', { noremap = true })
-vim.api.nvim_set_keymap('n', '<C-k>', '<C-w>k', { noremap = true })
-vim.api.nvim_set_keymap('n', '<C-l>', '<C-w>l', { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-h>", "<C-w>h", { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-j>", "<C-w>j", { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-k>", "<C-w>k", { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-l>", "<C-w>l", { noremap = true })
 -- Arrows
-vim.api.nvim_set_keymap('n', '<C-Left>', ':vertical resize +3<CR>', { noremap = true })
-vim.api.nvim_set_keymap('n', '<C-Right>', ':vertical resize -3<CR>', { noremap = true })
-vim.api.nvim_set_keymap('n', '<C-Up>', ':resize +3<CR>', { noremap = true })
-vim.api.nvim_set_keymap('n', '<C-Down>', ':resize -3<CR>', { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-Left>", ":vertical resize +3<CR>", { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-Right>", ":vertical resize -3<CR>", { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-Up>", ":resize +3<CR>", { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-Down>", ":resize -3<CR>", { noremap = true })
 
 -- Tmux
-vim.api.nvim_set_keymap('n', '<C-f>', '<cmd>!tmux neww tmux-sessionizer<CR>', { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-f>", "<cmd>!tmux neww tmux-sessionizer<CR>", { noremap = true })
 
 -- Comment with 'Ctrl-/'
-vim.api.nvim_set_keymap('n', '<C-_>', '<cmd>lua require("Comment.api").toggle.linewise()<CR>', { noremap = true })
-vim.api.nvim_set_keymap('i', '<C-_>', '<esc><cmd>lua require("Comment.api").toggle.linewise()<CR>', { noremap = true })
-vim.api.nvim_set_keymap('v', '<C-_>', '<esc><cmd>lua require("Comment.api").toggle.linewise(vim.fn.visualmode())<CR>', { noremap = true })
+vim.api.nvim_set_keymap("n", "<C-_>", '<cmd>lua require("Comment.api").toggle.linewise()<CR>', { noremap = true })
+vim.api.nvim_set_keymap("i", "<C-_>", '<esc><cmd>lua require("Comment.api").toggle.linewise()<CR>', { noremap = true })
+vim.api.nvim_set_keymap(
+	"v",
+	"<C-_>",
+	'<esc><cmd>lua require("Comment.api").toggle.linewise(vim.fn.visualmode())<CR>',
+	{ noremap = true }
+)
 
 -- Source file
-vim.api.nvim_set_keymap('n', '<leader><leader>', '<cmd>so<CR>', { noremap = true })
+vim.api.nvim_set_keymap("n", "<leader><leader>", "<cmd>so<CR>", { noremap = true })