Merge branch 'ChristianChiarulli:master' into master

1 files changed, 32 insertions, 11 deletions

diff --git a/lua/plugins.lua b/lua/plugins.lua
index b14cac46..2b215291 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -32,7 +32,7 @@ return require("packer").startup(function(use)
 
   -- TODO refactor all of this (for now it works, but yes I know it could be wrapped in a simpler function)
   use { "neovim/nvim-lspconfig" }
-  use { "kabouzeid/nvim-lspinstall", cmd = "LspInstall" }
+  use { "kabouzeid/nvim-lspinstall" }
   -- Telescope
   use { "nvim-lua/popup.nvim" }
   use { "nvim-lua/plenary.nvim" }
@@ -66,6 +66,9 @@ return require("packer").startup(function(use)
   -- Treesitter
   use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }
 
+  -- Neoformat
+  use { "sbdchd/neoformat", event = "BufEnter" }
+
   use {
     "kyazdani42/nvim-tree.lua",
     -- cmd = "NvimTreeToggle",
@@ -115,13 +118,21 @@ return require("packer").startup(function(use)
   use { "glepnir/galaxyline.nvim" }
 
   use {
-    "akinsho/nvim-bufferline.lua",
+    "romgrk/barbar.nvim",
     config = function()
-      require("lv-bufferline").config()
+      vim.api.nvim_set_keymap("n", "<TAB>", ":BufferNext<CR>", { noremap = true, silent = true })
+      vim.api.nvim_set_keymap("n", "<S-TAB>", ":BufferPrevious<CR>", { noremap = true, silent = true })
+      vim.api.nvim_set_keymap("n", "<S-x>", ":BufferClose<CR>", { noremap = true, silent = true })
     end,
-    event = "BufRead",
+    -- event = "BufRead",
   }
 
+  -- use {
+  --     "akinsho/nvim-bufferline.lua",
+  --     config = function() require("lv-bufferline").config() end,
+  --     event = "BufRead"
+  -- }
+
   -- Extras, these do not load by default
 
   -- Better motions
@@ -221,7 +232,11 @@ return require("packer").startup(function(use)
       vim.g.indentLine_enabled = 1
       vim.g.indent_blankline_char = "▏"
 
-      vim.g.indent_blankline_filetype_exclude = { "help", "terminal", "dashboard" }
+      vim.g.indent_blankline_filetype_exclude = {
+        "help",
+        "terminal",
+        "dashboard",
+      }
       vim.g.indent_blankline_buftype_exclude = { "terminal" }
 
       vim.g.indent_blankline_show_trailing_blankline_indent = false
@@ -253,9 +268,14 @@ return require("packer").startup(function(use)
   use {
     "mfussenegger/nvim-dap",
     config = function()
-        require('dap')
-        vim.fn.sign_define('DapBreakpoint', {text='', texthl='LspDiagnosticsSignError', linehl='', numhl=''})
-        require('dap').defaults.fallback.terminal_win_cmd = '50vsplit new'
+      require "dap"
+      vim.fn.sign_define("DapBreakpoint", {
+        text = "",
+        texthl = "LspDiagnosticsSignError",
+        linehl = "",
+        numhl = "",
+      })
+      require("dap").defaults.fallback.terminal_win_cmd = "50vsplit new"
     end,
     disable = not O.plugin.debug.active,
   }
@@ -435,7 +455,7 @@ return require("packer").startup(function(use)
       "typescript",
       "typescriptreact",
       "typescript.tsx",
-    }
+    },
   }
   -- use {
   --   "jose-elias-alvarez/null-ls.nvim",
@@ -459,6 +479,7 @@ return require("packer").startup(function(use)
     requires = "hrsh7th/nvim-compe",
     disable = not O.plugin.tabnine.active,
   }
-  for _, plugin in pairs(O.custom_plugins) do packer.use(plugin) end
-
+  for _, plugin in pairs(O.custom_plugins) do
+    packer.use(plugin)
+  end
 end)