up

init.lua

@@ -95,6 +95,7 @@ require 'kickstart.core.lazy-plugins'
 
 -- [[ Basic Autocommands ]]
 require 'kickstart.core.autocommands'
+require 'custom.autocommands'
 
 -- [[ Keymaps ]]
 require 'kickstart.core.keymaps'

lua/custom/autocommands/init.lua

@@ -0,0 +1,7 @@
+-- load autocommands
+--
+
+require 'custom.autocommands.quarto'
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et

lua/custom/autocommands/quarto.lua

@@ -0,0 +1,48 @@
+-- Quarto autocommands file
+--
+
+local status_wk, wk = pcall(require, 'which-key')
+if not status_wk then
+  return
+end
+
+vim.api.nvim_create_autocmd('FileType', {
+  desc = '',
+  pattern = 'quarto',
+  callback = function()
+    local init = function()
+      local quarto_cfg = require('quarto.config').config
+      quarto_cfg.codeRunner.default_method = 'molten'
+      vim.cmd [[MoltenInit]]
+    end
+    local deinit = function()
+      local quarto_cfg = require('quarto.config').config
+      quarto_cfg.codeRunner.default_method = 'slime'
+      vim.cmd [[MoltenDeinit]]
+    end
+    wk.add {
+      { mode = { 'n', 'v', 'i' }, buffer = true },
+
+      { -- Quarto
+        { '<leader>Q', group = '[Q]uarto' }, -- group
+        { '<leader>Qp', '<CMD>QuartoPreview<CR>', desc = '[p]review Quarto' },
+        { '<leader>Qs', '<CMD>QuartoSend<CR>', desc = '[s]end to Quarto' },
+      },
+
+      { -- Molten
+        { '<leader>M', group = '[M]olten' }, -- group
+        { '<leader>Mi', init, desc = '[i]nitialize Molten' },
+        { '<leader>Ms', deinit, desc = '[s]top Molten' },
+        { '<leader>Md', '<CMD>MoltenStop<CR>', desc = '[S]top Molten' },
+        { '<leader>Mp', '<CMD>MoltenPause<CR>', desc = '[p]ause Molten' },
+        { '<leader>Mr', '<CMD>MoltenReset<CR>', desc = '[r]eset Molten' },
+      },
+
+      { -- Vim-slime
+        { '<leader>S', group = '[S]lime' }, -- group
+        { '<leader>Ss', '<CMD>SlimeSend<CR>', desc = '[s]end Slime' },
+        { '<leader>Sr', '<CMD>SlimeRestart<CR>', desc = '[r]estart Slime' },
+      },
+    }
+  end,
+})

lua/custom/keymaps/buffers.lua

@@ -1,27 +1,35 @@
 -- Neo-tree mappings
 --
 
-local wk = require 'which-key'
-local bufremove = require 'mini.bufremove'
+local status_wk, wk = pcall(require, 'which-key')
+if not status_wk then
+  return
+end
+
+local status_mbr, mbr = pcall(require, 'mini.bufremove')
+if not status_mbr then
+  return
+end
 
 wk.add {
   { '<leader>b', group = '[b]uffers' }, -- group
   {
     mode = { 'n', 'v', 'i' },
-    { '<leader>bd', bufremove.delete, desc = '[d]elete buffer', silent = true },
-    { '<leader>bl', '<CMD>Neotree buffers<CR>', desc = '[l]ist buffers ', silent = true },
-    { '<leader>bs', '<CMD>source %<CR>', desc = '[s]ource buffer', silent = true },
-    { '<leader>bw', '<CMD>w<CR>', desc = '[w]rite buffer', silent = true },
-    { '<leader>bp', '<CMD>bprevious<CR>', desc = '[p]revious buffer', silent = true },
-    { '<leader>bn', '<CMD>bnext<CR>', desc = '[n]ext buffer', silent = true },
+    { '<leader>bd', mbr.delete, desc = '[d]elete buffer', noremap = true, silent = true },
+    { '<leader>bl', '<CMD>Neotree buffers<CR>', desc = '[l]ist buffers ', noremap = true, silent = true },
+    { '<leader>bs', '<CMD>source %<CR>', desc = '[s]ource buffer', noremap = true, silent = true },
+    { '<leader>bw', '<CMD>w<CR>', desc = '[w]rite buffer', noremap = true, silent = true },
+    { '<leader>bp', '<CMD>bprevious<CR>', desc = '[p]revious buffer', noremap = true, silent = true },
+    { '<leader>bn', '<CMD>bnext<CR>', desc = '[n]ext buffer', noremap = true, silent = true },
 
-    { '<C-PageUp>', '<CMD>bprevious<CR>', desc = 'Previous buffer', silent = true, hidden = true },
-    { '<C-PageDown>', '<CMD>bnext<CR>', desc = 'Next buffer', silent = true, hidden = true },
+    { '<C-PageUp>', '<CMD>bprevious<CR>', desc = 'Previous buffer', noremap = true, silent = true, hidden = true },
+    { '<C-PageDown>', '<CMD>bnext<CR>', desc = 'Next buffer', noremap = true, silent = true, hidden = true },
   },
   {
-    mode = { 'n', 'v' },
-    { '<C-c>', bufremove.delete, desc = 'Delete buffer', silent = true, hidden = true },
-    { '<C-s>', '<CMD>w<CR>', desc = 'Save buffer', silent = true, hidden = true },
+    mode = { 'n', 'v', 'i' },
+    -- mapping runs here as which-key intercepts ctrl-z signal before term
+    { '<C-c>', mbr.delete, desc = 'Delete buffer', noremap = true, silent = true, hidden = true },
+    { '<C-s>', '<CMD>w<CR><ESC>', desc = 'Save buffer', noremap = true, silent = true, hidden = true },
   },
 }
 

