From ffc401517b8ffda1822bd78686b40ae0669151f5 Mon Sep 17 00:00:00 2001
From: Ting Lu <ting-lu@student.kirkwood.edu>
Date: Sat, 25 Feb 2023 00:42:08 -0600
Subject: [PATCH 01/24] Added filetree

---
 init.lua                       |  8 ++++----
 lua/custom/plugins/filtree.lua | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 lua/custom/plugins/filtree.lua

diff --git a/init.lua b/init.lua
index aeca6d28a4d..b0f9de18630 100644
--- a/init.lua
+++ b/init.lua
@@ -288,10 +288,10 @@ vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { de
 -- See `:help nvim-treesitter`
 require('nvim-treesitter.configs').setup {
   -- Add languages to be installed here that you want installed for treesitter
-  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'help', 'vim' },
+  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'help', 'vim', 'ruby' },
 
   -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
-  auto_install = false,
+  auto_install = true,
 
   highlight = { enable = true },
   indent = { enable = true, disable = { 'python' } },
@@ -408,7 +408,7 @@ end
 --  the `settings` field of the server config. You must look up that documentation yourself.
 local servers = {
   -- clangd = {},
-  -- gopls = {},
+  gopls = {},
   -- pyright = {},
   -- rust_analyzer = {},
   -- tsserver = {},
@@ -474,7 +474,7 @@ cmp.setup {
       elseif luasnip.expand_or_jumpable() then
         luasnip.expand_or_jump()
       else
-        fallback()
+       fallback()
       end
     end, { 'i', 's' }),
     ['<S-Tab>'] = cmp.mapping(function(fallback)
diff --git a/lua/custom/plugins/filtree.lua b/lua/custom/plugins/filtree.lua
new file mode 100644
index 00000000000..237f750518d
--- /dev/null
+++ b/lua/custom/plugins/filtree.lua
@@ -0,0 +1,15 @@
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+  version = "*",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+    "MunifTanjim/nui.nvim",
+  },
+  config = function ()
+    -- Unless you are still migrating, remove the deprecated commands from v1.x
+    vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
+
+    require('neo-tree').setup {}
+  end,
+}

From 794918895aa86ff5462cfcbb50e3ad240e25a443 Mon Sep 17 00:00:00 2001
From: Ting Lu <ting-lu@student.kirkwood.edu>
Date: Sat, 25 Feb 2023 13:20:34 -0600
Subject: [PATCH 02/24] Added autopair

---
 lua/custom/plugins/autopair.lua | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 lua/custom/plugins/autopair.lua

diff --git a/lua/custom/plugins/autopair.lua b/lua/custom/plugins/autopair.lua
new file mode 100644
index 00000000000..fe5311bac46
--- /dev/null
+++ b/lua/custom/plugins/autopair.lua
@@ -0,0 +1,3 @@
+return {
+  'jiangmiao/auto-pairs'
+}

From 046e0b14776226a5102812056bdbf8b302eb65cd Mon Sep 17 00:00:00 2001
From: Ting Lu <ting-lu@student.kirkwood.edu>
Date: Sat, 25 Feb 2023 13:35:11 -0600
Subject: [PATCH 03/24] Added relative line numbers and more lsp

---
 init.lua | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/init.lua b/init.lua
index b0f9de18630..74870e16d1b 100644
--- a/init.lua
+++ b/init.lua
@@ -230,6 +230,10 @@ vim.o.completeopt = 'menuone,noselect'
 -- NOTE: You should make sure your terminal supports this
 vim.o.termguicolors = true
 
+-- Set relative and absolute line numbers
+vim.o.relativenumber = true
+vim.o.number = true
+
 -- [[ Basic Keymaps ]]
 
 -- Keymaps for better default experience
