merge

init.lua

@@ -72,6 +72,7 @@ vim.opt.scrolloff = 8
 
 vim.keymap.set('n', '<leader><leader>', '<cmd>Neotree toggle<CR>')
 vim.keymap.set('n', '<leader><leader>g', '<cmd>Neotree float git_status<CR>')
+vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
 
 -- [[ Basic Keymaps ]]
 --  See `:help vim.keymap.set()`
@@ -457,10 +458,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:
@@ -670,7 +671,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'

lua/custom/plugins/undotree.lua

@@ -0,0 +1,3 @@
+return {
+  'mbbill/undotree',
+}