mirror of
https://github.com/LunarVim/LunarVim.git
synced 2025-07-21 19:24:25 +02:00
refactoring whichkey
This commit is contained in:
christianchiarulli
parent
e02c7c5abb
commit
a247d69c82
7 changed files with 90 additions and 80 deletions
1
init.lua
1
init.lua
|
|
@ -6,7 +6,6 @@ require "plugins"
|
|||
require "lv-utils"
|
||||
require "lv-galaxyline"
|
||||
require "lv-treesitter"
|
||||
require "lv-which-key"
|
||||
require "lv-neoformat"
|
||||
if O.plugin.dashboard.active then
|
||||
require("lv-dashboard").config()
|
||||
|
|
|
|||
29
lua/lv-dap/init.lua
Normal file
29
lua/lv-dap/init.lua
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
local status_ok, dap = pcall(require, "dap")
|
||||
if not status_ok then
|
||||
return
|
||||
end
|
||||
-- require "dap"
|
||||
vim.fn.sign_define("DapBreakpoint", {
|
||||
text = "",
|
||||
texthl = "LspDiagnosticsSignError",
|
||||
linehl = "",
|
||||
numhl = "",
|
||||
})
|
||||
dap.defaults.fallback.terminal_win_cmd = "50vsplit new"
|
||||
|
||||
O.user_which_key["d"] = {
|
||||
name = "Debug",
|
||||
t = { "<cmd>lua require'dap'.toggle_breakpoint()<cr>", "Toggle Breakpoint" },
|
||||
b = { "<cmd>lua require'dap'.step_back()<cr>", "Step Back" },
|
||||
c = { "<cmd>lua require'dap'.continue()<cr>", "Continue" },
|
||||
C = { "<cmd>lua require'dap'.run_to_cursor()<cr>", "Run To Cursor" },
|
||||
d = { "<cmd>lua require'dap'.disconnect()<cr>", "Disconnect" },
|
||||
g = { "<cmd>lua require'dap'.session()<cr>", "Get Session" },
|
||||
i = { "<cmd>lua require'dap'.step_into()<cr>", "Step Into" },
|
||||
o = { "<cmd>lua require'dap'.step_over()<cr>", "Step Over" },
|
||||
u = { "<cmd>lua require'dap'.step_out()<cr>", "Step Out" },
|
||||
p = { "<cmd>lua require'dap'.pause.toggle()<cr>", "Pause" },
|
||||
r = { "<cmd>lua require'dap'.repl.toggle()<cr>", "Toggle Repl" },
|
||||
s = { "<cmd>lua require'dap'.continue()<cr>", "Start" },
|
||||
q = { "<cmd>lua require'dap'.stop()<cr>", "Quit" },
|
||||
}
|
||||
|
|
@ -42,15 +42,32 @@ M.config = function()
|
|||
end
|
||||
|
||||
-- Map esc to exit inside lazygit
|
||||
vim.api.nvim_exec([[
|
||||
function LazyGitNativation()
|
||||
echom &filetype
|
||||
if &filetype ==# 'FTerm'
|
||||
tnoremap <Esc> q
|
||||
tnoremap <C-v><Esc> <Esc>
|
||||
endif
|
||||
endfunction
|
||||
]], false)
|
||||
-- vim.api.nvim_exec(
|
||||
-- [[
|
||||
-- function LazyGitNativation()
|
||||
-- echom &filetype
|
||||
-- if &filetype ==# 'FTerm'
|
||||
-- tnoremap <Esc> q
|
||||
-- tnoremap <C-v><Esc> <Esc>
|
||||
-- endif
|
||||
-- endfunction
|
||||
-- ]],
|
||||
-- false
|
||||
-- )
|
||||
vim.api.nvim_set_keymap("n", "<A-i>", "<CMD>lua require('FTerm').toggle()<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap(
|
||||
"t",
|
||||
"<A-i>",
|
||||
"<C-\\><C-n><CMD>lua require('FTerm').toggle()<CR>",
|
||||
{ noremap = true, silent = true }
|
||||
)
|
||||
vim.api.nvim_set_keymap("n", "<A-l>", "<CMD>lua _G.__fterm_lazygit()<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap(
|
||||
"t",
|
||||
"<A-l>",
|
||||
"<C-\\><C-n><CMD>lua _G.__fterm_lazygit()<CR>",
|
||||
{ noremap = true, silent = true }
|
||||
)
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
-- autoformat
|
||||
if O.format_on_save then
|
||||
require("lv-utils").define_augroups({
|
||||
require("lv-utils").define_augroups {
|
||||
autoformat = {
|
||||
{
|
||||
"BufWritePre",
|
||||
|
|
@ -8,11 +8,16 @@ if O.format_on_save then
|
|||
[[try | undojoin | Neoformat | catch /^Vim\%((\a\+)\)\=:E790/ | finally | silent Neoformat | endtry]],
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
end
|
||||
|
||||
vim.g.neoformat_run_all_formatters = 0
|
||||
|
||||
vim.g.neoformat_enabled_python = { "autopep8", "yapf", "docformatter" }
|
||||
vim.g.neoformat_enabled_javascript = { "prettier" }
|
||||
|
||||
if not O.format_on_save then
|
||||
vim.cmd([[if exists('#autoformat#BufWritePre')
|
||||
vim.cmd [[if exists('#autoformat#BufWritePre')
|
||||
:autocmd! autoformat
|
||||
endif]])
|
||||
endif]]
|
||||
end
|
||||
|
|
|
|||
|
|
@ -76,10 +76,10 @@ lv_utils.define_augroups {
|
|||
-- will cause split windows to be resized evenly if main window is resized
|
||||
{ "VimResized ", "*", "wincmd =" },
|
||||
},
|
||||
_fterm_lazygit = {
|
||||
-- will cause esc key to exit lazy git
|
||||
{"TermEnter", "*", "call LazyGitNativation()"}
|
||||
},
|
||||
-- _fterm_lazygit = {
|
||||
-- -- will cause esc key to exit lazy git
|
||||
-- {"TermEnter", "*", "call LazyGitNativation()"}
|
||||
-- },
|
||||
-- _mode_switching = {
|
||||
-- -- will switch between absolute and relative line numbers depending on mode
|
||||
-- {'InsertEnter', '*', 'if &relativenumber | let g:ms_relativenumberoff = 1 | setlocal number norelativenumber | endif'},
|
||||
|
|
@ -89,7 +89,7 @@ lv_utils.define_augroups {
|
|||
-- },
|
||||
}
|
||||
|
||||
vim.cmd([[
|
||||
vim.cmd [[
|
||||
function! QuickFixToggle()
|
||||
if empty(filter(getwininfo(), 'v:val.quickfix'))
|
||||
copen
|
||||
|
|
@ -98,7 +98,6 @@ vim.cmd([[
|
|||
endif
|
||||
endfunction
|
||||
]]
|
||||
)
|
||||
|
||||
return lv_utils
|
||||
|
||||
|
|
|
|||
|
|
@ -140,22 +140,6 @@ local mappings = {
|
|||
-- " Debug Adapter protocol:
|
||||
-- " https://microsoft.github.io/debug-adapter-protocol/
|
||||
-- " Debugging
|
||||
d = {
|
||||
name = "Debug",
|
||||
t = { "<cmd>lua require'dap'.toggle_breakpoint()<cr>", "Toggle Breakpoint" },
|
||||
b = { "<cmd>lua require'dap'.step_back()<cr>", "Step Back" },
|
||||
c = { "<cmd>lua require'dap'.continue()<cr>", "Continue" },
|
||||
C = { "<cmd>lua require'dap'.run_to_cursor()<cr>", "Run To Cursor" },
|
||||
d = { "<cmd>lua require'dap'.disconnect()<cr>", "Disconnect" },
|
||||
g = { "<cmd>lua require'dap'.session()<cr>", "Get Session" },
|
||||
i = { "<cmd>lua require'dap'.step_into()<cr>", "Step Into" },
|
||||
o = { "<cmd>lua require'dap'.step_over()<cr>", "Step Over" },
|
||||
u = { "<cmd>lua require'dap'.step_out()<cr>", "Step Out" },
|
||||
p = { "<cmd>lua require'dap'.pause.toggle()<cr>", "Pause" },
|
||||
r = { "<cmd>lua require'dap'.repl.toggle()<cr>", "Toggle Repl" },
|
||||
s = { "<cmd>lua require'dap'.continue()<cr>", "Start" },
|
||||
q = { "<cmd>lua require'dap'.stop()<cr>", "Quit" },
|
||||
},
|
||||
g = {
|
||||
name = "Git",
|
||||
j = { "<cmd>lua require 'gitsigns'.next_hunk()<cr>", "Next Hunk" },
|
||||
|
|
@ -251,24 +235,6 @@ if O.plugin.zen.active then
|
|||
vim.api.nvim_set_keymap("n", "<leader>z", ":ZenMode<CR>", { noremap = true, silent = true })
|
||||
mappings["z"] = "Zen"
|
||||
end
|
||||
if O.plugin.floatterm.active then
|
||||
vim.api.nvim_set_keymap("n", "<leader>gg", "<CMD>lua _G.__fterm_lazygit()<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("n", "<A-i>", "<CMD>lua require('FTerm').toggle()<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap(
|
||||
"t",
|
||||
"<A-i>",
|
||||
"<C-\\><C-n><CMD>lua require('FTerm').toggle()<CR>",
|
||||
{ noremap = true, silent = true }
|
||||
)
|
||||
vim.api.nvim_set_keymap("n", "<A-l>", "<CMD>lua _G.__fterm_lazygit()<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap(
|
||||
"t",
|
||||
"<A-l>",
|
||||
"<C-\\><C-n><CMD>lua _G.__fterm_lazygit()<CR>",
|
||||
{ noremap = true, silent = true }
|
||||
)
|
||||
mappings["gg"] = "LazyGit"
|
||||
end
|
||||
if O.plugin.telescope_project.active then
|
||||
-- open projects
|
||||
vim.api.nvim_set_keymap(
|
||||
|
|
@ -304,13 +270,13 @@ if O.lushmode then
|
|||
}
|
||||
end
|
||||
|
||||
-- for _, v in pairs(O.user_which_key) do
|
||||
-- end
|
||||
if O.plugin.floatterm then
|
||||
vim.api.nvim_set_keymap("n", "<leader>gg", "<CMD>lua _G.__fterm_lazygit()<CR>", { noremap = true, silent = true })
|
||||
mappings["gg"] = "LazyGit"
|
||||
end
|
||||
|
||||
for k, v in pairs(O.user_which_key) do
|
||||
mappings[k] = v
|
||||
-- table.insert(mappings, O.user_which_key[1])
|
||||
-- print(k)
|
||||
-- print(v)
|
||||
end
|
||||
|
||||
local wk = require "which-key"
|
||||
|
|
|
|||
|
|
@ -79,7 +79,13 @@ return require("packer").startup(function(use)
|
|||
}
|
||||
|
||||
-- whichkey
|
||||
use { "folke/which-key.nvim" }
|
||||
use {
|
||||
"folke/which-key.nvim",
|
||||
config = function()
|
||||
require "lv-which-key"
|
||||
end,
|
||||
event = "BufWinEnter",
|
||||
}
|
||||
|
||||
-- Autopairs
|
||||
use {
|
||||
|
|
@ -209,18 +215,7 @@ return require("packer").startup(function(use)
|
|||
use {
|
||||
"mfussenegger/nvim-dap",
|
||||
config = function()
|
||||
local status_ok, dap = pcall(require, "dap")
|
||||
if not status_ok then
|
||||
return
|
||||
end
|
||||
-- require "dap"
|
||||
vim.fn.sign_define("DapBreakpoint", {
|
||||
text = "",
|
||||
texthl = "LspDiagnosticsSignError",
|
||||
linehl = "",
|
||||
numhl = "",
|
||||
})
|
||||
dap.defaults.fallback.terminal_win_cmd = "50vsplit new"
|
||||
require "lv-dap"
|
||||
end,
|
||||
disable = not O.plugin.debug.active,
|
||||
}
|
||||
|
|
@ -228,7 +223,7 @@ return require("packer").startup(function(use)
|
|||
-- Floating terminal
|
||||
use {
|
||||
"numToStr/FTerm.nvim",
|
||||
event = "BufWinEnter",
|
||||
event = "BufRead",
|
||||
config = function()
|
||||
require("lv-floatterm").config()
|
||||
end,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue