WIP: update-upstream #4

Closed
cscherrNT wants to merge 69 commits from update-upstream into master
2 changed files with 7 additions and 10 deletions
Showing only changes of commit 2cf989cf31 - Show all commits

View File

@ -84,20 +84,22 @@ map(
-- terminal -- terminal
map("t", "<C-x>", "<C-\\><C-N>", { desc = "Terminal Escape terminal mode" }) map("t", "<C-x>", "<C-\\><C-N>", { desc = "Terminal Escape terminal mode" })
-- new terminals
map("n", "<leader>h", function() map("n", "<leader>h", function()
require("nvchad.term").new { pos = "sp", size = 0.3 } require("nvchad.term").new { pos = "sp", size = 0.3 }
end, { desc = "Terminal New horizontal term" }) end, { desc = "Terminal New horizontal term" })
map("n", "<leader>v", function() map("n", "<leader>v", function()
require("nvchad.term").new { pos = "vsp", size = 0.3 } require("nvchad.term").new { pos = "vsp", size = 0.3 }
end, { desc = "Terminal New vertical term" }) end, { desc = "Terminal New vertical window" })
-- toggleable
map({ "n", "t" }, "<A-v>", function() map({ "n", "t" }, "<A-v>", function()
require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm", size = 0.3 } require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm", size = 0.3 }
end, { desc = "Terminal Toggleable vertical term" }) end, { desc = "Terminal Toggleable vertical term" })
map({ "n", "t" }, "<A-h>", function() map({ "n", "t" }, "<A-h>", function()
require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm", size = 0.2 } require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm", size = 0.3 }
end, { desc = "Terminal New horizontal term" }) end, { desc = "Terminal New horizontal term" })
map({ "n", "t" }, "<A-i>", function() map({ "n", "t" }, "<A-i>", function()

View File

@ -32,7 +32,7 @@ M.ui = {
tabufline = { tabufline = {
enabled = true, enabled = true,
lazyload = true, lazyload = true,
order= {'treeOffset', 'buffers' , 'tabs', 'btns'}, order = { "treeOffset", "buffers", "tabs", "btns" },
modules = nil, modules = nil,
}, },
@ -80,9 +80,6 @@ M.ui = {
height = 0.4, height = 0.4,
border = "single", border = "single",
}, },
behavior = {
auto_insert = true,
},
}, },
} }
@ -108,6 +105,4 @@ M.base46 = {
}, },
} }
M = vim.tbl_deep_extend("force", M, require('chadrc')) return vim.tbl_deep_extend("force", M, require('chadrc'))
return M