diff options
Diffstat (limited to 'vim/lua')
-rw-r--r-- | vim/lua/mappings.lua | 19 | ||||
-rw-r--r-- | vim/lua/plugins/init.lua | 4 |
2 files changed, 14 insertions, 9 deletions
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua index ed4c72f..c417ea4 100644 --- a/vim/lua/mappings.lua +++ b/vim/lua/mappings.lua | |||
@@ -16,10 +16,6 @@ vim.keymap.set("n", "<Esc>", "<cmd>noh<CR>", { desc = "general clear highlights" | |||
16 | -- map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "toggle relative number" }) | 16 | -- map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "toggle relative number" }) |
17 | vim.keymap.set("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "toggle nvcheatsheet" }) | 17 | vim.keymap.set("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "toggle nvcheatsheet" }) |
18 | 18 | ||
19 | vim.keymap.set("n", "<leader>F", function() | ||
20 | require("conform").format { lsp_fallback = true } | ||
21 | end, { desc = "format files" }) | ||
22 | |||
23 | -- global lsp mappings | 19 | -- global lsp mappings |
24 | vim.keymap.set("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "lsp diagnostic loclist" }) | 20 | vim.keymap.set("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "lsp diagnostic loclist" }) |
25 | 21 | ||
@@ -121,14 +117,19 @@ end, { desc = 'Search Directory' }) | |||
121 | -- map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" }) | 117 | -- map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" }) |
122 | 118 | ||
123 | -- new terminals | 119 | -- new terminals |
124 | vim.keymap.set("n", "<leader><leader>h", function() require("nvchad.term").new { pos = "sp" } end, { desc = "terminal new horizontal term" }) | 120 | vim.keymap.set("n", "<leader><leader>h", function() require("nvchad.term").new { pos = "sp" } end, |
125 | vim.keymap.set("n", "<leader>v", function() require("nvchad.term").new { pos = "vsp" } end, { desc = "terminal new vertical window" }) | 121 | { desc = "terminal new horizontal term" }) |
122 | vim.keymap.set("n", "<leader>v", function() require("nvchad.term").new { pos = "vsp" } end, | ||
123 | { desc = "terminal new vertical window" }) | ||
126 | -- toggleable | 124 | -- toggleable |
127 | vim.keymap.set({ "n", "t" }, "<A-v>", function() require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" } end, { desc = "terminal toggleable vertical term" }) | 125 | vim.keymap.set({ "n", "t" }, "<A-v>", function() require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" } end, |
126 | { desc = "terminal toggleable vertical term" }) | ||
128 | vim.keymap.set("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" }) | 127 | vim.keymap.set("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" }) |
129 | vim.keymap.set({ "t" }, "<A-e>", "<C-\\><C-N><C-W>|<C-W>_i", { desc = "terminal toggleable vertical term" }) | 128 | vim.keymap.set({ "t" }, "<A-e>", "<C-\\><C-N><C-W>|<C-W>_i", { desc = "terminal toggleable vertical term" }) |
130 | vim.keymap.set({ "n", "t" }, "<A-t>", function() require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" } end, { desc = "terminal new horizontal term" }) | 129 | vim.keymap.set({ "n", "t" }, "<A-t>", function() require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" } end, |
131 | vim.keymap.set({ "n", "t" }, "<A-i>", function() require("nvchad.term").toggle { pos = "float", id = "floatTerm" } end, { desc = "terminal toggle floating term" }) | 130 | { desc = "terminal new horizontal term" }) |
131 | vim.keymap.set({ "n", "t" }, "<A-i>", function() require("nvchad.term").toggle { pos = "float", id = "floatTerm" } end, | ||
132 | { desc = "terminal toggle floating term" }) | ||
132 | vim.keymap.set("n", "<leader>th", "<cmd>Telescope themes<CR>", { desc = "telescope nvchad themes" }) | 133 | vim.keymap.set("n", "<leader>th", "<cmd>Telescope themes<CR>", { desc = "telescope nvchad themes" }) |
133 | 134 | ||
134 | -- whichkey | 135 | -- whichkey |
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua index e2c7c58..e510475 100644 --- a/vim/lua/plugins/init.lua +++ b/vim/lua/plugins/init.lua | |||
@@ -35,6 +35,10 @@ return { | |||
35 | -- event = 'BufWritePre', -- uncomment for format on save | 35 | -- event = 'BufWritePre', -- uncomment for format on save |
36 | config = function() | 36 | config = function() |
37 | require "configs.conform" | 37 | require "configs.conform" |
38 | |||
39 | vim.keymap.set("n", "<leader>F", function() | ||
40 | require("conform").format { lsp_fallback = true } | ||
41 | end, { desc = "format files" }) | ||
38 | end, | 42 | end, |
39 | }, | 43 | }, |
40 | 44 | ||