lua/custom/keymaps/edit.lua

@@ -1,12 +1,17 @@
 -- Edition mappings
 --
 
-local wk = require 'which-key'
+local status_wk, wk = pcall(require, 'which-key')
+if not status_wk then
+  return
+end
 
 wk.add {
+  {
     mode = { 'n', 'v', 'i' },
     -- mapping runs here as which-key intercepts ctrl-z signal before term
     { '<C-z>', '<CMD>undo<CR>', desc = 'Undo', silent = true, noremap = true, hidden = true },
+  },
 }
 
 -- The line beneath this is called `modeline`. See `:help modeline`

lua/custom/keymaps/files.lua

@@ -1,17 +1,24 @@
 -- Neo-tree mappings
 --
 
-local wk = require 'which-key'
-local neotree_helper = require 'custom.plugins.neotree-helper'
+local status_wk, wk = pcall(require, 'which-key')
+if not status_wk then
+  return
+end
+
+local status_nth, nth = pcall(require, 'custom.plugins.neotree-helper')
+if not status_nth then
+  return
+end
 
 wk.add {
   {
     mode = { 'n', 'v', 'i' },
-    { '<leader>e', neotree_helper.smart_open, desc = 'File [e]xplorer', silent = true, noremap = true },
+    { '<leader>e', nth.smart_open, desc = 'File [e]xplorer', silent = true, noremap = true },
   },
   {
     mode = { 'n', 'v' },
-    { '<C-e>', neotree_helper.smart_open, desc = 'File explorer', silent = true, noremap = true, hidden = true },
+    { '<C-e>', nth.smart_open, desc = 'File explorer', silent = true, noremap = true, hidden = true },
   },
 }
 

lua/custom/keymaps/general.lua

@@ -1,9 +1,12 @@
 -- General mappings
 --
 
-local key = require 'custom.plugins.keymaps-helper'
+local status_kh, kh = pcall(require, 'custom.plugins.keymaps-helper')
+if not status_kh then
+  return
+end
 
-key.map({ 'n', 'v', 'i' }, '<leader>Q', '<CMD>qall<CR>', { silent = true, noremap = true, desc = '[Q]uit all' })
+kh.map({ 'n', 'v', 'i' }, '<leader>q', '<CMD>qall<CR>', { silent = true, noremap = true, desc = '[Q]uit all' })
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et

lua/custom/keymaps/init.lua

@@ -7,7 +7,6 @@ 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

@@ -1,13 +0,0 @@
--- 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 = '[p]review quarto' },
-}
-
--- The line beneath this is called `modeline`. See `:help modeline`
--- vim: ts=2 sts=2 sw=2 et

lua/kickstart/plugins/quarto.lua

@@ -50,7 +50,7 @@ return {
       endfunction
       ]]
 
-      vim.g.slime_target = 'kitty'
+      vim.g.slime_target = 'neovim'
       vim.g.slime_no_mappings = true
       vim.g.slime_python_ipython = 1
     end,
