laptop/init.lua

@@ -4,7 +4,7 @@ package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/?.lua"
 -- Load global configs
 require("globals")
 -- Load plugins using paq-nvim
-require("plugins")
+require("paq")
 -- Load keymaps
 require("keymaps")
 

laptop/paq.lua

@@ -44,7 +44,7 @@ bootstrap_paq {
     "hrsh7th/cmp-omni",        -- For LaTeX completion
     "hrsh7th/cmp-path",
     "hrsh7th/cmp-cmdline",
-    "SirVer/UltiSnips",         -- For snippets
+    "SirVer/ultisnips",        -- For snippets
     -- Support programming terms
     { "psliwka/vim-dirtytalk", build = ':let &rtp = &rtp | DirtytalkUpdate' },
     -- vim-moonfly theme
@@ -62,4 +62,3 @@ bootstrap_paq {
     "junegunn/fzf.vim",
     "kylechui/nvim-surround",
 }
-

server/init.lua

@@ -4,7 +4,7 @@ package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/?.lua"
 -- Load global configs
 require("globals")
 -- Load plugins using paq-nvim
-require("plugins")
+require("paq")
 -- Load keymaps
 require("keymaps")
 

vps/globals.lua

@@ -27,3 +27,11 @@ vim.g.loaded_perl_provider = 0
 vim.g.loaded_node_provider = 0
 vim.g.loaded_ruby_provider = 0
 
+-- Load keymaps
+local keymaps = vim.fn.stdpath("config") .. "/keymaps.lua"
+vim.cmd.source(keymaps)
+
+-- Load plugins using paq-nvim
+local paq = vim.fn.stdpath("config") .. "/paq.lua"
+vim.cmd.source(paq)
+

vps/init.lua

@@ -4,7 +4,7 @@ package.path = package.path .. ';' .. vim.fn.stdpath("config") .. "/?.lua"
 -- Load global configs
 require("globals")
 -- Load plugins using paq-nvim
-require("plugins")
+require("paq")
 -- Load keymaps
 require("keymaps")
 

vps/paq.lua

@@ -33,6 +33,16 @@ bootstrap_paq {
     "lambdalisue/suda.vim",
     -- Auto toggle for number mode when vim isn't focused
     "sitiom/nvim-numbertoggle",
+    -- LSP related plugins
+    "neovim/nvim-lspconfig",
+    "nvim-lua/plenary.nvim",
+    "hrsh7th/nvim-cmp",        -- For LSP completion
+    "hrsh7th/cmp-nvim-lsp",
+    "hrsh7th/cmp-buffer",
+    "hrsh7th/cmp-vsnip",       -- For snippets
+    "hrsh7th/vim-vsnip",       -- For snippets
+    "hrsh7th/cmp-path",
+    "hrsh7th/cmp-cmdline",
     -- Support programming terms
     { "psliwka/vim-dirtytalk", build = ':let &rtp = &rtp | DirtytalkUpdate' },
     -- vim-moonfly theme