More project specific stuff

lua/helpers.lua

@@ -16,5 +16,39 @@ end
 
 helpers.edit_cf('h', '/lua/helpers.lua')
 
+---@param opts? { cmd?: string }
+helpers.open_term = function(opts)
+    opts = opts or { cmd = '' }
+
+    local buf = vim.api.nvim_create_buf(false, true)
+    vim.api.nvim_set_option_value('bufhidden', 'wipe', { buf = buf })
+    vim.api.nvim_set_option_value('modifiable', false, { buf = buf })
+
+    local height = math.ceil(vim.o.lines * 0.9)
+    local width = math.ceil(vim.o.columns * 0.9)
+    local win = vim.api.nvim_open_win(buf, true, {
+        style = 'minimal',
+        relative = 'editor',
+        width = width,
+        height = height,
+        row = math.ceil((vim.o.lines - height) / 2),
+        col = math.ceil((vim.o.columns - width) / 2),
+        border = 'single',
+    })
+
+    vim.api.nvim_set_current_win(win)
+
+    vim.fn.jobstart(opts.cmd, {
+        term = true,
+        on_exit = function(_, _, _)
+            if vim.api.nvim_win_is_valid(win) then
+                vim.api.nvim_win_close(win, true)
+            end
+        end,
+    })
+
+    vim.cmd.startinsert()
+end
+
 return helpers
 -- nnoremap <Leader>ev :tabedit $MYVIMRC<CR>

lua/keymap.lua

@@ -1,6 +1,8 @@
 -- Basic Keymaps
 -- See `:help vim.keymap.set()`
 
+local helpers = require 'helpers'
+
 -- Swap : and ; around
 vim.keymap.set({ 'n', 'v' }, ':', ';')
 vim.keymap.set({ 'n', 'v' }, ';', ':')
@@ -93,24 +95,12 @@ vim.keymap.set('n', '<Leader>{', 'mzF[`a<CR><Esc>``%i<CR><Esc>`z', { desc = 'Ind
 vim.keymap.set('n', '<Leader>}', 'mzF[`a<CR><Esc>``%i<CR><Esc>`zvi[:s/,\\s*/,\\r/g<CR>vi[=<Esc>`z:nohlsearch<CR>', { desc = 'Indent an array some other way?' })
 
 -- Git mappings
-vim.keymap.set('n', '<Leader>gaf', '<CMD>Git add %<CR>', { desc = 'Git add current file' })
-vim.keymap.set('n', '<Leader>gaa', '<CMD>Git add --all<CR>', { desc = 'Git add all unstaged changes' })
-vim.keymap.set('n', '<Leader>gap', '<CMD>Git add --patch --all<CR>', { desc = 'Git add all unstaged changes interactively' })
 vim.keymap.set('n', '<Leader>gb', '<CMD>Git blame<CR>', { desc = 'Git blame' })
-vim.keymap.set('n', '<Leader>gcm', '<CMD>Git commit -v<CR>', { desc = 'Git commit' })
-vim.keymap.set('n', '<Leader>gp', '<CMD>Git push<CR>', { desc = 'Git push' })
-vim.keymap.set('n', '<Leader>gup', '<CMD>Git pull --rebase<CR>', { desc = 'Git pull --rebase' })
-vim.keymap.set('n', '<Leader>gsb', '<CMD>Git status<CR>', { desc = 'Git status' })
 vim.keymap.set('n', '<Leader>gd', '<CMD>Git diff<CR>', { desc = 'Git diff' })
-vim.keymap.set('n', '<Leader>gf', '<CMD>Git fetch<CR>', { desc = 'Git fetch' })
 vim.keymap.set('n', '<Leader>gdc', '<CMD>Git diff --cached<CR>', { desc = 'Git diff' })
-vim.keymap.set('n', '<Leader>gl', '<CMD>Git log<CR>', { desc = 'Git log' })
+vim.keymap.set('n', '<Leader>G', function()
-vim.keymap.set('n', '<Leader>gun', '<CMD>Git reset -- %<CR>', { desc = 'Git unstage file' })
+    helpers.open_term { cmd = 'lazygit' }
-vim.keymap.set('n', '<Leader>gco', '<CMD>Git checkout -- %<CR>', { desc = 'Git checkout' })
+end, { desc = 'Git' })
-vim.keymap.set('n', '<Leader>G', '<CMD>Git', { desc = 'Git' })
-vim.keymap.set('n', '<Leader>gsta', '<CMD>Git stash push<CR>', { desc = 'Git stash' })
-vim.keymap.set('n', '<Leader>gstA', '<CMD>Git stash apply<CR>', { desc = 'Git stash apply' })
-vim.keymap.set('n', '<Leader>gstp', '<CMD>Git stash pop<CR>', { desc = 'Git stash pop' })
 
 -- Add keymaps for diff mode
 vim.api.nvim_create_autocmd('BufEnter', {

lua/projects.lua

@@ -3,7 +3,8 @@
 local M = {}
 
 -- Helper to create mappings
-local map = require('helpers').map
+local helpers = require 'helpers'
+local map = helpers.map
 
 -- Get the last folder name from a path
 local function project_name_from_cwd(cwd)
@@ -20,6 +21,9 @@ 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>db', 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')
         map('sl ', '!cd server && sail ', { desc = 'Run sail command' }, 'c')