vim: make augroup util a global

3 files changed, 9 insertions, 10 deletions

diff --git a/.vim/lua/utils.lua b/.vim/lua/globals.lua
index b0edacd..634bc87 100644
--- a/.vim/lua/utils.lua
+++ b/.vim/lua/globals.lua
@@ -1,8 +1,5 @@
--- utils.lua
 
-local M = {}
-
-M.augroup2 = function(tbl)
+_G.augroup = function(tbl)
   for name, autocmds in pairs(tbl) do
     vim.cmd('augroup ' .. name)
     vim.cmd('autocmd!')
@@ -12,5 +9,3 @@ M.augroup2 = function(tbl)
     vim.cmd('augroup END')
   end
 end
-
-return M
diff --git a/.vim/lua/lsp.lua b/.vim/lua/lsp.lua
index 0e5f736..059579a 100644
--- a/.vim/lua/lsp.lua
+++ b/.vim/lua/lsp.lua
@@ -25,7 +25,7 @@ local my_attach = function(client, bufnr)
   -- nnoremap <silent> ;s <cmd> lua vim.lsp.buf.signature_help()<CR>
   nnoremap { '<leader>d' , vim.lsp.diagnostic.show_line_diagnostics }
 
-  require('utils').augroup2 {
+  augroup {
     lsp_user = {
       {'BufWritePre' , '*'    ,  'lua vim.lsp.buf.formatting_seq_sync(nil, 1000)'},
       {'BufWritePre' , '*.go' ,  'lua vim.lsp.buf.code_action({ only = {"source.organizeImports"} })'},
diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index 9560d98..6f7be9b 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -117,7 +117,7 @@ return require('packer').startup({function()
 
       vim.fn.sign_define('LightBulbSign', {text="⚐", texthl="LightBulbVirtualText"})
 
-      require('utils').augroup2 {
+      augroup {
         lightbulb = {
           {'CursorHold', '*', "lua require('nvim-lightbulb').update_lightbulb()"}
         }
@@ -167,6 +167,10 @@ return require('packer').startup({function()
           },
         },
       }
+
+      augroup {
+        treesitter = {{ 'FileType', '*', [[ set foldmethod=expr foldexpr=nvim_treesitter#foldexpr() ]] }}
+      }
     end} -- }}}
 
   use {'hrsh7th/nvim-compe', -- {{{
@@ -309,7 +313,7 @@ return require('packer').startup({function()
 
   use {'editorconfig/editorconfig-vim', -- {{{
     config = function()
-      require('utils').augroup2 {
+      augroup {
         editorconfig = {
           { 'FileType', 'gitcommit', 'let b:EditorConfig_disable = 1' },
         }
@@ -491,7 +495,7 @@ return require('packer').startup({function()
 
   use {'mhinz/vim-startify', -- {{{
     config = function()
-      require('utils').augroup2 {
+      augroup {
         startify = {{ 'FileType', 'startify', [[ IndentBlanklineDisable ]] }}
       }
     end} -- }}}