stuff

vim/.vim/lua/plugins.lua

@@ -11,6 +11,7 @@ if not vim.loop.fs_stat(lazypath) then
     })
 end
 vim.opt.rtp:prepend(lazypath)
+vim.opt.rtp:prepend("$HOME/.vim/lua")
 
 -- Example using a list of specs with the default options
 vim.g.mapleader = "," -- Make sure to set `mapleader` before lazy so your mappings are correct
@@ -66,6 +67,7 @@ require("lazy").setup({
 
     -- Completion and linting
     'neovim/nvim-lspconfig',
+
     {
         'hrsh7th/nvim-cmp',
         dependencies = {
@@ -82,24 +84,25 @@ require("lazy").setup({
             'hrsh7th/cmp-vsnip',
             'ray-x/cmp-treesitter',
         },
+        event = 'InsertEnter',
         config = function() require("config.lsp") end,
     },
+
     {
-        "tzachar/cmp-tabnine", run = "./install.sh",
+        "tzachar/cmp-tabnine", build = "./install.sh",
         event = 'InsertEnter',
         cond = not use_google(),
     },
+
     { 'ErichDonGubler/lsp_lines.nvim', config = function()  require("lsp_lines").setup()  end },
-    {
-        "williamboman/mason.nvim",
-        "williamboman/mason-lspconfig.nvim",
-        'VonHeikemen/lsp-zero.nvim',
-    },
     {
         'jose-elias-alvarez/null-ls.nvim',
         config = function()  require("config.null-ls")  end,
     },
 
+    "williamboman/mason.nvim",
+    "williamboman/mason-lspconfig.nvim",
+    'VonHeikemen/lsp-zero.nvim',
     {
         'nvim-telescope/telescope.nvim',
         cmd = 'Telescope',
@@ -199,10 +202,11 @@ require("lazy").setup({
     {
         'saecki/crates.nvim',
         ft = 'rust',
-        tag = 'v0.3.0',
+        version = 'v0.3.0',
         dependencies = { 'nvim-lua/plenary.nvim' },
         config = function()  require('crates').setup() end
     },
+
     {'simrat39/rust-tools.nvim', ft = 'rust'},
 
     {
@@ -218,16 +222,16 @@ require("lazy").setup({
         },
         config = function()  require("config.refactoring") end
     },
-    'apalmer1377/factorus',
 
+    'apalmer1377/factorus',
     'hrsh7th/vim-vsnip',
     'kosayoda/nvim-lightbulb',
-    {'andymass/vim-matchup', event = 'VimEnter'},
-
     'jghauser/mkdir.nvim',
+    'nvim-lua/lsp-status.nvim',
+
+    {'andymass/vim-matchup', event = 'VimEnter'},
     { 'simrat39/symbols-outline.nvim', config = function()  require("config.symbols-outline") end  },
     { 'petertriho/nvim-scrollbar', config = function()  require("scrollbar").setup() end },
-
     {
         'rmagatti/auto-session',
         lazy = false,
@@ -239,7 +243,6 @@ require("lazy").setup({
         end
     },
 
-
     {
         "ipod825/libp.nvim",
         config = function()
@@ -247,7 +250,7 @@ require("lazy").setup({
         end,
     },
 
-    'nvim-lua/lsp-status.nvim',
+
     {
         'nvim-lualine/lualine.nvim',
         lazy = false,
@@ -267,16 +270,15 @@ require("lazy").setup({
         },
         {
             'akinsho/git-conflict.nvim',
-            tag = '*',
             config = function() require('git-conflict').setup()  end,
         },
         { 'rhysd/conflict-marker.vim' }
     },
 
     -- { "catppuccin/nvim", as = "catppuccin" }
-    { "catppuccin/nvim", as = "catppuccin", lazy=false, config = function()  require("config.catppuccin")  end},
+    { "catppuccin/nvim", name = "catppuccin", lazy=false, config = function()  require("config.catppuccin")  end},
+
     -- Tmux
-    {
     'preservim/vimux',
     'tmux-plugins/vim-tmux',
     'christoomey/vim-tmux-navigator',
@@ -284,7 +286,7 @@ require("lazy").setup({
     'tmux-plugins/vim-tmux-focus-events',
     'jabirali/vim-tmux-yank',
     'skywind3000/asyncrun.vim',
-    },
+
     {
         'ojroques/nvim-osc52',
         config = function()  require("config.oscyank") end
@@ -302,7 +304,7 @@ require("lazy").setup({
 
     'ntpeters/vim-better-whitespace',
     'junegunn/fzf.vim',
-    { 'junegunn/fzf', run = ":call fzf#install()" },
+    { 'junegunn/fzf', build = ":call fzf#install()" },
 
     'nathanaelkane/vim-indent-guides',
     'tversteeg/registers.nvim',
@@ -325,8 +327,8 @@ require("lazy").setup({
     },
     {
         "iamcco/markdown-preview.nvim",
-        run = "cd app && npm install",
+        build = "cd app && npm install",
-        setup = function() vim.g.mkdp_filetypes = { "markdown" } end,
+        init = function() vim.g.mkdp_filetypes = { "markdown" } end,
         ft = { "markdown" }
     },
 
@@ -383,16 +385,16 @@ require("lazy").setup({
     },
 },
 {
-  defaults = {
+defaults = {
-    lazy = true, -- should plugins be lazy-loaded?
+    --  lazy = true, -- should plugins be lazy-loaded?
 }})
 
--- CiderLSP
+    -- CiderLSP
-vim.opt.completeopt = { "menu", "menuone", "noselect" }
+    vim.opt.completeopt = { "menu", "menuone", "noselect" }
--- Don't show the dumb matching stuff
+    -- Don't show the dumb matching stuff
-vim.opt.shortmess:append("c")
+    vim.opt.shortmess:append("c")
 
-vim.opt.spell = true
+    vim.opt.spell = true
-vim.opt.spelllang = { 'en_us' }
+    vim.opt.spelllang = { 'en_us' }
 
-require("config.imp")
+    require("config.imp")

vim/.vimrc

@@ -5,6 +5,7 @@ filetype off                  " required
 set rtp+=~/.vim
 set rtp+=~/.vim/after
 set rtp+=~/.config/nvim/after/
+set rtp+=~/.vim/lua/
 
 set directory=/tmp
 set undodir=/tmp