Merge branch 'main' of labs.scarif.space:chris/nvim

lua/helpers.lua

@@ -164,5 +164,4 @@ helpers.format_buffer = function(formatter, buf, cwd)
 end
 
 return helpers
--- nnoremap <Leader>ev :tabedit $MYVIMRC<CR>
 

lua/keymap.lua

@@ -407,13 +407,7 @@ vim.keymap.set('n', '<Leader>tc', function()
 end, { desc = 'Close test panels' })
 
 vim.keymap.set('i', '<Tab>', 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

lua/projects.lua

@@ -233,14 +233,15 @@ local PROJECTS = {
         laravel_utils 'server/'
         map('yrn ', '!cd client && yarn ', { desc = 'Run yarn script' }, 'c')
         map('<Leader>pt', ':!cd server && php artisan typescript:transform --format<CR>', { 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,