chg: Use the new recommended format for lazy.nvim

laptop/config/globals.lua

@@ -36,7 +36,7 @@ set.spell = true
 -- Enable mouse support
 set.mouse = 'n'
 -- Enable programming dictionary
-set.spelllang = { "en", "programming" }
+set.spelllang = { "en", "programming", "en-academic" }
 
 -- Disable unused plugins
 g.loaded_perl_provider = 0

laptop/config/keymaps.lua

@@ -38,8 +38,8 @@ map('n', '<leader>O', ":<c-u>call append(line('.')-1, repeat([''], v:count1))<cr
 map('n', '<leader>u', "<c-r>", { remap = false })
 
 -- Browser like keymaps
-map('n', '<leader>k', ":tabnext<cr>", { remap = false })
+map('n', '<leader>k', "gt", { remap = false })
-map('n', '<leader>j', ":tabprevious<cr>", { remap = false })
+map('n', '<leader>j', "gT", { remap = false })
 map('n', '<leader>w', ":bdelete<cr>", { remap = false })
 map('n', '<leader>W', ":bdelete!<cr>", { remap = false })
 map('n', '<leader>t', ":tabnew<cr>", { remap = false })

laptop/config/plugins.lua

@@ -1,20 +1,23 @@
 -- Automatically bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
-    vim.fn.system({
+    local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-        "git",
+    local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-        "clone",
+    if vim.v.shell_error ~= 0 then
-        "--filter=blob:none",
+        vim.api.nvim_echo({
-        "https://github.com/folke/lazy.nvim.git",
+            { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-        "--branch=stable", -- latest stable release
+            { out,                            "WarningMsg" },
-        lazypath,
+            { "\nPress any key to exit..." },
-    })
+        }, true, {})
+        vim.fn.getchar()
+        os.exit(1)
+    end
 end
 vim.opt.rtp:prepend(lazypath)
 
 -- Load plugin via paq-nvim
-require("lazy").setup(
+require("lazy").setup({
-    {
+    spec = {
         -- Use lualine for statusbar
         "nvim-lualine/lualine.nvim",
         "nvim-tree/nvim-web-devicons",
@@ -49,6 +52,8 @@ require("lazy").setup(
         "SirVer/ultisnips", -- For snippets
         -- Support programming terms
         { "psliwka/vim-dirtytalk",     build = ":DirtytalkUpdate" },
+        -- Support academic terms
+        { "ficcdaf/academic.nvim",     build = ":AcademicBuild" },
         -- vim-moonfly theme
         { "bluz71/vim-moonfly-colors", as = "moonfly" },
         -- Rust tools
@@ -77,14 +82,12 @@ require("lazy").setup(
         },
         {
             "felpafel/inlay-hint.nvim",
-            version = "1",
             event = "LspAttach",
             config = true,
         },
         "dvrlabs/takeout.nvim",
     },
-    {
     lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
-        install = { missing = true },
+    install = { missing = true, colorscheme = { "habamax" } },
-    }
+    checker = { enabled = true },
-)
+})

pizero/init.lua

@@ -87,8 +87,8 @@ map('n', '<leader>O', ":<c-u>call append(line('.')-1, repeat([''], v:count1))<cr
 map('n', '<leader>u', "<c-r>", { remap = false })
 
 -- Browser like keymaps
-map('n', '<leader>k', ":tabnext<cr>", { remap = false })
+map('n', '<leader>k', "gt", { remap = false })
-map('n', '<leader>j', ":tabprevious<cr>", { remap = false })
+map('n', '<leader>j', "gT", { remap = false })
 map('n', '<leader>w', ":bdelete<cr>", { remap = false })
 map('n', '<leader>W', ":bdelete!<cr>", { remap = false })
 map('n', '<leader>t', ":tabnew<cr>", { remap = false })

server/config/keymaps.lua

@@ -35,8 +35,8 @@ map('n', '<leader>u', "<c-r>", { remap = false })
 map('n', '<leader>f', ":Files<cr>", { remap = false })
 
 -- Browser like keymaps
-map('n', '<leader>k', ":tabnext<cr>", { remap = false })
+map('n', '<leader>k', "gt", { remap = false })
-map('n', '<leader>j', ":tabprevious<cr>", { remap = false })
+map('n', '<leader>j', "gT", { remap = false })
 map('n', '<leader>w', ":bdelete<cr>", { remap = false })
 map('n', '<leader>W', ":bdelete!<cr>", { remap = false })
 map('n', '<leader>t', ":tabnew<cr>", { remap = false })

server/config/plugins.lua

@@ -1,20 +1,23 @@
 -- Automatically bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  vim.fn.system({
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-    "git",
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-    "clone",
+  if vim.v.shell_error ~= 0 then
-    "--filter=blob:none",
+    vim.api.nvim_echo({
-    "https://github.com/folke/lazy.nvim.git",
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-    "--branch=stable", -- latest stable release
+      { out, "WarningMsg" },
-    lazypath,
+      { "\nPress any key to exit..." },
-  })
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
 end
 vim.opt.rtp:prepend(lazypath)
 
 -- Load plugins via lazy.nvim
-require("lazy").setup(
+require("lazy").setup({
-    {
+    spec = {
     -- Use lualine for statusbar
     "nvim-lualine/lualine.nvim",
     "nvim-tree/nvim-web-devicons",
@@ -52,9 +55,8 @@ require("lazy").setup(
     "ibhagwan/fzf-lua",
     "karb94/neoscroll.nvim",
     },
-    {
     lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
-        install = { missing = true },
+    install = { missing = true, colorscheme = { "habamax" } },
-    }
+    checker = { enabled = true },
-)
+})
 

vps/config/keymaps.lua

@@ -35,8 +35,8 @@ map('n', '<leader>u', "<c-r>", { remap = false })
 map('n', '<leader>f', ":Files<cr>", { remap = false })
 
 -- Browser like keymaps
-map('n', '<leader>k', ":tabnext<cr>", { remap = false })
+map('n', '<leader>k', "gt", { remap = false })
-map('n', '<leader>j', ":tabprevious<cr>", { remap = false })
+map('n', '<leader>j', "gT", { remap = false })
 map('n', '<leader>w', ":bdelete<cr>", { remap = false })
 map('n', '<leader>W', ":bdelete!<cr>", { remap = false })
 map('n', '<leader>t', ":tabnew<cr>", { remap = false })

vps/config/plugins.lua

@@ -1,20 +1,23 @@
 -- Automatically bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  vim.fn.system({
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-    "git",
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-    "clone",
+  if vim.v.shell_error ~= 0 then
-    "--filter=blob:none",
+    vim.api.nvim_echo({
-    "https://github.com/folke/lazy.nvim.git",
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-    "--branch=stable", -- latest stable release
+      { out, "WarningMsg" },
-    lazypath,
+      { "\nPress any key to exit..." },
-  })
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
 end
 vim.opt.rtp:prepend(lazypath)
 
 -- Load plugins via lazy.nvim
-require("lazy").setup(
+require("lazy").setup({
-    {
+    spec = {
     -- Use lualine for statusbar
     "nvim-lualine/lualine.nvim",
     "nvim-tree/nvim-web-devicons",
@@ -52,9 +55,8 @@ require("lazy").setup(
     "ibhagwan/fzf-lua",
     "karb94/neoscroll.nvim",
     },
-    {
     lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
-        install = { missing = true },
+    install = { missing = true, colorscheme = { "habamax" } },
-    }
+    checker = { enabled = true },
-)
+})