Skip to content

Commit 62bfff7

Browse files
committed
feat(minimax): sync to 6cc8e48
1 parent 849471a commit 62bfff7

6 files changed

Lines changed: 33 additions & 13 deletions

File tree

MiniMax/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
_Generated from the `main` branch of 'MiniMax'_
22

3+
## 2026-04-07 {#2026-04-07}
4+
5+
- Update `Config.on_packchanged` helper to pass plugin data to the callback. This makes it easier to use more universal callbacks in `vim.pack` hooks.
6+
7+
- Improve session (`<Leader>s` prefix) mappings:
8+
9+
- Use `vim.ui.input()` when creating new session with `<Leader>sn`.
10+
11+
- Add `<leader>sR` to restart Neovim while preserving current session. Uses `MiniSessions.restart()`, requires Neovim>=0.12.
12+
313
## 2026-04-02 {#2026-04-02}
414

515
- Add a note in `nvim-0.11` config about Neovim 0.11 not being the latest stable release.

MiniMax/configs/diffs/nvim-0.11_nvim-0.12/index.qmd

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,19 @@ Notes:
9898
+Config.on_event = function(ev, f) misc.safely('event:' .. ev, f) end
9999
+Config.on_filetype = function(ft, f) misc.safely('filetype:' .. ft, f) end
100100
+
101-
@@ -90,3 +110,11 @@
101+
@@ -90,3 +110,12 @@
102102
--- Some plugins and 'mini.nvim' modules only need setup during startup if Neovim
103103
--- is started like `nvim -- path/to/file`, otherwise delaying setup is fine
104104
-Config.now_if_args = vim.fn.argc(-1) > 0 and MiniDeps.now or MiniDeps.later
105-
+-- Define custom `vim.pack.add()` hook helper. See `:h vim.pack-events`.
105+
+-- Define custom `vim.pack.add()` hook helper. Plugin data is passed as
106+
+-- argument to the callback. See `:h vim.pack-events`.
106107
+-- Example usage: see 'plugin/40_plugins.lua'.
107108
+Config.on_packchanged = function(plugin_name, kinds, callback, desc)
108109
+ local f = function(ev)
109110
+ local name, kind = ev.data.spec.name, ev.data.kind
110111
+ if not (name == plugin_name and vim.tbl_contains(kinds, kind)) then return end
111112
+ if not ev.data.active then vim.cmd.packadd(plugin_name) end
112-
+ callback()
113+
+ callback(ev.data)
113114
+ end
114115
+ Config.new_autocmd('PackChanged', '*', f, desc)
115116
+end
@@ -187,6 +188,11 @@ Notes:
187188
-nmap(']p', '<Cmd>exe "put " . v:register<CR>', 'Paste Below')
188189
+nmap('[p', '<Cmd>exe "iput! " . v:register<CR>', 'Paste Above')
189190
+nmap(']p', '<Cmd>exe "iput " . v:register<CR>', 'Paste Below')
191+
@@ -218 +218 @@
192+
--- - `<Leader>sd` - delete previously started session
193+
+-- - `<Leader>sR` - restart Neovim preserving current session
194+
@@ -223,0 +224 @@
195+
+nmap_leader('sR', '<Cmd>lua MiniSessions.restart()<CR>', 'Restart')
190196
```
191197

192198
</details>

MiniMax/configs/nvim-0.10/index.qmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ nmap_leader('oz', '<Cmd>lua MiniMisc.zoom()<CR>', 'Zoom toggle')
464464
-- - `<Leader>sn` - start new session
465465
-- - `<Leader>sr` - read previously started session
466466
-- - `<Leader>sd` - delete previously started session
467-
local session_new = 'MiniSessions.write(vim.fn.input("Session name: "))'
467+
local session_new = 'vim.ui.input({ prompt = "Session name: " }, MiniSessions.write)'
468468

469469
nmap_leader('sd', '<Cmd>lua MiniSessions.select("delete")<CR>', 'Delete')
470470
nmap_leader('sn', '<Cmd>lua ' .. session_new .. '<CR>', 'New')

MiniMax/configs/nvim-0.11/index.qmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ nmap_leader('oz', '<Cmd>lua MiniMisc.zoom()<CR>', 'Zoom toggle')
465465
-- - `<Leader>sn` - start new session
466466
-- - `<Leader>sr` - read previously started session
467467
-- - `<Leader>sd` - delete previously started session
468-
local session_new = 'MiniSessions.write(vim.fn.input("Session name: "))'
468+
local session_new = 'vim.ui.input({ prompt = "Session name: " }, MiniSessions.write)'
469469

470470
nmap_leader('sd', '<Cmd>lua MiniSessions.select("delete")<CR>', 'Delete')
471471
nmap_leader('sn', '<Cmd>lua ' .. session_new .. '<CR>', 'New')

MiniMax/configs/nvim-0.12/index.qmd

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,15 @@ Config.new_autocmd = function(event, pattern, callback, desc)
120120
vim.api.nvim_create_autocmd(event, opts)
121121
end
122122

123-
-- Define custom `vim.pack.add()` hook helper. See `:h vim.pack-events`.
123+
-- Define custom `vim.pack.add()` hook helper. Plugin data is passed as
124+
-- argument to the callback. See `:h vim.pack-events`.
124125
-- Example usage: see 'plugin/40_plugins.lua'.
125126
Config.on_packchanged = function(plugin_name, kinds, callback, desc)
126127
local f = function(ev)
127128
local name, kind = ev.data.spec.name, ev.data.kind
128129
if not (name == plugin_name and vim.tbl_contains(kinds, kind)) then return end
129130
if not ev.data.active then vim.cmd.packadd(plugin_name) end
130-
callback()
131+
callback(ev.data)
131132
end
132133
Config.new_autocmd('PackChanged', '*', f, desc)
133134
end
@@ -532,12 +533,13 @@ nmap_leader('oz', '<Cmd>lua MiniMisc.zoom()<CR>', 'Zoom toggle')
532533
-- s is for 'Session'. Common usage:
533534
-- - `<Leader>sn` - start new session
534535
-- - `<Leader>sr` - read previously started session
535-
-- - `<Leader>sd` - delete previously started session
536-
local session_new = 'MiniSessions.write(vim.fn.input("Session name: "))'
536+
-- - `<Leader>sR` - restart Neovim preserving current session
537+
local session_new = 'vim.ui.input({ prompt = "Session name: " }, MiniSessions.write)'
537538

538539
nmap_leader('sd', '<Cmd>lua MiniSessions.select("delete")<CR>', 'Delete')
539540
nmap_leader('sn', '<Cmd>lua ' .. session_new .. '<CR>', 'New')
540541
nmap_leader('sr', '<Cmd>lua MiniSessions.select("read")<CR>', 'Read')
542+
nmap_leader('sR', '<Cmd>lua MiniSessions.restart()<CR>', 'Restart')
541543
nmap_leader('sw', '<Cmd>lua MiniSessions.write()<CR>', 'Write current')
542544

543545
-- t is for 'Terminal'

MiniMax/configs/nvim-0.13/index.qmd

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,15 @@ Config.new_autocmd = function(event, pattern, callback, desc)
125125
vim.api.nvim_create_autocmd(event, opts)
126126
end
127127

128-
-- Define custom `vim.pack.add()` hook helper. See `:h vim.pack-events`.
128+
-- Define custom `vim.pack.add()` hook helper. Plugin data is passed as
129+
-- argument to the callback. See `:h vim.pack-events`.
129130
-- Example usage: see 'plugin/40_plugins.lua'.
130131
Config.on_packchanged = function(plugin_name, kinds, callback, desc)
131132
local f = function(ev)
132133
local name, kind = ev.data.spec.name, ev.data.kind
133134
if not (name == plugin_name and vim.tbl_contains(kinds, kind)) then return end
134135
if not ev.data.active then vim.cmd.packadd(plugin_name) end
135-
callback()
136+
callback(ev.data)
136137
end
137138
Config.new_autocmd('PackChanged', '*', f, desc)
138139
end
@@ -537,12 +538,13 @@ nmap_leader('oz', '<Cmd>lua MiniMisc.zoom()<CR>', 'Zoom toggle')
537538
-- s is for 'Session'. Common usage:
538539
-- - `<Leader>sn` - start new session
539540
-- - `<Leader>sr` - read previously started session
540-
-- - `<Leader>sd` - delete previously started session
541-
local session_new = 'MiniSessions.write(vim.fn.input("Session name: "))'
541+
-- - `<Leader>sR` - restart Neovim preserving current session
542+
local session_new = 'vim.ui.input({ prompt = "Session name: " }, MiniSessions.write)'
542543

543544
nmap_leader('sd', '<Cmd>lua MiniSessions.select("delete")<CR>', 'Delete')
544545
nmap_leader('sn', '<Cmd>lua ' .. session_new .. '<CR>', 'New')
545546
nmap_leader('sr', '<Cmd>lua MiniSessions.select("read")<CR>', 'Read')
547+
nmap_leader('sR', '<Cmd>lua MiniSessions.restart()<CR>', 'Restart')
546548
nmap_leader('sw', '<Cmd>lua MiniSessions.write()<CR>', 'Write current')
547549

548550
-- t is for 'Terminal'

0 commit comments

Comments
 (0)