up

lua/custom/keymaps/buffers.lua

@@ -0,0 +1,24 @@
+-- Neo-tree mappings
+--
+
+local wk = require 'which-key'
+local neotree_helper = require 'custom.plugins.neotree-helper'
+local bufremove = require 'mini.bufremove'
+
+wk.add {
+  mode = { 'n', 'v', 'i' },
+  { '<leader>b', group = '[B]uffers' }, -- group
+  { '<leader>bc', bufremove.delete, desc = '[C]lose [B]uffer', silent = true },
+  { '<leader>bl', '<CMD>Neotree buffers<CR>', desc = '[L]ist open [B]uffers', silent = true },
+  { '<leader>bs', '<CMD>source %<CR>', desc = '[B]uffer [S]ource', silent = true },
+  { '<leader>bw', '<CMD>w<CR>', desc = '[B]uffer [W]rite', silent = true },
+  { '<leader>bp', '<CMD>bprevious<CR>', desc = '[P]revious [B]uffer', silent = true },
+  { '<leader>bn', '<CMD>bnext<CR>', desc = '[N]ext [B]uffer', silent = true },
+  { '<C-PageUp>', '<CMD>bprevious<CR>', desc = '[P]revious [B]uffer', silent = true, hidden = true },
+  { '<C-PageDown>', '<CMD>bnext<CR>', desc = '[N]ext [B]uffer', silent = true, hidden = true },
+  { '<C-c>', bufremove.delete, desc = '[C]lose [B]uffer', silent = true, hidden = true },
+  { '<C-s>', '<CMD>w<CR>', desc = 'Save buffer', silent = true, hidden = true },
+}
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et

lua/custom/keymaps/files.lua

@@ -7,20 +7,9 @@ local bufremove = require 'mini.bufremove'
 
 wk.add {
   mode = { 'n', 'v' },
-  { '<leader>F', group = 'Fichier' }, -- group
-  { '<leader>Fe', neotree_helper.smart_open, desc = 'Parcourir fichiers' },
-  { '<leader>Fc', bufremove.delete, desc = 'Fermer buffer', silent = true },
-  { '<leader>Fl', '<CMD>Neotree buffers<CR>', desc = 'Buffers ouverts', silent = true },
-  { '<leader>Fr', '<CMD>source %<CR>', desc = 'Recharger buffer', silent = true },
-  { '<leader>Fs', '<CMD>w<CR>', desc = 'Sauver buffer', silent = true },
-  { '<leader>Fp', '<CMD>bprevious<CR>', desc = 'Buffer précédent', silent = true },
-  { '<leader>Fn', '<CMD>bnext<CR>', desc = 'Buffer suivant', silent = true },
-  { '<C-PageUp>', '<CMD>bprevious<CR>', desc = 'Buffer précédent', silent = true, hidden = true },
-  { '<C-PageDown>', '<CMD>bnext<CR>', desc = 'Buffer suivant', silent = true, hidden = true },
-  -- { '<F5>', '<CMD>source %<CR>', desc = 'Recharger buffer', silent = true, hidden = true },
-  { '<C-s>', '<CMD>w<CR>', desc = 'Sauver buffer', silent = true, hidden = true },
-  { '<C-c>', bufremove.delete, desc = 'Fermer buffer', silent = true, hidden = true },
-  { '<C-o>', neotree_helper.smart_open, desc = 'Parcourir fichiers', silent = true, hidden = true },
+  -- { '<leader>f', group = '[F]iles' }, -- group
+  { '<leader>f', neotree_helper.smart_open, desc = 'Open file' },
+  { '<C-o>', neotree_helper.smart_open, desc = 'Open file', silent = true, hidden = true },
 }
 
 -- The line beneath this is called `modeline`. See `:help modeline`

lua/custom/keymaps/general.lua

@@ -5,7 +5,7 @@ local wk = require 'which-key'
 
 wk.add {
   mode = { 'n', 'v', 'i' },
-  { '<leader>q', '<CMD>qall<CR>', desc = 'Quitter', silent = true },
+  { '<C-q>', '<CMD>qall<CR>', desc = 'Quitter', silent = true },
 }
 
 -- The line beneath this is called `modeline`. See `:help modeline`

lua/custom/keymaps/init.lua

@@ -3,9 +3,11 @@
 
 require 'custom.keymaps.nop'
 require 'custom.keymaps.general'
+require 'custom.keymaps.buffers'
 require 'custom.keymaps.files'
 require 'custom.keymaps.edit'
 require 'custom.keymaps.display'
+require 'custom.keymaps.quarto'
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et

lua/custom/keymaps/quarto.lua

@@ -0,0 +1,13 @@
+-- Quarto mappings
+--
+
+local wk = require 'which-key'
+
+wk.add {
+  mode = { 'n', 'v', 'i' },
+  { '<leader>q', group = '[Q]uarto' }, -- group
+  { '<leader>qp', '<CMD>QuartoPreview<CR>', desc = '[Q]uarto [P]review' },
+}
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et

lua/custom/plugins/keymaps-helper.lua

@@ -0,0 +1,17 @@
+-- Keymapping helper module
+--
+
+local M = {}
+
+local function map(mode, key, func, opts)
+  vim.keymap.set(mode, key, func, opts)
+end
+
+function M.nmap(key, effect, desc)
+  map('n', key, effect, { silent = true, noremap = true, desc = desc })
+end
+
+return M
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et

lua/custom/plugins/neotree-helper.lua

@@ -30,10 +30,11 @@ function M.smart_open()
     vim.cmd('Neotree toggle reveal=false position=float dir=' .. vim.fn.expand '~')
   -- Si c'est un fichier réel, révéler le fichier dans l'arborescence
   elseif is_real_file and bufname ~= '' then
-    vim.cmd 'Neotree position=left reveal=true'
-  -- Sinon, ouvrir dans le répertoire de travail courant
+    vim.cmd('Neotree toggle position=left reveal=true dir=' .. vim.fn.expand '%:p:h')
+    -- vim.cmd 'Neotree position=left reveal=true'
+    -- Sinon, ouvrir dans le répertoire de travail courant
   else
-    vim.cmd('Neotree position=left reveal_force_cwd=true dir=' .. vim.fn.getcwd())
+    vim.cmd('Neotree toggle position=left reveal_force_cwd=true dir=' .. vim.fn.getcwd())
   end
 end
 
@@ -85,4 +86,3 @@ return M
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
-