chg: Reorganize config files

laptop/config/globals.lua

@@ -29,7 +29,3 @@ set.spelllang = { "en", "programming" }
 vim.g.loaded_perl_provider = 0
 vim.g.loaded_node_provider = 0
 vim.g.loaded_ruby_provider = 0
-
--- Load UltiSnips snippets from custom-snippets directory
-vim.g.UltiSnipsSnippetDirectories = { "custom-snippets", "UltiSnips" }
-

laptop/config/plugins.lua

@@ -0,0 +1,68 @@
+-- Automatically bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+    vim.fn.system({
+        "git",
+        "clone",
+        "--filter=blob:none",
+        "https://github.com/folke/lazy.nvim.git",
+        "--branch=stable", -- latest stable release
+        lazypath,
+    })
+end
+vim.opt.rtp:prepend(lazypath)
+
+-- Load plugin via paq-nvim
+require("lazy").setup(
+    {
+        -- Use lualine for statusbar
+        "nvim-lualine/lualine.nvim",
+        "nvim-tree/nvim-web-devicons",
+        -- Auto commenting per filetype
+        "numToStr/Comment.nvim",
+        -- Give option to save files using sudo, if needed
+        "lambdalisue/suda.vim",
+        -- Auto toggle for number mode when vim isn't focused
+        "sitiom/nvim-numbertoggle",
+        -- Plugin for lean
+        "julian/lean.nvim",
+        -- Treesitter
+        { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
+        -- LSP related plugins
+        "neovim/nvim-lspconfig",
+        "nvim-lua/plenary.nvim",
+        {
+            "hrsh7th/nvim-cmp", -- For LSP completion
+            event = "InsertEnter",
+            dependencies = {
+                "hrsh7th/cmp-nvim-lsp",
+                "hrsh7th/cmp-buffer",
+                "micangl/cmp-vimtex",
+                "hrsh7th/cmp-path",
+                "hrsh7th/cmp-cmdline",
+            }
+        },
+        "SirVer/ultisnips", -- For snippets
+        -- Support programming terms
+        { "psliwka/vim-dirtytalk",           build = ":DirtytalkUpdate" },
+        -- vim-moonfly theme
+        { "bluz71/vim-moonfly-colors",       as = "moonfly" },
+        -- Rust tools
+        "simrat39/rust-tools.nvim",
+        -- Automatically add bracket pairs
+        "windwp/nvim-autopairs",
+        -- Syntax highlighting for Fish scripts
+        "khaveesh/vim-fish-syntax",
+        -- Plugin for LaTeX
+        "lervag/vimtex",
+        -- Formatter
+        "stevearc/conform.nvim",
+        "kylechui/nvim-surround",
+        "junegunn/fzf",
+        "junegunn/fzf.vim",
+    },
+    {
+        lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
+        install = { missing = true },
+    }
+)

laptop/init.lua

@@ -1,5 +1,5 @@
 -- Load the different config files
-package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/?.lua"
+package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/config/?.lua"
 
 -- Load global configs
 require("globals")

laptop/plugin/misc.lua

@@ -5,3 +5,6 @@ require("Comment").setup()
 
 -- Default settings for nvim-surround
 require("nvim-surround").setup()
+
+-- Load UltiSnips snippets from custom-snippets directory
+vim.g.UltiSnipsSnippetDirectories = { "my-snippets", "UltiSnips" }

laptop/plugins.lua

@@ -1,62 +0,0 @@
--- Automatically bootstrap lazy.nvim
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-    vim.fn.system({
-        "git",
-        "clone",
-        "--filter=blob:none",
-        "https://github.com/folke/lazy.nvim.git",
-        "--branch=stable", -- latest stable release
-        lazypath,
-    })
-end
-vim.opt.rtp:prepend(lazypath)
-
--- Load plugin via paq-nvim
-require("lazy").setup({
-    -- Use lualine for statusbar
-    "nvim-lualine/lualine.nvim",
-    "nvim-tree/nvim-web-devicons",
-    -- Auto commenting per filetype
-    "numToStr/Comment.nvim",
-    -- Give option to save files using sudo, if needed
-    "lambdalisue/suda.vim",
-    -- Auto toggle for number mode when vim isn't focused
-    "sitiom/nvim-numbertoggle",
-    -- Plugin for lean
-    "julian/lean.nvim",
-    -- Treesitter
-    { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
-    -- LSP related plugins
-    "neovim/nvim-lspconfig",
-    "nvim-lua/plenary.nvim",
-    {
-        "hrsh7th/nvim-cmp", -- For LSP completion
-        event = "InsertEnter",
-        dependencies = {
-            "hrsh7th/cmp-nvim-lsp",
-            "hrsh7th/cmp-buffer",
-            "micangl/cmp-vimtex",
-            "hrsh7th/cmp-path",
-            "hrsh7th/cmp-cmdline",
-        }
-    },
-    "SirVer/ultisnips", -- For snippets
-    -- Support programming terms
-    { "psliwka/vim-dirtytalk",           build = ":DirtytalkUpdate" },
-    -- vim-moonfly theme
-    { "bluz71/vim-moonfly-colors",       as = "moonfly" },
-    -- Rust tools
-    "simrat39/rust-tools.nvim",
-    -- Automatically add bracket pairs
-    "windwp/nvim-autopairs",
-    -- Syntax highlighting for Fish scripts
-    "khaveesh/vim-fish-syntax",
-    -- Plugin for LaTeX
-    "lervag/vimtex",
-    -- Formatter
-    "stevearc/conform.nvim",
-    "kylechui/nvim-surround",
-    "junegunn/fzf",
-    "junegunn/fzf.vim",
-})

server/config/plugins.lua

@@ -13,7 +13,8 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 -- Load plugins via lazy.nvim
-require("lazy").setup({
+require("lazy").setup(
+    {
     -- Use lualine for statusbar
     "nvim-lualine/lualine.nvim",
     "nvim-tree/nvim-web-devicons",
@@ -50,5 +51,10 @@ require("lazy").setup({
     "kylechui/nvim-surround",
     "junegunn/fzf",
     "junegunn/fzf.vim",
-})
+    },
+    {
+        lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
+        install = { missing = true },
+    }
+)
 

server/init.lua

@@ -1,5 +1,5 @@
 -- Load the different config files
-package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/?.lua"
+package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/config/?.lua"
 
 -- Load global configs
 require("globals")

vps/config/plugins.lua

@@ -13,7 +13,8 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 -- Load plugins via lazy.nvim
-require("lazy").setup({
+require("lazy").setup(
+    {
     -- Use lualine for statusbar
     "nvim-lualine/lualine.nvim",
     "nvim-tree/nvim-web-devicons",
@@ -50,5 +51,10 @@ require("lazy").setup({
     "kylechui/nvim-surround",
     "junegunn/fzf",
     "junegunn/fzf.vim",
-})
+    },
+    {
+        lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
+        install = { missing = true },
+    }
+)
 

vps/init.lua

@@ -1,5 +1,5 @@
 -- Load the different config files
-package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/?.lua"
+package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/config/?.lua"
 
 -- Load global configs
 require("globals")