diff --git a/nvim/.config/nvim/lua/maps.lua b/nvim/.config/nvim/lua/maps.lua index cc8a371..7c889a0 100644 --- a/nvim/.config/nvim/lua/maps.lua +++ b/nvim/.config/nvim/lua/maps.lua @@ -184,6 +184,11 @@ map.n.nore.silent['q'] = 'gqap' map.x.nore.silent['q'] = 'gq' map.n.nore.silent['Q'] = 'vapJgqap' +-- FORMAT code with +-- PLUGIN: formatter.nvim +map.n.nore.silent['f'] = ':FormatLock' +map.n.nore.silent['F'] = ':FormatWriteLock' + -- Enter distraction free prose mode with F11 map.n.nore.silent[''] = ':ZenMode' diff --git a/nvim/.config/nvim/lua/plug/_format.lua b/nvim/.config/nvim/lua/plug/_format.lua index e4cdeac..88c461b 100644 --- a/nvim/.config/nvim/lua/plug/_format.lua +++ b/nvim/.config/nvim/lua/plug/_format.lua @@ -52,11 +52,13 @@ local formatters = { require('formatter').setup({ logging = false, filetype = formatters }) -- Format on save: +-- DISABLED FOR NOW, due to messing with git contributions if they +-- do not use a formatter. Instead, formatting with key mapping used. -- gather filetypes to autocorrect for each activated formatter above -for k, _ in pairs(formatters) do - vim.api.nvim_create_autocmd({"Filetype " .. k}, { - command = "autocmd BufWritePost FormatWrite", - desc = "Automatically format on write", - group = vim.api.nvim_create_augroup('formatonsave', {clear = true}) - }) -end +-- for k, _ in pairs(formatters) do +-- vim.api.nvim_create_autocmd({"Filetype " .. k}, { +-- command = "autocmd BufWritePost FormatWrite", +-- desc = "Automatically format on write", +-- group = vim.api.nvim_create_augroup('formatonsave', {clear = true}) +-- }) +-- end