@@ -407,11 +411,24 @@ end
 --  Add any additional override configuration in the following tables. They will be passed to
 --  the `settings` field of the server config. You must look up that documentation yourself.
 local servers = {
-  -- clangd = {},
+  clangd = {},
   gopls = {},
-  -- pyright = {},
-  -- rust_analyzer = {},
-  -- tsserver = {},
+  solargraph = {},
+  sqlls = {},
+  angularls = {},
+  bashls = {},
+  cssls = {},
+  dockerls = {},
+  gradle_ls = {},
+  pyright = {},
+  tsserver = {},
+  html = {},
+  jsonls = {},
+  jdtls = {},
+  rust_analyzer = {},
+  marksman = {},
+  volar = {},
+  yamlls = {},
 
   lua_ls = {
     Lua = {

From a35bc79b5f59bd48c55415b5c6a116b83f7e7838 Mon Sep 17 00:00:00 2001
From: Ting Lu <ting-lu@student.kirkwood.edu>
Date: Sat, 25 Feb 2023 15:26:01 -0600
Subject: [PATCH 04/24] Neotree close on only window open

---
 lua/custom/plugins/filtree.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lua/custom/plugins/filtree.lua b/lua/custom/plugins/filtree.lua
index 237f750518d..87d84b9e48c 100644
--- a/lua/custom/plugins/filtree.lua
+++ b/lua/custom/plugins/filtree.lua
@@ -10,6 +10,8 @@ return {
     -- Unless you are still migrating, remove the deprecated commands from v1.x
     vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
 
-    require('neo-tree').setup {}
+    require('neo-tree').setup {
+      close_if_last_window = true,
+    }
   end,
 }

From d2d5a4effb78a40392dd1d3a89b5a0a9b488c846 Mon Sep 17 00:00:00 2001
From: Ting Lu <ting-lu@student.kirkwood.edu>
Date: Sat, 25 Feb 2023 19:45:53 -0600
Subject: [PATCH 05/24] Added dap

---
 lua/custom/plugins/nvim-dap.lua | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 lua/custom/plugins/nvim-dap.lua

diff --git a/lua/custom/plugins/nvim-dap.lua b/lua/custom/plugins/nvim-dap.lua
new file mode 100644
index 00000000000..2471b2c26d3
--- /dev/null
+++ b/lua/custom/plugins/nvim-dap.lua
@@ -0,0 +1,3 @@
+return {
+  'mfussenegger/nvim-dap'
+}

From 555d200655d5c5dc113fd02a20a26fcee51c4f39 Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Tue, 28 Feb 2023 13:48:04 -0500
Subject: [PATCH 06/24] Updated to latest settings

---
 init.lua                          | 8 ++++++--
 lua/custom/plugins/easymotion.lua | 3 +++
 lua/custom/plugins/filtree.lua    | 3 +++
 lua/custom/plugins/surround.lua   | 7 +++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 lua/custom/plugins/easymotion.lua
 create mode 100644 lua/custom/plugins/surround.lua

diff --git a/init.lua b/init.lua
index 74870e16d1b..40486661308 100644
--- a/init.lua
+++ b/init.lua
@@ -234,6 +234,9 @@ vim.o.termguicolors = true
 vim.o.relativenumber = true
 vim.o.number = true
 
+vim.o.scrolloff = 5
+vim.o.sidescrolloff = 10
+
 -- [[ Basic Keymaps ]]
 
 -- Keymaps for better default experience
@@ -273,7 +276,7 @@ pcall(require('telescope').load_extension, 'fzf')
 
 -- See `:help telescope.builtin`
 vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
-vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
+vim.keymap.set('n', '<leader>b', require('telescope.builtin').buffers, { desc = 'Find existing [b]uffers' })
 vim.keymap.set('n', '<leader>/', function()
   -- You can pass additional configuration to telescope to change theme, layout, etc.
   require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
@@ -413,7 +416,8 @@ end
 local servers = {
   clangd = {},
   gopls = {},
-  solargraph = {},
+  -- solargraph = {},
+  ruby_ls = {},
   sqlls = {},
   angularls = {},
   bashls = {},
diff --git a/lua/custom/plugins/easymotion.lua b/lua/custom/plugins/easymotion.lua
new file mode 100644
index 00000000000..82639d4fa9d
--- /dev/null
+++ b/lua/custom/plugins/easymotion.lua
@@ -0,0 +1,3 @@
+return {
+  'easymotion/vim-easymotion'
+}
diff --git a/lua/custom/plugins/filtree.lua b/lua/custom/plugins/filtree.lua
index 87d84b9e48c..f29e7bc0ba5 100644
--- a/lua/custom/plugins/filtree.lua
+++ b/lua/custom/plugins/filtree.lua
@@ -13,5 +13,8 @@ return {
     require('neo-tree').setup {
       close_if_last_window = true,
     }
+
+    vim.keymap.set('n', '<leader>nf', ':NeoTreeFloatToggle<CR>', { desc = '[N]eoTree [F]loat Toggle' })
+    vim.keymap.set('n', '<leader>nr', ':NeoTreeRevealToggle<CR>', { desc = '[N]eoTree [R]eveal Toggle' })
   end,
 }
diff --git a/lua/custom/plugins/surround.lua b/lua/custom/plugins/surround.lua
new file mode 100644
index 00000000000..f1ba9a6b957
--- /dev/null
+++ b/lua/custom/plugins/surround.lua
@@ -0,0 +1,7 @@
+return {
+  "kylechui/nvim-surround",
+  version = "*",
+  config = function ()
+    require("nvim-surround").setup()
+  end
+}

From ca533432a64be51189f1a18ff6458431fa968f81 Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Tue, 28 Feb 2023 14:09:49 -0500
Subject: [PATCH 07/24] Added format and auto format support

---
 init.lua | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/init.lua b/init.lua
index 40486661308..71136f7091f 100644
--- a/init.lua
+++ b/init.lua
@@ -35,7 +35,6 @@ I hope you enjoy your Neovim journey,
 
 P.S. You can delete this when you're done too. It's your config now :)
 --]]
-
 -- Set <space> as the leader key
 -- See `:help mapleader`
 --  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
@@ -97,7 +96,7 @@ require('lazy').setup({
   },
 
   -- Useful plugin to show you pending keybinds.
-  { 'folke/which-key.nvim', opts = {} },
+  { 'folke/which-key.nvim',          opts = {} },
   { -- Adds git releated signs to the gutter, as well as utilities for managing changes
     'lewis6991/gitsigns.nvim',
     opts = {
@@ -144,7 +143,7 @@ require('lazy').setup({
   },
 
   -- "gc" to comment visual regions/lines
-  { 'numToStr/Comment.nvim', opts = {} },
+  { 'numToStr/Comment.nvim',         opts = {} },
 
   -- Fuzzy Finder (files, lsp, etc)
   { 'nvim-telescope/telescope.nvim', version = '*', dependencies = { 'nvim-lua/plenary.nvim' } },
@@ -406,6 +405,8 @@ local on_attach = function(_, bufnr)
   vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
     vim.lsp.buf.format()
   end, { desc = 'Format current buffer with LSP' })
+
+  nmap('<leader>f', function() vim.lsp.buf.format { async = true } end, 'Auto [F]ormat')
 end
 
 -- Enable the following language servers
@@ -433,7 +434,6 @@ local servers = {
   marksman = {},
   volar = {},
   yamlls = {},
-
   lua_ls = {
     Lua = {
       workspace = { checkThirdParty = false },
@@ -482,7 +482,7 @@ cmp.setup {
     end,
   },
   mapping = cmp.mapping.preset.insert {
-    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
+    ['<C-d>'] = cmp.mapping.scroll_docs( -4),
     ['<C-f>'] = cmp.mapping.scroll_docs(4),
     ['<C-Space>'] = cmp.mapping.complete {},
     ['<CR>'] = cmp.mapping.confirm {
@@ -495,14 +495,14 @@ cmp.setup {
       elseif luasnip.expand_or_jumpable() then
         luasnip.expand_or_jump()
       else
-       fallback()
+        fallback()
       end
     end, { 'i', 's' }),
     ['<S-Tab>'] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_prev_item()
-      elseif luasnip.jumpable(-1) then
-        luasnip.jump(-1)
+      elseif luasnip.jumpable( -1) then
+        luasnip.jump( -1)
       else
         fallback()
       end
@@ -514,5 +514,7 @@ cmp.setup {
   },
 }
 
+vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]]
+
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et

From f5fd67fb1b0859ef9dfd877811ad4ab446d82aa0 Mon Sep 17 00:00:00 2001
From: Wil Simpson <simpson.wil255@gmail.com>
Date: Sun, 12 Mar 2023 19:54:52 +0000
Subject: [PATCH 08/24] Added tabstop/softtabstop 4

---
 init.lua | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/init.lua b/init.lua
index 71136f7091f..90d4a04e05c 100644
--- a/init.lua
+++ b/init.lua
@@ -74,7 +74,8 @@ require('lazy').setup({
 
   -- NOTE: This is where your plugins related to LSP can be installed.
   --  The configuration is done below. Search for lspconfig to find it below.
-  { -- LSP Configuration & Plugins
+  {
+    -- LSP Configuration & Plugins
     'neovim/nvim-lspconfig',
     dependencies = {
       -- Automatically install LSPs to stdpath for neovim
@@ -90,14 +91,16 @@ require('lazy').setup({
     },
   },
 
-  { -- Autocompletion
+  {
+    -- Autocompletion
     'hrsh7th/nvim-cmp',
     dependencies = { 'hrsh7th/cmp-nvim-lsp', 'L3MON4D3/LuaSnip', 'saadparwaiz1/cmp_luasnip' },
   },
 
   -- Useful plugin to show you pending keybinds.
   { 'folke/which-key.nvim',          opts = {} },
-  { -- Adds git releated signs to the gutter, as well as utilities for managing changes
+  {
+    -- Adds git releated signs to the gutter, as well as utilities for managing changes
     'lewis6991/gitsigns.nvim',
     opts = {
       -- See `:help gitsigns.txt`
@@ -111,7 +114,8 @@ require('lazy').setup({
     },
   },
 
-  { -- Theme inspired by Atom
+  {
+    -- Theme inspired by Atom
     'navarasu/onedark.nvim',
     priority = 1000,
     config = function()
@@ -119,7 +123,8 @@ require('lazy').setup({
     end,
   },
 
-  { -- Set lualine as statusline
+  {
+    -- Set lualine as statusline
     'nvim-lualine/lualine.nvim',
     -- See `:help lualine.txt`
     opts = {
@@ -132,7 +137,8 @@ require('lazy').setup({
     },
   },
 
-  { -- Add indentation guides even on blank lines
+  {
+    -- Add indentation guides even on blank lines
     'lukas-reineke/indent-blankline.nvim',
     -- Enable `lukas-reineke/indent-blankline.nvim`
     -- See `:help indent_blankline.txt`
@@ -161,7 +167,8 @@ require('lazy').setup({
     end,
   },
 
-  { -- Highlight, edit, and navigate code
+  {
+    -- Highlight, edit, and navigate code
     'nvim-treesitter/nvim-treesitter',
     dependencies = {
       'nvim-treesitter/nvim-treesitter-textobjects',
@@ -236,6 +243,9 @@ vim.o.number = true
 vim.o.scrolloff = 5
 vim.o.sidescrolloff = 10
 
+vim.o.tabstop = 4
+vim.o.softtabstop = 4
+
 -- [[ Basic Keymaps ]]
 
 -- Keymaps for better default experience
@@ -482,7 +492,7 @@ cmp.setup {
     end,
   },
   mapping = cmp.mapping.preset.insert {
-    ['<C-d>'] = cmp.mapping.scroll_docs( -4),
+    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
     ['<C-f>'] = cmp.mapping.scroll_docs(4),
     ['<C-Space>'] = cmp.mapping.complete {},
     ['<CR>'] = cmp.mapping.confirm {
@@ -501,8 +511,8 @@ cmp.setup {
     ['<S-Tab>'] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_prev_item()
-      elseif luasnip.jumpable( -1) then
-        luasnip.jump( -1)
+      elseif luasnip.jumpable(-1) then
+        luasnip.jump(-1)
       else
         fallback()
       end

From 9953fa644c7f0d43be4b7cbf9a0154f11f55db52 Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Mon, 13 Mar 2023 15:13:29 -0400
Subject: [PATCH 09/24] tree picker and go

---
 init.lua                           | 10 ++++++++--
 lua/custom/plugins/go.lua          | 12 ++++++++++++
 lua/custom/plugins/tree-picker.lua |  7 +++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 lua/custom/plugins/go.lua
 create mode 100644 lua/custom/plugins/tree-picker.lua

diff --git a/init.lua b/init.lua
index 71136f7091f..2f3cd14b37a 100644
--- a/init.lua
+++ b/init.lua
@@ -203,7 +203,7 @@ vim.o.mouse = 'a'
 -- Sync clipboard between OS and Neovim.
 --  Remove this option if you want your OS clipboard to remain independent.
 --  See `:help 'clipboard'`
-vim.o.clipboard = 'unnamedplus'
+-- vim.o.clipboard = 'unnamedplus'
 
 -- Enable break indent
 vim.o.breakindent = true
@@ -233,9 +233,15 @@ vim.o.termguicolors = true
 vim.o.relativenumber = true
 vim.o.number = true
 
+-- Set scroll offsets to have additional space when scrolling
 vim.o.scrolloff = 5
 vim.o.sidescrolloff = 10
 
+-- Set tabs to 2 spaces
+vim.o.tabstop = 2
+vim.o.softtabstop = 2
+vim.o.shiftwidth = 2
+
 -- [[ Basic Keymaps ]]
 
 -- Keymaps for better default experience
@@ -406,7 +412,7 @@ local on_attach = function(_, bufnr)
     vim.lsp.buf.format()
   end, { desc = 'Format current buffer with LSP' })
 
-  nmap('<leader>f', function() vim.lsp.buf.format { async = true } end, 'Auto [F]ormat')
+  nmap('<leader><C-f>', function() vim.lsp.buf.format { async = true } end, 'Auto [F]ormat')
 end
 
 -- Enable the following language servers
diff --git a/lua/custom/plugins/go.lua b/lua/custom/plugins/go.lua
new file mode 100644
index 00000000000..d131143606f
--- /dev/null
+++ b/lua/custom/plugins/go.lua
@@ -0,0 +1,12 @@
+return {
+  'ray-x/go.nvim',
+  requires = {
+    'ray-x/guihua.lua'
+  },
+  config = function()
+    require("go").setup()
+  end,
+  event = { 'CmdlineEnter' },
+  ft = { 'go', 'gomod' },
+  build = ':lua require("go.install").update_all_sync()',
+}
diff --git a/lua/custom/plugins/tree-picker.lua b/lua/custom/plugins/tree-picker.lua
new file mode 100644
index 00000000000..1d56d358915
--- /dev/null
+++ b/lua/custom/plugins/tree-picker.lua
@@ -0,0 +1,7 @@
+return {
+  's1n7ax/nvim-window-picker',
+  version = "*",
+  config = function()
+    require('window-picker').setup()
+  end
+}

From 8693bde8802324ee802f3b1dd97912067c40cd04 Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Fri, 31 Mar 2023 10:29:59 -0400
Subject: [PATCH 10/24] Latest version

---
 init.lua                                | 36 ++++++++++++++++++++-----
 lua/custom/plugins/colorizer.lua        |  6 +++++
 lua/custom/plugins/leetcode.lua         | 10 +++++++
 lua/custom/plugins/markdown-preview.lua |  4 +++
 4 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 lua/custom/plugins/colorizer.lua
 create mode 100644 lua/custom/plugins/leetcode.lua
 create mode 100644 lua/custom/plugins/markdown-preview.lua

diff --git a/init.lua b/init.lua
index c43900e06ac..726e48f78bf 100644
--- a/init.lua
+++ b/init.lua
@@ -41,6 +41,8 @@ P.S. You can delete this when you're done too. It's your config now :)
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
+vim.o.termguicolors = true
+
 -- Install package manager
 --    https://github.com/folke/lazy.nvim
 --    `:help lazy.nvim.txt` for more info
@@ -114,13 +116,28 @@ require('lazy').setup({
     },
   },
 
+  -- {
+  --   -- Theme inspired by Atom
+  --   'navarasu/onedark.nvim',
+  --   priority = 1000,
+  --   config = function()
+  --     require('onedark').setup {
+  --       style = 'dark',
+  --       code_style = {
+  --         comments = 'none',
+  --       },
+  --     }
+  --     require('onedark').load()
+  --     vim.cmd.colorscheme 'onedark'
+  --   end,
+  -- },
   {
-    -- Theme inspired by Atom
-    'navarasu/onedark.nvim',
-    priority = 1000,
+    'morhetz/gruvbox',
     config = function()
-      vim.cmd.colorscheme 'onedark'
-    end,
+      vim.cmd.colorscheme 'gruvbox'
+      vim.o.background = 'dark'
+      vim.o.termguicolors = true
+    end
   },
 
   {
@@ -130,7 +147,7 @@ require('lazy').setup({
     opts = {
       options = {
         icons_enabled = false,
-        theme = 'onedark',
+        theme = 'gruvbox',
         component_separators = '|',
         section_separators = '',
       },
@@ -306,7 +323,8 @@ vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { de
 -- See `:help nvim-treesitter`
 require('nvim-treesitter.configs').setup {
   -- Add languages to be installed here that you want installed for treesitter
-  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'help', 'vim', 'ruby' },
+  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'help', 'vim', 'ruby', 'http',
+    'css' },
 
   -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
   auto_install = true,
@@ -419,6 +437,9 @@ local on_attach = function(_, bufnr)
   end, { desc = 'Format current buffer with LSP' })
 
   nmap('<leader><C-f>', function() vim.lsp.buf.format { async = true } end, 'Auto [F]ormat')
+
+  nmap('[e', vim.diagnostic.goto_next, 'Next [e]rror')
+  nmap(']e', vim.diagnostic.goto_prev, 'Prev [e]rror')
 end
 
 -- Enable the following language servers
@@ -452,6 +473,7 @@ local servers = {
       telemetry = { enable = false },
     },
   },
+  tailwindcss = {},
 }
 
 -- Setup neovim lua configuration
diff --git a/lua/custom/plugins/colorizer.lua b/lua/custom/plugins/colorizer.lua
new file mode 100644
index 00000000000..416f2d12559
--- /dev/null
+++ b/lua/custom/plugins/colorizer.lua
@@ -0,0 +1,6 @@
+return {
+  'norcalli/nvim-colorizer.lua',
+  config = function()
+    require('colorizer').setup()
+  end,
+}
diff --git a/lua/custom/plugins/leetcode.lua b/lua/custom/plugins/leetcode.lua
new file mode 100644
index 00000000000..5ee4663b1d0
--- /dev/null
+++ b/lua/custom/plugins/leetcode.lua
@@ -0,0 +1,10 @@
+return {
+  'mbledkowski/neuleetcode.vim',
+  config = function()
+    vim.g.leetcode_browser = 'chrome'
+    vim.keymap.set('n', '<leader>ll', ':LeetCodeList<CR>', { desc = '[L]eetCode [L]ist' })
+    vim.keymap.set('n', '<leader>lt', ':LeetCodeTest<CR>', { desc = '[L]eetCode [T]est' })
+    vim.keymap.set('n', '<leader>ls', ':LeetCodeSubmit<CR>', { desc = '[L]eetCode [S]ubmit' })
+    vim.keymap.set('n', '<leader>li', ':LeetCodeSignIn<CR>', { desc = '[L]eetCode Sign [I]n' })
+  end,
+}
diff --git a/lua/custom/plugins/markdown-preview.lua b/lua/custom/plugins/markdown-preview.lua
new file mode 100644
index 00000000000..cf277aa0d35
--- /dev/null
+++ b/lua/custom/plugins/markdown-preview.lua
@@ -0,0 +1,4 @@
+return {
+  "iamcco/markdown-preview.nvim",
+  run = function() vim.fn["mkdp#util#install"]() end,
+}

From 2870f89f1e0398cb1ac1075cdb9ae7882c4c5a9f Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Tue, 4 Jul 2023 14:34:42 -0400
Subject: [PATCH 11/24] Lastest changes

---
 init.lua                                         |  8 ++++----
 lua/custom/plugins/easymotion.lua                |  8 +++++++-
 lua/custom/plugins/{filtree.lua => filetree.lua} |  0
 lua/custom/plugins/leetcode.lua                  | 10 ----------
 lua/custom/plugins/markdown-preview.lua          |  4 ----
 lua/custom/plugins/nvim-dap.lua                  |  3 ---
 6 files changed, 11 insertions(+), 22 deletions(-)
 rename lua/custom/plugins/{filtree.lua => filetree.lua} (100%)
 delete mode 100644 lua/custom/plugins/leetcode.lua
 delete mode 100644 lua/custom/plugins/markdown-preview.lua
 delete mode 100644 lua/custom/plugins/nvim-dap.lua

diff --git a/init.lua b/init.lua
index 726e48f78bf..c0a54b57d0b 100644
--- a/init.lua
+++ b/init.lua
@@ -198,8 +198,8 @@ require('lazy').setup({
   -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
   --       These are some example plugins that I've included in the kickstart repository.
   --       Uncomment any of the lines below to enable them.
-  -- require 'kickstart.plugins.autoformat',
-  -- require 'kickstart.plugins.debug',
+  require 'kickstart.plugins.autoformat',
+  require 'kickstart.plugins.debug',
 
   -- NOTE: The import below automatically adds your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
   --    You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping
@@ -451,7 +451,7 @@ local servers = {
   clangd = {},
   gopls = {},
   -- solargraph = {},
-  ruby_ls = {},
+  -- ruby_ls = {},
   sqlls = {},
   angularls = {},
   bashls = {},
@@ -548,7 +548,7 @@ cmp.setup {
   },
 }
 
-vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]]
+-- vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]]
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/custom/plugins/easymotion.lua b/lua/custom/plugins/easymotion.lua
index 82639d4fa9d..802d422167e 100644
--- a/lua/custom/plugins/easymotion.lua
+++ b/lua/custom/plugins/easymotion.lua
@@ -1,3 +1,9 @@
 return {
-  'easymotion/vim-easymotion'
+  'easymotion/vim-easymotion',
+  config = function()
+    vim.keymap.set('n', 'f', '<Plug>(easymotion-f)', { desc = '[f]ind next character' })
+    vim.keymap.set('n', 'F', '<Plug>(easymotion-F)', { desc = '[F]ind previous character' })
+    vim.keymap.set('n', 't', '<Plug>(easymotion-t)', { desc = '[t]ill next character' })
+    vim.keymap.set('n', 'T', '<Plug>(easymotion-T)', { desc = '[T]ill previous character' })
+  end,
 }
diff --git a/lua/custom/plugins/filtree.lua b/lua/custom/plugins/filetree.lua
similarity index 100%
rename from lua/custom/plugins/filtree.lua
rename to lua/custom/plugins/filetree.lua
diff --git a/lua/custom/plugins/leetcode.lua b/lua/custom/plugins/leetcode.lua
deleted file mode 100644
index 5ee4663b1d0..00000000000
--- a/lua/custom/plugins/leetcode.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-  'mbledkowski/neuleetcode.vim',
-  config = function()
-    vim.g.leetcode_browser = 'chrome'
-    vim.keymap.set('n', '<leader>ll', ':LeetCodeList<CR>', { desc = '[L]eetCode [L]ist' })
-    vim.keymap.set('n', '<leader>lt', ':LeetCodeTest<CR>', { desc = '[L]eetCode [T]est' })
-    vim.keymap.set('n', '<leader>ls', ':LeetCodeSubmit<CR>', { desc = '[L]eetCode [S]ubmit' })
-    vim.keymap.set('n', '<leader>li', ':LeetCodeSignIn<CR>', { desc = '[L]eetCode Sign [I]n' })
-  end,
-}
diff --git a/lua/custom/plugins/markdown-preview.lua b/lua/custom/plugins/markdown-preview.lua
deleted file mode 100644
index cf277aa0d35..00000000000
--- a/lua/custom/plugins/markdown-preview.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-return {
-  "iamcco/markdown-preview.nvim",
-  run = function() vim.fn["mkdp#util#install"]() end,
-}
diff --git a/lua/custom/plugins/nvim-dap.lua b/lua/custom/plugins/nvim-dap.lua
deleted file mode 100644
index 2471b2c26d3..00000000000
--- a/lua/custom/plugins/nvim-dap.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-  'mfussenegger/nvim-dap'
-}

From 073800f7dbcab25e120448fb05511bb24424ff90 Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Sun, 3 Mar 2024 12:42:45 -0500
Subject: [PATCH 12/24] Added debugging and autosession

---
 init.lua                           |   6 +-
 lua/custom/plugins/autosession.lua |  25 +++++++
 lua/kickstart/plugins/debug.lua    | 116 +++++++++++++++++++++++++++--
 3 files changed, 137 insertions(+), 10 deletions(-)
 create mode 100644 lua/custom/plugins/autosession.lua

diff --git a/init.lua b/init.lua
index c0a54b57d0b..d9a5f961d83 100644
--- a/init.lua
+++ b/init.lua
@@ -457,14 +457,14 @@ local servers = {
   bashls = {},
   cssls = {},
   dockerls = {},
-  gradle_ls = {},
+  -- gradle_ls = {},
   pyright = {},
   tsserver = {},
   html = {},
   jsonls = {},
-  jdtls = {},
+  -- jdtls = {},
   rust_analyzer = {},
-  marksman = {},
+  -- marksman = {},
   volar = {},
   yamlls = {},
   lua_ls = {
diff --git a/lua/custom/plugins/autosession.lua b/lua/custom/plugins/autosession.lua
new file mode 100644
index 00000000000..9054d50b3b2
--- /dev/null
+++ b/lua/custom/plugins/autosession.lua
@@ -0,0 +1,25 @@
+return {
+  'rmagatti/auto-session',
+  config = function()
+    require("auto-session").setup {
+      log_level = "error",
+      auto_session_suppress_dirs = { "~/", "~/Downloads", "/"},
+      auto_save_enabled = true,
+      auto_restore_enabled = true,
+      auto_session_use_git_branch = true,
+      auto_session_enable_last_session = true,
+      pre_save_cmds = {
+        "NeoTreeClose"
+      },
+      post_save_cmds = {
+        "NeoTreeReveal"
+      },
+      pre_restore_cmds = {
+        "NeoTreeClose"
+      },
+      post_restore_cmds = {
+        "NeoTreeReveal"
+      },
+    }
+  end
+}
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index 0b68c43b94b..c7ff70b7b9f 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -21,6 +21,8 @@ return {
 
     -- Add your own debuggers here
     'leoluz/nvim-dap-go',
+    'microsoft/vscode-js-debug',
+    'mxsdev/nvim-dap-vscode-js',
   },
 
   config = function()
@@ -37,7 +39,18 @@ return {
       ensure_installed = {
         -- Update this to ensure that you have the debuggers for the langs you want
         'delve',
+        'js',
+        'node2',
+        'cppdbg',
+        'python',
+        'javadbg',
+        'javatest',
       },
+      handlers = {
+        function(config)
+          require('mason-nvim-dap').default_setup(config)
+        end
+      }
     }
 
     -- You can provide additional configuration to the handlers,
@@ -45,14 +58,14 @@ return {
     require('mason-nvim-dap').setup_handlers()
 
     -- Basic debugging keymaps, feel free to change to your liking!
-    vim.keymap.set('n', '<F5>', dap.continue)
-    vim.keymap.set('n', '<F1>', dap.step_into)
-    vim.keymap.set('n', '<F2>', dap.step_over)
-    vim.keymap.set('n', '<F3>', dap.step_out)
-    vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint)
-    vim.keymap.set('n', '<leader>B', function()
+    vim.keymap.set('n', '<F5>', dap.continue, { desc = '[DAP] Continue' })
+    vim.keymap.set('n', '<F1>', dap.step_over, { desc = '[DAP] Over' })
+    vim.keymap.set('n', '<F2>', dap.step_into, { desc = '[DAP] Into' })
+    vim.keymap.set('n', '<F3>', dap.step_out, { desc = '[DAP] Out' })
+    vim.keymap.set('n', '<F6>', dap.toggle_breakpoint, { desc = '[DAP] Breakpoint toggle' })
+    vim.keymap.set('n', '<F7>', function()
       dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
-    end)
+    end, { desc = '[DAP] Conditional Breakpoint' })
 
     -- Dap UI setup
     -- For more information, see |:help nvim-dap-ui|
@@ -79,7 +92,96 @@ return {
     dap.listeners.before.event_terminated['dapui_config'] = dapui.close
     dap.listeners.before.event_exited['dapui_config'] = dapui.close
 
+    dap.defaults.fallback.exception_breakpoints = {'Notice', 'Warning', 'Error', 'Exception'}
+
     -- Install golang specific config
     require('dap-go').setup()
+
+    -- Install javascript specific config
+    require("dap-vscode-js").setup {
+      debugger_path = vim.fn.stdpath("data") .. "/mason/packages/js-debug-adapter",
+      debugger_cmd = { "js-debug-adapter" },
+      adapters = { "pwa-node", "pwa-chrome", "pwa-msedge", "node-terminal", "pwa-extensionHost" },
+    }
+
+    for _, jsLang in ipairs({'typescript', 'javascript'}) do
+      require("dap").configurations[jsLang] = {
+        {
+          type = "pwa-node",
+          request = "launch",
+          name = "Launch file",
+          program = "${file}",
+          cwd = "${workspaceFolder}",
+        },
+        {
+          type = "pwa-node",
+          request = "attach",
+          name = "Attach",
+          processId = require'dap.utils'.pick_process,
+          cwd = "${workspaceFolder}",
+        },
+        {
+          type = "pwa-node",
+          request = "launch",
+          name = "Debug Jest Tests",
+          -- trace = true, -- include debugger info
+          runtimeExecutable = "node",
+          runtimeArgs = {
+            "./node_modules/jest/bin/jest.js",
+            "--runInBand",
+          },
+          rootPath = "${workspaceFolder}",
+          cwd = "${workspaceFolder}",
+          console = "integratedTerminal",
+          internalConsoleOptions = "neverOpen",
+        },
+        {
+            name = 'Debug Main Process (Electron)',
+            type = 'pwa-node',
+            request = 'launch',
+            program = '${workspaceFolder}/node_modules/.bin/electron',
+            args = {
+                '${workspaceFolder}/dist/index.js',
+            },
+            outFiles = {
+                '${workspaceFolder}/dist/*.js',
+            },
+            resolveSourceMapLocations = {
+                '${workspaceFolder}/dist/**/*.js',
+                '${workspaceFolder}/dist/*.js',
+            },
+            rootPath = '${workspaceFolder}',
+            cwd = '${workspaceFolder}',
+            sourceMaps = true,
+            skipFiles = { '<node_internals>/**' },
+            protocol = 'inspector',
+            console = 'integratedTerminal',
+        },
+        {
+            name = 'Compile & Debug Main Process (Electron)',
+            type = custom_adapter,
+            request = 'launch',
+            preLaunchTask = 'npm run build-ts',
+            program = '${workspaceFolder}/node_modules/.bin/electron',
+            args = {
+                '${workspaceFolder}/dist/index.js',
+            },
+            outFiles = {
+                '${workspaceFolder}/dist/*.js',
+            },
+            resolveSourceMapLocations = {
+                '${workspaceFolder}/dist/**/*.js',
+                '${workspaceFolder}/dist/*.js',
+            },
+            rootPath = '${workspaceFolder}',
+            cwd = '${workspaceFolder}',
+            sourceMaps = true,
+            skipFiles = { '<node_internals>/**' },
+            protocol = 'inspector',
+            console = 'integratedTerminal',
+        },
+      }
+    end
+
   end,
 }

From c1315e0d1624f3f135fbc209d80e093f5172db0e Mon Sep 17 00:00:00 2001
From: Wil Simpson <simpson.wil255@gmail.com>
Date: Mon, 17 Jun 2024 18:18:53 -0400
Subject: [PATCH 13/24] Added leetcode

---
 lua/custom/plugins/leetcode.lua |  3 +++
 lua/custom/plugins/surround.lua | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 lua/custom/plugins/leetcode.lua

diff --git a/lua/custom/plugins/leetcode.lua b/lua/custom/plugins/leetcode.lua
new file mode 100644
index 00000000000..fe5311bac46
--- /dev/null
+++ b/lua/custom/plugins/leetcode.lua
@@ -0,0 +1,3 @@
+return {
+  'jiangmiao/auto-pairs'
+}
diff --git a/lua/custom/plugins/surround.lua b/lua/custom/plugins/surround.lua
index f1ba9a6b957..5d8529f8022 100644
--- a/lua/custom/plugins/surround.lua
+++ b/lua/custom/plugins/surround.lua
@@ -1,7 +1,17 @@
 return {
-  "kylechui/nvim-surround",
-  version = "*",
-  config = function ()
-    require("nvim-surround").setup()
-  end
+    "kawre/leetcode.nvim",
+    build = ":TSUpdate html",
+    dependencies = {
+        "nvim-telescope/telescope.nvim",
+        "nvim-lua/plenary.nvim", -- required by telescope
+        "MunifTanjim/nui.nvim",
+
+        -- optional
+        "nvim-treesitter/nvim-treesitter",
+        "rcarriga/nvim-notify",
+        "nvim-tree/nvim-web-devicons",
+    },
+    opts = {
+        -- configuration goes here
+    },
 }

From 8d946c13e759be006b47d48f0615e1b78fac27f9 Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Mon, 17 Jun 2024 18:26:31 -0400
Subject: [PATCH 14/24] Latest changes

---
 init.lua                          | 61 ++++++++++++---------
 lua/custom/plugins/autopair.lua   |  3 -
 lua/custom/plugins/copilot.lua    |  3 +
 lua/custom/plugins/easymotion.lua |  8 +--
 lua/custom/plugins/go.lua         |  8 +++
 lua/kickstart/plugins/debug.lua   | 91 +++++++++++++++----------------
 6 files changed, 95 insertions(+), 79 deletions(-)
 delete mode 100644 lua/custom/plugins/autopair.lua
 create mode 100644 lua/custom/plugins/copilot.lua

diff --git a/init.lua b/init.lua
index d9a5f961d83..e98bfaac1ec 100644
--- a/init.lua
+++ b/init.lua
@@ -262,8 +262,8 @@ vim.o.scrolloff = 5
 vim.o.sidescrolloff = 10
 
 -- Set tabs to 4 spaces
-vim.o.tabstop = 4
-vim.o.softtabstop = 4
+vim.o.tabstop = 2
+vim.o.softtabstop = 2
 
 -- [[ Basic Keymaps ]]
 
@@ -275,6 +275,15 @@ vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
 vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
+-- Map window slection
+vim.keymap.set('n', '<M-h>', "<C-w>h", { silent = true })
+vim.keymap.set('n', '<M-j>', "<C-w>j", { silent = true })
+vim.keymap.set('n', '<M-k>', "<C-w>k", { silent = true })
+vim.keymap.set('n', '<M-l>', "<C-w>l", { silent = true })
+
+-- Map copy to clipboard
+vim.keymap.set('v', '<leader>y', "\"+y", { silent = true })
+
 -- [[ Highlight on yank ]]
 -- See `:help vim.highlight.on_yank()`
 local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
@@ -410,7 +419,7 @@ local on_attach = function(_, bufnr)
   end
 
   nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
-  nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
+  nmap('<c-a>', vim.lsp.buf.code_action, '[C]ode [A]ction')
 
   nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
   nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
@@ -420,8 +429,8 @@ local on_attach = function(_, bufnr)
   nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
 
   -- See `:help K` for why this keymap
-  nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
-  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
+  nmap('<c-i>', vim.lsp.buf.hover, 'Hover Documentation')
+  nmap('<c-p>', vim.lsp.buf.signature_help, 'Signature Documentation')
 
   -- Lesser used LSP functionality
   nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
@@ -516,31 +525,31 @@ cmp.setup {
     end,
   },
   mapping = cmp.mapping.preset.insert {
-    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
-    ['<C-Space>'] = cmp.mapping.complete {},
+    ['<M-d>'] = cmp.mapping.scroll_docs(-4),
+    ['<M-f>'] = cmp.mapping.scroll_docs(4),
+    ['<M-Space>'] = cmp.mapping.complete {},
     ['<CR>'] = cmp.mapping.confirm {
       behavior = cmp.ConfirmBehavior.Replace,
       select = true,
     },
-    ['<Tab>'] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_next_item()
-      elseif luasnip.expand_or_jumpable() then
-        luasnip.expand_or_jump()
-      else
-        fallback()
-      end
-    end, { 'i', 's' }),
-    ['<S-Tab>'] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_prev_item()
-      elseif luasnip.jumpable(-1) then
-        luasnip.jump(-1)
-      else
-        fallback()
-      end
-    end, { 'i', 's' }),
+    -- ['<Tab>'] = cmp.mapping(function(fallback)
+    --   if cmp.visible() then
+    --     cmp.select_next_item()
+    --   elseif luasnip.expand_or_jumpable() then
+    --     luasnip.expand_or_jump()
+    --   else
+    --     fallback()
+    --   end
+    -- end, { 'i', 's' }),
+    -- ['<S-Tab>'] = cmp.mapping(function(fallback)
+    --   if cmp.visible() then
+    --     cmp.select_prev_item()
+    --   elseif luasnip.jumpable(-1) then
+    --     luasnip.jump(-1)
+    --   else
+    --     fallback()
+    --   end
+    -- end, { 'i', 's' }),
   },
   sources = {
     { name = 'nvim_lsp' },
diff --git a/lua/custom/plugins/autopair.lua b/lua/custom/plugins/autopair.lua
deleted file mode 100644
index fe5311bac46..00000000000
--- a/lua/custom/plugins/autopair.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-  'jiangmiao/auto-pairs'
-}
diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua
new file mode 100644
index 00000000000..1a804873741
--- /dev/null
+++ b/lua/custom/plugins/copilot.lua
@@ -0,0 +1,3 @@
+return {
+  'github/copilot.vim',
+}
diff --git a/lua/custom/plugins/easymotion.lua b/lua/custom/plugins/easymotion.lua
index 802d422167e..9b228e29904 100644
--- a/lua/custom/plugins/easymotion.lua
+++ b/lua/custom/plugins/easymotion.lua
@@ -1,9 +1,9 @@
 return {
   'easymotion/vim-easymotion',
   config = function()
-    vim.keymap.set('n', 'f', '<Plug>(easymotion-f)', { desc = '[f]ind next character' })
-    vim.keymap.set('n', 'F', '<Plug>(easymotion-F)', { desc = '[F]ind previous character' })
-    vim.keymap.set('n', 't', '<Plug>(easymotion-t)', { desc = '[t]ill next character' })
-    vim.keymap.set('n', 'T', '<Plug>(easymotion-T)', { desc = '[T]ill previous character' })
+    vim.keymap.set('n', '<leader>f', '<Plug>(easymotion-f)', { desc = '[f]ind next character' })
+    vim.keymap.set('n', '<leader>F', '<Plug>(easymotion-F)', { desc = '[F]ind previous character' })
+    vim.keymap.set('n', '<leader>t', '<Plug>(easymotion-t)', { desc = '[t]ill next character' })
+    vim.keymap.set('n', '<leader>T', '<Plug>(easymotion-T)', { desc = '[T]ill previous character' })
   end,
 }
diff --git a/lua/custom/plugins/go.lua b/lua/custom/plugins/go.lua
index d131143606f..ebc0063c702 100644
--- a/lua/custom/plugins/go.lua
+++ b/lua/custom/plugins/go.lua
@@ -5,6 +5,14 @@ return {
   },
   config = function()
     require("go").setup()
+    local format_sync_grp = vim.api.nvim_create_augroup("GoImport", {})
+    vim.api.nvim_create_autocmd("BufWritePre", {
+      pattern = "*.go",
+      callback = function()
+        require('go.format').goimport()
+      end,
+      group = format_sync_grp,
+    })
   end,
   event = { 'CmdlineEnter' },
   ft = { 'go', 'gomod' },
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index c7ff70b7b9f..80d726b10de 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -32,7 +32,7 @@ return {
     require('mason-nvim-dap').setup {
       -- Makes a best effort to setup the various debuggers with
       -- reasonable debug configurations
-      automatic_setup = true,
+      automatic_setup = false,
 
       -- You'll need to check that you have the required things installed
       -- online, please don't ask me how to install them :)
@@ -92,7 +92,7 @@ return {
     dap.listeners.before.event_terminated['dapui_config'] = dapui.close
     dap.listeners.before.event_exited['dapui_config'] = dapui.close
 
-    dap.defaults.fallback.exception_breakpoints = {'Notice', 'Warning', 'Error', 'Exception'}
+    dap.defaults.fallback.exception_breakpoints = { 'Notice', 'Warning', 'Error', 'Exception' }
 
     -- Install golang specific config
     require('dap-go').setup()
@@ -104,7 +104,7 @@ return {
       adapters = { "pwa-node", "pwa-chrome", "pwa-msedge", "node-terminal", "pwa-extensionHost" },
     }
 
-    for _, jsLang in ipairs({'typescript', 'javascript'}) do
+    for _, jsLang in ipairs({ 'typescript', 'javascript' }) do
       require("dap").configurations[jsLang] = {
         {
           type = "pwa-node",
@@ -117,7 +117,7 @@ return {
           type = "pwa-node",
           request = "attach",
           name = "Attach",
-          processId = require'dap.utils'.pick_process,
+          processId = require 'dap.utils'.pick_process,
           cwd = "${workspaceFolder}",
         },
         {
@@ -136,52 +136,51 @@ return {
           internalConsoleOptions = "neverOpen",
         },
         {
-            name = 'Debug Main Process (Electron)',
-            type = 'pwa-node',
-            request = 'launch',
-            program = '${workspaceFolder}/node_modules/.bin/electron',
-            args = {
-                '${workspaceFolder}/dist/index.js',
-            },
-            outFiles = {
-                '${workspaceFolder}/dist/*.js',
-            },
-            resolveSourceMapLocations = {
-                '${workspaceFolder}/dist/**/*.js',
-                '${workspaceFolder}/dist/*.js',
-            },
-            rootPath = '${workspaceFolder}',
-            cwd = '${workspaceFolder}',
-            sourceMaps = true,
-            skipFiles = { '<node_internals>/**' },
-            protocol = 'inspector',
-            console = 'integratedTerminal',
+          name = 'Debug Main Process (Electron)',
+          type = 'pwa-node',
+          request = 'launch',
+          program = '${workspaceFolder}/node_modules/.bin/electron',
+          args = {
+            '${workspaceFolder}/dist/index.js',
+          },
+          outFiles = {
+            '${workspaceFolder}/dist/*.js',
+          },
+          resolveSourceMapLocations = {
+            '${workspaceFolder}/dist/**/*.js',
+            '${workspaceFolder}/dist/*.js',
+          },
+          rootPath = '${workspaceFolder}',
+          cwd = '${workspaceFolder}',
+          sourceMaps = true,
+          skipFiles = { '<node_internals>/**' },
+          protocol = 'inspector',
+          console = 'integratedTerminal',
         },
         {
-            name = 'Compile & Debug Main Process (Electron)',
-            type = custom_adapter,
-            request = 'launch',
-            preLaunchTask = 'npm run build-ts',
-            program = '${workspaceFolder}/node_modules/.bin/electron',
-            args = {
-                '${workspaceFolder}/dist/index.js',
-            },
-            outFiles = {
-                '${workspaceFolder}/dist/*.js',
-            },
-            resolveSourceMapLocations = {
-                '${workspaceFolder}/dist/**/*.js',
-                '${workspaceFolder}/dist/*.js',
-            },
-            rootPath = '${workspaceFolder}',
-            cwd = '${workspaceFolder}',
-            sourceMaps = true,
-            skipFiles = { '<node_internals>/**' },
-            protocol = 'inspector',
-            console = 'integratedTerminal',
+          name = 'Compile & Debug Main Process (Electron)',
+          type = custom_adapter,
+          request = 'launch',
+          preLaunchTask = 'npm run build-ts',
+          program = '${workspaceFolder}/node_modules/.bin/electron',
+          args = {
+            '${workspaceFolder}/dist/index.js',
+          },
+          outFiles = {
+            '${workspaceFolder}/dist/*.js',
+          },
+          resolveSourceMapLocations = {
+            '${workspaceFolder}/dist/**/*.js',
+            '${workspaceFolder}/dist/*.js',
+          },
+          rootPath = '${workspaceFolder}',
+          cwd = '${workspaceFolder}',
+          sourceMaps = true,
+          skipFiles = { '<node_internals>/**' },
+          protocol = 'inspector',
+          console = 'integratedTerminal',
         },
       }
     end
-
   end,
 }

From 9d965db75fc76b61cbddc5015f1b8242483b7912 Mon Sep 17 00:00:00 2001
From: Wil Simpson <simpson.wil255@gmail.com>
Date: Sat, 29 Jun 2024 16:35:40 -0400
Subject: [PATCH 15/24] Fixed errors

---
 init.lua                        |  15 +++--
 lua/custom/plugins/leetcode.lua | 102 +++++++++++++++++++++++++++++++-
 lua/kickstart/plugins/debug.lua |   5 +-
 3 files changed, 112 insertions(+), 10 deletions(-)

diff --git a/init.lua b/init.lua
index e98bfaac1ec..c09fb8d5950 100644
--- a/init.lua
+++ b/init.lua
@@ -159,10 +159,15 @@ require('lazy').setup({
     'lukas-reineke/indent-blankline.nvim',
     -- Enable `lukas-reineke/indent-blankline.nvim`
     -- See `:help indent_blankline.txt`
-    opts = {
-      char = '┊',
-      show_trailing_blankline_indent = false,
-    },
+    main = 'ibl',
+    config = function()
+      require('ibl').setup {
+        indent = { char = "┊" },
+        whitespace = {
+          remove_blankline_trail = true,
+        },
+      }
+    end,
   },
 
   -- "gc" to comment visual regions/lines
@@ -332,7 +337,7 @@ vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { de
 -- See `:help nvim-treesitter`
 require('nvim-treesitter.configs').setup {
   -- Add languages to be installed here that you want installed for treesitter
-  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'help', 'vim', 'ruby', 'http',
+  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vim', 'ruby', 'http',
     'css' },
 
   -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
diff --git a/lua/custom/plugins/leetcode.lua b/lua/custom/plugins/leetcode.lua
index fe5311bac46..c950a285d27 100644
--- a/lua/custom/plugins/leetcode.lua
+++ b/lua/custom/plugins/leetcode.lua
@@ -1,3 +1,103 @@
 return {
-  'jiangmiao/auto-pairs'
+    "kawre/leetcode.nvim",
+    build = ":TSUpdate html",
+    dependencies = {
+        "nvim-telescope/telescope.nvim",
+        "nvim-lua/plenary.nvim", -- required by telescope
+        "MunifTanjim/nui.nvim",
+
+        -- optional
+        "nvim-treesitter/nvim-treesitter",
+        "rcarriga/nvim-notify",
+        "nvim-tree/nvim-web-devicons",
+    },
+    opts = {
+        ---@type string
+        arg = "leetcode.nvim",
+
+        ---@type lc.lang
+        lang = "golang",
+
+        cn = { -- leetcode.cn
+            enabled = false, ---@type boolean
+            translator = true, ---@type boolean
+            translate_problems = true, ---@type boolean
+        },
+
+        ---@type lc.storage
+        storage = {
+            home = vim.fn.stdpath("data") .. "/leetcode",
+            cache = vim.fn.stdpath("cache") .. "/leetcode",
+        },
+
+        ---@type table<string, boolean>
+        plugins = {
+            non_standalone = false,
+        },
+
+        ---@type boolean
+        logging = true,
+
+        injector = {}, ---@type table<lc.lang, lc.inject>
+
+        cache = {
+            update_interval = 60 * 60 * 24 * 7, ---@type integer 7 days
+        },
+
+        console = {
+            open_on_runcode = true, ---@type boolean
+
+            dir = "row", ---@type lc.direction
+
+            size = { ---@type lc.size
+                width = "90%",
+                height = "75%",
+            },
+
+            result = {
+                size = "60%", ---@type lc.size
+            },
+
+            testcase = {
+                virt_text = true, ---@type boolean
+
+                size = "40%", ---@type lc.size
+            },
+        },
+
+        description = {
+            position = "left", ---@type lc.position
+
+            width = "40%", ---@type lc.size
+
+            show_stats = true, ---@type boolean
+        },
+
+        hooks = {
+            ---@type fun()[]
+            ["enter"] = {},
+
+            ---@type fun(question: lc.ui.Question)[]
+            ["question_enter"] = {},
+
+            ---@type fun()[]
+            ["leave"] = {},
+        },
+
+        keys = {
+            toggle = { "q" }, ---@type string|string[]
+            confirm = { "<CR>" }, ---@type string|string[]
+
+            reset_testcases = "r", ---@type string
+            use_testcase = "U", ---@type string
+            focus_testcases = "H", ---@type string
+            focus_result = "L", ---@type string
+        },
+
+        ---@type lc.highlights
+        theme = {},
+
+        ---@type boolean
+        image_support = false,
+    },
 }
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index 80d726b10de..d2f01b9515b 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -13,6 +13,7 @@ return {
   -- NOTE: And you can specify dependencies as well
   dependencies = {
     -- Creates a beautiful debugger UI
+    'nvim-neotest/nvim-nio',
     'rcarriga/nvim-dap-ui',
 
     -- Installs the debug adapters for you
@@ -53,10 +54,6 @@ return {
       }
     }
 
-    -- You can provide additional configuration to the handlers,
-    -- see mason-nvim-dap README for more information
-    require('mason-nvim-dap').setup_handlers()
-
     -- Basic debugging keymaps, feel free to change to your liking!
     vim.keymap.set('n', '<F5>', dap.continue, { desc = '[DAP] Continue' })
     vim.keymap.set('n', '<F1>', dap.step_over, { desc = '[DAP] Over' })

From 8a2b8592402326633062ad5377eb8fb8251251b0 Mon Sep 17 00:00:00 2001
From: Wil Simpson <simpson.wil255@gmail.com>
Date: Sun, 22 Dec 2024 10:15:01 -0600
Subject: [PATCH 16/24] feat: fixed surround not being imported correctly

---
 lua/custom/plugins/surround.lua | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/lua/custom/plugins/surround.lua b/lua/custom/plugins/surround.lua
index 5d8529f8022..0f96d447beb 100644
--- a/lua/custom/plugins/surround.lua
+++ b/lua/custom/plugins/surround.lua
@@ -1,17 +1,7 @@
 return {
-    "kawre/leetcode.nvim",
-    build = ":TSUpdate html",
-    dependencies = {
-        "nvim-telescope/telescope.nvim",
-        "nvim-lua/plenary.nvim", -- required by telescope
-        "MunifTanjim/nui.nvim",
-
-        -- optional
-        "nvim-treesitter/nvim-treesitter",
-        "rcarriga/nvim-notify",
-        "nvim-tree/nvim-web-devicons",
-    },
-    opts = {
-        -- configuration goes here
-    },
+    "kylechui/nvim-surround",
+    version = "*",
+    config = function()
+        require("nvim-surround").setup()
+    end
 }

From e935e9c93c892a63cecac3d0b93de9450bc7b589 Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Mon, 23 Dec 2024 13:09:57 -0600
Subject: [PATCH 17/24] feat: upgarde to new ts lsp name

---
 init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.lua b/init.lua
index c09fb8d5950..fefa6917988 100644
--- a/init.lua
+++ b/init.lua
@@ -473,7 +473,7 @@ local servers = {
   dockerls = {},
   -- gradle_ls = {},
   pyright = {},
-  tsserver = {},
+  ts_ls = {},
   html = {},
   jsonls = {},
   -- jdtls = {},

From 1fd6b5e58b71c9d08e0fbaf19f30d066bc21edd4 Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Mon, 6 Jan 2025 16:38:01 -0500
Subject: [PATCH 18/24] feat: latest preferences

---
 .stylua.toml                         |  6 ----
 init.lua                             | 45 ++++++++++++++--------------
 lua/custom/plugins/abolish.lua       |  4 +++
 lua/custom/plugins/autosession.lua   | 32 ++++++++++----------
 lua/custom/plugins/filetree.lua      |  6 ++--
 lua/custom/plugins/go.lua            | 14 +++------
 lua/custom/plugins/markdown.lua      |  9 ++++++
 lua/kickstart/plugins/autoformat.lua | 21 +++++++++----
 lua/kickstart/plugins/debug.lua      | 36 +++++++++++++++++++---
 9 files changed, 106 insertions(+), 67 deletions(-)
 delete mode 100644 .stylua.toml
 create mode 100644 lua/custom/plugins/abolish.lua
 create mode 100644 lua/custom/plugins/markdown.lua

diff --git a/.stylua.toml b/.stylua.toml
deleted file mode 100644
index 5d12dbdfb00..00000000000
--- a/.stylua.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-column_width = 160
-line_endings = "Unix"
-indent_type = "Spaces"
-indent_width = 2
-quote_style = "AutoPreferSingle"
-no_call_parentheses = true
diff --git a/init.lua b/init.lua
index c09fb8d5950..0d7f788b5d6 100644
--- a/init.lua
+++ b/init.lua
@@ -116,29 +116,30 @@ require('lazy').setup({
     },
   },
 
-  -- {
-  --   -- Theme inspired by Atom
-  --   'navarasu/onedark.nvim',
-  --   priority = 1000,
-  --   config = function()
-  --     require('onedark').setup {
-  --       style = 'dark',
-  --       code_style = {
-  --         comments = 'none',
-  --       },
-  --     }
-  --     require('onedark').load()
-  --     vim.cmd.colorscheme 'onedark'
-  --   end,
-  -- },
   {
-    'morhetz/gruvbox',
+    -- Theme inspired by Atom
+    'navarasu/onedark.nvim',
+    priority = 1000,
     config = function()
-      vim.cmd.colorscheme 'gruvbox'
-      vim.o.background = 'dark'
-      vim.o.termguicolors = true
-    end
+      require('onedark').setup {
+        style = 'warmer',
+        transparent = true,
+        -- code_style = {
+        --   comments = 'none',
+        -- },
+      }
+      require('onedark').load()
+      vim.cmd.colorscheme 'onedark'
+    end,
   },
+  -- {
+  --   'morhetz/gruvbox',
+  --   config = function()
+  --     vim.cmd.colorscheme 'gruvbox'
+  --     vim.o.background = 'dark'
+  --     vim.o.termguicolors = true
+  --   end
+  -- },
 
   {
     -- Set lualine as statusline
@@ -266,7 +267,7 @@ vim.o.number = true
 vim.o.scrolloff = 5
 vim.o.sidescrolloff = 10
 
--- Set tabs to 4 spaces
+-- Set tabs to 2 spaces
 vim.o.tabstop = 2
 vim.o.softtabstop = 2
 
@@ -473,7 +474,7 @@ local servers = {
   dockerls = {},
   -- gradle_ls = {},
   pyright = {},
-  tsserver = {},
+  ts_ls = {},
   html = {},
   jsonls = {},
   -- jdtls = {},
diff --git a/lua/custom/plugins/abolish.lua b/lua/custom/plugins/abolish.lua
new file mode 100644
index 00000000000..c93e2d9e76c
--- /dev/null
+++ b/lua/custom/plugins/abolish.lua
@@ -0,0 +1,4 @@
+-- User :%S to replace words with smart case
+return {
+  'tpope/vim-abolish',
+}
diff --git a/lua/custom/plugins/autosession.lua b/lua/custom/plugins/autosession.lua
index 9054d50b3b2..fe4e2518fcd 100644
--- a/lua/custom/plugins/autosession.lua
+++ b/lua/custom/plugins/autosession.lua
@@ -2,24 +2,24 @@ return {
   'rmagatti/auto-session',
   config = function()
     require("auto-session").setup {
-      log_level = "error",
-      auto_session_suppress_dirs = { "~/", "~/Downloads", "/"},
-      auto_save_enabled = true,
+      suppressed_dirs = { "~/", "~/Downloads", "/" },
+      use_git_branch = true,
       auto_restore_enabled = true,
-      auto_session_use_git_branch = true,
-      auto_session_enable_last_session = true,
-      pre_save_cmds = {
-        "NeoTreeClose"
-      },
-      post_save_cmds = {
-        "NeoTreeReveal"
-      },
-      pre_restore_cmds = {
-        "NeoTreeClose"
-      },
-      post_restore_cmds = {
-        "NeoTreeReveal"
+      pre_cwd_changed_cmds = {
+        "Neotree close"
       },
+      -- pre_save_cmds = {
+      --   "tabdo Neotree close"
+      -- },
+      -- post_save_cmds = {
+      --   "tabdo Neotree"
+      -- },
+      -- pre_restore_cmds = {
+      --   "tabdo Neotree close"
+      -- },
+      -- post_restore_cmds = {
+      --   "tabdo Neotree"
+      -- },
     }
   end
 }
diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua
index f29e7bc0ba5..6af438730df 100644
--- a/lua/custom/plugins/filetree.lua
+++ b/lua/custom/plugins/filetree.lua
@@ -6,7 +6,7 @@ return {
     "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
     "MunifTanjim/nui.nvim",
   },
-  config = function ()
+  config = function()
     -- Unless you are still migrating, remove the deprecated commands from v1.x
     vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
 
@@ -14,7 +14,7 @@ return {
       close_if_last_window = true,
     }
 
-    vim.keymap.set('n', '<leader>nf', ':NeoTreeFloatToggle<CR>', { desc = '[N]eoTree [F]loat Toggle' })
-    vim.keymap.set('n', '<leader>nr', ':NeoTreeRevealToggle<CR>', { desc = '[N]eoTree [R]eveal Toggle' })
+    vim.keymap.set('n', '<leader>nf', ':Neotree show float toggle<CR>', { desc = '[N]eoTree [F]loat Toggle' })
+    vim.keymap.set('n', '<leader>nr', ':Neotree show toggle<CR>', { desc = '[N]eoTree [R]eveal Toggle' })
   end,
 }
diff --git a/lua/custom/plugins/go.lua b/lua/custom/plugins/go.lua
index ebc0063c702..94d35f5154f 100644
--- a/lua/custom/plugins/go.lua
+++ b/lua/custom/plugins/go.lua
@@ -1,18 +1,12 @@
 return {
   'ray-x/go.nvim',
   requires = {
-    'ray-x/guihua.lua'
+    'ray-x/guihua.lua',
+    'neovim/nvim-lspconfig',
+    'nvim-treesitter/nvim-treesitter',
   },
   config = function()
-    require("go").setup()
-    local format_sync_grp = vim.api.nvim_create_augroup("GoImport", {})
-    vim.api.nvim_create_autocmd("BufWritePre", {
-      pattern = "*.go",
-      callback = function()
-        require('go.format').goimport()
-      end,
-      group = format_sync_grp,
-    })
+    require('go').setup()
   end,
   event = { 'CmdlineEnter' },
   ft = { 'go', 'gomod' },
diff --git a/lua/custom/plugins/markdown.lua b/lua/custom/plugins/markdown.lua
new file mode 100644
index 00000000000..92836b231d6
--- /dev/null
+++ b/lua/custom/plugins/markdown.lua
@@ -0,0 +1,9 @@
+return {
+  "iamcco/markdown-preview.nvim",
+  cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
+  ft = { "markdown" },
+  build = "cd app && yarn install",
+  init = function()
+    vim.g.mkdp_filetypes = { "markdown" }
+  end
+}
diff --git a/lua/kickstart/plugins/autoformat.lua b/lua/kickstart/plugins/autoformat.lua
index bc56b15b027..ac3e2ab75d3 100644
--- a/lua/kickstart/plugins/autoformat.lua
+++ b/lua/kickstart/plugins/autoformat.lua
@@ -5,7 +5,12 @@
 
 return {
   'neovim/nvim-lspconfig',
+  dependencies = {
+    'ray-x/go.nvim',
+    'ray-x/guihua.lua',
+  },
   config = function()
+    require("go").setup()
     -- Switch for controlling whether you want autoformatting.
     --  Use :KickstartFormatToggle to toggle autoformatting on or off
     local format_is_enabled = true
@@ -60,12 +65,16 @@ return {
               return
             end
 
-            vim.lsp.buf.format {
-              async = false,
-              filter = function(c)
-                return c.id == client.id
-              end,
-            }
+            if vim.bo.filetype == 'go' then
+              require('go.format').goimport()
+            else
+              vim.lsp.buf.format {
+                async = false,
+                filter = function(c)
+                  return c.id == client.id
+                end,
+              }
+            end
           end,
         })
       end,
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index d2f01b9515b..b65ee569c9f 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -24,22 +24,49 @@ return {
     'leoluz/nvim-dap-go',
     'microsoft/vscode-js-debug',
     'mxsdev/nvim-dap-vscode-js',
+    'julianolf/nvim-dap-lldb',
+    'vadimcn/codelldb',
   },
 
   config = function()
     local dap = require 'dap'
     local dapui = require 'dapui'
 
+    dap.adapters.lldb = {
+      type = 'server',
+      command = vim.fn.expand('$HOME/.local/share/nvim/mason/bin/codelldb'),
+      host = '127.0.0.1',
+      port = 13000,
+    }
+
+    dap.configurations.cpp = {
+      {
+        name = 'Launch Editor (Development)',
+        type = 'lldb',
+        request = 'launch',
+        program = '/home/wil/dev/ue5/Engine/Binaries/Linux/UnrealEditor',
+        preLaunchTask = 'Editor Linux Development Build',
+        args = {
+          '/home/wil/dev/sro/game/SRO.uproject',
+          '--port ${port}',
+        },
+        -- terminal = 'integrated',
+        cwd = '/home/wil/dev/ue5',
+        -- visualizerFile = '/home/wil/dev/ue5/Engine/Extras/VisualStudioDebugging/Unreal.natvis',
+        -- showDisplayString = 'true',
+      },
+    }
+
     require('mason-nvim-dap').setup {
       -- Makes a best effort to setup the various debuggers with
       -- reasonable debug configurations
-      automatic_setup = false,
+      automatic_installation = true,
 
       -- You'll need to check that you have the required things installed
       -- online, please don't ask me how to install them :)
       ensure_installed = {
         -- Update this to ensure that you have the debuggers for the langs you want
-        'delve',
+        -- 'delve',
         'js',
         'node2',
         'cppdbg',
@@ -86,8 +113,8 @@ return {
     }
 
     dap.listeners.after.event_initialized['dapui_config'] = dapui.open
-    dap.listeners.before.event_terminated['dapui_config'] = dapui.close
-    dap.listeners.before.event_exited['dapui_config'] = dapui.close
+    -- dap.listeners.before.event_terminated['dapui_config'] = dapui.close
+    -- dap.listeners.before.event_exited['dapui_config'] = dapui.close
 
     dap.defaults.fallback.exception_breakpoints = { 'Notice', 'Warning', 'Error', 'Exception' }
 
@@ -101,6 +128,7 @@ return {
       adapters = { "pwa-node", "pwa-chrome", "pwa-msedge", "node-terminal", "pwa-extensionHost" },
     }
 
+
     for _, jsLang in ipairs({ 'typescript', 'javascript' }) do
       require("dap").configurations[jsLang] = {
         {

From 03a824311b1663798133b6c52f2a742ed6530c5d Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Sun, 23 Mar 2025 15:52:13 -0400
Subject: [PATCH 19/24] Better Go support

---
 init.lua                  | 25 +++++++++++++++++++++++--
 lua/custom/plugins/go.lua | 14 --------------
 2 files changed, 23 insertions(+), 16 deletions(-)
 delete mode 100644 lua/custom/plugins/go.lua

diff --git a/init.lua b/init.lua
index 0d7f788b5d6..e08b92a5c98 100644
--- a/init.lua
+++ b/init.lua
@@ -463,10 +463,31 @@ end
 --  Add any additional override configuration in the following tables. They will be passed to
 --  the `settings` field of the server config. You must look up that documentation yourself.
 local servers = {
-  clangd = {},
+  clangd = {
+    cmd = {
+      "~/.local/share/nvim/mason/bin/clangd",
+      "--all-scopes-completion",
+      "--background-index",
+      "--clang-tidy",
+      "--completion-parse=always",
+      "--completion-style=bundled",
+      "--cross-file-rename",
+      "--debug-origin",
+      "--enable-config", -- clangd 11+ supports reading from .clangd configuration file
+      "--fallback-style=Qt",
+      "--folding-ranges",
+      "--function-arg-placeholders",
+      "--header-insertion=iwyu",
+      "--pch-storage=memory", -- could also be disk
+      "--suggest-missing-includes",
+      "-j=20",                -- number of workers
+      -- "--resource-dir="
+      "--log=error",
+    },
+  },
   gopls = {},
   -- solargraph = {},
-  -- ruby_ls = {},
+  ruby_lsp = {},
   sqlls = {},
   angularls = {},
   bashls = {},
diff --git a/lua/custom/plugins/go.lua b/lua/custom/plugins/go.lua
deleted file mode 100644
index 94d35f5154f..00000000000
--- a/lua/custom/plugins/go.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-return {
-  'ray-x/go.nvim',
-  requires = {
-    'ray-x/guihua.lua',
-    'neovim/nvim-lspconfig',
-    'nvim-treesitter/nvim-treesitter',
-  },
-  config = function()
-    require('go').setup()
-  end,
-  event = { 'CmdlineEnter' },
-  ft = { 'go', 'gomod' },
-  build = ':lua require("go.install").update_all_sync()',
-}

From 1268c5006f0ff51f46eb74e8250c181d7202a74c Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Wed, 11 Jun 2025 10:48:56 -0400
Subject: [PATCH 20/24] feat: latest changes

---
 .stylua.toml                         |    6 +
 init.lua                             | 1258 +++++++++++++++++++++-----
 lua/kickstart/plugins/autoformat.lua |  164 ++--
 lua/kickstart/plugins/debug.lua      |  141 ++-
 lua/kickstart/plugins/gitsigns.lua   |   61 ++
 lua/kickstart/plugins/lint.lua       |   60 ++
 6 files changed, 1320 insertions(+), 370 deletions(-)
 create mode 100644 .stylua.toml
 create mode 100644 lua/kickstart/plugins/gitsigns.lua
 create mode 100644 lua/kickstart/plugins/lint.lua

diff --git a/.stylua.toml b/.stylua.toml
new file mode 100644
index 00000000000..139e9397d90
--- /dev/null
+++ b/.stylua.toml
@@ -0,0 +1,6 @@
+column_width = 160
+line_endings = "Unix"
+indent_type = "Spaces"
+indent_width = 2
+quote_style = "AutoPreferSingle"
+call_parentheses = "None"
diff --git a/init.lua b/init.lua
index e08b92a5c98..c56afdd108a 100644
--- a/init.lua
+++ b/init.lua
@@ -1,48 +1,77 @@
---[[
+-- [[ Setting options ]]
+-- See `:help vim.o`
+--
+-- Set <space> as the leader key
+-- See `:help mapleader`
+--  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
 
-=====================================================================
-==================== READ THIS BEFORE CONTINUING ====================
-=====================================================================
+vim.g.have_nerd_font = true
 
-Kickstart.nvim is *not* a distribution.
+vim.o.termguicolors = true
 
-Kickstart.nvim is a template for your own configuration.
-  The goal is that you can read every line of code, top-to-bottom, and understand
-  what your configuration is doing.
+-- Set highlight on search
+vim.o.hlsearch = false
 
-  Once you've done that, you should start exploring, configuring and tinkering to
-  explore Neovim!
+-- Make line numbers default
+vim.wo.number = true
 
-  If you don't know anything about Lua, I recommend taking some time to read through
-  a guide. One possible example:
-  - https://learnxinyminutes.com/docs/lua/
+-- Enable mouse mode
+vim.o.mouse = 'a'
 
-  And then you can explore or search through `:help lua-guide`
+-- Sync clipboard between OS and Neovim.
+--  Remove this option if you want your OS clipboard to remain independent.
+--  See `:help 'clipboard'`
+vim.o.clipboard = 'unnamedplus'
 
+-- Enable break indent
+vim.o.breakindent = true
 
-Kickstart Guide:
+-- Save undo history
+vim.o.undofile = true
 
-I have left several `:help X` comments throughout the init.lua
-You should run that command and read that help section for more information.
+-- Case insensitive searching UNLESS /C or capital in search
+vim.o.ignorecase = true
+vim.o.smartcase = true
 
-In addition, I have some `NOTE:` items throughout the file.
-These are for you, the reader to help understand what is happening. Feel free to delete
-them once you know what you're doing, but they should serve as a guide for when you
-are first encountering a few different constructs in your nvim config.
+-- Keep signcolumn on by default
+vim.wo.signcolumn = 'yes'
 
-I hope you enjoy your Neovim journey,
-- TJ
+-- Decrease update time
+vim.o.updatetime = 250
+vim.o.timeout = true
+vim.o.timeoutlen = 300
 
-P.S. You can delete this when you're done too. It's your config now :)
---]]
--- Set <space> as the leader key
--- See `:help mapleader`
---  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
-vim.g.mapleader = ' '
-vim.g.maplocalleader = ' '
+-- Set completeopt to have a better completion experience
+vim.o.completeopt = 'menuone,noselect'
 
+-- NOTE: You should make sure your terminal supports this
 vim.o.termguicolors = true
 
+-- Set relative and absolute line numbers
+vim.o.relativenumber = true
+vim.o.number = true
+
+-- Set scroll offsets to have additional space when scrolling
+vim.o.scrolloff = 5
+vim.o.sidescrolloff = 10
+
+-- Set tabs to 2 spaces
+vim.o.tabstop = 2
+vim.o.softtabstop = 2
+
+vim.o.list = true
+vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
+
+vim.api.nvim_create_autocmd('TextYankPost', {
+  desc = 'Highlight when yanking (copying) text',
+  group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
+  callback = function()
+    vim.hl.on_yank()
+  end,
+})
+
 -- Install package manager
 --    https://github.com/folke/lazy.nvim
 --    `:help lazy.nvim.txt` for more info
@@ -66,13 +95,23 @@ vim.opt.rtp:prepend(lazypath)
 --    as they will be available in your neovim runtime.
 require('lazy').setup({
   -- NOTE: First, some plugins that don't require any configuration
+  'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically
 
   -- Git related plugins
   'tpope/vim-fugitive',
   'tpope/vim-rhubarb',
-
-  -- Detect tabstop and shiftwidth automatically
-  'tpope/vim-sleuth',
+  { -- Adds git related signs to the gutter, as well as utilities for managing changes
+    'lewis6991/gitsigns.nvim',
+    opts = {
+      signs = {
+        add = { text = '+' },
+        change = { text = '~' },
+        delete = { text = '_' },
+        topdelete = { text = '‾' },
+        changedelete = { text = '~' },
+      },
+    },
+  },
 
   -- NOTE: This is where your plugins related to LSP can be installed.
   --  The configuration is done below. Search for lspconfig to find it below.
@@ -91,6 +130,48 @@ require('lazy').setup({
       -- Additional lua configuration, makes nvim stuff amazing!
       'folke/neodev.nvim',
     },
+    config = function()
+      vim.api.nvim_create_autocmd('LspAttach', {
+        group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
+        callback = function(event)
+          local nmap = function(keys, func, desc)
+            if desc then
+              desc = 'LSP: ' .. desc
+            end
+
+            vim.keymap.set('n', keys, func, { buffer = bufr, desc = desc })
+          end
+
+          nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
+          nmap('<c-a>', vim.lsp.buf.code_action, '[C]ode [A]ction')
+
+          nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
+          nmap('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
+          nmap('grI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
+          nmap('gri', require('telescope.builtin').lsp_implementations, '[G]oto [R]eferences')
+          nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
+          nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
+          nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+
+          -- Lesser used LSP functionality
+          nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+          nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
+          nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
+          nmap('<leader>wl', function()
+            print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+          end, '[W]orkspace [L]ist Folders')
+
+          -- Create a command `:Format` local to the LSP buffer
+          vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
+            vim.lsp.buf.format()
+          end, { desc = 'Format current buffer with LSP' })
+
+          nmap('<leader><C-f>', function()
+            vim.lsp.buf.format { async = true }
+          end, 'Auto [F]ormat')
+        end,
+      })
+    end,
   },
 
   {
@@ -100,7 +181,18 @@ require('lazy').setup({
   },
 
   -- Useful plugin to show you pending keybinds.
-  { 'folke/which-key.nvim',          opts = {} },
+  {
+    'folke/which-key.nvim',
+    event = 'VimEnter',
+    opts = {
+      mappings = true,
+    },
+    spec = {
+      { '<leader>s', group = '[S]earch' },
+      { '<leader>t', group = '[T]oggle' },
+      { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
+    },
+  },
   {
     -- Adds git releated signs to the gutter, as well as utilities for managing changes
     'lewis6991/gitsigns.nvim',
@@ -163,7 +255,7 @@ require('lazy').setup({
     main = 'ibl',
     config = function()
       require('ibl').setup {
-        indent = { char = "┊" },
+        indent = { char = '┊' },
         whitespace = {
           remove_blankline_trail = true,
         },
@@ -172,34 +264,899 @@ require('lazy').setup({
   },
 
   -- "gc" to comment visual regions/lines
-  { 'numToStr/Comment.nvim',         opts = {} },
+  { 'numToStr/Comment.nvim', opts = {} },
 
   -- Fuzzy Finder (files, lsp, etc)
-  { 'nvim-telescope/telescope.nvim', version = '*', dependencies = { 'nvim-lua/plenary.nvim' } },
+  { -- Fuzzy Finder (files, lsp, etc)
+    'nvim-telescope/telescope.nvim',
+    event = 'VimEnter',
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      { -- If encountering errors, see telescope-fzf-native README for installation instructions
+        'nvim-telescope/telescope-fzf-native.nvim',
+
+        -- `build` is used to run some command when the plugin is installed/updated.
+        -- This is only run then, not every time Neovim starts up.
+        build = 'make',
+
+        -- `cond` is a condition used to determine whether this plugin should be
+        -- installed and loaded.
+        cond = function()
+          return vim.fn.executable 'make' == 1
+        end,
+      },
+      { 'nvim-telescope/telescope-ui-select.nvim' },
+
+      -- Useful for getting pretty icons, but requires a Nerd Font.
+      { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
+    },
+    config = function()
+      -- Telescope is a fuzzy finder that comes with a lot of different things that
+      -- it can fuzzy find! It's more than just a "file finder", it can search
+      -- many different aspects of Neovim, your workspace, LSP, and more!
+      --
+      -- The easiest way to use Telescope, is to start by doing something like:
+      --  :Telescope help_tags
+      --
+      -- After running this command, a window will open up and you're able to
+      -- type in the prompt window. You'll see a list of `help_tags` options and
+      -- a corresponding preview of the help.
+      --
+      -- Two important keymaps to use while in Telescope are:
+      --  - Insert mode: <c-/>
+      --  - Normal mode: ?
+      --
+      -- This opens a window that shows you all of the keymaps for the current
+      -- Telescope picker. This is really useful to discover what Telescope can
+      -- do as well as how to actually do it!
+
+      -- [[ Configure Telescope ]]
+      -- See `:help telescope` and `:help telescope.setup()`
+      require('telescope').setup {
+        -- You can put your default mappings / updates / etc. in here
+        --  All the info you're looking for is in `:help telescope.setup()`
+        --
+        -- defaults = {
+        --   mappings = {
+        --     i = { ['<c-enter>'] = 'to_fuzzy_refine' },
+        --   },
+        -- },
+        -- pickers = {}
+        extensions = {
+          ['ui-select'] = {
+            require('telescope.themes').get_dropdown(),
+          },
+        },
+      }
 
-  -- Fuzzy Finder Algorithm which requires local dependencies to be built.
-  -- Only load if `make` is available. Make sure you have the system
-  -- requirements installed.
+      -- Enable Telescope extensions if they are installed
+      pcall(require('telescope').load_extension, 'fzf')
+      pcall(require('telescope').load_extension, 'ui-select')
+
+      -- See `:help telescope.builtin`
+      local builtin = require 'telescope.builtin'
+      vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' })
+      vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' })
+      vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' })
+      vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' })
+      vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' })
+      vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
+      vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
+      vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
+      vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
+      vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
+
+      -- Slightly advanced example of overriding default behavior and theme
+      vim.keymap.set('n', '<leader>/', function()
+        -- You can pass additional configuration to Telescope to change the theme, layout, etc.
+        builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
+          winblend = 10,
+          previewer = false,
+        })
+      end, { desc = '[/] Fuzzily search in current buffer' })
+
+      -- It's also possible to pass additional configuration options.
+      --  See `:help telescope.builtin.live_grep()` for information about particular keys
+      vim.keymap.set('n', '<leader>s/', function()
+        builtin.live_grep {
+          grep_open_files = true,
+          prompt_title = 'Live Grep in Open Files',
+        }
+      end, { desc = '[S]earch [/] in Open Files' })
+
+      -- Shortcut for searching your Neovim configuration files
+      vim.keymap.set('n', '<leader>sn', function()
+        builtin.find_files { cwd = vim.fn.stdpath 'config' }
+      end, { desc = '[S]earch [N]eovim files' })
+    end,
+  },
+  -- LSP Plugins
   {
-    'nvim-telescope/telescope-fzf-native.nvim',
-    -- NOTE: If you are having trouble with this installation,
-    --       refer to the README for telescope-fzf-native for more instructions.
-    build = 'make',
-    cond = function()
-      return vim.fn.executable 'make' == 1
+    -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
+    -- used for completion, annotations and signatures of Neovim apis
+    'folke/lazydev.nvim',
+    ft = 'lua',
+    opts = {
+      library = {
+        -- Load luvit types when the `vim.uv` word is found
+        { path = '${3rd}/luv/library', words = { 'vim%.uv' } },
+      },
+    },
+  },
+  {
+    -- Main LSP Configuration
+    'neovim/nvim-lspconfig',
+    dependencies = {
+      -- Automatically install LSPs and related tools to stdpath for Neovim
+      -- Mason must be loaded before its dependents so we need to set it up here.
+      -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
+      { 'mason-org/mason.nvim', opts = {} },
+      'mason-org/mason-lspconfig.nvim',
+      'WhoIsSethDaniel/mason-tool-installer.nvim',
+
+      -- Useful status updates for LSP.
+      { 'j-hui/fidget.nvim', opts = {} },
+
+      -- Allows extra capabilities provided by blink.cmp
+      'saghen/blink.cmp',
+    },
+    config = function()
+      -- Brief aside: **What is LSP?**
+      --
+      -- LSP is an initialism you've probably heard, but might not understand what it is.
+      --
+      -- LSP stands for Language Server Protocol. It's a protocol that helps editors
+      -- and language tooling communicate in a standardized fashion.
+      --
+      -- In general, you have a "server" which is some tool built to understand a particular
+      -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers
+      -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone
+      -- processes that communicate with some "client" - in this case, Neovim!
+      --
+      -- LSP provides Neovim with features like:
+      --  - Go to definition
+      --  - Find references
+      --  - Autocompletion
+      --  - Symbol Search
+      --  - and more!
+      --
+      -- Thus, Language Servers are external tools that must be installed separately from
+      -- Neovim. This is where `mason` and related plugins come into play.
+      --
+      -- If you're wondering about lsp vs treesitter, you can check out the wonderfully
+      -- and elegantly composed help section, `:help lsp-vs-treesitter`
+
+      --  This function gets run when an LSP attaches to a particular buffer.
+      --    That is to say, every time a new file is opened that is associated with
+      --    an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this
+      --    function will be executed to configure the current buffer
+      vim.api.nvim_create_autocmd('LspAttach', {
+        group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
+        callback = function(event)
+          -- NOTE: Remember that Lua is a real programming language, and as such it is possible
+          -- to define small helper and utility functions so you don't have to repeat yourself.
+          --
+          -- In this case, we create a function that lets us more easily define mappings specific
+          -- for LSP related items. It sets the mode, buffer and description for us each time.
+          local map = function(keys, func, desc, mode)
+            mode = mode or 'n'
+            vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
+          end
+
+          -- Rename the variable under your cursor.
+          --  Most Language Servers support renaming across files, etc.
+          map('grn', vim.lsp.buf.rename, '[R]e[n]ame')
+
+          -- Execute a code action, usually your cursor needs to be on top of an error
+          -- or a suggestion from your LSP for this to activate.
+          map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
+
+          -- Find references for the word under your cursor.
+          map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
+
+          -- Jump to the implementation of the word under your cursor.
+          --  Useful when your language has ways of declaring types without an actual implementation.
+          map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
+
+          -- Jump to the definition of the word under your cursor.
+          --  This is where a variable was first declared, or where a function is defined, etc.
+          --  To jump back, press <C-t>.
+          map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
+
+          -- WARN: This is not Goto Definition, this is Goto Declaration.
+          --  For example, in C this would take you to the header.
+          map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+
+          -- Fuzzy find all the symbols in your current document.
+          --  Symbols are things like variables, functions, types, etc.
+          map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols')
+
+          -- Fuzzy find all the symbols in your current workspace.
+          --  Similar to document symbols, except searches over your entire project.
+          map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols')
+
+          -- Jump to the type of the word under your cursor.
+          --  Useful when you're not sure what type a variable is and you want to see
+          --  the definition of its *type*, not where it was *defined*.
+          map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
+
+          map('[e', vim.diagnostic.goto_next, 'Next [e]rror')
+          map(']e', vim.diagnostic.goto_prev, 'Prev [e]rror')
+
+          -- See `:help K` for why this keymap
+          map('<c-i>', vim.lsp.buf.hover, 'Hover Documentation')
+          map('<c-p>', vim.lsp.buf.signature_help, 'Signature Documentation')
+
+          -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10)
+          ---@param client vim.lsp.Client
+          ---@param method vim.lsp.protocol.Method
+          ---@param bufnr? integer some lsp support methods only in specific files
+          ---@return boolean
+          local function client_supports_method(client, method, bufnr)
+            if vim.fn.has 'nvim-0.11' == 1 then
+              return client:supports_method(method, bufnr)
+            else
+              return client.supports_method(method, { bufnr = bufnr })
+            end
+          end
+
+          -- The following two autocommands are used to highlight references of the
+          -- word under your cursor when your cursor rests there for a little while.
+          --    See `:help CursorHold` for information about when this is executed
+          --
+          -- When you move your cursor, the highlights will be cleared (the second autocommand).
+          local client = vim.lsp.get_client_by_id(event.data.client_id)
+          if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
+            local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
+            vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
+              buffer = event.buf,
+              group = highlight_augroup,
+              callback = vim.lsp.buf.document_highlight,
+            })
+
+            vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
+              buffer = event.buf,
+              group = highlight_augroup,
+              callback = vim.lsp.buf.clear_references,
+            })
+
+            vim.api.nvim_create_autocmd('LspDetach', {
+              group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
+              callback = function(event2)
+                vim.lsp.buf.clear_references()
+                vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf }
+              end,
+            })
+          end
+
+          -- The following code creates a keymap to toggle inlay hints in your
+          -- code, if the language server you are using supports them
+          --
+          -- This may be unwanted, since they displace some of your code
+          if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
+            map('<leader>th', function()
+              vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
+            end, '[T]oggle Inlay [H]ints')
+          end
+        end,
+      })
+
+      -- Diagnostic Config
+      -- See :help vim.diagnostic.Opts
+      vim.diagnostic.config {
+        severity_sort = true,
+        float = { border = 'rounded', source = 'if_many' },
+        underline = { severity = vim.diagnostic.severity.ERROR },
+        signs = vim.g.have_nerd_font and {
+          text = {
+            [vim.diagnostic.severity.ERROR] = '󰅚 ',
+            [vim.diagnostic.severity.WARN] = '󰀪 ',
+            [vim.diagnostic.severity.INFO] = '󰋽 ',
+            [vim.diagnostic.severity.HINT] = '󰌶 ',
+          },
+        } or {},
+        virtual_text = {
+          source = 'if_many',
+          spacing = 2,
+          format = function(diagnostic)
+            local diagnostic_message = {
+              [vim.diagnostic.severity.ERROR] = diagnostic.message,
+              [vim.diagnostic.severity.WARN] = diagnostic.message,
+              [vim.diagnostic.severity.INFO] = diagnostic.message,
+              [vim.diagnostic.severity.HINT] = diagnostic.message,
+            }
+            return diagnostic_message[diagnostic.severity]
+          end,
+        },
+      }
+
+      -- LSP servers and clients are able to communicate to each other what features they support.
+      --  By default, Neovim doesn't support everything that is in the LSP specification.
+      --  When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
+      --  So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
+      local capabilities = require('blink.cmp').get_lsp_capabilities()
+
+      -- Enable the following language servers
+      --  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
+      --
+      --  Add any additional override configuration in the following tables. Available keys are:
+      --  - cmd (table): Override the default command used to start the server
+      --  - filetypes (table): Override the default list of associated filetypes for the server
+      --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
+      --  - 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 = {
+          cmd = {
+            '~/.local/share/nvim/mason/bin/clangd',
+            '--all-scopes-completion',
+            '--background-index',
+            '--clang-tidy',
+            '--completion-parse=always',
+            '--completion-style=bundled',
+            '--cross-file-rename',
+            '--debug-origin',
+            '--enable-config', -- clangd 11+ supports reading from .clangd configuration file
+            '--fallback-style=Qt',
+            '--folding-ranges',
+            '--function-arg-placeholders',
+            '--header-insertion=iwyu',
+            '--pch-storage=memory', -- could also be disk
+            '--suggest-missing-includes',
+            '-j=20', -- number of workers
+            -- "--resource-dir="
+            '--log=error',
+          },
+        },
+        gopls = {},
+        -- solargraph = {},
+        -- ruby_lsp = {},
+        sqlls = {},
+        angularls = {},
+        bashls = {},
+        cssls = {},
+        dockerls = {},
+        -- gradle_ls = {},
+        pyright = {},
+        ts_ls = {},
+        html = {},
+        jsonls = {},
+        -- jdtls = {},
+        -- rust_analyzer = {},
+        marksman = {},
+        -- volar = {},
+        yamlls = {},
+        lua_ls = {
+          settings = {
+            Lua = {
+              workspace = { checkThirdParty = false },
+              telemetry = { enable = false },
+              completion = {
+                callSnippet = 'Replace',
+              },
+            },
+          },
+        },
+        tailwindcss = {},
+      }
+
+      -- Ensure the servers and tools above are installed
+      --
+      -- To check the current status of installed tools and/or manually install
+      -- other tools, you can run
+      --    :Mason
+      --
+      -- You can press `g?` for help in this menu.
+      --
+      -- `mason` had to be setup earlier: to configure its options see the
+      -- `dependencies` table for `nvim-lspconfig` above.
+      --
+      -- You can add other tools here that you want Mason to install
+      -- for you, so that they are available from within Neovim.
+      local ensure_installed = vim.tbl_keys(servers or {})
+      vim.list_extend(ensure_installed, {
+        'stylua', -- Used to format Lua code
+      })
+      require('mason-tool-installer').setup { ensure_installed = ensure_installed }
+
+      require('mason-lspconfig').setup {
+        ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer)
+        automatic_installation = false,
+        handlers = {
+          function(server_name)
+            local server = servers[server_name] or {}
+            -- This handles overriding only values explicitly passed
+            -- by the server configuration above. Useful when disabling
+            -- certain features of an LSP (for example, turning off formatting for ts_ls)
+            server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
+            require('lspconfig')[server_name].setup(server)
+          end,
+        },
+      }
     end,
   },
+  -- {
+  --   -- Main LSP Configuration
+  --   'neovim/nvim-lspconfig',
+  --   dependencies = {
+  --     -- Automatically install LSPs and related tools to stdpath for Neovim
+  --     -- Mason must be loaded before its dependents so we need to set it up here.
+  --     -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
+  --     { 'mason-org/mason.nvim', opts = {} },
+  --     'mason-org/mason-lspconfig.nvim',
+  --     'WhoIsSethDaniel/mason-tool-installer.nvim',
+  --
+  --     -- Useful status updates for LSP.
+  --     { 'j-hui/fidget.nvim', opts = {} },
+  --
+  --     -- Allows extra capabilities provided by blink.cmp
+  --     'saghen/blink.cmp',
+  --   },
+  --   config = function()
+  --     -- Brief aside: **What is LSP?**
+  --     --
+  --     -- LSP is an initialism you've probably heard, but might not understand what it is.
+  --     --
+  --     -- LSP stands for Language Server Protocol. It's a protocol that helps editors
+  --     -- and language tooling communicate in a standardized fashion.
+  --     --
+  --     -- In general, you have a "server" which is some tool built to understand a particular
+  --     -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers
+  --     -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone
+  --     -- processes that communicate with some "client" - in this case, Neovim!
+  --     --
+  --     -- LSP provides Neovim with features like:
+  --     --  - Go to definition
+  --     --  - Find references
+  --     --  - Autocompletion
+  --     --  - Symbol Search
+  --     --  - and more!
+  --     --
+  --     -- Thus, Language Servers are external tools that must be installed separately from
+  --     -- Neovim. This is where `mason` and related plugins come into play.
+  --     --
+  --     -- If you're wondering about lsp vs treesitter, you can check out the wonderfully
+  --     -- and elegantly composed help section, `:help lsp-vs-treesitter`
+  --
+  --     --  This function gets run when an LSP attaches to a particular buffer.
+  --     --    That is to say, every time a new file is opened that is associated with
+  --     --    an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this
+  --     --    function will be executed to configure the current buffer
+  --     vim.api.nvim_create_autocmd('LspAttach', {
+  --       group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
+  --       callback = function(event)
+  --         -- NOTE: Remember that Lua is a real programming language, and as such it is possible
+  --         -- to define small helper and utility functions so you don't have to repeat yourself.
+  --         --
+  --         -- In this case, we create a function that lets us more easily define mappings specific
+  --         -- for LSP related items. It sets the mode, buffer and description for us each time.
+  --         local map = function(keys, func, desc, mode)
+  --           mode = mode or 'n'
+  --           vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
+  --         end
+  --
+  --         -- Rename the variable under your cursor.
+  --         --  Most Language Servers support renaming across files, etc.
+  --         map('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
+  --
+  --         -- Execute a code action, usually your cursor needs to be on top of an error
+  --         -- or a suggestion from your LSP for this to activate.
+  --         map('<leader>ra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
+  --
+  --         -- Find references for the word under your cursor.
+  --         map('<leader>rr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
+  --
+  --         -- Jump to the implementation of the word under your cursor.
+  --         --  Useful when your language has ways of declaring types without an actual implementation.
+  --         map('<leader>ri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
+  --
+  --         -- Jump to the definition of the word under your cursor.
+  --         --  This is where a variable was first declared, or where a function is defined, etc.
+  --         --  To jump back, press <C-t>.
+  --         map('<leader>rd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
+  --
+  --         -- WARN: This is not Goto Definition, this is Goto Declaration.
+  --         --  For example, in C this would take you to the header.
+  --         map('<leader>rD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+  --
+  --         -- Fuzzy find all the symbols in your current document.
+  --         --  Symbols are things like variables, functions, types, etc.
+  --         map('<leader>O', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols')
+  --
+  --         -- Fuzzy find all the symbols in your current workspace.
+  --         --  Similar to document symbols, except searches over your entire project.
+  --         map('<leader>W', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols')
+  --
+  --         -- Jump to the type of the word under your cursor.
+  --         --  Useful when you're not sure what type a variable is and you want to see
+  --         --  the definition of its *type*, not where it was *defined*.
+  --         map('<leader>rt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
+  --
+  --         -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10)
+  --         ---@param client vim.lsp.Client
+  --         ---@param method vim.lsp.protocol.Method
+  --         ---@param bufnr? integer some lsp support methods only in specific files
+  --         ---@return boolean
+  --         local function client_supports_method(client, method, bufnr)
+  --           if vim.fn.has 'nvim-0.11' == 1 then
+  --             return client:supports_method(method, bufnr)
+  --           else
+  --             return client.supports_method(method, { bufnr = bufnr })
+  --           end
+  --         end
+  --
+  --         -- The following two autocommands are used to highlight references of the
+  --         -- word under your cursor when your cursor rests there for a little while.
+  --         --    See `:help CursorHold` for information about when this is executed
+  --         --
+  --         -- When you move your cursor, the highlights will be cleared (the second autocommand).
+  --         local client = vim.lsp.get_client_by_id(event.data.client_id)
+  --         if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
+  --           local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
+  --           vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
+  --             buffer = event.buf,
+  --             group = highlight_augroup,
+  --             callback = vim.lsp.buf.document_highlight,
+  --           })
+  --
+  --           vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
+  --             buffer = event.buf,
+  --             group = highlight_augroup,
+  --             callback = vim.lsp.buf.clear_references,
+  --           })
+  --
+  --           vim.api.nvim_create_autocmd('LspDetach', {
+  --             group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
+  --             callback = function(event2)
+  --               vim.lsp.buf.clear_references()
+  --               vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf }
+  --             end,
+  --           })
+  --         end
+  --
+  --         -- The following code creates a keymap to toggle inlay hints in your
+  --         -- code, if the language server you are using supports them
+  --         --
+  --         -- This may be unwanted, since they displace some of your code
+  --         if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
+  --           map('<leader>th', function()
+  --             vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
+  --           end, '[T]oggle Inlay [H]ints')
+  --         end
+  --       end,
+  --     })
+  --
+  --     -- Diagnostic Config
+  --     -- See :help vim.diagnostic.Opts
+  --     vim.diagnostic.config {
+  --       severity_sort = true,
+  --       float = { border = 'rounded', source = 'if_many' },
+  --       underline = { severity = vim.diagnostic.severity.ERROR },
+  --       signs = vim.g.have_nerd_font and {
+  --         text = {
+  --           [vim.diagnostic.severity.ERROR] = '󰅚 ',
+  --           [vim.diagnostic.severity.WARN] = '󰀪 ',
+  --           [vim.diagnostic.severity.INFO] = '󰋽 ',
+  --           [vim.diagnostic.severity.HINT] = '󰌶 ',
+  --         },
+  --       } or {},
+  --       virtual_text = {
+  --         source = 'if_many',
+  --         spacing = 2,
+  --         format = function(diagnostic)
+  --           local diagnostic_message = {
+  --             [vim.diagnostic.severity.ERROR] = diagnostic.message,
+  --             [vim.diagnostic.severity.WARN] = diagnostic.message,
+  --             [vim.diagnostic.severity.INFO] = diagnostic.message,
+  --             [vim.diagnostic.severity.HINT] = diagnostic.message,
+  --           }
+  --           return diagnostic_message[diagnostic.severity]
+  --         end,
+  --       },
+  --     }
+  --
+  --     -- LSP servers and clients are able to communicate to each other what features they support.
+  --     --  By default, Neovim doesn't support everything that is in the LSP specification.
+  --     --  When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
+  --     --  So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
+  --     local capabilities = require('blink.cmp').get_lsp_capabilities()
+  --
+  --     -- Enable the following language servers
+  --     --  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
+  --     --
+  --     --  Add any additional override configuration in the following tables. Available keys are:
+  --     --  - cmd (table): Override the default command used to start the server
+  --     --  - filetypes (table): Override the default list of associated filetypes for the server
+  --     --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
+  --     --  - 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 = {
+  --         cmd = {
+  --           '~/.local/share/nvim/mason/bin/clangd',
+  --           '--all-scopes-completion',
+  --           '--background-index',
+  --           '--clang-tidy',
+  --           '--completion-parse=always',
+  --           '--completion-style=bundled',
+  --           '--cross-file-rename',
+  --           '--debug-origin',
+  --           '--enable-config', -- clangd 11+ supports reading from .clangd configuration file
+  --           '--fallback-style=Qt',
+  --           '--folding-ranges',
+  --           '--function-arg-placeholders',
+  --           '--header-insertion=iwyu',
+  --           '--pch-storage=memory', -- could also be disk
+  --           '--suggest-missing-includes',
+  --           '-j=20', -- number of workers
+  --           -- "--resource-dir="
+  --           '--log=error',
+  --         },
+  --       },
+  --       gopls = {},
+  --       pyright = {},
+  --       -- 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:
+  --       --    https://github.com/pmizio/typescript-tools.nvim
+  --       --
+  --       -- But for many setups, the LSP (`ts_ls`) will work just fine
+  --       ts_ls = {},
+  --       --
+  --
+  --       lua_ls = {
+  --         -- cmd = { ... },
+  --         -- filetypes = { ... },
+  --         -- capabilities = {},
+  --         settings = {
+  --           Lua = {
+  --             completion = {
+  --               callSnippet = 'Replace',
+  --             },
+  --             -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
+  --             -- diagnostics = { disable = { 'missing-fields' } },
+  --           },
+  --         },
+  --       },
+  --     }
+  --
+  --     -- Ensure the servers and tools above are installed
+  --     --
+  --     -- To check the current status of installed tools and/or manually install
+  --     -- other tools, you can run
+  --     --    :Mason
+  --     --
+  --     -- You can press `g?` for help in this menu.
+  --     --
+  --     -- `mason` had to be setup earlier: to configure its options see the
+  --     -- `dependencies` table for `nvim-lspconfig` above.
+  --     --
+  --     -- You can add other tools here that you want Mason to install
+  --     -- for you, so that they are available from within Neovim.
+  --     local ensure_installed = vim.tbl_keys(servers or {})
+  --     vim.list_extend(ensure_installed, {
+  --       'stylua', -- Used to format Lua code
+  --     })
+  --     require('mason-tool-installer').setup { ensure_installed = ensure_installed }
+  --
+  --     require('mason-lspconfig').setup {
+  --       ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer)
+  --       automatic_installation = false,
+  --       handlers = {
+  --         function(server_name)
+  --           local server = servers[server_name] or {}
+  --           -- This handles overriding only values explicitly passed
+  --           -- by the server configuration above. Useful when disabling
+  --           -- certain features of an LSP (for example, turning off formatting for ts_ls)
+  --           server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
+  --           require('lspconfig')[server_name].setup(server)
+  --         end,
+  --       },
+  --     }
+  --   end,
+  -- },
 
-  {
-    -- Highlight, edit, and navigate code
-    'nvim-treesitter/nvim-treesitter',
+  { -- Autoformat
+    'stevearc/conform.nvim',
+    event = { 'BufWritePre' },
+    cmd = { 'ConformInfo' },
+    keys = {
+      {
+        '<leader>f',
+        function()
+          require('conform').format { async = true, lsp_format = 'fallback' }
+        end,
+        mode = '',
+        desc = '[F]ormat buffer',
+      },
+    },
+    opts = {
+      notify_on_error = false,
+      format_on_save = function(bufnr)
+        -- Disable "format_on_save lsp_fallback" for languages that don't
+        -- have a well standardized coding style. You can add additional
+        -- languages here or re-enable it for the disabled ones.
+        local disable_filetypes = { c = true, cpp = true }
+        if disable_filetypes[vim.bo[bufnr].filetype] then
+          return nil
+        else
+          return {
+            timeout_ms = 500,
+            lsp_format = 'fallback',
+          }
+        end
+      end,
+      formatters_by_ft = {
+        lua = { 'stylua' },
+        -- Conform can also run multiple formatters sequentially
+        -- python = { "isort", "black" },
+        --
+        -- You can use 'stop_after_first' to run the first available formatter from the list
+        -- javascript = { "prettierd", "prettier", stop_after_first = true },
+      },
+    },
+  },
+  { -- Autocompletion
+    'saghen/blink.cmp',
+    event = 'VimEnter',
+    version = '1.*',
     dependencies = {
-      'nvim-treesitter/nvim-treesitter-textobjects',
+      -- Snippet Engine
+      {
+        'L3MON4D3/LuaSnip',
+        version = '2.*',
+        build = (function()
+          -- Build Step is needed for regex support in snippets.
+          -- This step is not supported in many windows environments.
+          -- Remove the below condition to re-enable on windows.
+          if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
+            return
+          end
+          return 'make install_jsregexp'
+        end)(),
+        dependencies = {
+          -- `friendly-snippets` contains a variety of premade snippets.
+          --    See the README about individual language/framework/plugin snippets:
+          --    https://github.com/rafamadriz/friendly-snippets
+          -- {
+          --   'rafamadriz/friendly-snippets',
+          --   config = function()
+          --     require('luasnip.loaders.from_vscode').lazy_load()
+          --   end,
+          -- },
+        },
+        opts = {},
+      },
+      'folke/lazydev.nvim',
+    },
+    --- @module 'blink.cmp'
+    --- @type blink.cmp.Config
+    opts = {
+      keymap = {
+        -- 'default' (recommended) for mappings similar to built-in completions
+        --   <c-y> to accept ([y]es) the completion.
+        --    This will auto-import if your LSP supports it.
+        --    This will expand snippets if the LSP sent a snippet.
+        -- 'super-tab' for tab to accept
+        -- 'enter' for enter to accept
+        -- 'none' for no mappings
+        --
+        -- For an understanding of why the 'default' preset is recommended,
+        -- you will need to read `:help ins-completion`
+        --
+        -- No, but seriously. Please read `:help ins-completion`, it is really good!
+        --
+        -- All presets have the following mappings:
+        -- <tab>/<s-tab>: move to right/left of your snippet expansion
+        -- <c-space>: Open menu or open docs if already open
+        -- <c-n>/<c-p> or <up>/<down>: Select next/previous item
+        -- <c-e>: Hide menu
+        -- <c-k>: Toggle signature help
+        --
+        -- See :h blink-cmp-config-keymap for defining your own keymap
+        preset = 'default',
+
+        -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
+        --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
+      },
+
+      appearance = {
+        -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
+        -- Adjusts spacing to ensure icons are aligned
+        nerd_font_variant = 'mono',
+      },
+
+      completion = {
+        -- By default, you may press `<c-space>` to show the documentation.
+        -- Optionally, set `auto_show = true` to show the documentation after a delay.
+        documentation = { auto_show = false, auto_show_delay_ms = 500 },
+      },
+
+      sources = {
+        default = { 'lsp', 'path', 'snippets', 'lazydev' },
+        providers = {
+          lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
+        },
+      },
+
+      snippets = { preset = 'luasnip' },
+
+      -- Blink.cmp includes an optional, recommended rust fuzzy matcher,
+      -- which automatically downloads a prebuilt binary when enabled.
+      --
+      -- By default, we use the Lua implementation instead, but you may enable
+      -- the rust implementation via `'prefer_rust_with_warning'`
+      --
+      -- See :h blink-cmp-config-fuzzy for more information
+      fuzzy = { implementation = 'lua' },
+
+      -- Shows a signature help window while you type arguments for a function
+      signature = { enabled = true },
     },
+  },
+  { -- Collection of various small independent plugins/modules
+    'echasnovski/mini.nvim',
     config = function()
-      pcall(require('nvim-treesitter.install').update { with_sync = true })
+      -- Better Around/Inside textobjects
+      --
+      -- Examples:
+      --  - va)  - [V]isually select [A]round [)]paren
+      --  - yinq - [Y]ank [I]nside [N]ext [Q]uote
+      --  - ci'  - [C]hange [I]nside [']quote
+      require('mini.ai').setup { n_lines = 500 }
+
+      -- Add/delete/replace surroundings (brackets, quotes, etc.)
+      --
+      -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
+      -- - sd'   - [S]urround [D]elete [']quotes
+      -- - sr)'  - [S]urround [R]eplace [)] [']
+      require('mini.surround').setup()
+
+      -- Simple and easy statusline.
+      --  You could remove this setup call if you don't like it,
+      --  and try some other statusline plugin
+      local statusline = require 'mini.statusline'
+      -- set use_icons to true if you have a Nerd Font
+      statusline.setup { use_icons = vim.g.have_nerd_font }
+
+      -- You can configure sections in the statusline by overriding their
+      -- default behavior. For example, here we set the section for
+      -- cursor location to LINE:COLUMN
+      ---@diagnostic disable-next-line: duplicate-set-field
+      statusline.section_location = function()
+        return '%2l:%-2v'
+      end
+
+      -- ... and there is more!
+      --  Check out: https://github.com/echasnovski/mini.nvim
     end,
   },
+  { -- Highlight, edit, and navigate code
+    'nvim-treesitter/nvim-treesitter',
+    build = ':TSUpdate',
+    main = 'nvim-treesitter.configs', -- Sets main module to use for opts
+    -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
+    opts = {
+      ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
+      -- Autoinstall languages that are not installed
+      auto_install = true,
+      highlight = {
+        enable = true,
+        -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
+        --  If you are experiencing weird indenting issues, add the language to
+        --  the list of additional_vim_regex_highlighting and disabled languages for indent.
+        additional_vim_regex_highlighting = { 'ruby' },
+      },
+      indent = { enable = true, disable = { 'ruby' } },
+    },
+    -- There are additional nvim-treesitter modules that you can use to interact
+    -- with nvim-treesitter. You should go explore a few and see what interests you:
+    --
+    --    - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
+    --    - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
+    --    - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
+  },
 
   -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
   --       These are some example plugins that I've included in the kickstart repository.
@@ -218,58 +1175,10 @@ require('lazy').setup({
   { import = 'custom.plugins' },
 }, {})
 
--- [[ Setting options ]]
--- See `:help vim.o`
-
--- Set highlight on search
-vim.o.hlsearch = false
-
--- Make line numbers default
-vim.wo.number = true
+-- Clear highlight on search
+vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
 
--- Enable mouse mode
-vim.o.mouse = 'a'
-
--- Sync clipboard between OS and Neovim.
---  Remove this option if you want your OS clipboard to remain independent.
---  See `:help 'clipboard'`
--- vim.o.clipboard = 'unnamedplus'
-
--- Enable break indent
-vim.o.breakindent = true
-
--- Save undo history
-vim.o.undofile = true
-
--- Case insensitive searching UNLESS /C or capital in search
-vim.o.ignorecase = true
-vim.o.smartcase = true
-
--- Keep signcolumn on by default
-vim.wo.signcolumn = 'yes'
-
--- Decrease update time
-vim.o.updatetime = 250
-vim.o.timeout = true
-vim.o.timeoutlen = 300
-
--- Set completeopt to have a better completion experience
-vim.o.completeopt = 'menuone,noselect'
-
--- NOTE: You should make sure your terminal supports this
-vim.o.termguicolors = true
-
--- Set relative and absolute line numbers
-vim.o.relativenumber = true
-vim.o.number = true
-
--- Set scroll offsets to have additional space when scrolling
-vim.o.scrolloff = 5
-vim.o.sidescrolloff = 10
-
--- Set tabs to 2 spaces
-vim.o.tabstop = 2
-vim.o.softtabstop = 2
+vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
 
 -- [[ Basic Keymaps ]]
 
@@ -282,13 +1191,13 @@ vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = tr
 vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
 -- Map window slection
-vim.keymap.set('n', '<M-h>', "<C-w>h", { silent = true })
-vim.keymap.set('n', '<M-j>', "<C-w>j", { silent = true })
-vim.keymap.set('n', '<M-k>', "<C-w>k", { silent = true })
-vim.keymap.set('n', '<M-l>', "<C-w>l", { silent = true })
+vim.keymap.set('n', '<M-h>', '<C-w>h', { silent = true })
+vim.keymap.set('n', '<M-j>', '<C-w>j', { silent = true })
+vim.keymap.set('n', '<M-k>', '<C-w>k', { silent = true })
+vim.keymap.set('n', '<M-l>', '<C-w>l', { silent = true })
 
 -- Map copy to clipboard
-vim.keymap.set('v', '<leader>y', "\"+y", { silent = true })
+vim.keymap.set('v', '<leader>y', '"+y', { silent = true })
 
 -- [[ Highlight on yank ]]
 -- See `:help vim.highlight.on_yank()`
@@ -338,8 +1247,7 @@ vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { de
 -- See `:help nvim-treesitter`
 require('nvim-treesitter.configs').setup {
   -- Add languages to be installed here that you want installed for treesitter
-  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vim', 'ruby', 'http',
-    'css' },
+  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vim', 'http', 'css' },
 
   -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
   auto_install = true,
@@ -407,138 +1315,6 @@ vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
 vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
 vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
 
--- LSP settings.
---  This function gets run when an LSP connects to a particular buffer.
-local on_attach = function(_, bufnr)
-  -- NOTE: Remember that lua is a real programming language, and as such it is possible
-  -- to define small helper and utility functions so you don't have to repeat yourself
-  -- many times.
-  --
-  -- In this case, we create a function that lets us more easily define mappings specific
-  -- for LSP related items. It sets the mode, buffer and description for us each time.
-  local nmap = function(keys, func, desc)
-    if desc then
-      desc = 'LSP: ' .. desc
-    end
-
-    vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
-  end
-
-  nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
-  nmap('<c-a>', vim.lsp.buf.code_action, '[C]ode [A]ction')
-
-  nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
-  nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-  nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
-  nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
-  nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-  nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-
-  -- See `:help K` for why this keymap
-  nmap('<c-i>', vim.lsp.buf.hover, 'Hover Documentation')
-  nmap('<c-p>', vim.lsp.buf.signature_help, 'Signature Documentation')
-
-  -- Lesser used LSP functionality
-  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-  nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
-  nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
-  nmap('<leader>wl', function()
-    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, '[W]orkspace [L]ist Folders')
-
-  -- Create a command `:Format` local to the LSP buffer
-  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
-    vim.lsp.buf.format()
-  end, { desc = 'Format current buffer with LSP' })
-
-  nmap('<leader><C-f>', function() vim.lsp.buf.format { async = true } end, 'Auto [F]ormat')
-
-  nmap('[e', vim.diagnostic.goto_next, 'Next [e]rror')
-  nmap(']e', vim.diagnostic.goto_prev, 'Prev [e]rror')
-end
-
--- Enable the following language servers
---  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
---
---  Add any additional override configuration in the following tables. They will be passed to
---  the `settings` field of the server config. You must look up that documentation yourself.
-local servers = {
-  clangd = {
-    cmd = {
-      "~/.local/share/nvim/mason/bin/clangd",
-      "--all-scopes-completion",
-      "--background-index",
-      "--clang-tidy",
-      "--completion-parse=always",
-      "--completion-style=bundled",
-      "--cross-file-rename",
-      "--debug-origin",
-      "--enable-config", -- clangd 11+ supports reading from .clangd configuration file
-      "--fallback-style=Qt",
-      "--folding-ranges",
-      "--function-arg-placeholders",
-      "--header-insertion=iwyu",
-      "--pch-storage=memory", -- could also be disk
-      "--suggest-missing-includes",
-      "-j=20",                -- number of workers
-      -- "--resource-dir="
-      "--log=error",
-    },
-  },
-  gopls = {},
-  -- solargraph = {},
-  ruby_lsp = {},
-  sqlls = {},
-  angularls = {},
-  bashls = {},
-  cssls = {},
-  dockerls = {},
-  -- gradle_ls = {},
-  pyright = {},
-  ts_ls = {},
-  html = {},
-  jsonls = {},
-  -- jdtls = {},
-  rust_analyzer = {},
-  -- marksman = {},
-  volar = {},
-  yamlls = {},
-  lua_ls = {
-    Lua = {
-      workspace = { checkThirdParty = false },
-      telemetry = { enable = false },
-    },
-  },
-  tailwindcss = {},
-}
-
--- Setup neovim lua configuration
-require('neodev').setup()
-
--- nvim-cmp supports additional completion capabilities, so broadcast that to servers
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
-
--- Setup mason so it can manage external tooling
-require('mason').setup()
-
--- Ensure the servers above are installed
-local mason_lspconfig = require 'mason-lspconfig'
-
-mason_lspconfig.setup {
-  ensure_installed = vim.tbl_keys(servers),
-}
-
-mason_lspconfig.setup_handlers {
-  function(server_name)
-    require('lspconfig')[server_name].setup {
-      capabilities = capabilities,
-      on_attach = on_attach,
-      settings = servers[server_name],
-    }
-  end,
-}
-
 -- nvim-cmp setup
 local cmp = require 'cmp'
 local luasnip = require 'luasnip'
diff --git a/lua/kickstart/plugins/autoformat.lua b/lua/kickstart/plugins/autoformat.lua
index ac3e2ab75d3..f53f98db4ee 100644
--- a/lua/kickstart/plugins/autoformat.lua
+++ b/lua/kickstart/plugins/autoformat.lua
@@ -1,83 +1,85 @@
--- autoformat.lua
---
--- Use your language server to automatically format your code on save.
--- Adds additional commands as well to manage the behavior
-
 return {
-  'neovim/nvim-lspconfig',
-  dependencies = {
-    'ray-x/go.nvim',
-    'ray-x/guihua.lua',
-  },
-  config = function()
-    require("go").setup()
-    -- Switch for controlling whether you want autoformatting.
-    --  Use :KickstartFormatToggle to toggle autoformatting on or off
-    local format_is_enabled = true
-    vim.api.nvim_create_user_command('KickstartFormatToggle', function()
-      format_is_enabled = not format_is_enabled
-      print('Setting autoformatting to: ' .. tostring(format_is_enabled))
-    end, {})
-
-    -- Create an augroup that is used for managing our formatting autocmds.
-    --      We need one augroup per client to make sure that multiple clients
-    --      can attach to the same buffer without interfering with each other.
-    local _augroups = {}
-    local get_augroup = function(client)
-      if not _augroups[client.id] then
-        local group_name = 'kickstart-lsp-format-' .. client.name
-        local id = vim.api.nvim_create_augroup(group_name, { clear = true })
-        _augroups[client.id] = id
-      end
-
-      return _augroups[client.id]
-    end
-
-    -- Whenever an LSP attaches to a buffer, we will run this function.
-    --
-    -- See `:help LspAttach` for more information about this autocmd event.
-    vim.api.nvim_create_autocmd('LspAttach', {
-      group = vim.api.nvim_create_augroup('kickstart-lsp-attach-format', { clear = true }),
-      -- This is where we attach the autoformatting for reasonable clients
-      callback = function(args)
-        local client_id = args.data.client_id
-        local client = vim.lsp.get_client_by_id(client_id)
-        local bufnr = args.buf
-
-        -- Only attach to clients that support document formatting
-        if not client.server_capabilities.documentFormattingProvider then
-          return
-        end
-
-        -- Tsserver usually works poorly. Sorry you work with bad languages
-        -- You can remove this line if you know what you're doing :)
-        if client.name == 'tsserver' then
-          return
-        end
-
-        -- Create an autocmd that will run *before* we save the buffer.
-        --  Run the formatting command for the LSP that has just attached.
-        vim.api.nvim_create_autocmd('BufWritePre', {
-          group = get_augroup(client),
-          buffer = bufnr,
-          callback = function()
-            if not format_is_enabled then
-              return
-            end
-
-            if vim.bo.filetype == 'go' then
-              require('go.format').goimport()
-            else
-              vim.lsp.buf.format {
-                async = false,
-                filter = function(c)
-                  return c.id == client.id
-                end,
-              }
-            end
-          end,
-        })
-      end,
-    })
-  end,
 }
+-- -- autoformat.lua
+-- --
+-- -- Use your language server to automatically format your code on save.
+-- -- Adds additional commands as well to manage the behavior
+--
+-- return {
+--   'neovim/nvim-lspconfig',
+--   dependencies = {
+--     'ray-x/go.nvim',
+--     'ray-x/guihua.lua',
+--   },
+--   config = function()
+--     require("go").setup()
+--     -- Switch for controlling whether you want autoformatting.
+--     --  Use :KickstartFormatToggle to toggle autoformatting on or off
+--     local format_is_enabled = true
+--     vim.api.nvim_create_user_command('KickstartFormatToggle', function()
+--       format_is_enabled = not format_is_enabled
+--       print('Setting autoformatting to: ' .. tostring(format_is_enabled))
+--     end, {})
+--
+--     -- Create an augroup that is used for managing our formatting autocmds.
+--     --      We need one augroup per client to make sure that multiple clients
+--     --      can attach to the same buffer without interfering with each other.
+--     local _augroups = {}
+--     local get_augroup = function(client)
+--       if not _augroups[client.id] then
+--         local group_name = 'kickstart-lsp-format-' .. client.name
+--         local id = vim.api.nvim_create_augroup(group_name, { clear = true })
+--         _augroups[client.id] = id
+--       end
+--
+--       return _augroups[client.id]
+--     end
+--
+--     -- Whenever an LSP attaches to a buffer, we will run this function.
+--     --
+--     -- See `:help LspAttach` for more information about this autocmd event.
+--     vim.api.nvim_create_autocmd('LspAttach', {
+--       group = vim.api.nvim_create_augroup('kickstart-lsp-attach-format', { clear = true }),
+--       -- This is where we attach the autoformatting for reasonable clients
+--       callback = function(args)
+--         local client_id = args.data.client_id
+--         local client = vim.lsp.get_client_by_id(client_id)
+--         local bufnr = args.buf
+--
+--         -- Only attach to clients that support document formatting
+--         if not client.server_capabilities.documentFormattingProvider then
+--           return
+--         end
+--
+--         -- Tsserver usually works poorly. Sorry you work with bad languages
+--         -- You can remove this line if you know what you're doing :)
+--         if client.name == 'tsserver' then
+--           return
+--         end
+--
+--         -- Create an autocmd that will run *before* we save the buffer.
+--         --  Run the formatting command for the LSP that has just attached.
+--         vim.api.nvim_create_autocmd('BufWritePre', {
+--           group = get_augroup(client),
+--           buffer = bufnr,
+--           callback = function()
+--             if not format_is_enabled then
+--               return
+--             end
+--
+--             if vim.bo.filetype == 'go' then
+--               require('go.format').goimport()
+--             else
+--               vim.lsp.buf.format {
+--                 async = false,
+--                 filter = function(c)
+--                   return c.id == client.id
+--                 end,
+--               }
+--             end
+--           end,
+--         })
+--       end,
+--     })
+--   end,
+-- }
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index b65ee569c9f..194c3d7f084 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -13,8 +13,8 @@ return {
   -- NOTE: And you can specify dependencies as well
   dependencies = {
     -- Creates a beautiful debugger UI
-    'nvim-neotest/nvim-nio',
     'rcarriga/nvim-dap-ui',
+    'nvim-neotest/nvim-nio',
 
     -- Installs the debug adapters for you
     'williamboman/mason.nvim',
@@ -27,6 +27,58 @@ return {
     'julianolf/nvim-dap-lldb',
     'vadimcn/codelldb',
   },
+  keys = {
+    {
+      '<F5>',
+      function()
+        require('dap').continue()
+      end,
+      desc = 'Debug: Start/Continue',
+    },
+    {
+      '<F1>',
+      function()
+        require('dap').step_into()
+      end,
+      desc = 'Debug: Step Into',
+    },
+    {
+      '<F2>',
+      function()
+        require('dap').step_over()
+      end,
+      desc = 'Debug: Step Over',
+    },
+    {
+      '<F3>',
+      function()
+        require('dap').step_out()
+      end,
+      desc = 'Debug: Step Out',
+    },
+    {
+      '<leader>b',
+      function()
+        require('dap').toggle_breakpoint()
+      end,
+      desc = 'Debug: Toggle Breakpoint',
+    },
+    {
+      '<leader>B',
+      function()
+        require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ')
+      end,
+      desc = 'Debug: Set Breakpoint',
+    },
+    -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
+    {
+      '<F7>',
+      function()
+        require('dapui').toggle()
+      end,
+      desc = 'Debug: See last session result.',
+    },
+  },
 
   config = function()
     local dap = require 'dap'
@@ -34,7 +86,7 @@ return {
 
     dap.adapters.lldb = {
       type = 'server',
-      command = vim.fn.expand('$HOME/.local/share/nvim/mason/bin/codelldb'),
+      command = vim.fn.expand '$HOME/.local/share/nvim/mason/bin/codelldb',
       host = '127.0.0.1',
       port = 13000,
     }
@@ -66,7 +118,7 @@ return {
       -- online, please don't ask me how to install them :)
       ensure_installed = {
         -- Update this to ensure that you have the debuggers for the langs you want
-        -- 'delve',
+        'delve',
         'js',
         'node2',
         'cppdbg',
@@ -75,22 +127,11 @@ return {
         'javatest',
       },
       handlers = {
-        function(config)
-          require('mason-nvim-dap').default_setup(config)
-        end
-      }
+        -- function(config)
+        --   require('mason-nvim-dap').default_setup(config)
+        -- end,
+      },
     }
-
-    -- Basic debugging keymaps, feel free to change to your liking!
-    vim.keymap.set('n', '<F5>', dap.continue, { desc = '[DAP] Continue' })
-    vim.keymap.set('n', '<F1>', dap.step_over, { desc = '[DAP] Over' })
-    vim.keymap.set('n', '<F2>', dap.step_into, { desc = '[DAP] Into' })
-    vim.keymap.set('n', '<F3>', dap.step_out, { desc = '[DAP] Out' })
-    vim.keymap.set('n', '<F6>', dap.toggle_breakpoint, { desc = '[DAP] Breakpoint toggle' })
-    vim.keymap.set('n', '<F7>', function()
-      dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
-    end, { desc = '[DAP] Conditional Breakpoint' })
-
     -- Dap UI setup
     -- For more information, see |:help nvim-dap-ui|
     dapui.setup {
@@ -108,57 +149,61 @@ return {
           step_back = 'b',
           run_last = '▶▶',
           terminate = '⏹',
+          disconnect = '⏏',
         },
       },
     }
 
     dap.listeners.after.event_initialized['dapui_config'] = dapui.open
-    -- dap.listeners.before.event_terminated['dapui_config'] = dapui.close
-    -- dap.listeners.before.event_exited['dapui_config'] = dapui.close
+    dap.listeners.before.event_terminated['dapui_config'] = dapui.close
+    dap.listeners.before.event_exited['dapui_config'] = dapui.close
 
     dap.defaults.fallback.exception_breakpoints = { 'Notice', 'Warning', 'Error', 'Exception' }
 
     -- Install golang specific config
-    require('dap-go').setup()
+    require('dap-go').setup{
+      delve = {
+        detached = vim.fn.has 'win32' == 0,
+      },
+    }
 
     -- Install javascript specific config
-    require("dap-vscode-js").setup {
-      debugger_path = vim.fn.stdpath("data") .. "/mason/packages/js-debug-adapter",
-      debugger_cmd = { "js-debug-adapter" },
-      adapters = { "pwa-node", "pwa-chrome", "pwa-msedge", "node-terminal", "pwa-extensionHost" },
+    require('dap-vscode-js').setup {
+      debugger_path = vim.fn.stdpath 'data' .. '/mason/packages/js-debug-adapter',
+      debugger_cmd = { 'js-debug-adapter' },
+      adapters = { 'pwa-node', 'pwa-chrome', 'pwa-msedge', 'node-terminal', 'pwa-extensionHost' },
     }
 
-
-    for _, jsLang in ipairs({ 'typescript', 'javascript' }) do
-      require("dap").configurations[jsLang] = {
+    for _, jsLang in ipairs { 'typescript', 'javascript' } do
+      require('dap').configurations[jsLang] = {
         {
-          type = "pwa-node",
-          request = "launch",
-          name = "Launch file",
-          program = "${file}",
-          cwd = "${workspaceFolder}",
+          type = 'pwa-node',
+          request = 'launch',
+          name = 'Launch file',
+          program = '${file}',
+          cwd = '${workspaceFolder}',
         },
         {
-          type = "pwa-node",
-          request = "attach",
-          name = "Attach",
-          processId = require 'dap.utils'.pick_process,
-          cwd = "${workspaceFolder}",
+          type = 'pwa-node',
+          request = 'attach',
+          name = 'Attach',
+          processId = require('dap.utils').pick_process,
+          cwd = '${workspaceFolder}',
         },
         {
-          type = "pwa-node",
-          request = "launch",
-          name = "Debug Jest Tests",
+          type = 'pwa-node',
+          request = 'launch',
+          name = 'Debug Jest Tests',
           -- trace = true, -- include debugger info
-          runtimeExecutable = "node",
+          runtimeExecutable = 'node',
           runtimeArgs = {
-            "./node_modules/jest/bin/jest.js",
-            "--runInBand",
+            './node_modules/jest/bin/jest.js',
+            '--runInBand',
           },
-          rootPath = "${workspaceFolder}",
-          cwd = "${workspaceFolder}",
-          console = "integratedTerminal",
-          internalConsoleOptions = "neverOpen",
+          rootPath = '${workspaceFolder}',
+          cwd = '${workspaceFolder}',
+          console = 'integratedTerminal',
+          internalConsoleOptions = 'neverOpen',
         },
         {
           name = 'Debug Main Process (Electron)',
diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/kickstart/plugins/gitsigns.lua
new file mode 100644
index 00000000000..cbbd22d24fc
--- /dev/null
+++ b/lua/kickstart/plugins/gitsigns.lua
@@ -0,0 +1,61 @@
+-- Adds git related signs to the gutter, as well as utilities for managing changes
+-- NOTE: gitsigns is already included in init.lua but contains only the base
+-- config. This will add also the recommended keymaps.
+
+return {
+  {
+    'lewis6991/gitsigns.nvim',
+    opts = {
+      on_attach = function(bufnr)
+        local gitsigns = require 'gitsigns'
+
+        local function map(mode, l, r, opts)
+          opts = opts or {}
+          opts.buffer = bufnr
+          vim.keymap.set(mode, l, r, opts)
+        end
+
+        -- Navigation
+        map('n', ']c', function()
+          if vim.wo.diff then
+            vim.cmd.normal { ']c', bang = true }
+          else
+            gitsigns.nav_hunk 'next'
+          end
+        end, { desc = 'Jump to next git [c]hange' })
+
+        map('n', '[c', function()
+          if vim.wo.diff then
+            vim.cmd.normal { '[c', bang = true }
+          else
+            gitsigns.nav_hunk 'prev'
+          end
+        end, { desc = 'Jump to previous git [c]hange' })
+
+        -- Actions
+        -- visual mode
+        map('v', '<leader>hs', function()
+          gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
+        end, { desc = 'git [s]tage hunk' })
+        map('v', '<leader>hr', function()
+          gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
+        end, { desc = 'git [r]eset hunk' })
+        -- normal mode
+        map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
+        map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
+        map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
+        map('n', '<leader>hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' })
+        map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
+        map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
+        map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
+        map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
+        map('n', '<leader>hD', function()
+          gitsigns.diffthis '@'
+        end, { desc = 'git [D]iff against last commit' })
+        -- Toggles
+        map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
+        map('n', '<leader>tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })
+      end,
+    },
+  },
+}
diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua
new file mode 100644
index 00000000000..dec42f097c6
--- /dev/null
+++ b/lua/kickstart/plugins/lint.lua
@@ -0,0 +1,60 @@
+return {
+
+  { -- Linting
+    'mfussenegger/nvim-lint',
+    event = { 'BufReadPre', 'BufNewFile' },
+    config = function()
+      local lint = require 'lint'
+      lint.linters_by_ft = {
+        markdown = { 'markdownlint' },
+      }
+
+      -- To allow other plugins to add linters to require('lint').linters_by_ft,
+      -- instead set linters_by_ft like this:
+      -- lint.linters_by_ft = lint.linters_by_ft or {}
+      -- lint.linters_by_ft['markdown'] = { 'markdownlint' }
+      --
+      -- However, note that this will enable a set of default linters,
+      -- which will cause errors unless these tools are available:
+      -- {
+      --   clojure = { "clj-kondo" },
+      --   dockerfile = { "hadolint" },
+      --   inko = { "inko" },
+      --   janet = { "janet" },
+      --   json = { "jsonlint" },
+      --   markdown = { "vale" },
+      --   rst = { "vale" },
+      --   ruby = { "ruby" },
+      --   terraform = { "tflint" },
+      --   text = { "vale" }
+      -- }
+      --
+      -- You can disable the default linters by setting their filetypes to nil:
+      -- lint.linters_by_ft['clojure'] = nil
+      -- lint.linters_by_ft['dockerfile'] = nil
+      -- lint.linters_by_ft['inko'] = nil
+      -- lint.linters_by_ft['janet'] = nil
+      -- lint.linters_by_ft['json'] = nil
+      -- lint.linters_by_ft['markdown'] = nil
+      -- lint.linters_by_ft['rst'] = nil
+      -- lint.linters_by_ft['ruby'] = nil
+      -- lint.linters_by_ft['terraform'] = nil
+      -- lint.linters_by_ft['text'] = nil
+
+      -- Create autocommand which carries out the actual linting
+      -- on the specified events.
+      local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
+      vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
+        group = lint_augroup,
+        callback = function()
+          -- Only run the linter in buffers that you can modify in order to
+          -- avoid superfluous noise, notably within the handy LSP pop-ups that
+          -- describe the hovered symbol using Markdown.
+          if vim.bo.modifiable then
+            lint.try_lint()
+          end
+        end,
+      })
+    end,
+  },
+}

From 0029de4b5afb2772c44645aa893a7d7dcf06d741 Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Fri, 13 Jun 2025 07:58:17 -0400
Subject: [PATCH 21/24] bug: guess indent not working

---
 init.lua | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/init.lua b/init.lua
index c56afdd108a..9f62578e9cf 100644
--- a/init.lua
+++ b/init.lua
@@ -23,7 +23,7 @@ vim.o.mouse = 'a'
 -- Sync clipboard between OS and Neovim.
 --  Remove this option if you want your OS clipboard to remain independent.
 --  See `:help 'clipboard'`
-vim.o.clipboard = 'unnamedplus'
+-- vim.o.clipboard = 'unnamedplus'
 
 -- Enable break indent
 vim.o.breakindent = true
@@ -95,7 +95,12 @@ vim.opt.rtp:prepend(lazypath)
 --    as they will be available in your neovim runtime.
 require('lazy').setup({
   -- NOTE: First, some plugins that don't require any configuration
-  'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically
+  {
+    'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically
+    config = function()
+      require('guess-indent').setup {}
+    end,
+  },
 
   -- Git related plugins
   'tpope/vim-fugitive',

From 4b7c1bb8f648b56f8145e7b548a17df2e23a2d9c Mon Sep 17 00:00:00 2001
From: Wil Simpson <wil@forever.dev>
Date: Fri, 13 Jun 2025 08:46:07 -0400
Subject: [PATCH 22/24] feat: latest preferences

---
 init.lua | 594 +++++++++----------------------------------------------
 1 file changed, 92 insertions(+), 502 deletions(-)

diff --git a/init.lua b/init.lua
index 9f62578e9cf..2f9c1e58896 100644
--- a/init.lua
+++ b/init.lua
@@ -61,9 +61,23 @@ vim.o.sidescrolloff = 10
 vim.o.tabstop = 2
 vim.o.softtabstop = 2
 
+vim.o.shiftwidth = 2
+
+-- Preview substitutions live, as you type!
+vim.o.inccommand = 'split'
+
+-- Show which line your cursor is on
+vim.o.cursorline = true
+
 vim.o.list = true
 vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
 
+-- Clear highlights on search when pressing <Esc> in normal mode
+--  See `:help hlsearch`
+vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
+
+vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
+
 vim.api.nvim_create_autocmd('TextYankPost', {
   desc = 'Highlight when yanking (copying) text',
   group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
@@ -97,9 +111,7 @@ require('lazy').setup({
   -- NOTE: First, some plugins that don't require any configuration
   {
     'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically
-    config = function()
-      require('guess-indent').setup {}
-    end,
+    opts = {},
   },
 
   -- Git related plugins
@@ -118,67 +130,6 @@ require('lazy').setup({
     },
   },
 
-  -- NOTE: This is where your plugins related to LSP can be installed.
-  --  The configuration is done below. Search for lspconfig to find it below.
-  {
-    -- LSP Configuration & Plugins
-    'neovim/nvim-lspconfig',
-    dependencies = {
-      -- Automatically install LSPs to stdpath for neovim
-      'williamboman/mason.nvim',
-      'williamboman/mason-lspconfig.nvim',
-
-      -- Useful status updates for LSP
-      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { 'j-hui/fidget.nvim', opts = {} },
-
-      -- Additional lua configuration, makes nvim stuff amazing!
-      'folke/neodev.nvim',
-    },
-    config = function()
-      vim.api.nvim_create_autocmd('LspAttach', {
-        group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
-        callback = function(event)
-          local nmap = function(keys, func, desc)
-            if desc then
-              desc = 'LSP: ' .. desc
-            end
-
-            vim.keymap.set('n', keys, func, { buffer = bufr, desc = desc })
-          end
-
-          nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
-          nmap('<c-a>', vim.lsp.buf.code_action, '[C]ode [A]ction')
-
-          nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
-          nmap('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-          nmap('grI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
-          nmap('gri', require('telescope.builtin').lsp_implementations, '[G]oto [R]eferences')
-          nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
-          nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-          nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-
-          -- Lesser used LSP functionality
-          nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-          nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
-          nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
-          nmap('<leader>wl', function()
-            print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-          end, '[W]orkspace [L]ist Folders')
-
-          -- Create a command `:Format` local to the LSP buffer
-          vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
-            vim.lsp.buf.format()
-          end, { desc = 'Format current buffer with LSP' })
-
-          nmap('<leader><C-f>', function()
-            vim.lsp.buf.format { async = true }
-          end, 'Auto [F]ormat')
-        end,
-      })
-    end,
-  },
-
   {
     -- Autocompletion
     'hrsh7th/nvim-cmp',
@@ -403,7 +354,7 @@ require('lazy').setup({
       { 'j-hui/fidget.nvim', opts = {} },
 
       -- Allows extra capabilities provided by blink.cmp
-      'saghen/blink.cmp',
+      -- 'saghen/blink.cmp',
     },
     config = function()
       -- Brief aside: **What is LSP?**
@@ -490,7 +441,7 @@ require('lazy').setup({
 
           -- See `:help K` for why this keymap
           map('<c-i>', vim.lsp.buf.hover, 'Hover Documentation')
-          map('<c-p>', vim.lsp.buf.signature_help, 'Signature Documentation')
+          map('<c-s>', vim.lsp.buf.signature_help, 'Signature Documentation')
 
           -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10)
           ---@param client vim.lsp.Client
@@ -680,288 +631,6 @@ require('lazy').setup({
       }
     end,
   },
-  -- {
-  --   -- Main LSP Configuration
-  --   'neovim/nvim-lspconfig',
-  --   dependencies = {
-  --     -- Automatically install LSPs and related tools to stdpath for Neovim
-  --     -- Mason must be loaded before its dependents so we need to set it up here.
-  --     -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
-  --     { 'mason-org/mason.nvim', opts = {} },
-  --     'mason-org/mason-lspconfig.nvim',
-  --     'WhoIsSethDaniel/mason-tool-installer.nvim',
-  --
-  --     -- Useful status updates for LSP.
-  --     { 'j-hui/fidget.nvim', opts = {} },
-  --
-  --     -- Allows extra capabilities provided by blink.cmp
-  --     'saghen/blink.cmp',
-  --   },
-  --   config = function()
-  --     -- Brief aside: **What is LSP?**
-  --     --
-  --     -- LSP is an initialism you've probably heard, but might not understand what it is.
-  --     --
-  --     -- LSP stands for Language Server Protocol. It's a protocol that helps editors
-  --     -- and language tooling communicate in a standardized fashion.
-  --     --
-  --     -- In general, you have a "server" which is some tool built to understand a particular
-  --     -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers
-  --     -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone
-  --     -- processes that communicate with some "client" - in this case, Neovim!
-  --     --
-  --     -- LSP provides Neovim with features like:
-  --     --  - Go to definition
-  --     --  - Find references
-  --     --  - Autocompletion
-  --     --  - Symbol Search
-  --     --  - and more!
-  --     --
-  --     -- Thus, Language Servers are external tools that must be installed separately from
-  --     -- Neovim. This is where `mason` and related plugins come into play.
-  --     --
-  --     -- If you're wondering about lsp vs treesitter, you can check out the wonderfully
-  --     -- and elegantly composed help section, `:help lsp-vs-treesitter`
-  --
-  --     --  This function gets run when an LSP attaches to a particular buffer.
-  --     --    That is to say, every time a new file is opened that is associated with
-  --     --    an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this
-  --     --    function will be executed to configure the current buffer
-  --     vim.api.nvim_create_autocmd('LspAttach', {
-  --       group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
-  --       callback = function(event)
-  --         -- NOTE: Remember that Lua is a real programming language, and as such it is possible
-  --         -- to define small helper and utility functions so you don't have to repeat yourself.
-  --         --
-  --         -- In this case, we create a function that lets us more easily define mappings specific
-  --         -- for LSP related items. It sets the mode, buffer and description for us each time.
-  --         local map = function(keys, func, desc, mode)
-  --           mode = mode or 'n'
-  --           vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
-  --         end
-  --
-  --         -- Rename the variable under your cursor.
-  --         --  Most Language Servers support renaming across files, etc.
-  --         map('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
-  --
-  --         -- Execute a code action, usually your cursor needs to be on top of an error
-  --         -- or a suggestion from your LSP for this to activate.
-  --         map('<leader>ra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
-  --
-  --         -- Find references for the word under your cursor.
-  --         map('<leader>rr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-  --
-  --         -- Jump to the implementation of the word under your cursor.
-  --         --  Useful when your language has ways of declaring types without an actual implementation.
-  --         map('<leader>ri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
-  --
-  --         -- Jump to the definition of the word under your cursor.
-  --         --  This is where a variable was first declared, or where a function is defined, etc.
-  --         --  To jump back, press <C-t>.
-  --         map('<leader>rd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-  --
-  --         -- WARN: This is not Goto Definition, this is Goto Declaration.
-  --         --  For example, in C this would take you to the header.
-  --         map('<leader>rD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-  --
-  --         -- Fuzzy find all the symbols in your current document.
-  --         --  Symbols are things like variables, functions, types, etc.
-  --         map('<leader>O', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols')
-  --
-  --         -- Fuzzy find all the symbols in your current workspace.
-  --         --  Similar to document symbols, except searches over your entire project.
-  --         map('<leader>W', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols')
-  --
-  --         -- Jump to the type of the word under your cursor.
-  --         --  Useful when you're not sure what type a variable is and you want to see
-  --         --  the definition of its *type*, not where it was *defined*.
-  --         map('<leader>rt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
-  --
-  --         -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10)
-  --         ---@param client vim.lsp.Client
-  --         ---@param method vim.lsp.protocol.Method
-  --         ---@param bufnr? integer some lsp support methods only in specific files
-  --         ---@return boolean
-  --         local function client_supports_method(client, method, bufnr)
-  --           if vim.fn.has 'nvim-0.11' == 1 then
-  --             return client:supports_method(method, bufnr)
-  --           else
-  --             return client.supports_method(method, { bufnr = bufnr })
-  --           end
-  --         end
-  --
-  --         -- The following two autocommands are used to highlight references of the
-  --         -- word under your cursor when your cursor rests there for a little while.
-  --         --    See `:help CursorHold` for information about when this is executed
-  --         --
-  --         -- When you move your cursor, the highlights will be cleared (the second autocommand).
-  --         local client = vim.lsp.get_client_by_id(event.data.client_id)
-  --         if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
-  --           local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
-  --           vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
-  --             buffer = event.buf,
-  --             group = highlight_augroup,
-  --             callback = vim.lsp.buf.document_highlight,
-  --           })
-  --
-  --           vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
-  --             buffer = event.buf,
-  --             group = highlight_augroup,
-  --             callback = vim.lsp.buf.clear_references,
-  --           })
-  --
-  --           vim.api.nvim_create_autocmd('LspDetach', {
-  --             group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
-  --             callback = function(event2)
-  --               vim.lsp.buf.clear_references()
-  --               vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf }
-  --             end,
-  --           })
-  --         end
-  --
-  --         -- The following code creates a keymap to toggle inlay hints in your
-  --         -- code, if the language server you are using supports them
-  --         --
-  --         -- This may be unwanted, since they displace some of your code
-  --         if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
-  --           map('<leader>th', function()
-  --             vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
-  --           end, '[T]oggle Inlay [H]ints')
-  --         end
-  --       end,
-  --     })
-  --
-  --     -- Diagnostic Config
-  --     -- See :help vim.diagnostic.Opts
-  --     vim.diagnostic.config {
-  --       severity_sort = true,
-  --       float = { border = 'rounded', source = 'if_many' },
-  --       underline = { severity = vim.diagnostic.severity.ERROR },
-  --       signs = vim.g.have_nerd_font and {
-  --         text = {
-  --           [vim.diagnostic.severity.ERROR] = '󰅚 ',
-  --           [vim.diagnostic.severity.WARN] = '󰀪 ',
-  --           [vim.diagnostic.severity.INFO] = '󰋽 ',
-  --           [vim.diagnostic.severity.HINT] = '󰌶 ',
-  --         },
-  --       } or {},
-  --       virtual_text = {
-  --         source = 'if_many',
-  --         spacing = 2,
-  --         format = function(diagnostic)
-  --           local diagnostic_message = {
-  --             [vim.diagnostic.severity.ERROR] = diagnostic.message,
-  --             [vim.diagnostic.severity.WARN] = diagnostic.message,
-  --             [vim.diagnostic.severity.INFO] = diagnostic.message,
-  --             [vim.diagnostic.severity.HINT] = diagnostic.message,
-  --           }
-  --           return diagnostic_message[diagnostic.severity]
-  --         end,
-  --       },
-  --     }
-  --
-  --     -- LSP servers and clients are able to communicate to each other what features they support.
-  --     --  By default, Neovim doesn't support everything that is in the LSP specification.
-  --     --  When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
-  --     --  So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
-  --     local capabilities = require('blink.cmp').get_lsp_capabilities()
-  --
-  --     -- Enable the following language servers
-  --     --  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
-  --     --
-  --     --  Add any additional override configuration in the following tables. Available keys are:
-  --     --  - cmd (table): Override the default command used to start the server
-  --     --  - filetypes (table): Override the default list of associated filetypes for the server
-  --     --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
-  --     --  - 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 = {
-  --         cmd = {
-  --           '~/.local/share/nvim/mason/bin/clangd',
-  --           '--all-scopes-completion',
-  --           '--background-index',
-  --           '--clang-tidy',
-  --           '--completion-parse=always',
-  --           '--completion-style=bundled',
-  --           '--cross-file-rename',
-  --           '--debug-origin',
-  --           '--enable-config', -- clangd 11+ supports reading from .clangd configuration file
-  --           '--fallback-style=Qt',
-  --           '--folding-ranges',
-  --           '--function-arg-placeholders',
-  --           '--header-insertion=iwyu',
-  --           '--pch-storage=memory', -- could also be disk
-  --           '--suggest-missing-includes',
-  --           '-j=20', -- number of workers
-  --           -- "--resource-dir="
-  --           '--log=error',
-  --         },
-  --       },
-  --       gopls = {},
-  --       pyright = {},
-  --       -- 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:
-  --       --    https://github.com/pmizio/typescript-tools.nvim
-  --       --
-  --       -- But for many setups, the LSP (`ts_ls`) will work just fine
-  --       ts_ls = {},
-  --       --
-  --
-  --       lua_ls = {
-  --         -- cmd = { ... },
-  --         -- filetypes = { ... },
-  --         -- capabilities = {},
-  --         settings = {
-  --           Lua = {
-  --             completion = {
-  --               callSnippet = 'Replace',
-  --             },
-  --             -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-  --             -- diagnostics = { disable = { 'missing-fields' } },
-  --           },
-  --         },
-  --       },
-  --     }
-  --
-  --     -- Ensure the servers and tools above are installed
-  --     --
-  --     -- To check the current status of installed tools and/or manually install
-  --     -- other tools, you can run
-  --     --    :Mason
-  --     --
-  --     -- You can press `g?` for help in this menu.
-  --     --
-  --     -- `mason` had to be setup earlier: to configure its options see the
-  --     -- `dependencies` table for `nvim-lspconfig` above.
-  --     --
-  --     -- You can add other tools here that you want Mason to install
-  --     -- for you, so that they are available from within Neovim.
-  --     local ensure_installed = vim.tbl_keys(servers or {})
-  --     vim.list_extend(ensure_installed, {
-  --       'stylua', -- Used to format Lua code
-  --     })
-  --     require('mason-tool-installer').setup { ensure_installed = ensure_installed }
-  --
-  --     require('mason-lspconfig').setup {
-  --       ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer)
-  --       automatic_installation = false,
-  --       handlers = {
-  --         function(server_name)
-  --           local server = servers[server_name] or {}
-  --           -- This handles overriding only values explicitly passed
-  --           -- by the server configuration above. Useful when disabling
-  --           -- certain features of an LSP (for example, turning off formatting for ts_ls)
-  --           server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
-  --           require('lspconfig')[server_name].setup(server)
-  --         end,
-  --       },
-  --     }
-  --   end,
-  -- },
-
   { -- Autoformat
     'stevearc/conform.nvim',
     event = { 'BufWritePre' },
@@ -1143,9 +812,24 @@ require('lazy').setup({
     main = 'nvim-treesitter.configs', -- Sets main module to use for opts
     -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
     opts = {
-      ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
-      -- Autoinstall languages that are not installed
-      auto_install = true,
+      ensure_installed = {
+        'bash',
+        'c',
+        'go',
+        'tsx',
+        'typescript',
+        'http',
+        'css',
+        'diff',
+        'html',
+        'lua',
+        'luadoc',
+        'markdown',
+        'markdown_inline',
+        'query',
+        'vim',
+        'vimdoc',
+      },
       highlight = {
         enable = true,
         -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
@@ -1154,6 +838,62 @@ require('lazy').setup({
         additional_vim_regex_highlighting = { 'ruby' },
       },
       indent = { enable = true, disable = { 'ruby' } },
+      -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
+      auto_install = true,
+
+      incremental_selection = {
+        enable = true,
+        keymaps = {
+          init_selection = '<c-space>',
+          node_incremental = '<c-space>',
+          scope_incremental = '<c-s>',
+          node_decremental = '<M-space>',
+        },
+      },
+      textobjects = {
+        select = {
+          enable = true,
+          lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
+          keymaps = {
+            -- You can use the capture groups defined in textobjects.scm
+            ['aa'] = '@parameter.outer',
+            ['ia'] = '@parameter.inner',
+            ['af'] = '@function.outer',
+            ['if'] = '@function.inner',
+            ['ac'] = '@class.outer',
+            ['ic'] = '@class.inner',
+          },
+        },
+        move = {
+          enable = true,
+          set_jumps = true, -- whether to set jumps in the jumplist
+          goto_next_start = {
+            [']m'] = '@function.outer',
+            [']]'] = '@class.outer',
+          },
+          goto_next_end = {
+            [']M'] = '@function.outer',
+            [']['] = '@class.outer',
+          },
+          goto_previous_start = {
+            ['[m'] = '@function.outer',
+            ['[['] = '@class.outer',
+          },
+          goto_previous_end = {
+            ['[M'] = '@function.outer',
+            ['[]'] = '@class.outer',
+          },
+        },
+        swap = {
+          enable = true,
+          swap_next = {
+            ['<leader>a'] = '@parameter.inner',
+          },
+          swap_previous = {
+            ['<leader>A'] = '@parameter.inner',
+          },
+        },
+      },
     },
     -- There are additional nvim-treesitter modules that you can use to interact
     -- with nvim-treesitter. You should go explore a few and see what interests you:
@@ -1183,8 +923,6 @@ require('lazy').setup({
 -- Clear highlight on search
 vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
 
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
-
 -- [[ Basic Keymaps ]]
 
 -- Keymaps for better default experience
@@ -1215,157 +953,9 @@ vim.api.nvim_create_autocmd('TextYankPost', {
   pattern = '*',
 })
 
--- [[ Configure Telescope ]]
--- See `:help telescope` and `:help telescope.setup()`
-require('telescope').setup {
-  defaults = {
-    mappings = {
-      i = {
-        ['<C-u>'] = false,
-        ['<C-d>'] = false,
-      },
-    },
-  },
-}
-
--- Enable telescope fzf native, if installed
-pcall(require('telescope').load_extension, 'fzf')
-
--- See `:help telescope.builtin`
-vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
-vim.keymap.set('n', '<leader>b', require('telescope.builtin').buffers, { desc = 'Find existing [b]uffers' })
-vim.keymap.set('n', '<leader>/', function()
-  -- You can pass additional configuration to telescope to change theme, layout, etc.
-  require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
-    winblend = 10,
-    previewer = false,
-  })
-end, { desc = '[/] Fuzzily search in current buffer' })
-
-vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
-vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
-vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
-vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
-vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
-
--- [[ Configure Treesitter ]]
--- See `:help nvim-treesitter`
-require('nvim-treesitter.configs').setup {
-  -- Add languages to be installed here that you want installed for treesitter
-  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vim', 'http', 'css' },
-
-  -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
-  auto_install = true,
-
-  highlight = { enable = true },
-  indent = { enable = true, disable = { 'python' } },
-  incremental_selection = {
-    enable = true,
-    keymaps = {
-      init_selection = '<c-space>',
-      node_incremental = '<c-space>',
-      scope_incremental = '<c-s>',
-      node_decremental = '<M-space>',
-    },
-  },
-  textobjects = {
-    select = {
-      enable = true,
-      lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
-      keymaps = {
-        -- You can use the capture groups defined in textobjects.scm
-        ['aa'] = '@parameter.outer',
-        ['ia'] = '@parameter.inner',
-        ['af'] = '@function.outer',
-        ['if'] = '@function.inner',
-        ['ac'] = '@class.outer',
-        ['ic'] = '@class.inner',
-      },
-    },
-    move = {
-      enable = true,
-      set_jumps = true, -- whether to set jumps in the jumplist
-      goto_next_start = {
-        [']m'] = '@function.outer',
-        [']]'] = '@class.outer',
-      },
-      goto_next_end = {
-        [']M'] = '@function.outer',
-        [']['] = '@class.outer',
-      },
-      goto_previous_start = {
-        ['[m'] = '@function.outer',
-        ['[['] = '@class.outer',
-      },
-      goto_previous_end = {
-        ['[M'] = '@function.outer',
-        ['[]'] = '@class.outer',
-      },
-    },
-    swap = {
-      enable = true,
-      swap_next = {
-        ['<leader>a'] = '@parameter.inner',
-      },
-      swap_previous = {
-        ['<leader>A'] = '@parameter.inner',
-      },
-    },
-  },
-}
-
 -- Diagnostic keymaps
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Prev [d]iagnostic' })
 vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
-
--- nvim-cmp setup
-local cmp = require 'cmp'
-local luasnip = require 'luasnip'
-
-luasnip.config.setup {}
-
-cmp.setup {
-  snippet = {
-    expand = function(args)
-      luasnip.lsp_expand(args.body)
-    end,
-  },
-  mapping = cmp.mapping.preset.insert {
-    ['<M-d>'] = cmp.mapping.scroll_docs(-4),
-    ['<M-f>'] = cmp.mapping.scroll_docs(4),
-    ['<M-Space>'] = cmp.mapping.complete {},
-    ['<CR>'] = cmp.mapping.confirm {
-      behavior = cmp.ConfirmBehavior.Replace,
-      select = true,
-    },
-    -- ['<Tab>'] = cmp.mapping(function(fallback)
-    --   if cmp.visible() then
-    --     cmp.select_next_item()
-    --   elseif luasnip.expand_or_jumpable() then
-    --     luasnip.expand_or_jump()
-    --   else
-    --     fallback()
-    --   end
-    -- end, { 'i', 's' }),
-    -- ['<S-Tab>'] = cmp.mapping(function(fallback)
-    --   if cmp.visible() then
-    --     cmp.select_prev_item()
-    --   elseif luasnip.jumpable(-1) then
-    --     luasnip.jump(-1)
-    --   else
-    --     fallback()
-    --   end
-    -- end, { 'i', 's' }),
-  },
-  sources = {
-    { name = 'nvim_lsp' },
-    { name = 'luasnip' },
-  },
-}
-
--- vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]]
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et

From c721d67a750a68750b5536bed126522c36053921 Mon Sep 17 00:00:00 2001
From: Wil Simpson <william.simpson@partner.magna.com>
Date: Mon, 18 Aug 2025 13:42:45 -0400
Subject: [PATCH 23/24] feat: flutter debugging and git diff

---
 init.lua                       | 51 ++++++++++++++++++++++++++++++++--
 lua/custom/plugins/flutter.lua |  9 ++++++
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 lua/custom/plugins/flutter.lua

diff --git a/init.lua b/init.lua
index 2f9c1e58896..52b0aa383b2 100644
--- a/init.lua
+++ b/init.lua
@@ -76,8 +76,6 @@ vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
 --  See `:help hlsearch`
 vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
 
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
-
 vim.api.nvim_create_autocmd('TextYankPost', {
   desc = 'Highlight when yanking (copying) text',
   group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
@@ -565,6 +563,9 @@ require('lazy').setup({
           },
         },
         gopls = {},
+        dart = {
+          force = true,
+        },
         -- solargraph = {},
         -- ruby_lsp = {},
         sqlls = {},
@@ -959,3 +960,49 @@ vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
+--
+
+-- Enable exrc, which will load a local .nvim.lua if it exists in the pwd
+vim.opt.exrc = true
+
+-- Quickfix
+vim.keymap.set('n', '<leader>qn', ':cnext<CR>', { desc = 'Next quickfix item' })
+vim.keymap.set('n', '<leader>qp', ':cprev<CR>', { desc = 'Previous quickfix item' })
+
+-- Git diff base tracking
+vim.keymap.set('n', '<leader>qgc', function()
+  vim.g.last_git_diff_mode = ''
+  vim.cmd 'Git difftool'
+end, { desc = '[Q]uickfix [G]itdiff [C]reate' })
+
+vim.keymap.set('n', '<leader>qgh', function()
+  vim.g.last_git_diff_mode = 'HEAD~1'
+  vim.cmd 'Git difftool HEAD~1'
+end, { desc = '[Q]uickfix [G]itdiff [H]EAD~1' })
+
+-- Smart quickfix Gitdiff next/prev
+vim.keymap.set('n', '<leader>qgv', function()
+  local buffers = vim.api.nvim_list_bufs()
+  local deleted_count = 0
+
+  for _, buf in ipairs(buffers) do
+    if vim.api.nvim_buf_is_loaded(buf) then
+      local name = vim.api.nvim_buf_get_name(buf)
+      if name:match '^fugitive://' then
+        vim.api.nvim_buf_delete(buf, { force = true })
+        deleted_count = deleted_count + 1
+      end
+    end
+  end
+
+  if deleted_count > 0 then
+    vim.notify('Closed ' .. deleted_count .. ' Gdiffsplit buffer(s)', vim.log.levels.INFO)
+  else
+    vim.notify('Opening new GDiffsplit', vim.log.levels.INFO)
+  end
+
+  vim.cmd('Gdiffsplit ' .. vim.g.last_git_diff_mode)
+end, { desc = '[Q]uickfix [G]itdiff [V]iew (context-aware)' })
+
+-- Quickfix with diagnostics
+vim.keymap.set('n', '<leader>qd', vim.diagnostic.setloclist, { desc = 'Open [Q]uickfix [D]iagnostic list' })
diff --git a/lua/custom/plugins/flutter.lua b/lua/custom/plugins/flutter.lua
new file mode 100644
index 00000000000..c224327b18a
--- /dev/null
+++ b/lua/custom/plugins/flutter.lua
@@ -0,0 +1,9 @@
+return {
+  'nvim-flutter/flutter-tools.nvim',
+  lazy = false,
+  dependencies = {
+    'nvim-lua/plenary.nvim',
+    'stevearc/dressing.nvim', -- optional for vim.ui.select
+  },
+  config = true,
+}

From df3a2f6e18d6933da72e714456d831b4dd4e5569 Mon Sep 17 00:00:00 2001
From: Wil Simpson <william.simpson@magna.com>
Date: Sun, 21 Dec 2025 20:08:58 -0600
Subject: [PATCH 24/24] feat: cleanup ts lsp, dapui color handling

---
 init.lua                             | 118 ++++++++++++++++++++++-----
 lua/kickstart/plugins/autoformat.lua |  85 -------------------
 lua/kickstart/plugins/debug.lua      |  24 +++++-
 3 files changed, 119 insertions(+), 108 deletions(-)
 delete mode 100644 lua/kickstart/plugins/autoformat.lua

diff --git a/init.lua b/init.lua
index 52b0aa383b2..e3891add9ce 100644
--- a/init.lua
+++ b/init.lua
@@ -115,24 +115,6 @@ require('lazy').setup({
   -- Git related plugins
   'tpope/vim-fugitive',
   'tpope/vim-rhubarb',
-  { -- Adds git related signs to the gutter, as well as utilities for managing changes
-    'lewis6991/gitsigns.nvim',
-    opts = {
-      signs = {
-        add = { text = '+' },
-        change = { text = '~' },
-        delete = { text = '_' },
-        topdelete = { text = '‾' },
-        changedelete = { text = '~' },
-      },
-    },
-  },
-
-  {
-    -- Autocompletion
-    'hrsh7th/nvim-cmp',
-    dependencies = { 'hrsh7th/cmp-nvim-lsp', 'L3MON4D3/LuaSnip', 'saadparwaiz1/cmp_luasnip' },
-  },
 
   -- Useful plugin to show you pending keybinds.
   {
@@ -276,6 +258,18 @@ require('lazy').setup({
         --   },
         -- },
         -- pickers = {}
+        pickers = {
+          live_grep = {
+            file_ignore_patterns = { 'node_modules', '.git', '.venv' },
+            additional_args = function(_)
+              return { '--hidden' }
+            end,
+          },
+          find_files = {
+            file_ignore_patterns = { 'node_modules', '.git', '.venv' },
+            hidden = true,
+          },
+        },
         extensions = {
           ['ui-select'] = {
             require('telescope.themes').get_dropdown(),
@@ -539,6 +533,8 @@ require('lazy').setup({
       --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
       --  - 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 mason_packages = vim.fn.stdpath 'data' .. '/mason/packages'
+      local volar_path = mason_packages .. '/vue-language-server/node_modules/@vue/language-server'
       local servers = {
         clangd = {
           cmd = {
@@ -562,7 +558,39 @@ require('lazy').setup({
             '--log=error',
           },
         },
-        gopls = {},
+        gopls = {
+          settings = {
+            gopls = {
+              gofumpt = true, -- A stricter gofmt
+              codelenses = {
+                gc_details = false,
+                generate = true,
+                regenerate_cgo = true,
+                run_govulncheck = true,
+                test = true,
+                tidy = true,
+                upgrade_dependency = true,
+                vendor = true,
+              },
+              hints = {
+                assignVariableTypes = true,
+                compositeLiteralFields = true,
+                compositeLiteralTypes = true,
+                constantValues = true,
+                functionTypeParameters = true,
+                parameterNames = true,
+                rangeVariableTypes = true,
+              },
+              analyses = {
+                unusedparams = true,
+                shadow = true,
+              },
+              completeUnimported = true,
+              staticcheck = true,
+              usePlaceholders = true,
+            },
+          },
+        },
         dart = {
           force = true,
         },
@@ -575,13 +603,11 @@ require('lazy').setup({
         dockerls = {},
         -- gradle_ls = {},
         pyright = {},
-        ts_ls = {},
         html = {},
         jsonls = {},
         -- jdtls = {},
         -- rust_analyzer = {},
         marksman = {},
-        -- volar = {},
         yamlls = {},
         lua_ls = {
           settings = {
@@ -597,6 +623,30 @@ require('lazy').setup({
         tailwindcss = {},
       }
 
+      local vue_language_server_path = vim.fn.expand '$MASON/packages' .. '/vue-language-server' .. '/node_modules/@vue/language-server'
+      local tsserver_filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }
+      local vue_plugin = {
+        name = '@vue/typescript-plugin',
+        location = vue_language_server_path,
+        languages = { 'vue' },
+        configNamespace = 'typescript',
+      }
+      local vtsls_config = {
+        settings = {
+          vtsls = {
+            tsserver = {
+              globalPlugins = {
+                vue_plugin,
+              },
+            },
+          },
+        },
+        filetypes = tsserver_filetypes,
+      }
+
+      vim.lsp.config('vtsls', vtsls_config)
+      vim.lsp.enable { 'vtsls' }
+
       -- Ensure the servers and tools above are installed
       --
       -- To check the current status of installed tools and/or manually install
@@ -907,7 +957,6 @@ require('lazy').setup({
   -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
   --       These are some example plugins that I've included in the kickstart repository.
   --       Uncomment any of the lines below to enable them.
-  require 'kickstart.plugins.autoformat',
   require 'kickstart.plugins.debug',
 
   -- NOTE: The import below automatically adds your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
@@ -1006,3 +1055,28 @@ end, { desc = '[Q]uickfix [G]itdiff [V]iew (context-aware)' })
 
 -- Quickfix with diagnostics
 vim.keymap.set('n', '<leader>qd', vim.diagnostic.setloclist, { desc = 'Open [Q]uickfix [D]iagnostic list' })
+
+-- Create an autocommand to clear ANSI color codes from the DAP REPL
+vim.api.nvim_create_autocmd('FileType', {
+  pattern = 'dap-repl',
+  callback = function()
+    -- Set an autocommand to clean the buffer whenever it's updated
+    vim.api.nvim_create_autocmd('TextChanged', {
+      buffer = vim.api.nvim_get_current_buf(),
+      callback = function()
+        local buf = vim.api.nvim_get_current_buf()
+        local lines = vim.api.nvim_buf_get_lines(buf, 0, -1, false)
+        local cleaned_lines = {}
+
+        for _, line in ipairs(lines) do
+          -- Regex to find and remove ANSI escape sequences
+          local cleaned = line:gsub('\27%[[0-9;]*m', '')
+          table.insert(cleaned_lines, cleaned)
+        end
+
+        -- Only update if changes were actually made to avoid infinite loops
+        vim.api.nvim_buf_set_lines(buf, 0, -1, false, cleaned_lines)
+      end,
+    })
+  end,
+})
diff --git a/lua/kickstart/plugins/autoformat.lua b/lua/kickstart/plugins/autoformat.lua
deleted file mode 100644
index f53f98db4ee..00000000000
--- a/lua/kickstart/plugins/autoformat.lua
+++ /dev/null
@@ -1,85 +0,0 @@
-return {
-}
--- -- autoformat.lua
--- --
--- -- Use your language server to automatically format your code on save.
--- -- Adds additional commands as well to manage the behavior
---
--- return {
---   'neovim/nvim-lspconfig',
---   dependencies = {
---     'ray-x/go.nvim',
---     'ray-x/guihua.lua',
---   },
---   config = function()
---     require("go").setup()
---     -- Switch for controlling whether you want autoformatting.
---     --  Use :KickstartFormatToggle to toggle autoformatting on or off
---     local format_is_enabled = true
---     vim.api.nvim_create_user_command('KickstartFormatToggle', function()
---       format_is_enabled = not format_is_enabled
---       print('Setting autoformatting to: ' .. tostring(format_is_enabled))
---     end, {})
---
---     -- Create an augroup that is used for managing our formatting autocmds.
---     --      We need one augroup per client to make sure that multiple clients
---     --      can attach to the same buffer without interfering with each other.
---     local _augroups = {}
---     local get_augroup = function(client)
---       if not _augroups[client.id] then
---         local group_name = 'kickstart-lsp-format-' .. client.name
---         local id = vim.api.nvim_create_augroup(group_name, { clear = true })
---         _augroups[client.id] = id
---       end
---
---       return _augroups[client.id]
---     end
---
---     -- Whenever an LSP attaches to a buffer, we will run this function.
---     --
---     -- See `:help LspAttach` for more information about this autocmd event.
---     vim.api.nvim_create_autocmd('LspAttach', {
---       group = vim.api.nvim_create_augroup('kickstart-lsp-attach-format', { clear = true }),
---       -- This is where we attach the autoformatting for reasonable clients
---       callback = function(args)
---         local client_id = args.data.client_id
---         local client = vim.lsp.get_client_by_id(client_id)
---         local bufnr = args.buf
---
---         -- Only attach to clients that support document formatting
---         if not client.server_capabilities.documentFormattingProvider then
---           return
---         end
---
---         -- Tsserver usually works poorly. Sorry you work with bad languages
---         -- You can remove this line if you know what you're doing :)
---         if client.name == 'tsserver' then
---           return
---         end
---
---         -- Create an autocmd that will run *before* we save the buffer.
---         --  Run the formatting command for the LSP that has just attached.
---         vim.api.nvim_create_autocmd('BufWritePre', {
---           group = get_augroup(client),
---           buffer = bufnr,
---           callback = function()
---             if not format_is_enabled then
---               return
---             end
---
---             if vim.bo.filetype == 'go' then
---               require('go.format').goimport()
---             else
---               vim.lsp.buf.format {
---                 async = false,
---                 filter = function(c)
---                   return c.id == client.id
---                 end,
---               }
---             end
---           end,
---         })
---       end,
---     })
---   end,
--- }
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index 194c3d7f084..fe9bea25221 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -135,6 +135,28 @@ return {
     -- Dap UI setup
     -- For more information, see |:help nvim-dap-ui|
     dapui.setup {
+      layouts = {
+        {
+          -- The Sidebar (Left)
+          elements = {
+            { id = 'scopes', size = 0.25 },
+            { id = 'breakpoints', size = 0.25 },
+            { id = 'stacks', size = 0.25 },
+            { id = 'watches', size = 0.25 },
+          },
+          position = 'left',
+          size = 40,
+        },
+        {
+          -- The Bottom Tray
+          -- REMOVED "console" from here
+          elements = {
+            { id = 'repl', size = 1.0 },
+          },
+          position = 'bottom',
+          size = 10,
+        },
+      },
       -- Set icons to characters that are more likely to work in every terminal.
       --    Feel free to remove or use ones that you like more! :)
       --    Don't feel like these are good choices.
@@ -161,7 +183,7 @@ return {
     dap.defaults.fallback.exception_breakpoints = { 'Notice', 'Warning', 'Error', 'Exception' }
 
     -- Install golang specific config
-    require('dap-go').setup{
+    require('dap-go').setup {
       delve = {
         detached = vim.fn.has 'win32' == 0,
       },