diff options
| -rw-r--r-- | config/nvim/init.lua | 28 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 8 |
2 files changed, 33 insertions, 3 deletions
diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 4e050a9..faa3cf4 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -69,7 +69,11 @@ vim.api.nvim_create_autocmd( -- set filttype for *.sql.j2 files vim.api.nvim_create_autocmd( "BufReadPre", - { pattern = "*.sql.j2", command = "set ft=sql", group = augroup } + { + pattern = "*.sql.j2", + callback = function() vim.opt.filetype = "sql" end, + group = augroup, + } ) -- -- Format go files on save @@ -80,11 +84,29 @@ vim.api.nvim_create_autocmd( vim.api.nvim_create_autocmd( "FileType", - { pattern = "haskell", command = [[ set formatprg=stylish-haskell ]], group = augroup } + { + pattern = "haskell", + callback = function() vim.opt_local.formatprg = "stylish-haskell" end, + group = augroup, + } ) + vim.api.nvim_create_autocmd( "FileType", - { pattern = "lisp,html,css,htmldjango", command = [[ setlocal shiftwidth=2 ]], group = augroup } + { + pattern = "lisp,html,css,htmldjango", + callback = function() vim.opt_local.shiftwidth = 2 end, + group = augroup, + } +) + +vim.api.nvim_create_autocmd( + "FileType", + { + pattern = "go", + callback = function() vim.opt_local.expandtab = false end, + group = augroup, + } ) require("mappings") diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index a4b4f0c..e4578c2 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -13,6 +13,14 @@ return require("packer").startup(function() "FooSoft/vim-argwrap", config = function() vim.g.argwrap_tail_comma = 1 + vim.api.nvim_create_autocmd( + "Filetype", + { + pattern = "go,lua", + callback = function() vim.g.argwrap_padded_braces = "{" end, + group = augroup, + } + ) end } |