Switch to using Neovim native package manager

9 files changed, 39 insertions, 47 deletions

diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 713ec00..6a81db3 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -1,5 +1,4 @@
 require('config.globals')
 require('config.options')
-require("config.lazy")
 require('config.keymaps')
-require('config.colorscheme')
+require('plugins')
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
deleted file mode 100644
index fed3a3d..0000000
--- a/nvim/.config/nvim/lazy-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
-  "nvim-treesitter": { "branch": "main", "commit": "45a07f869b0cffba342276f2c77ba7c116d35db8" },
-  "vim-obsession": { "branch": "master", "commit": "ed9dfc7c2cc917ace8b24f4f9f80a91e05614b63" }
-}
diff --git a/nvim/.config/nvim/lua/config/colorscheme.lua b/nvim/.config/nvim/lua/config/colorscheme.lua
deleted file mode 100644
index 0adddf3..0000000
--- a/nvim/.config/nvim/lua/config/colorscheme.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.cmd[[colorscheme nord]]
diff --git a/nvim/.config/nvim/lua/config/lazy.lua b/nvim/.config/nvim/lua/config/lazy.lua
deleted file mode 100644
index 4a07a57..0000000
--- a/nvim/.config/nvim/lua/config/lazy.lua
+++ /dev/null
@@ -1,26 +0,0 @@
--- Bootstrap lazy.nvim
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-  if vim.v.shell_error ~= 0 then
-    vim.api.nvim_echo({
-      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      { out, "WarningMsg" },
-      { "\nPress any key to exit..." },
-    }, true, {})
-    vim.fn.getchar()
-    os.exit(1)
-  end
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("lazy").setup({
-  spec = {
-    { import = "plugins" },
-  },
-  -- colorscheme that will be used when installing plugins.
-  install = { colorscheme = { "nord" } },
-  -- automatically check for plugin updates.
-  checker = { enabled = true },
-})
diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua
new file mode 100644
index 0000000..16d4787
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/init.lua
@@ -0,0 +1,3 @@
+require('plugins.nord')
+require('plugins.vim-obsession')
+require('plugins.nvim-treesitter')
diff --git a/nvim/.config/nvim/lua/plugins/nord.lua b/nvim/.config/nvim/lua/plugins/nord.lua
index d189415..046d8ad 100644
--- a/nvim/.config/nvim/lua/plugins/nord.lua
+++ b/nvim/.config/nvim/lua/plugins/nord.lua
@@ -1,3 +1,3 @@
-return {
-  'shaunsingh/nord.nvim'
-}
+vim.pack.add({'https://github.com/shaunsingh/nord.nvim'})
+
+vim.cmd[[colorscheme nord]]
diff --git a/nvim/.config/nvim/lua/plugins/nvim-treesitter.lua b/nvim/.config/nvim/lua/plugins/nvim-treesitter.lua
index 457a542..6b1d60c 100644
--- a/nvim/.config/nvim/lua/plugins/nvim-treesitter.lua
+++ b/nvim/.config/nvim/lua/plugins/nvim-treesitter.lua
@@ -1,5 +1,15 @@
-return {
-  'nvim-treesitter/nvim-treesitter',
-  lazy = false,
-  build = ':TSUpdate'
-}
+vim.pack.add({'https://github.com/nvim-treesitter/nvim-treesitter'})
+
+require('nvim-treesitter').install({
+  'bash',
+  'git_config',
+  'git_rebase',
+  'gitattributes',
+  'gitcommit',
+  'gitignore',
+  'json',
+  'lua',
+  'markdown',
+  'markdown_inline',
+  'php',
+})
diff --git a/nvim/.config/nvim/lua/plugins/vim-obsession.lua b/nvim/.config/nvim/lua/plugins/vim-obsession.lua
index fed1d81..7621449 100644
--- a/nvim/.config/nvim/lua/plugins/vim-obsession.lua
+++ b/nvim/.config/nvim/lua/plugins/vim-obsession.lua
@@ -1,4 +1 @@
-return {
-  'tpope/vim-obsession',
-  lazy = false,
-}
+vim.pack.add({'https://github.com/tpope/vim-obsession'})
diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json
new file mode 100644
index 0000000..ace4518
--- /dev/null
+++ b/nvim/.config/nvim/nvim-pack-lock.json
@@ -0,0 +1,16 @@
+{
+  "plugins": {
+    "nord.nvim": {
+      "rev": "80c1e5321505aeb22b7a9f23eb82f1e193c12470",
+      "src": "https://github.com/shaunsingh/nord.nvim.git"
+    },
+    "nvim-treesitter": {
+      "rev": "45a07f869b0cffba342276f2c77ba7c116d35db8",
+      "src": "https://github.com/nvim-treesitter/nvim-treesitter"
+    },
+    "vim-obsession": {
+      "rev": "ed9dfc7c2cc917ace8b24f4f9f80a91e05614b63",
+      "src": "https://github.com/tpope/vim-obsession.git"
+    }
+  }
+}
\ No newline at end of file