Mercurial > hg > mhoward > dotfiles / changeset

--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,4 +1,4 @@
 require("config.options")
-require("config.lazy")
+require("lazy-bootstrap")
 require("config.maps")
 require("config.lsp")

--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -2,11 +2,12 @@
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "fidget.nvim": { "branch": "main", "commit": "9dc6d15fdb877b2fb09ea0ba2dfde9beccb5965a" },
   "indent-blankline.nvim": { "branch": "master", "commit": "8299fe7703dfff4b1752aeed271c3b95281a952d" },
   "jellybeans.vim": { "branch": "master", "commit": "ef83bf4dc8b3eacffc97bf5c96ab2581b415c9fa" },
-  "lazy.nvim": { "branch": "main", "commit": "4917222c7e5c924bf7471b72a5e2d3e661530b40" },
+  "lazy.nvim": { "branch": "main", "commit": "c778b7aa04c484e1536ba219e71f2fd0f05302aa" },
   "lualine.nvim": { "branch": "master", "commit": "0050b308552e45f7128f399886c86afefc3eb988" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "d2d55255a0295ba0a75ef2dd5535e4c89c46e773" },
   "mason.nvim": { "branch": "main", "commit": "47e9f6bc4c5bb3d6453949f07b8280c725ef7490" },

deleted file mode 100644
--- a/.config/nvim/lua/config/lazy.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-require("lazy-bootstrap").setup({
-  spec = {
-    { "nanotech/jellybeans.vim",
-      priority = 1000,
-      config = function() vim.cmd.colorscheme("jellybeans") end },
-    { import = "plugins" }
-  },
-  change_detection = { enabled = false },
-  performance = {
-    rtp = {
-      disabled_plugins = {
-        "gzip",
-        "tarPlugin",
-        "tohtml",
-        "zipPlugin",
-        "tutor",
-      },
-    },
-  },
-})
-

--- a/.config/nvim/lua/config/options.lua
+++ b/.config/nvim/lua/config/options.lua
@@ -39,6 +39,7 @@ o.undofile = true
 o.wildignorecase = true
 
 -- Paths
+o.backupdir:remove(".")
 o.tags:append({".tags", "./.tags;"})
 o.wildignore = "*~,*.o,*.pyc,.git/*,hg/*,.svn/*"
 

--- a/.config/nvim/lua/lazy-bootstrap.lua
+++ b/.config/nvim/lua/lazy-bootstrap.lua
@@ -4,4 +4,23 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
 
-return require("lazy")
+require("lazy").setup({
+  spec = {
+    { "nanotech/jellybeans.vim",
+      priority = 1000,
+      config = function() vim.cmd.colorscheme("jellybeans") end },
+    { import = "plugins" }
+  },
+  change_detection = { enabled = false },
+  performance = {
+    rtp = {
+      disabled_plugins = {
+        "gzip",
+        "tarPlugin",
+        "tohtml",
+        "zipPlugin",
+        "tutor",
+      },
+    },
+  },
+})

--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -6,6 +6,7 @@ return {
   {
     "williamboman/mason-lspconfig.nvim",
     config = function(plugin, opts)
+      require("mason-lspconfig").setup()
       require("mason-lspconfig").setup_handlers({
         function(server)
           require("lspconfig")[server].setup({})
@@ -22,6 +23,7 @@ return {
       "hrsh7th/cmp-path",
       "hrsh7th/cmp-nvim-lsp",
       "hrsh7th/cmp-nvim-lsp-signature-help",
+      "hrsh7th/cmp-nvim-lua",
     },
     opts = function()
       local cmp = require("cmp")
@@ -42,6 +44,7 @@ return {
         sources = cmp.config.sources({
           { name = "nvim_lsp" },
           { name = "nvim_lsp_signature_help" },
+          { name = "nvim_lua" },
           { name = "buffer" },
           { name = "path" },
         }),