Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lua/mappings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ map("n", "<leader>;", ":")
map("v", "<leader>;", ":")

-- easier than reaching for escape
map("i", "<leader>j", "<Esc>")
map("v", "<leader>j", "<Esc>")
map("i", "<A-n>", "<Esc>")
map("v", "<A-n>", "<Esc>")

-- navigate tabs
map("n", "<C-h>", "gT")
Expand All @@ -21,9 +21,9 @@ map("n", "<C-x>", "<cmd>x<CR>")
map("n", "<C-q>", "<cmd>q!<CR>")

-- terminal
map("t", "<leader>j", "<C-\\><C-n>")
map("t", "<A-n>", "<C-\\><C-n>")
map("t", "<Esc>", "<C-\\><C-n>")
map("n", "<leader>t", "<cmd>vsp<CR><cmd>terminal<CR>i")
map("n", "<A-n>", "<cmd>vsp<CR><cmd>terminal<CR>i")

-- commenting out
map("n", "<C-\\>", "gcc", { remap = true })
Expand Down
2 changes: 1 addition & 1 deletion lua/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ local options = {
splitright = true, -- force all vertical splits to go to the right of current window
swapfile = false, -- disable swapfile
termguicolors = true, -- set term gui colors (most terminals support this)
timeoutlen = 250, -- time to wait for a mapped sequence to complete (in milliseconds)
timeoutlen = 300, -- time to wait for a mapped sequence to complete (in milliseconds)
undofile = true, -- enable persistent undo
updatetime = 300, -- faster completion (4000ms default)
writebackup = false, -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited
Expand Down
2 changes: 1 addition & 1 deletion lua/plugins/telescope.lua
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ return {
mappings = {
i = {
["<esc>"] = actions.close,
["<leader>j"] = actions.close,
["<A-n>"] = actions.close,
["<C-t>"] = actions.select_tab, -- Open in new tab
["<C-y>"] = actions.select_vertical, -- Open in vertical split
},
Expand Down