vim: make augroup util a global

4 files changed, 11 insertions, 13 deletions

diff --git a/.vim/init.lua b/.vim/init.lua
index 2f364de..5dc645c 100644
--- a/.vim/init.lua
+++ b/.vim/init.lua
@@ -6,6 +6,7 @@ g.maplocalleader = '\\'
 
 require('plugins')
 require('hardmode')
+require('globals')
 
 -- OPTIONS -- {{{
 local opt = vim.opt
@@ -83,10 +84,8 @@ nnoremap { 'gGf', function() require('misc').file_under_cursor(function(s) requi
 nnoremap { 'gs',  function() require('misc').word_under_cursor(function(s) vim.fn.feedkeys(':%s/' .. s .. '//g'); cmd [[ call feedkeys("\<left>\<left>") ]] end) end }
 -- }}}
 
-local u = require('utils')
-
 -- AUTO GROUPS -- {{{
-u.augroup2 {
+augroup {
   yank_highlight = {{'TextYankPost', '*', [[ silent! lua require("vim.highlight").on_yank() ]]}},
   obvious_active_win = {
     {'WinEnter', '*', 'set cul'},
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} -- }}}