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
3 changes: 3 additions & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[default.extend-words]
# noice is a Neovim plugin name, not a typo
noice = "noice"
12 changes: 12 additions & 0 deletions dot_config/nvim/init.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
-- vim ui2
require("vim._core.ui2").enable({
enable = true,
msg = {
target = "cmd", -- options: cmd(classic), msg(folke/noice.nvim-style popup)
pager = { height = 1 },
msg = { height = 0.5, timeout = 4500 },
dialog = { height = 0.5 },
cmd = { height = 0.5 },
},
})

require("user.options")

-- When running in VSCode, avoid plugins that duplicate VSCode features
Expand Down
7 changes: 7 additions & 0 deletions dot_config/nvim/lua/plugins/editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ return {
},
},
},
{
"mbbill/undotree",
cmd = "UndotreeToggle",
keys = {
{ "<leader>u", "<cmd>UndotreeToggle<cr>", desc = "Undotree toggle" },
},
},
{
"akinsho/git-conflict.nvim",
version = "*",
Expand Down
5 changes: 5 additions & 0 deletions dot_config/nvim/lua/user/keymaps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ utils.inoremap("kj", "<Esc>")
utils.nmap("∆", "<Cmd>move .+1<CR>==")
utils.nmap("˚", "<Cmd>move .-2<CR>==")

-- Restart
vim.keymap.set("n", "<leader>re", "<cmd>restart<cr>", {
desc = "Restart Neovim (:restart)",
})

-- Git hotkeys
utils.map("<C-g>f", "<Cmd>GFiles<CR>")
utils.nmap("<leader>gs", "<Cmd>Git<CR>", { desc = "Git status" })
Expand Down
Loading