@@ -60,16 +60,16 @@ return {
       vim.g.slime_menu_config = false
       vim.g.slime_neovim_ignore_unlisted = true
 
-      local function mark_terminal()
-        local job_id = vim.b.terminal_job_id
-        vim.print('job_id: ' .. job_id)
-      end
-
-      local function set_terminal()
-        vim.fn.call('slime#config', {})
-      end
-      vim.keymap.set('n', '<leader>cm', mark_terminal, { desc = '[m]ark terminal' })
-      vim.keymap.set('n', '<leader>cs', set_terminal, { desc = '[s]et terminal' })
+      -- local function mark_terminal()
+      --   local job_id = vim.b.terminal_job_id
+      --   vim.print('job_id: ' .. job_id)
+      -- end
+      --
+      -- local function set_terminal()
+      --   vim.fn.call('slime#config', {})
+      -- end
+      -- vim.keymap.set('n', '<leader>cm', mark_terminal, { desc = '[m]ark terminal' })
+      -- vim.keymap.set('n', '<leader>cs', set_terminal, { desc = '[s]et terminal' })
     end,
     opts = {
       debug = true,
@@ -89,42 +89,27 @@ return {
       vim.g.molten_tick_rate = 200
     end,
     config = function()
-      local init = function()
-        local quarto_cfg = require('quarto.config').config
-        quarto_cfg.codeRunner.default_method = 'molten'
-        vim.cmd [[MoltenInit]]
-      end
-      local deinit = function()
-        local quarto_cfg = require('quarto.config').config
-        quarto_cfg.codeRunner.default_method = 'slime'
-        vim.cmd [[MoltenDeinit]]
-      end
-      vim.keymap.set('n', '<localleader>mi', init, { silent = true, desc = 'Initialize molten' })
-      vim.keymap.set('n', '<localleader>md', deinit, { silent = true, desc = 'Stop molten' })
-      vim.keymap.set('n', '<localleader>mp', ':MoltenImagePopup<CR>', { silent = true, desc = 'molten image popup' })
-      vim.keymap.set('n', '<localleader>mb', ':MoltenOpenInBrowser<CR>', { silent = true, desc = 'molten open in browser' })
-      vim.keymap.set('n', '<localleader>mh', ':MoltenHideOutput<CR>', { silent = true, desc = 'hide output' })
-      vim.keymap.set('n', '<localleader>ms', ':noautocmd MoltenEnterOutput<CR>', { silent = true, desc = 'show/enter output' })
+      -- local init = function()
+      --   local quarto_cfg = require('quarto.config').config
+      --   quarto_cfg.codeRunner.default_method = 'molten'
+      --   vim.cmd [[MoltenInit]]
+      -- end
+      -- local deinit = function()
+      --   local quarto_cfg = require('quarto.config').config
+      --   quarto_cfg.codeRunner.default_method = 'slime'
+      --   vim.cmd [[MoltenDeinit]]
+      -- end
+      -- vim.keymap.set('n', '<localleader>mi', init, { silent = true, desc = 'Initialize molten' })
+      -- vim.keymap.set('n', '<localleader>md', deinit, { silent = true, desc = 'Stop molten' })
+      -- vim.keymap.set('n', '<localleader>mp', ':MoltenImagePopup<CR>', { silent = true, desc = 'molten image popup' })
+      -- vim.keymap.set('n', '<localleader>mb', ':MoltenOpenInBrowser<CR>', { silent = true, desc = 'molten open in browser' })
+      -- vim.keymap.set('n', '<localleader>mh', ':MoltenHideOutput<CR>', { silent = true, desc = 'hide output' })
+      -- vim.keymap.set('n', '<localleader>ms', ':noautocmd MoltenEnterOutput<CR>', { silent = true, desc = 'show/enter output' })
     end,
     opts = {
       auto_scroll = true,
     },
   },
-
-  -- {
-  --   'benlubas/molten-nvim',
-  --   version = '^1.0.0', -- use version <2.0.0 to avoid breaking changes
-  --   dependencies = { '3rd/image.nvim' },
-  --   build = ':UpdateRemotePlugins',
-  --   init = function()
-  --     -- these are examples, not defaults. Please see the readme
-  --     vim.g.molten_image_provider = 'image.nvim'
-  --     vim.g.molten_output_win_max_height = 20
-  --   end,
-  --   opts = {
-  --     debug = true,
-  --   },
-  -- },
   {
     '3rd/image.nvim',
     build = false, -- so that it doesn't build the rock https://github.com/3rd/image.nvim/issues/91#issuecomment-2453430239