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

lua/helpers.lua

@@ -27,6 +27,10 @@ helpers.open_term = function(opts, buf_opts)
     }
 
     local buf = vim.api.nvim_create_buf(false, true)
+    if buf_options.name then
+        vim.api.nvim_buf_set_name(buf, buf_options.name)
+        buf_options.name = nil
+    end
     for k, v in pairs(buf_options) do
         vim.api.nvim_set_option_value(k, v, { buf = buf })
     end

lua/keymap.lua

@@ -236,9 +236,9 @@ end, { desc = 'Open scratchpad' })
 vim.keymap.set({ 'n', 'v', 'c', 'i' }, '<C-S-S>', function()
     require('snacks').scratch.select()
 end, { desc = 'Open scratchpad buffers' })
-vim.keymap.set({ 'n', 'v', 'c', 'i' }, '<C-T>', function()
+vim.keymap.set({ 'n', 'v', 'c', 'i', 't' }, '<C-T>', function()
     require('snacks').terminal.toggle()
-end, { desc = 'Open terminal' })
+end, { desc = 'Toggle terminal' })
 
 -- Editing helpers
 vim.keymap.set('i', '<C-O>', '<Esc>o', { desc = 'Add line below' })

lua/projects.lua

@@ -128,6 +128,18 @@ local function laravel_bookmarks_with_dir(dir)
     }
 end
 
+local function laravel_utils(dir)
+    map('<Leader>D', function()
+        helpers.open_term {
+            cmd = dir .. 'vendor/bin/var-dump-server',
+            buf_opts = {
+                bufhidden = 'hide',
+                modifiable = false,
+            },
+        }
+    end, { desc = 'Open dump-server window' })
+end
+
 local function laravel_keymaps(dir)
     map('sl ', command_with_dir(dir, 'vendor/bin/sail '), { desc = 'Run sail command' }, 'c')
     map('art ', command_with_dir(dir, 'php artisan '), { desc = 'Run artisan command' }, 'c')
@@ -211,13 +223,14 @@ local PROJECTS = {
             ':cexpr system("cd server && vendor/bin/phpstan analyse --no-progress --error-format=raw --memory-limit=2G -vv") <CR>',
             { desc = 'Run lint' }
         )
-        map('<leader>pd', function()
+        map('<leader>T', function()
             helpers.open_term { cmd = 'lazysql mysql://root@localhost:3306/runcats' }
         end, { desc = 'Open database manager' })
         map('s ', '!cd server && ', { desc = 'Run command in server directory' }, 'c')
         map('c ', '!cd client && ', { desc = 'Run command in client directory' }, 'c')
         laravel_keymaps 'server/'
         laravel_makes 'server/'
+        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' })
         vim.api.nvim_create_autocmd({ 'BufWritePre' }, {
@@ -243,11 +256,12 @@ local PROJECTS = {
 
     ['hylark'] = function(dir)
         map('<leader>pl', ':cexpr system("vendor/bin/phpstan analyse --no-progress --error-format=raw --memory-limit=2G -vv") <CR>', { desc = 'Run lint' })
-        map('<leader>pd', function()
+        map('<leader>T', function()
             helpers.open_term { cmd = 'lazysql pgsql://homestead:password@localhost:5432/homestead' }
         end, { desc = 'Open database manager' })
         laravel_keymaps()
         laravel_makes()
+        laravel_utils 'server/'
         map('yrn ', '!cd frontend && yarn ', { desc = 'Run yarn script' }, 'c')
         map('<Leader>pm', ':vendor/bin/sail composer migrate<CR>')