diff --git a/.typos.toml b/.typos.toml new file mode 100644 index 0000000..2fcf005 --- /dev/null +++ b/.typos.toml @@ -0,0 +1,3 @@ +[default.extend-words] +# noice is a Neovim plugin name, not a typo +noice = "noice" diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua index 0f930e7..0e1c740 100644 --- a/dot_config/nvim/init.lua +++ b/dot_config/nvim/init.lua @@ -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 diff --git a/dot_config/nvim/lua/plugins/editor.lua b/dot_config/nvim/lua/plugins/editor.lua index 3b7c63f..6aa8c37 100644 --- a/dot_config/nvim/lua/plugins/editor.lua +++ b/dot_config/nvim/lua/plugins/editor.lua @@ -42,6 +42,13 @@ return { }, }, }, + { + "mbbill/undotree", + cmd = "UndotreeToggle", + keys = { + { "u", "UndotreeToggle", desc = "Undotree toggle" }, + }, + }, { "akinsho/git-conflict.nvim", version = "*", diff --git a/dot_config/nvim/lua/user/keymaps.lua b/dot_config/nvim/lua/user/keymaps.lua index feacc4c..aedbb87 100644 --- a/dot_config/nvim/lua/user/keymaps.lua +++ b/dot_config/nvim/lua/user/keymaps.lua @@ -38,6 +38,11 @@ utils.inoremap("kj", "") utils.nmap("∆", "move .+1==") utils.nmap("˚", "move .-2==") +-- Restart +vim.keymap.set("n", "re", "restart", { + desc = "Restart Neovim (:restart)", +}) + -- Git hotkeys utils.map("f", "GFiles") utils.nmap("gs", "Git", { desc = "Git status" })