New contract (#1080)

Changes to the global config object

O is now lvim
user_plugins is now plugins
user_autocommands is now autocommands
No more lang specific plugins

Null-ls has replaced both formatter.nvim and nvim-lint

1 files changed, 39 insertions, 131 deletions

diff --git a/lua/plugins.lua b/lua/plugins.lua
index 26b75431..7d2356d5 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -1,17 +1,17 @@
 return {
   -- Packer can manage itself as an optional plugin
   { "wbthomason/packer.nvim" },
-
-  -- TODO: refactor all of this (for now it works, but yes I know it could be wrapped in a simpler function)
   { "neovim/nvim-lspconfig" },
+  { "tamago324/nlsp-settings.nvim" },
+  { "jose-elias-alvarez/null-ls.nvim" },
   {
     "kabouzeid/nvim-lspinstall",
     event = "VimEnter",
     config = function()
       local lspinstall = require "lspinstall"
       lspinstall.setup()
-      if O.plugin.lspinstall.on_config_done then
-        O.plugin.lspinstall.on_config_done(lspinstall)
+      if lvim.builtin.lspinstall.on_config_done then
+        lvim.builtin.lspinstall.on_config_done(lspinstall)
       end
     end,
   },
@@ -25,8 +25,8 @@ return {
     "nvim-telescope/telescope.nvim",
     config = function()
       require("core.telescope").setup()
-      if O.plugin.telescope.on_config_done then
-        O.plugin.telescope.on_config_done(require "telescope")
+      if lvim.builtin.telescope.on_config_done then
+        lvim.builtin.telescope.on_config_done(require "telescope")
       end
     end,
   },
@@ -37,8 +37,8 @@ return {
     -- event = "InsertEnter",
     config = function()
       require("core.compe").setup()
-      if O.plugin.compe.on_config_done then
-        O.plugin.compe.on_config_done(require "compe")
+      if lvim.builtin.compe.on_config_done then
+        lvim.builtin.compe.on_config_done(require "compe")
       end
     end,
   },
@@ -49,8 +49,8 @@ return {
     -- event = "InsertEnter",
     config = function()
       require "core.autopairs"
-      if O.plugin.autopairs.on_config_done then
-        O.plugin.autopairs.on_config_done(require "nvim-autopairs")
+      if lvim.builtin.autopairs.on_config_done then
+        lvim.builtin.autopairs.on_config_done(require "nvim-autopairs")
       end
     end,
   },
@@ -65,30 +65,8 @@ return {
     "nvim-treesitter/nvim-treesitter",
     config = function()
       require("core.treesitter").setup()
-      if O.plugin.treesitter.on_config_done then
-        O.plugin.treesitter.on_config_done(require "nvim-treesitter.configs")
-      end
-    end,
-  },
-
-  -- Formatter.nvim
-  {
-    "mhartington/formatter.nvim",
-    config = function()
-      require "core.formatter"
-      if O.plugin.formatter.on_config_done then
-        O.plugin.formatter.on_config_done(require "formatter")
-      end
-    end,
-  },
-
-  -- Linter
-  {
-    "mfussenegger/nvim-lint",
-    config = function()
-      require("core.linter").setup()
-      if O.plugin.lint.on_config_done then
-        O.plugin.lint.on_config_done(require "lint")
+      if lvim.builtin.treesitter.on_config_done then
+        lvim.builtin.treesitter.on_config_done(require "nvim-treesitter.configs")
       end
     end,
   },
@@ -101,8 +79,8 @@ return {
     -- commit = "fd7f60e242205ea9efc9649101c81a07d5f458bb",
     config = function()
       require("core.nvimtree").setup()
-      if O.plugin.nvimtree.on_config_done then
-        O.plugin.nvimtree.on_config_done(require "nvim-tree.config")
+      if lvim.builtin.nvimtree.on_config_done then
+        lvim.builtin.nvimtree.on_config_done(require "nvim-tree.config")
       end
     end,
   },
@@ -112,20 +90,20 @@ return {
 
     config = function()
       require("core.gitsigns").setup()
-      if O.plugin.gitsigns.on_config_done then
-        O.plugin.gitsigns.on_config_done(require "gitsigns")
+      if lvim.builtin.gitsigns.on_config_done then
+        lvim.builtin.gitsigns.on_config_done(require "gitsigns")
       end
     end,
     event = "BufRead",
   },
 
-  -- whichkey
+  -- Whichkey
   {
     "folke/which-key.nvim",
     config = function()
       require("core.which-key").setup()
-      if O.plugin.which_key.on_config_done then
-        O.plugin.which_key.on_config_done(require "which-key")
+      if lvim.builtin.which_key.on_config_done then
+        lvim.builtin.which_key.on_config_done(require "which-key")
       end
     end,
     event = "BufWinEnter",
@@ -141,8 +119,8 @@ return {
         return
       end
       nvim_comment.setup()
-      if O.plugin.comment.on_config_done then
-        O.plugin.comment.on_config_done(nvim_comment)
+      if lvim.builtin.comment.on_config_done then
+        lvim.builtin.comment.on_config_done(nvim_comment)
       end
     end,
   },
@@ -152,8 +130,8 @@ return {
     "airblade/vim-rooter",
     config = function()
       vim.g.rooter_silent_chdir = 1
-      if O.plugin.rooter.on_config_done then
-        O.plugin.rooter.on_config_done()
+      if lvim.builtin.rooter.on_config_done then
+        lvim.builtin.rooter.on_config_done()
       end
     end,
   },
@@ -166,20 +144,20 @@ return {
     "glepnir/galaxyline.nvim",
     config = function()
       require "core.galaxyline"
-      if O.plugin.galaxyline.on_config_done then
-        O.plugin.galaxyline.on_config_done(require "galaxyline")
+      if lvim.builtin.galaxyline.on_config_done then
+        lvim.builtin.galaxyline.on_config_done(require "galaxyline")
       end
     end,
     event = "BufWinEnter",
-    disable = not O.plugin.galaxyline.active,
+    disable = not lvim.builtin.galaxyline.active,
   },
 
   {
     "romgrk/barbar.nvim",
     config = function()
       require "core.bufferline"
-      if O.plugin.bufferline.on_config_done then
-        O.plugin.bufferline.on_config_done()
+      if lvim.builtin.bufferline.on_config_done then
+        lvim.builtin.bufferline.on_config_done()
       end
     end,
     event = "BufWinEnter",
@@ -191,11 +169,11 @@ return {
     -- event = "BufWinEnter",
     config = function()
       require("core.dap").setup()
-      if O.plugin.dap.on_config_done then
-        O.plugin.dap.on_config_done(require "dap")
+      if lvim.builtin.dap.on_config_done then
+        lvim.builtin.dap.on_config_done(require "dap")
       end
     end,
-    disable = not O.plugin.dap.active,
+    disable = not lvim.builtin.dap.active,
   },
 
   -- Debugger management
@@ -203,102 +181,32 @@ return {
     "Pocco81/DAPInstall.nvim",
     -- event = "BufWinEnter",
     -- event = "BufRead",
-    disable = not O.plugin.dap.active,
+    disable = not lvim.builtin.dap.active,
   },
 
-  -- Builtins, these do not load by default
-
   -- Dashboard
   {
     "ChristianChiarulli/dashboard-nvim",
     event = "BufWinEnter",
     config = function()
       require("core.dashboard").setup()
-      if O.plugin.dashboard.on_config_done then
-        O.plugin.dashboard.on_config_done(require "dashboard")
+      if lvim.builtin.dashboard.on_config_done then
+        lvim.builtin.dashboard.on_config_done(require "dashboard")
       end
     end,
-    disable = not O.plugin.dashboard.active,
+    disable = not lvim.builtin.dashboard.active,
   },
 
-  -- TODO: remove in favor of akinsho/nvim-toggleterm.lua
-  -- Floating terminal
-  -- {
-  --   "numToStr/FTerm.nvim",
-  --   event = "BufWinEnter",
-  --   config = function()
-  --     require("core.floatterm").setup()
-  --   end,
-  --   disable = not O.plugin.floatterm.active,
-  -- },
-
+  -- Terminal
   {
     "akinsho/nvim-toggleterm.lua",
     event = "BufWinEnter",
     config = function()
       require("core.terminal").setup()
-      if O.plugin.terminal.on_config_done then
-        O.plugin.terminal.on_config_done(require "toggleterm")
+      if lvim.builtin.terminal.on_config_done then
+        lvim.builtin.terminal.on_config_done(require "toggleterm")
       end
     end,
-    disable = not O.plugin.terminal.active,
-  },
-
-  -- Zen Mode
-  {
-    "folke/zen-mode.nvim",
-    cmd = "ZenMode",
-    event = "BufRead",
-    config = function()
-      require("core.zen").setup()
-      if O.plugin.zen.on_config_done then
-        O.plugin.zen.on_config_done(require "zen-mode")
-      end
-    end,
-    disable = not O.plugin.zen.active,
-  },
-
-  ---------------------------------------------------------------------------------
-
-  -- LANGUAGE SPECIFIC GOES HERE
-  {
-    "lervag/vimtex",
-    ft = "tex",
-  },
-
-  -- Rust tools
-  -- TODO: use lazy loading maybe?
-  {
-    "simrat39/rust-tools.nvim",
-    disable = not O.lang.rust.rust_tools.active,
-  },
-
-  -- Elixir
-  { "elixir-editors/vim-elixir", ft = { "elixir", "eelixir", "euphoria3" } },
-
-  -- Javascript / Typescript
-  {
-    "jose-elias-alvarez/nvim-lsp-ts-utils",
-    ft = {
-      "javascript",
-      "javascriptreact",
-      "javascript.jsx",
-      "typescript",
-      "typescriptreact",
-      "typescript.tsx",
-    },
-  },
-
-  -- Java
-  {
-    "mfussenegger/nvim-jdtls",
-    -- ft = { "java" },
-    disable = not O.lang.java.java_tools.active,
-  },
-
-  -- Scala
-  {
-    "scalameta/nvim-metals",
-    disable = not O.lang.scala.metals.active,
+    disable = not lvim.builtin.terminal.active,
   },
 }