From 64723103b60ed10cda6aae5bb583ed23c74d55c3 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 8 Jul 2026 08:58:18 +0100 Subject: [PATCH] Update files --- lua/helpers.lua | 5 +++++ lua/keymap.lua | 4 ++-- lua/projects.lua | 18 ++++++++++++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/lua/helpers.lua b/lua/helpers.lua index b55f9a6..6976004 100644 --- a/lua/helpers.lua +++ b/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 @@ -161,3 +165,4 @@ end return helpers -- nnoremap ev :tabedit $MYVIMRC + diff --git a/lua/keymap.lua b/lua/keymap.lua index db081d5..781a810 100644 --- a/lua/keymap.lua +++ b/lua/keymap.lua @@ -236,9 +236,9 @@ end, { desc = 'Open scratchpad' }) vim.keymap.set({ 'n', 'v', 'c', 'i' }, '', function() require('snacks').scratch.select() end, { desc = 'Open scratchpad buffers' }) -vim.keymap.set({ 'n', 'v', 'c', 'i' }, '', function() +vim.keymap.set({ 'n', 'v', 'c', 'i', 't' }, '', function() require('snacks').terminal.toggle() -end, { desc = 'Open terminal' }) +end, { desc = 'Toggle terminal' }) -- Editing helpers vim.keymap.set('i', '', 'o', { desc = 'Add line below' }) diff --git a/lua/projects.lua b/lua/projects.lua index e3e4135..9c32570 100644 --- a/lua/projects.lua +++ b/lua/projects.lua @@ -128,6 +128,18 @@ local function laravel_bookmarks_with_dir(dir) } end +local function laravel_utils(dir) + map('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") ', { desc = 'Run lint' } ) - map('pd', function() + map('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('pt', ':!cd server && php artisan typescript:transform --format', { desc = 'Compile typescript' }) require('conform').formatters.pint = { @@ -242,11 +255,12 @@ local PROJECTS = { ['hylark'] = function(dir) map('pl', ':cexpr system("vendor/bin/phpstan analyse --no-progress --error-format=raw --memory-limit=2G -vv") ', { desc = 'Run lint' }) - map('pd', function() + map('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('pm', ':vendor/bin/sail composer migrate')