more speed

2 files changed, 51 insertions, 20 deletions

diff --git a/lua/lsp/efm-general-ls.lua b/lua/lsp/efm-general-ls.lua
index 01bc3eed..24bdde23 100644
--- a/lua/lsp/efm-general-ls.lua
+++ b/lua/lsp/efm-general-ls.lua
@@ -29,7 +29,7 @@ end
 local lua_arguments = {}
 
 local luaFormat = {
-    formatCommand = "lua-format -i --no-keep-simple-function-one-line --column-limit=120",
+    formatCommand = "lua-format -i --no-keep-simple-function-one-line --column-limit=80",
     formatStdin = true
 }
 
diff --git a/lua/plugins.lua b/lua/plugins.lua
index d01d39f3..c51426f0 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -4,7 +4,8 @@ local fn = vim.fn
 local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
 
 if fn.empty(fn.glob(install_path)) > 0 then
-    execute("!git clone https://github.com/wbthomason/packer.nvim " .. install_path)
+    execute("!git clone https://github.com/wbthomason/packer.nvim " ..
+                install_path)
     execute "packadd packer.nvim"
 end
 
@@ -33,7 +34,8 @@ return require("packer").startup(function(use)
     use "wbthomason/packer.nvim"
 
     -- 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", opt = true}
+    use {"neovim/nvim-lspconfig", event = "BufRead", opt = true}
+    use {"glepnir/lspsaga.nvim", opt = true}
     use {"kabouzeid/nvim-lspinstall", opt = true}
     -- Telescope
     use {"nvim-lua/popup.nvim", opt = true}
@@ -46,46 +48,70 @@ return require("packer").startup(function(use)
     -- Treesitter
     use {
         "nvim-treesitter/nvim-treesitter",
-        -- event = "BufRead"
 
-         run = ":TSUpdate"
+        -- event = "BufRead",
 
+        run = ":TSUpdate"
     }
 
     -- Explorer
     -- use {"kyazdani42/nvim-tree.lua", opt = true}
 
-    use {"kyazdani42/nvim-tree.lua", opt = true, cmd = "NvimTreeToggle", config = require_plugin("nvim-tree.lua")}
+    use {"kyazdani42/nvim-tree.lua", opt = true, cmd = "NvimTreeToggle"}
 
     -- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'}
-    use {"lewis6991/gitsigns.nvim", config = require_plugin("gitsigns.nvim"), event = "BufRead", opt = true}
+    use {"lewis6991/gitsigns.nvim", event = "BufRead", opt = true}
 
-    use {"folke/which-key.nvim", config = require_plugin("which-key.nvim"), opt = true}
-    use {"windwp/nvim-autopairs", config = require_plugin("nvim-autopairs"), event = "InsertEnter", opt = true}
+    use {"folke/which-key.nvim", opt = true}
+    use {"windwp/nvim-autopairs", event = "InsertEnter", opt = true}
 
     -- Comments
-    use {"terrortylor/nvim-comment", config = require_plugin("nvim-comment"), opt = true}
+    use {
+        "terrortylor/nvim-comment",
+        config = require_plugin("nvim-comment"),
+        opt = true
+    }
 
     -- Color
-    use {"christianchiarulli/nvcode-color-schemes.vim", config = require_plugin("nvcode-color-schemes.vim"), opt = true}
+    use {
+        "christianchiarulli/nvcode-color-schemes.vim",
+        config = require_plugin("nvcode-color-schemes.vim"),
+        opt = true
+    }
 
     -- Icons
-    use {"kyazdani42/nvim-web-devicons", config = require_plugin("nvim-web-devicons"), opt = true}
+    use {
+        "kyazdani42/nvim-web-devicons",
+        config = require_plugin("nvim-web-devicons"),
+        opt = true
+    }
 
     -- Status Line and Bufferline
-    use {"glepnir/galaxyline.nvim", config = require_plugin("galaxyline.nvim"), opt = true}
-    use {"romgrk/barbar.nvim", config = require_plugin("barbar.nvim"), opt = true}
+    use {
+        "glepnir/galaxyline.nvim",
+        config = require_plugin("galaxyline.nvim"),
+        opt = true
+    }
+    use {
+        "romgrk/barbar.nvim",
+        config = require_plugin("barbar.nvim"),
+        opt = true
+    }
 
     use {"hrsh7th/vim-vsnip", config = require_plugin("vim-vsnip"), opt = true}
 
     require_plugin("nvim-lspconfig")
+    require_plugin("lspsaga.nvim")
     require_plugin("nvim-lspinstall")
     require_plugin("popup.nvim")
     require_plugin("plenary.nvim")
     require_plugin("telescope.nvim")
     require_plugin("nvim-compe")
     require_plugin("nvim-treesitter")
-
+    require_plugin("nvim-tree.lua")
+    require_plugin("gitsigns.nvim")
+    require_plugin("which-key.nvim")
+    require_plugin("nvim-autopairs")
 
     -- Extras
     if O.extras then
@@ -93,7 +119,11 @@ return require("packer").startup(function(use)
         use {'metakirby5/codi.vim', opt = true}
         require_plugin('codi.vim')
         -- Markdown preview
-        use {'iamcco/markdown-preview.nvim', run = 'cd app && npm install', opt = true}
+        use {
+            'iamcco/markdown-preview.nvim',
+            run = 'cd app && npm install',
+            opt = true
+        }
         require_plugin('markdown-preview.nvim')
         -- Floating terminal
         use {'numToStr/FTerm.nvim', opt = true}
@@ -105,7 +135,11 @@ return require("packer").startup(function(use)
         use {'nacro90/numb.nvim', opt = true}
         require_plugin('numb.nvim')
         -- HTML preview
-        use {'turbio/bracey.vim', run = 'npm install --prefix server', opt = true}
+        use {
+            'turbio/bracey.vim',
+            run = 'npm install --prefix server',
+            opt = true
+        }
         require_plugin('bracey.vim')
         -- Better motions
         use {'phaazon/hop.nvim', opt = true}
@@ -155,9 +189,6 @@ return require("packer").startup(function(use)
         use {"ahmedkhalf/lsp-rooter.nvim", opt = true} -- with this nvim-tree will follow you
         require_plugin('lsp-rooter.nvim')
 
-        use {"glepnir/lspsaga.nvim", opt = true}
-        require_plugin("lspsaga.nvim")
-
         use {"ChristianChiarulli/dashboard-nvim", opt = true}
         require_plugin("dashboard-nvim")