diff --git a/lua/helpers.lua b/lua/helpers.lua index 6976004..3c51fda 100644 --- a/lua/helpers.lua +++ b/lua/helpers.lua @@ -164,5 +164,4 @@ helpers.format_buffer = function(formatter, buf, cwd) end return helpers --- nnoremap ev :tabedit $MYVIMRC diff --git a/lua/keymap.lua b/lua/keymap.lua index 781a810..a635e1c 100644 --- a/lua/keymap.lua +++ b/lua/keymap.lua @@ -407,13 +407,7 @@ vim.keymap.set('n', 'tc', function() end, { desc = 'Close test panels' }) vim.keymap.set('i', '', function() - local copilot = require 'copilot.suggestion' - local ls = require 'luasnip' - if copilot.is_visible() then - vim.api.nvim_echo({ { 'Accepting copilot suggestion' } }, false, {}) - copilot.accept() - copilot.dismiss() - elseif ls.jumpable(1) then + if ls.jumpable(1) then vim.api.nvim_echo({ { 'Jumping in snippet' } }, false, {}) ls.jump() else diff --git a/lua/projects.lua b/lua/projects.lua index 9c32570..9619e22 100644 --- a/lua/projects.lua +++ b/lua/projects.lua @@ -233,14 +233,15 @@ local PROJECTS = { laravel_utils 'server/' map('yrn ', '!cd client && yarn ', { desc = 'Run yarn script' }, 'c') map('pt', ':!cd server && php artisan typescript:transform --format', { desc = 'Compile typescript' }) - require('conform').formatters.pint = { - append_args = { - '--config=' .. dir .. '/server/pint.json', - }, - } - vim.api.nvim_create_autocmd({ 'BufWritePre' }, { pattern = { '*.php' }, + callback = function(args) + require('helpers').format_buffer('pint', args.buf) + end, + }) + + vim.api.nvim_create_autocmd({ 'BufWritePre' }, { + pattern = { '*.js', '*.ts', '*.vue' }, callback = function(args) require('helpers').format_buffer('eslint_d', args.buf) end,