From 4d88798fed204399aabe06cfdedf054964932451 Mon Sep 17 00:00:00 2001 From: Eric Olerud Date: Wed, 17 Apr 2024 19:07:43 -0400 Subject: [PATCH 1/2] add undotree --- init.lua | 3 ++- lua/custom/plugins/undotree.lua | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 lua/custom/plugins/undotree.lua diff --git a/init.lua b/init.lua index cb2a4f68..ccdeaf6f 100644 --- a/init.lua +++ b/init.lua @@ -71,6 +71,7 @@ vim.opt.scrolloff = 8 -- [[ Eric's Custom Keymaps]] vim.keymap.set('n', '', 'Neotree toggle') +vim.keymap.set('n', 'u', vim.cmd.UndotreeToggle) -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` @@ -669,7 +670,7 @@ require('lazy').setup({ -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' + vim.cmd.colorscheme 'tokyonight' -- You can configure highlights by doing something like: vim.cmd.hi 'Comment gui=none' diff --git a/lua/custom/plugins/undotree.lua b/lua/custom/plugins/undotree.lua new file mode 100644 index 00000000..77581624 --- /dev/null +++ b/lua/custom/plugins/undotree.lua @@ -0,0 +1,3 @@ +return { + 'mbbill/undotree', +} From bf123f80743dd68858ee363d4bce5189aa35d49b Mon Sep 17 00:00:00 2001 From: Eric Olerud Date: Wed, 17 Apr 2024 19:19:49 -0400 Subject: [PATCH 2/2] always include clangd and rust_analyzer --- init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index ccdeaf6f..1d278799 100644 --- a/init.lua +++ b/init.lua @@ -457,10 +457,10 @@ require('lazy').setup({ -- - settings (table): Override the default settings passed when initializing the server. -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ local servers = { - -- clangd = {}, + clangd = {}, -- gopls = {}, -- pyright = {}, - -- rust_analyzer = {}, + rust_analyzer = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- -- Some languages (like typescript) have entire language plugins that can be useful: