From f48167d6542cf40bca0ffc784fb32a41744d150f Mon Sep 17 00:00:00 2001
From: Rakshit Sinha <rakshit.sinha@oracle.com>
Date: Sat, 2 Nov 2024 11:20:52 -0700
Subject: [PATCH 1/4] Modularize plugins

---
 lua/rakshit/core/init.lua    |  2 ++
 lua/rakshit/core/keymaps.lua | 43 ++++++++++++++++++++++
 lua/rakshit/core/options.lua | 70 ++++++++++++++++++++++++++++++++++++
 3 files changed, 115 insertions(+)
 create mode 100644 lua/rakshit/core/init.lua
 create mode 100644 lua/rakshit/core/keymaps.lua
 create mode 100644 lua/rakshit/core/options.lua

diff --git a/lua/rakshit/core/init.lua b/lua/rakshit/core/init.lua
new file mode 100644
index 00000000..48bc627f
--- /dev/null
+++ b/lua/rakshit/core/init.lua
@@ -0,0 +1,2 @@
+require 'rakshit.core.options'
+require 'rakshit.core.keymaps'
diff --git a/lua/rakshit/core/keymaps.lua b/lua/rakshit/core/keymaps.lua
new file mode 100644
index 00000000..0f9071ab
--- /dev/null
+++ b/lua/rakshit/core/keymaps.lua
@@ -0,0 +1,43 @@
+-- Set <space> as the leader key
+-- See `:help mapleader`
+--  NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used)
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+
+-- [[ Basic Keymaps ]]
+--  See `:help vim.keymap.set()`
+
+-- Clear highlights on search when pressing <Esc> in normal mode
+-- See `:help hlsearch`
+vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
+-- Delete entire word with Alt+Backspace
+vim.keymap.set('i', '<A-BS>', '<C-W>')
+
+-- Diagnostic keymaps
+vim.keymap.set('n', '[d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' })
+vim.keymap.set('n', ']d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' })
+vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror message' })
+vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
+
+-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
+-- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
+-- is not what someone will guess without a bit more experience.
+--
+-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping
+-- or just use <C-\><C-n> to exit terminal mode
+vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
+
+-- TIP: Disable arrow keys in normal mode
+-- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
+-- vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
+-- vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
+-- vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
+
+-- Keybinds to make split navigation easier.
+--  Use CTRL+<hjkl> to switch between windows
+--
+--  See `:help wincmd` for a list of all window commands
+vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
+vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
+vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
+vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
diff --git a/lua/rakshit/core/options.lua b/lua/rakshit/core/options.lua
new file mode 100644
index 00000000..51d996c5
--- /dev/null
+++ b/lua/rakshit/core/options.lua
@@ -0,0 +1,70 @@
+-- Change the :Explore option to show in a tree styled format
+vim.cmd 'let g:netrw_liststyle = 3'
+
+-- [[ Setting options ]]
+-- See `:help vim.opt`
+-- NOTE: You can change these options as you wish!
+--  For more options, you can see `:help option-list`
+
+-- Make line numbers default
+vim.opt.number = true
+-- You can also add relative line numbers, to help with jumping.
+--  Experiment for yourself to see if you like it!
+vim.opt.relativenumber = true
+
+-- Enable mouse mode, can be useful for resizing splits for example!
+vim.opt.mouse = 'a'
+
+-- Don't show the mode, since it's already in the status line
+vim.opt.showmode = false
+
+-- Sync clipboard between OS and Neovim.
+--  Schedule the setting after `UiEnter` because it can increase startup-time.
+--  Remove this option if you want your OS clipboard to remain independent.
+--  See `:help 'clipboard'`
+vim.schedule(function()
+  vim.opt.clipboard = 'unnamedplus'
+end)
+
+-- Save undo history
+vim.opt.undofile = true
+
+-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term
+vim.opt.ignorecase = true
+vim.opt.smartcase = true -- Really smart ๐Ÿ˜Ž
+
+-- Keep signcolumn on by default
+vim.opt.signcolumn = 'yes'
+
+-- Decrease update time
+vim.opt.updatetime = 250
+
+-- Decrease mapped sequence wait time
+-- Displays which-key popup sooner
+vim.opt.timeoutlen = 300
+
+-- Configure how new splits should be opened
+vim.opt.splitright = true
+vim.opt.splitbelow = true
+
+-- Sets how neovim will display certain whitespace characters in the editor.
+--  See `:help 'list'`
+--  and `:help 'listchars'`
+vim.opt.list = true
+-- vim.opt.listchars = { tab = 'ยป ', trail = 'ยท', nbsp = 'โฃ' }
+vim.opt.listchars = { tab = '  ', trail = 'ยท', nbsp = 'โฃ' }
+
+-- Preview substitutions live, as you type!
+vim.opt.inccommand = 'split'
+
+-- Show which line your cursor is on
+vim.opt.cursorline = true
+
+-- Minimal number of screen lines to keep above and below the cursor.
+vim.opt.scrolloff = 10
+
+-- Allow backspace on indent, end of line or insert mode start position
+vim.opt.backspace = 'indent,eol,start'
+
+-- Enable break indent
+vim.opt.breakindent = true

From 1dacc4c2d311764a37a8e5237307896d47473c95 Mon Sep 17 00:00:00 2001
From: Rakshit Sinha <rakshit.sinha@oracle.com>
Date: Sun, 3 Nov 2024 20:14:28 -0800
Subject: [PATCH 2/4] Finally a lot of changes

---
 .stylua.toml                          |   3 +-
 init.lua                              | 752 +-------------------------
 lua/kickstart/plugins/indent_line.lua |   9 -
 lua/kickstart/plugins/lint.lua        |  55 --
 lua/rakshit/core/keymaps.lua          |  23 +-
 5 files changed, 20 insertions(+), 822 deletions(-)

diff --git a/.stylua.toml b/.stylua.toml
index 139e9397..48575bec 100644
--- a/.stylua.toml
+++ b/.stylua.toml
@@ -1,6 +1,5 @@
-column_width = 160
+column_width = 100
 line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2
 quote_style = "AutoPreferSingle"
-call_parentheses = "None"
diff --git a/init.lua b/init.lua
index c91c0e52..56e43b15 100644
--- a/init.lua
+++ b/init.lua
@@ -43,758 +43,8 @@ vim.api.nvim_create_autocmd('TextYankPost', {
   end,
 })
 
--- [[ Install `lazy.nvim` plugin manager ]]
---    See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info
-local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
-  local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
-  if vim.v.shell_error ~= 0 then
-    error('Error cloning lazy.nvim:\n' .. out)
-  end
-end ---@diagnostic disable-next-line: undefined-field
-vim.opt.rtp:prepend(lazypath)
+require('rakshit.lazy')
 
--- [[ Configure and install plugins ]]
---
---  To check the current status of your plugins, run
---    :Lazy
---
---  You can press `?` in this menu for help. Use `:q` to close the window
---
---  To update plugins you can run
---    :Lazy update
---
--- NOTE: Here is where you install your plugins.
-require('lazy').setup({
-  -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
-  'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
-
-  -- NOTE: Plugins can also be added by using a table,
-  -- with the first argument being the link and the following
-  -- keys can be used to configure plugin behavior/loading/etc.
-  --
-  -- Use `opts = {}` to force a plugin to be loaded.
-  --
-
-  -- Here is a more advanced example where we pass configuration
-  -- options to `gitsigns.nvim`. This is equivalent to the following Lua:
-  --    require('gitsigns').setup({ ... })
-  --
-  -- See `:help gitsigns` to understand what the configuration keys do
-  { -- 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: Plugins can also be configured to run Lua code when they are loaded.
-  --
-  -- This is often very useful to both group configuration, as well as handle
-  -- lazy loading plugins that don't need to be loaded immediately at startup.
-  --
-  -- For example, in the following configuration, we use:
-  --  event = 'VimEnter'
-  --
-  -- which loads which-key before all the UI elements are loaded. Events can be
-  -- normal autocommands events (`:help autocmd-events`).
-  --
-  -- Then, because we use the `config` key, the configuration only runs
-  -- after the plugin has been loaded:
-  --  config = function() ... end
-
-  { -- Useful plugin to show you pending keybinds.
-    'folke/which-key.nvim',
-    event = 'VimEnter', -- Sets the loading event to 'VimEnter'
-    opts = {
-      icons = {
-        -- set icon mappings to true if you have a Nerd Font
-        mappings = vim.g.have_nerd_font,
-        -- If you are using a Nerd Font: set icons.keys to an empty table which will use the
-        -- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
-        keys = vim.g.have_nerd_font and {} or {
-          Up = '<Up> ',
-          Down = '<Down> ',
-          Left = '<Left> ',
-          Right = '<Right> ',
-          C = '<C-โ€ฆ> ',
-          M = '<M-โ€ฆ> ',
-          D = '<D-โ€ฆ> ',
-          S = '<S-โ€ฆ> ',
-          CR = '<CR> ',
-          Esc = '<Esc> ',
-          ScrollWheelDown = '<ScrollWheelDown> ',
-          ScrollWheelUp = '<ScrollWheelUp> ',
-          NL = '<NL> ',
-          BS = '<BS> ',
-          Space = '<Space> ',
-          Tab = '<Tab> ',
-          F1 = '<F1>',
-          F2 = '<F2>',
-          F3 = '<F3>',
-          F4 = '<F4>',
-          F5 = '<F5>',
-          F6 = '<F6>',
-          F7 = '<F7>',
-          F8 = '<F8>',
-          F9 = '<F9>',
-          F10 = '<F10>',
-          F11 = '<F11>',
-          F12 = '<F12>',
-        },
-      },
-
-      -- Document existing key chains
-      spec = {
-        { '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
-        { '<leader>d', group = '[D]ocument' },
-        { '<leader>r', group = '[R]ename' },
-        { '<leader>s', group = '[S]earch' },
-        { '<leader>w', group = '[W]orkspace' },
-        { '<leader>t', group = '[T]oggle' },
-        { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
-      },
-    },
-  },
-
-  -- NOTE: Plugins can specify dependencies.
-  --
-  -- The dependencies are proper plugin specifications as well - anything
-  -- you do for a plugin at the top level, you can do for a dependency.
-  --
-  -- Use the `dependencies` key to specify the dependencies of a particular plugin
-
-  { -- Fuzzy Finder (files, lsp, etc)
-    'nvim-telescope/telescope.nvim',
-    event = 'VimEnter',
-    branch = '0.1.x',
-    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(),
-          },
-        },
-      }
-
-      -- 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
-  {
-    -- `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 = 'luvit-meta/library', words = { 'vim%.uv' } },
-      },
-    },
-  },
-  { 'Bilal2453/luvit-meta', lazy = true },
-  {
-    -- Main LSP Configuration
-    'neovim/nvim-lspconfig',
-    dependencies = {
-      -- Automatically install LSPs and related tools to stdpath for Neovim
-      { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
-      'williamboman/mason-lspconfig.nvim',
-      'WhoIsSethDaniel/mason-tool-installer.nvim',
-
-      -- Useful status updates for LSP.
-      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { 'j-hui/fidget.nvim', opts = {} },
-
-      -- Allows extra capabilities provided by nvim-cmp
-      'hrsh7th/cmp-nvim-lsp',
-    },
-    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
-
-          -- 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('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-
-          -- Find references for the word under your cursor.
-          map('gr', 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('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
-
-          -- 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>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
-
-          -- Fuzzy find all the symbols in your current document.
-          --  Symbols are things like variables, functions, types, etc.
-          map('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-
-          -- Fuzzy find all the symbols in your current workspace.
-          --  Similar to document symbols, except searches over your entire project.
-          map('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-
-          -- 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>ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' })
-
-          -- Opens a popup that displays documentation about the word under your cursor
-          -- See `:help K` for why this keymap
-
-          -- WARN: This is not Goto Definition, this is Goto Declaration.
-          --  For example, in C this would take you to the header.
-          map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-
-          -- 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(vim.lsp.protocol.Methods.textDocument_documentHighlight) 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(vim.lsp.protocol.Methods.textDocument_inlayHint) 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,
-      })
-
-      -- 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 nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
-      --  So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
-      local capabilities = vim.lsp.protocol.make_client_capabilities()
-      capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_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 = {},
-        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.
-      require('mason').setup()
-
-      -- 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 {
-        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' },
-    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 }
-        local lsp_format_opt
-        if disable_filetypes[vim.bo[bufnr].filetype] then
-          lsp_format_opt = 'never'
-        else
-          lsp_format_opt = 'fallback'
-        end
-        return {
-          timeout_ms = 500,
-          lsp_format = lsp_format_opt,
-        }
-      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
-    'hrsh7th/nvim-cmp',
-    event = 'InsertEnter',
-    dependencies = {
-      -- Snippet Engine & its associated nvim-cmp source
-      {
-        'L3MON4D3/LuaSnip',
-        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,
-          -- },
-        },
-      },
-      'saadparwaiz1/cmp_luasnip',
-
-      -- Adds other completion capabilities.
-      --  nvim-cmp does not ship with all sources by default. They are split
-      --  into multiple repos for maintenance purposes.
-      'hrsh7th/cmp-nvim-lsp',
-      'hrsh7th/cmp-path',
-    },
-    config = function()
-      -- See `:help cmp`
-      local cmp = require 'cmp'
-      local luasnip = require 'luasnip'
-      luasnip.config.setup {}
-
-      cmp.setup {
-        snippet = {
-          expand = function(args)
-            luasnip.lsp_expand(args.body)
-          end,
-        },
-        completion = { completeopt = 'menu,menuone,noinsert' },
-
-        -- For an understanding of why these mappings were
-        -- chosen, you will need to read `:help ins-completion`
-        --
-        -- No, but seriously. Please read `:help ins-completion`, it is really good!
-        mapping = cmp.mapping.preset.insert {
-          -- Select the [n]ext item
-          ['<C-n>'] = cmp.mapping.select_next_item(),
-          -- Select the [p]revious item
-          ['<C-p>'] = cmp.mapping.select_prev_item(),
-
-          -- Scroll the documentation window [b]ack / [f]orward
-          ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-          ['<C-f>'] = cmp.mapping.scroll_docs(4),
-
-          -- Accept ([y]es) the completion.
-          --  This will auto-import if your LSP supports it.
-          --  This will expand snippets if the LSP sent a snippet.
-          ['<C-y>'] = cmp.mapping.confirm { select = true },
-
-          -- If you prefer more traditional completion keymaps,
-          -- you can uncomment the following lines
-          --['<CR>'] = cmp.mapping.confirm { select = true },
-          --['<Tab>'] = cmp.mapping.select_next_item(),
-          --['<S-Tab>'] = cmp.mapping.select_prev_item(),
-
-          -- Manually trigger a completion from nvim-cmp.
-          --  Generally you don't need this, because nvim-cmp will display
-          --  completions whenever it has completion options available.
-          ['<C-Space>'] = cmp.mapping.complete {},
-
-          -- Think of <c-l> as moving to the right of your snippet expansion.
-          --  So if you have a snippet that's like:
-          --  function $name($args)
-          --    $body
-          --  end
-          --
-          -- <c-l> will move you to the right of each of the expansion locations.
-          -- <c-h> is similar, except moving you backwards.
-          ['<C-l>'] = cmp.mapping(function()
-            if luasnip.expand_or_locally_jumpable() then
-              luasnip.expand_or_jump()
-            end
-          end, { 'i', 's' }),
-          ['<C-h>'] = cmp.mapping(function()
-            if luasnip.locally_jumpable(-1) then
-              luasnip.jump(-1)
-            end
-          end, { 'i', 's' }),
-
-          -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
-          --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
-        },
-        sources = {
-          {
-            name = 'lazydev',
-            -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
-            group_index = 0,
-          },
-          { name = 'nvim_lsp' },
-          { name = 'luasnip' },
-          { name = 'path' },
-        },
-      }
-    end,
-  },
-
-  { -- You can easily change to a different colorscheme.
-    -- Change the name of the colorscheme plugin below, and then
-    -- change the command in the config to whatever the name of that colorscheme is.
-    --
-    -- If you want to see what colorschemes are already installed,
-    -- you can use `:Telescope colorscheme`.
-    'folke/tokyonight.nvim',
-    priority = 1000, -- Make sure to load this before all the other start plugins.
-    init = function()
-      -- Load the colorscheme here.
-      -- Like many other themes, this one has different styles, and you could load
-      -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
-      vim.cmd.colorscheme 'tokyonight-night'
-
-      -- You can configure highlights by doing something like:
-      vim.cmd.hi 'Comment gui=none'
-    end,
-  },
-
-  -- Highlight todo, notes, etc in comments
-  { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
-
-  { -- Collection of various small independent plugins/modules
-    'echasnovski/mini.nvim',
-    config = function()
-      -- 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
-  },
-
-  -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
-  -- init.lua. If you want these files, they are in the repository, so you can just download them and
-  -- place them in the correct locations.
-
-  -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart
-  --
-  --  Here are some example plugins that I've included in the Kickstart repository.
-  --  Uncomment any of the lines below to enable them (you will need to restart nvim).
-  --
-  -- require 'kickstart.plugins.debug',
-  -- require 'kickstart.plugins.indent_line',
-  -- require 'kickstart.plugins.lint',
-  -- require 'kickstart.plugins.autopairs',
-  -- require 'kickstart.plugins.neo-tree',
-  -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
-  -- require 'rakshit.core.options',
-
-  -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
-  --    This is the easiest way to modularize your config.
-  --
-  --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-  --    For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
-  -- { import = 'custom.plugins' },
-  -- { import = 'rakshit.core' },
-}, {
-  ui = {
-    -- If you are using a Nerd Font: set icons to an empty table which will use the
-    -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table
-    icons = vim.g.have_nerd_font and {} or {
-      cmd = 'โŒ˜',
-      config = '๐Ÿ› ',
-      event = '๐Ÿ“…',
-      ft = '๐Ÿ“‚',
-      init = 'โš™',
-      keys = '๐Ÿ—',
-      plugin = '๐Ÿ”Œ',
-      runtime = '๐Ÿ’ป',
-      require = '๐ŸŒ™',
-      source = '๐Ÿ“„',
-      start = '๐Ÿš€',
-      task = '๐Ÿ“Œ',
-      lazy = '๐Ÿ’ค ',
-    },
-  },
-})
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/kickstart/plugins/indent_line.lua
index ed7f2693..e69de29b 100644
--- a/lua/kickstart/plugins/indent_line.lua
+++ b/lua/kickstart/plugins/indent_line.lua
@@ -1,9 +0,0 @@
-return {
-  { -- Add indentation guides even on blank lines
-    'lukas-reineke/indent-blankline.nvim',
-    -- Enable `lukas-reineke/indent-blankline.nvim`
-    -- See `:help ibl`
-    main = 'ibl',
-    opts = {},
-  },
-}
diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua
index ca9bc237..e69de29b 100644
--- a/lua/kickstart/plugins/lint.lua
+++ b/lua/kickstart/plugins/lint.lua
@@ -1,55 +0,0 @@
-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()
-          lint.try_lint()
-        end,
-      })
-    end,
-  },
-}
diff --git a/lua/rakshit/core/keymaps.lua b/lua/rakshit/core/keymaps.lua
index 0f9071ab..79c80daf 100644
--- a/lua/rakshit/core/keymaps.lua
+++ b/lua/rakshit/core/keymaps.lua
@@ -28,16 +28,29 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagn
 vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
 
 -- TIP: Disable arrow keys in normal mode
--- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
--- vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
--- vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
--- vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
+vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
+vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
+vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
+vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
 
 -- Keybinds to make split navigation easier.
---  Use CTRL+<hjkl> to switch between windows
+--  Use CTRL+<hjkl> to switch between windowsC
 --
 --  See `:help wincmd` for a list of all window commands
 vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
 vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
 vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
 vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
+
+-- Window management
+vim.keymap.set('n', '<leader>sv', '<C-w>v', { desc = '[S]plit window [V]ertically' })
+vim.keymap.set('n', '<leader>sh', '<C-w>s', { desc = '[S]plit window [H]orizontally' })
+vim.keymap.set('n', '<leader>se', '<C-w>=', { desc = 'Make [S]plit [E]qual size' })
+vim.keymap.set('n', '<leader>sx', '<cmd>close<CR>', { desc = 'Current [S]plit [X]Close' })
+
+-- Tab management
+vim.keymap.set('n', '<leader>to', '<cmd>tabnew<CR>', { desc = 'Open new tab' }) -- open new tab
+vim.keymap.set('n', '<leader>tx', '<cmd>tabclose<CR>', { desc = 'Close current tab' }) -- close current tab
+vim.keymap.set('n', '<leader>tn', '<cmd>tabn<CR>', { desc = 'Go to next tab' }) --  go to next tab
+vim.keymap.set('n', '<leader>tp', '<cmd>tabp<CR>', { desc = 'Go to previous tab' }) --  go to previous tab
+vim.keymap.set('n', '<leader>tf', '<cmd>tabnew %<CR>', { desc = 'Open current buffer in new tab' }) --  move current buffer to new tab

From a467ba4a6903736da9c4257af08268f09cb3383a Mon Sep 17 00:00:00 2001
From: Rakshit Sinha <rakshit.sinha@oracle.com>
Date: Sun, 3 Nov 2024 20:15:03 -0800
Subject: [PATCH 3/4] Add lazy and plugins dir

---
 lua/rakshit/lazy.lua                     |  50 ++++
 lua/rakshit/plugins/alpha.lua            |  36 +++
 lua/rakshit/plugins/auto-session.lua     |  16 ++
 lua/rakshit/plugins/autopairs.lua        |  30 +++
 lua/rakshit/plugins/bufferline.lua       |  12 +
 lua/rakshit/plugins/colorscheme.lua      |  18 ++
 lua/rakshit/plugins/comment.lua          |  19 ++
 lua/rakshit/plugins/dressing.lua         |   4 +
 lua/rakshit/plugins/formatting.lua       |  44 ++++
 lua/rakshit/plugins/indent-blankline.lua |  10 +
 lua/rakshit/plugins/init.lua             | 108 ++++++++
 lua/rakshit/plugins/linting.lua          |  64 +++++
 lua/rakshit/plugins/lsp/lspconfig.lua    | 314 +++++++++++++++++++++++
 lua/rakshit/plugins/lsp/mason.lua        |  55 ++++
 lua/rakshit/plugins/lualine.lua          |  71 +++++
 lua/rakshit/plugins/nvim-cmp.lua         | 131 ++++++++++
 lua/rakshit/plugins/nvim-tree.lua        |  57 ++++
 lua/rakshit/plugins/substitute.lua       |  20 ++
 lua/rakshit/plugins/surround.lua         |   6 +
 lua/rakshit/plugins/telescope.lua        | 125 +++++++++
 lua/rakshit/plugins/todo-comments.lua    |  23 ++
 lua/rakshit/plugins/treesitter.lua       |  90 +++++++
 lua/rakshit/plugins/trouble.lua          |  15 ++
 lua/rakshit/plugins/vim-maximizer.lua    |   6 +
 lua/rakshit/plugins/which-key.lua        |  69 +++++
 25 files changed, 1393 insertions(+)
 create mode 100644 lua/rakshit/lazy.lua
 create mode 100644 lua/rakshit/plugins/alpha.lua
 create mode 100644 lua/rakshit/plugins/auto-session.lua
 create mode 100644 lua/rakshit/plugins/autopairs.lua
 create mode 100644 lua/rakshit/plugins/bufferline.lua
 create mode 100644 lua/rakshit/plugins/colorscheme.lua
 create mode 100644 lua/rakshit/plugins/comment.lua
 create mode 100644 lua/rakshit/plugins/dressing.lua
 create mode 100644 lua/rakshit/plugins/formatting.lua
 create mode 100644 lua/rakshit/plugins/indent-blankline.lua
 create mode 100644 lua/rakshit/plugins/init.lua
 create mode 100644 lua/rakshit/plugins/linting.lua
 create mode 100644 lua/rakshit/plugins/lsp/lspconfig.lua
 create mode 100644 lua/rakshit/plugins/lsp/mason.lua
 create mode 100644 lua/rakshit/plugins/lualine.lua
 create mode 100644 lua/rakshit/plugins/nvim-cmp.lua
 create mode 100644 lua/rakshit/plugins/nvim-tree.lua
 create mode 100644 lua/rakshit/plugins/substitute.lua
 create mode 100644 lua/rakshit/plugins/surround.lua
 create mode 100644 lua/rakshit/plugins/telescope.lua
 create mode 100644 lua/rakshit/plugins/todo-comments.lua
 create mode 100644 lua/rakshit/plugins/treesitter.lua
 create mode 100644 lua/rakshit/plugins/trouble.lua
 create mode 100644 lua/rakshit/plugins/vim-maximizer.lua
 create mode 100644 lua/rakshit/plugins/which-key.lua

diff --git a/lua/rakshit/lazy.lua b/lua/rakshit/lazy.lua
new file mode 100644
index 00000000..ad36aea5
--- /dev/null
+++ b/lua/rakshit/lazy.lua
@@ -0,0 +1,50 @@
+--    See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info
+local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
+  local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
+  if vim.v.shell_error ~= 0 then
+    error('Error cloning lazy.nvim:\n' .. out)
+  end
+end ---@diagnostic disable-next-line: undefined-field
+vim.opt.rtp:prepend(lazypath)
+
+-- [[ Configure and install plugins ]]
+--
+--  To check the current status of your plugins, run
+--    :Lazy
+--
+--  You can press `?` in this menu for help. Use `:q` to close the window
+--
+--  To update plugins you can run
+--    :Lazy update
+--
+-- NOTE: Here is where you install your plugins.
+require('lazy').setup({ { import = 'rakshit.plugins' }, { import = 'rakshit.plugins.lsp' } }, {
+  checker = {
+    enabled = true,
+    notify = false,
+  },
+  change_detection = {
+    notify = false,
+  },
+  ui = {
+    -- If you are using a Nerd Font: set icons to an empty table which will use the
+    -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table
+    icons = vim.g.have_nerd_font and {} or {
+      cmd = 'โŒ˜',
+      config = '๐Ÿ› ',
+      event = '๐Ÿ“…',
+      ft = '๐Ÿ“‚',
+      init = 'โš™',
+      keys = '๐Ÿ—',
+      plugin = '๐Ÿ”Œ',
+      runtime = '๐Ÿ’ป',
+      require = '๐ŸŒ™',
+      source = '๐Ÿ“„',
+      start = '๐Ÿš€',
+      task = '๐Ÿ“Œ',
+      lazy = '๐Ÿ’ค ',
+    },
+  },
+})
diff --git a/lua/rakshit/plugins/alpha.lua b/lua/rakshit/plugins/alpha.lua
new file mode 100644
index 00000000..1ac924e3
--- /dev/null
+++ b/lua/rakshit/plugins/alpha.lua
@@ -0,0 +1,36 @@
+return {
+  'goolord/alpha-nvim',
+  event = 'VimEnter',
+  config = function()
+    local alpha = require 'alpha'
+    local dashboard = require 'alpha.themes.dashboard'
+
+    -- Set header
+    dashboard.section.header.val = {
+      '                                                     ',
+      '  โ–ˆโ–ˆโ–ˆโ•—   โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•—   โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ–ˆโ•—   โ–ˆโ–ˆโ–ˆโ•— ',
+      '  โ–ˆโ–ˆโ–ˆโ–ˆโ•—  โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ•โ•โ•โ•โ•โ–ˆโ–ˆโ•”โ•โ•โ•โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•‘   โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ•‘ ',
+      '  โ–ˆโ–ˆโ•”โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•—  โ–ˆโ–ˆโ•‘   โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘   โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ–ˆโ–ˆโ–ˆโ–ˆโ•”โ–ˆโ–ˆโ•‘ ',
+      '  โ–ˆโ–ˆโ•‘โ•šโ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ•โ•โ•  โ–ˆโ–ˆโ•‘   โ–ˆโ–ˆโ•‘โ•šโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ•šโ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ•‘ ',
+      '  โ–ˆโ–ˆโ•‘ โ•šโ–ˆโ–ˆโ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•—โ•šโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•”โ• โ•šโ–ˆโ–ˆโ–ˆโ–ˆโ•”โ• โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘ โ•šโ•โ• โ–ˆโ–ˆโ•‘ ',
+      '  โ•šโ•โ•  โ•šโ•โ•โ•โ•โ•šโ•โ•โ•โ•โ•โ•โ• โ•šโ•โ•โ•โ•โ•โ•   โ•šโ•โ•โ•โ•  โ•šโ•โ•โ•šโ•โ•     โ•šโ•โ• ',
+      '                                                     ',
+    }
+
+    -- Set menu
+    dashboard.section.buttons.val = {
+      dashboard.button('e', '๏…›  > New File', '<cmd>ene<CR>'),
+      dashboard.button('SPC ee', '๎—พ  > Toggle file explorer', '<cmd>NvimTreeToggle<CR>'),
+      dashboard.button('SPC sf', '๓ฐฑผ > Find File', '<cmd>Telescope find_files<CR>'),
+      dashboard.button('SPC sg', '๏ข  > Find Word', '<cmd>Telescope live_grep<CR>'),
+      dashboard.button('SPC wr', '๓ฐฏ  > Restore Session For Current Directory', '<cmd>SessionRestore<CR>'),
+      dashboard.button('q', '๏— > Quit NVIM', '<cmd>qa<CR>'),
+    }
+
+    -- Send config to alpha
+    alpha.setup(dashboard.opts)
+
+    -- Disable folding on alpha buffer
+    vim.cmd [[autocmd FileType alpha setlocal nofoldenable]]
+  end,
+}
diff --git a/lua/rakshit/plugins/auto-session.lua b/lua/rakshit/plugins/auto-session.lua
new file mode 100644
index 00000000..6cdab7a9
--- /dev/null
+++ b/lua/rakshit/plugins/auto-session.lua
@@ -0,0 +1,16 @@
+return {
+  'rmagatti/auto-session',
+  config = function()
+    local auto_session = require 'auto-session'
+
+    auto_session.setup {
+      auto_restore_enabled = false,
+      auto_session_suppress_dirs = { '~/', '~/Dev/', '~/Downloads', '~/Documents', '~/Desktop/' },
+    }
+
+    local keymap = vim.keymap
+
+    keymap.set('n', '<leader>wr', '<cmd>SessionRestore<CR>', { desc = 'Restore session for cwd' }) -- restore last workspace session for current directory
+    keymap.set('n', '<leader>ws', '<cmd>SessionSave<CR>', { desc = 'Save session for auto session root dir' }) -- save workspace session for current working directory
+  end,
+}
diff --git a/lua/rakshit/plugins/autopairs.lua b/lua/rakshit/plugins/autopairs.lua
new file mode 100644
index 00000000..38ab9d89
--- /dev/null
+++ b/lua/rakshit/plugins/autopairs.lua
@@ -0,0 +1,30 @@
+return {
+  'windwp/nvim-autopairs',
+  event = { 'InsertEnter' },
+  dependencies = {
+    'hrsh7th/nvim-cmp',
+  },
+  config = function()
+    -- import nvim-autopairs
+    local autopairs = require 'nvim-autopairs'
+
+    -- configure autopairs
+    autopairs.setup {
+      check_ts = true, -- enable treesitter
+      ts_config = {
+        lua = { 'string' }, -- don't add pairs in lua string treesitter nodes
+        javascript = { 'template_string' }, -- don't add pairs in javscript template_string treesitter nodes
+        java = false, -- don't check treesitter on java
+      },
+    }
+
+    -- import nvim-autopairs completion functionality
+    local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
+
+    -- import nvim-cmp plugin (completions plugin)
+    local cmp = require 'cmp'
+
+    -- make autopairs and completion work together
+    cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
+  end,
+}
diff --git a/lua/rakshit/plugins/bufferline.lua b/lua/rakshit/plugins/bufferline.lua
new file mode 100644
index 00000000..4d80bcb0
--- /dev/null
+++ b/lua/rakshit/plugins/bufferline.lua
@@ -0,0 +1,12 @@
+-- Adds a new line for the open buffers (aka tabs)
+return {
+  'akinsho/bufferline.nvim',
+  dependencies = { 'nvim-tree/nvim-web-devicons' },
+  version = '*',
+  opts = {
+    options = {
+      mode = 'tabs',
+      separator_style = 'slant',
+    },
+  },
+}
diff --git a/lua/rakshit/plugins/colorscheme.lua b/lua/rakshit/plugins/colorscheme.lua
new file mode 100644
index 00000000..98bb3c22
--- /dev/null
+++ b/lua/rakshit/plugins/colorscheme.lua
@@ -0,0 +1,18 @@
+return { -- You can easily change to a different colorscheme.
+  -- Change the name of the colorscheme plugin below, and then
+  -- change the command in the config to whatever the name of that colorscheme is.
+  --
+  -- If you want to see what colorschemes are already installed,
+  -- you can use `:Telescope colorscheme`.
+  'folke/tokyonight.nvim',
+  priority = 1000, -- Make sure to load this before all the other start plugins.
+  init = function()
+    -- Load the colorscheme here.
+    -- Like many other themes, this one has different styles, and you could load
+    -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
+    vim.cmd.colorscheme 'tokyonight-night'
+
+    -- You can configure highlights by doing something like:
+    vim.cmd.hi 'Comment gui=none'
+  end,
+}
diff --git a/lua/rakshit/plugins/comment.lua b/lua/rakshit/plugins/comment.lua
new file mode 100644
index 00000000..c88c9904
--- /dev/null
+++ b/lua/rakshit/plugins/comment.lua
@@ -0,0 +1,19 @@
+return {
+  'numToStr/Comment.nvim',
+  event = { 'BufReadPre', 'BufNewFile' },
+  dependencies = {
+    'JoosepAlviste/nvim-ts-context-commentstring',
+  },
+  config = function()
+    -- import comment plugin safely
+    local comment = require 'Comment'
+
+    local ts_context_commentstring = require 'ts_context_commentstring.integrations.comment_nvim'
+
+    -- enable comment
+    comment.setup {
+      -- for commenting tsx, jsx, svelte, html files
+      pre_hook = ts_context_commentstring.create_pre_hook(),
+    }
+  end,
+}
diff --git a/lua/rakshit/plugins/dressing.lua b/lua/rakshit/plugins/dressing.lua
new file mode 100644
index 00000000..76454948
--- /dev/null
+++ b/lua/rakshit/plugins/dressing.lua
@@ -0,0 +1,4 @@
+return {
+  'stevearc/dressing.nvim',
+  event = 'VeryLazy',
+}
diff --git a/lua/rakshit/plugins/formatting.lua b/lua/rakshit/plugins/formatting.lua
new file mode 100644
index 00000000..82bc99cb
--- /dev/null
+++ b/lua/rakshit/plugins/formatting.lua
@@ -0,0 +1,44 @@
+return { -- Autoformat
+  'stevearc/conform.nvim',
+  event = { 'BufWritePre', 'BufReadPre', 'BufNewFile' },
+  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 = {
+      lsp_fallback = true,
+      async = false,
+      timeout_ms = 500,
+    },
+    formatters_by_ft = {
+      lua = { 'stylua' },
+      javascript = { 'prettier' },
+      typescript = { 'prettier' },
+      javascriptreact = { 'prettier' },
+      typescriptreact = { 'prettier' },
+      svelte = { 'prettier' },
+      css = { 'prettier' },
+      html = { 'prettier' },
+      json = { 'prettier' },
+      yaml = { 'prettier' },
+      markdown = { 'prettier' },
+      graphql = { 'prettier' },
+      liquid = { 'prettier' },
+      python = { 'isort', 'black' },
+      -- 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 },
+    },
+  },
+}
diff --git a/lua/rakshit/plugins/indent-blankline.lua b/lua/rakshit/plugins/indent-blankline.lua
new file mode 100644
index 00000000..19a83e94
--- /dev/null
+++ b/lua/rakshit/plugins/indent-blankline.lua
@@ -0,0 +1,10 @@
+return {
+  { -- Add indentation guides even on blank lines
+    'lukas-reineke/indent-blankline.nvim',
+    event = { 'BufReadPre', 'BufNewFile' },
+    -- Enable `lukas-reineke/indent-blankline.nvim`
+    -- See `:help ibl`
+    main = 'ibl',
+    opts = {},
+  },
+}
diff --git a/lua/rakshit/plugins/init.lua b/lua/rakshit/plugins/init.lua
new file mode 100644
index 00000000..b7c37aee
--- /dev/null
+++ b/lua/rakshit/plugins/init.lua
@@ -0,0 +1,108 @@
+return {
+  'nvim-lua/plenary.nvim', -- lua functions that many plugins use
+  'christoomey/vim-tmux-navigator', -- tmux % split window navigation
+  -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
+  'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
+
+  -- NOTE: Plugins can also be added by using a table,
+  -- with the first argument being the link and the following
+  -- keys can be used to configure plugin behavior/loading/etc.
+  --
+  -- Use `opts = {}` to force a plugin to be loaded.
+  --
+
+  -- Here is a more advanced example where we pass configuration
+  -- options to `gitsigns.nvim`. This is equivalent to the following Lua:
+  --    require('gitsigns').setup({ ... })
+  --
+  -- See `:help gitsigns` to understand what the configuration keys do
+  { -- 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 = '~' },
+      },
+    },
+  },
+
+  -- LSP Plugins
+  {
+    -- `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 = 'luvit-meta/library', words = { 'vim%.uv' } },
+      },
+    },
+  },
+  { 'Bilal2453/luvit-meta', lazy = true },
+
+  { -- Collection of various small independent plugins/modules
+    'echasnovski/mini.nvim',
+    config = function()
+      -- 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,
+  },
+
+  -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
+  -- init.lua. If you want these files, they are in the repository, so you can just download them and
+  -- place them in the correct locations.
+
+  -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart
+  --
+  --  Here are some example plugins that I've included in the Kickstart repository.
+  --  Uncomment any of the lines below to enable them (you will need to restart nvim).
+  --
+  -- require 'kickstart.plugins.debug',
+  -- require 'kickstart.plugins.indent_line',
+  -- require 'kickstart.plugins.lint',
+  -- require 'kickstart.plugins.autopairs',
+  -- require 'kickstart.plugins.neo-tree',
+  -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
+  -- require 'rakshit.core.options',
+
+  -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
+  --    This is the easiest way to modularize your config.
+  --
+  --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
+  --    For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
+  -- { import = 'custom.plugins' },
+  -- { import = 'rakshit.core' },
+}
diff --git a/lua/rakshit/plugins/linting.lua b/lua/rakshit/plugins/linting.lua
new file mode 100644
index 00000000..2d5e030a
--- /dev/null
+++ b/lua/rakshit/plugins/linting.lua
@@ -0,0 +1,64 @@
+return {
+  { -- Linting
+    'mfussenegger/nvim-lint',
+    event = { 'BufReadPre', 'BufNewFile' },
+    config = function()
+      local lint = require('lint')
+      lint.linters_by_ft = {
+        -- TODO: Add the linter for golang as well
+        javascript = { 'eslint_d' },
+        typescript = { 'eslint_d' },
+        javascriptreact = { 'eslint_d' },
+        typescriptreact = { 'eslint_d' },
+        svelte = { 'eslint_d' },
+        python = { 'pylint' },
+      }
+
+      -- 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()
+          lint.try_lint()
+        end,
+      })
+
+      vim.keymap.set('n', '<leader>l', function()
+        lint.try_lint()
+      end, { desc = 'Trigger linting for current file' })
+    end,
+  },
+}
diff --git a/lua/rakshit/plugins/lsp/lspconfig.lua b/lua/rakshit/plugins/lsp/lspconfig.lua
new file mode 100644
index 00000000..1dc19c25
--- /dev/null
+++ b/lua/rakshit/plugins/lsp/lspconfig.lua
@@ -0,0 +1,314 @@
+return {
+  -- Main LSP Configuration
+  'neovim/nvim-lspconfig',
+  event = { 'BufReadPre', 'BufNewFile' },
+  dependencies = {
+    -- Allows extra capabilities provided by nvim-cmp
+    'hrsh7th/cmp-nvim-lsp',
+    -- Modify imports when a file has been renamed
+    { 'antosha417/nvim-lsp-file-operations', config = true },
+    -- Improved LSP functionality when working with lua files
+    { 'folke/neodev.nvim', opts = {} },
+
+    -- Automatically install LSPs and related tools to stdpath for Neovim
+    -- { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
+    -- 'williamboman/mason-lspconfig.nvim',
+
+    -- Useful status updates for LSP.
+    -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
+    { 'j-hui/fidget.nvim', opts = {} },
+  },
+  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
+    -- import lspconfig plugin
+    local lspconfig = require('lspconfig')
+
+    -- import mason_lspconfig plugin
+    local mason_lspconfig = require('mason-lspconfig')
+
+    -- import cmp-nvim-lsp plugin
+    local cmp_nvim_lsp = require('cmp_nvim_lsp')
+
+    local keymap = vim.keymap
+
+    vim.api.nvim_create_autocmd('LspAttach', {
+      group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+      callback = function(event)
+        -- Buffer local mappings
+        -- See `:help vim.lsp.*` for documentation on ay of the below function
+        local opts = { buffer = event.buf, silent = true }
+        -- set keybinds
+        opts.desc = 'Show LSP references'
+        keymap.set('n', 'gR', '<cmd>Telescope lsp_references<CR>', opts) -- show definition, references
+
+        opts.desc = 'Go to declaration'
+        keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) -- go to declaration
+
+        opts.desc = 'Show LSP definitions'
+        keymap.set('n', 'gd', '<cmd>Telescope lsp_definitions<CR>', opts) -- show lsp definitions
+
+        opts.desc = 'Show LSP implementations'
+        keymap.set('n', 'gi', '<cmd>Telescope lsp_implementations<CR>', opts) -- show lsp implementations
+
+        opts.desc = 'Show LSP type definitions'
+        keymap.set('n', 'gt', '<cmd>Telescope lsp_type_definitions<CR>', opts) -- show lsp type definitions
+
+        opts.desc = 'See available code actions'
+        keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection
+
+        opts.desc = 'Smart rename'
+        keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts) -- smart rename
+
+        opts.desc = 'Show buffer diagnostics'
+        keymap.set('n', '<leader>D', '<cmd>Telescope diagnostics bufnr=0<CR>', opts) -- show  diagnostics for file
+
+        opts.desc = 'Show line diagnostics'
+        keymap.set('n', '<leader>d', vim.diagnostic.open_float, opts) -- show diagnostics for line
+
+        opts.desc = 'Go to previous diagnostic'
+        keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer
+
+        opts.desc = 'Go to next diagnostic'
+        keymap.set('n', ']d', vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer
+
+        opts.desc = 'Show documentation for what is under cursor'
+        keymap.set('n', 'K', vim.lsp.buf.hover, opts) -- show documentation for what is under cursor
+
+        opts.desc = 'Restart LSP'
+        keymap.set('n', '<leader>rs', ':LspRestart<CR>', opts) -- mapping to restart lsp if necessary
+      end,
+    })
+
+    local capabilities = cmp_nvim_lsp.default_capabilities()
+    -- Change the Diagnostic symbols in the sign column (gutter)
+    -- (not in youtube nvim video)
+    local signs = { Error = '๏— ', Warn = '๏ฑ ', Hint = '๓ฐ   ', Info = '๏š ' }
+    for type, icon in pairs(signs) do
+      local hl = 'DiagnosticSign' .. type
+      vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = '' })
+    end
+
+    mason_lspconfig.setup_handlers({
+      -- default handler for installed servers
+      function(server_name)
+        lspconfig[server_name].setup({
+          capabilities = capabilities,
+        })
+      end,
+
+      -- Language specific configuration for any individual language server. Lua in this case
+      ['lua_ls'] = function()
+        -- configure lua server (with special settings)
+        lspconfig['lua_ls'].setup({
+          capabilities = capabilities,
+          settings = {
+            Lua = {
+              -- make the language server recognize "vim" global
+              diagnostics = {
+                globals = { 'vim' },
+              },
+              completion = {
+                callSnippet = 'Replace',
+              },
+            },
+          },
+        })
+      end,
+    })
+  end,
+}
+--     -- 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
+--
+--     -- 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('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
+--
+--     -- Find references for the word under your cursor.
+--     map('gr', 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('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
+--
+--     -- 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>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
+--
+--     -- Fuzzy find all the symbols in your current document.
+--     --  Symbols are things like variables, functions, types, etc.
+--     map('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
+--
+--     -- Fuzzy find all the symbols in your current workspace.
+--     --  Similar to document symbols, except searches over your entire project.
+--     -- map('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+--
+--     -- 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>ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' })
+--
+--     -- Opens a popup that displays documentation about the word under your cursor
+--     -- See `:help K` for why this keymap
+--
+--     -- WARN: This is not Goto Definition, this is Goto Declaration.
+--     --  For example, in C this would take you to the header.
+--     map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+--
+--     -- 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(vim.lsp.protocol.Methods.textDocument_documentHighlight) 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(vim.lsp.protocol.Methods.textDocument_inlayHint) 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,
+-- })
+
+-- 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 nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
+--  So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
+-- local capabilities = vim.lsp.protocol.make_client_capabilities()
+-- capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_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 = {},
+--   -- 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.
+-- require('mason').setup()
+
+-- 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 {
+--   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,
+-- }
diff --git a/lua/rakshit/plugins/lsp/mason.lua b/lua/rakshit/plugins/lsp/mason.lua
new file mode 100644
index 00000000..9f11d059
--- /dev/null
+++ b/lua/rakshit/plugins/lsp/mason.lua
@@ -0,0 +1,55 @@
+return {
+  'williamboman/mason.nvim',
+  dependencies = {
+    'williamboman/mason-lspconfig.nvim',
+    'WhoIsSethDaniel/mason-tool-installer.nvim',
+  },
+  config = function()
+    -- import mason
+    local mason = require('mason')
+
+    -- import mason-lspconfig
+    local mason_lspconfig = require('mason-lspconfig')
+
+    local mason_tool_installer = require('mason-tool-installer')
+
+    -- enable mason and configure icons
+    mason.setup({
+      ui = {
+        icons = {
+          package_installed = 'โœ“',
+          package_pending = 'โžœ',
+          package_uninstalled = 'โœ—',
+        },
+      },
+    })
+
+    mason_lspconfig.setup({
+      -- list of servers for mason to install
+      ensure_installed = {
+        'html',
+        'cssls',
+        'tailwindcss',
+        'svelte',
+        'lua_ls',
+        'graphql',
+        'emmet_ls',
+        'prismals',
+        'pyright',
+        'gopls',
+      },
+    })
+
+    mason_tool_installer.setup({
+      ensure_installed = {
+        -- TODO: Make sure to install golang formatter as well
+        'prettier',
+        'stylua',
+        'isort',
+        'black',
+        'pylint',
+        'eslint_d',
+      },
+    })
+  end,
+}
diff --git a/lua/rakshit/plugins/lualine.lua b/lua/rakshit/plugins/lualine.lua
new file mode 100644
index 00000000..5a67e393
--- /dev/null
+++ b/lua/rakshit/plugins/lualine.lua
@@ -0,0 +1,71 @@
+return {
+  'nvim-lualine/lualine.nvim',
+  dependencies = { 'nvim-tree/nvim-web-devicons' },
+  config = function()
+    local lualine = require('lualine')
+    local lazy_status = require('lazy.status') -- to configure lazy pending updates count
+
+    local colors = {
+      blue = '#65D1FF',
+      green = '#3EFFDC',
+      violet = '#FF61EF',
+      yellow = '#FFDA7B',
+      red = '#FF4A4A',
+      fg = '#c3ccdc',
+      bg = '#112638',
+      inactive_bg = '#2c3043',
+    }
+
+    local my_lualine_theme = {
+      normal = {
+        a = { bg = colors.blue, fg = colors.bg, gui = 'bold' },
+        b = { bg = colors.bg, fg = colors.fg },
+        c = { bg = colors.bg, fg = colors.fg },
+      },
+      insert = {
+        a = { bg = colors.green, fg = colors.bg, gui = 'bold' },
+        b = { bg = colors.bg, fg = colors.fg },
+        c = { bg = colors.bg, fg = colors.fg },
+      },
+      visual = {
+        a = { bg = colors.violet, fg = colors.bg, gui = 'bold' },
+        b = { bg = colors.bg, fg = colors.fg },
+        c = { bg = colors.bg, fg = colors.fg },
+      },
+      command = {
+        a = { bg = colors.yellow, fg = colors.bg, gui = 'bold' },
+        b = { bg = colors.bg, fg = colors.fg },
+        c = { bg = colors.bg, fg = colors.fg },
+      },
+      replace = {
+        a = { bg = colors.red, fg = colors.bg, gui = 'bold' },
+        b = { bg = colors.bg, fg = colors.fg },
+        c = { bg = colors.bg, fg = colors.fg },
+      },
+      inactive = {
+        a = { bg = colors.inactive_bg, fg = colors.semilightgray, gui = 'bold' },
+        b = { bg = colors.inactive_bg, fg = colors.semilightgray },
+        c = { bg = colors.inactive_bg, fg = colors.semilightgray },
+      },
+    }
+
+    -- configure lualine with modified theme
+    lualine.setup({
+      options = {
+        theme = my_lualine_theme,
+      },
+      sections = {
+        lualine_x = {
+          {
+            lazy_status.updates,
+            cond = lazy_status.has_updates,
+            color = { fg = '#ff9e64' },
+          },
+          { 'encoding' },
+          { 'fileformat' },
+          { 'filetype' },
+        },
+      },
+    })
+  end,
+}
diff --git a/lua/rakshit/plugins/nvim-cmp.lua b/lua/rakshit/plugins/nvim-cmp.lua
new file mode 100644
index 00000000..73cc33bb
--- /dev/null
+++ b/lua/rakshit/plugins/nvim-cmp.lua
@@ -0,0 +1,131 @@
+return { -- Autocompletion
+  'hrsh7th/nvim-cmp',
+  event = 'InsertEnter',
+  dependencies = {
+    -- Snippet Engine & its associated nvim-cmp source
+    {
+      'L3MON4D3/LuaSnip',
+      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,
+        -- },
+      },
+    },
+    'saadparwaiz1/cmp_luasnip',
+
+    -- Adds other completion capabilities.
+    --  nvim-cmp does not ship with all sources by default. They are split
+    --  into multiple repos for maintenance purposes.
+    'hrsh7th/cmp-nvim-lsp',
+    'hrsh7th/cmp-path', -- source for file system paths
+    'hrsh7th/cmp-buffer', -- completion source for text within the current buffer
+    'rafamadriz/friendly-snippets', -- friendly snippets from various languages
+    'onsails/lspkind.nvim', -- VSCode like pictograms
+  },
+  config = function()
+    -- See `:help cmp`
+    local cmp = require 'cmp'
+    local luasnip = require 'luasnip'
+    local lspkind = require 'lspkind'
+
+    -- loads vscode style snippets from the installed plugins (e.g. friendly-snippets)
+    require('luasnip.loaders.from_vscode').lazy_load()
+    luasnip.config.setup {}
+
+    cmp.setup {
+      snippet = {
+        expand = function(args)
+          luasnip.lsp_expand(args.body)
+        end,
+      },
+      completion = { completeopt = 'menu,menuone,noinsert,preview,noselect' },
+
+      -- For an understanding of why these mappings were
+      -- chosen, you will need to read `:help ins-completion`
+      --
+      -- No, but seriously. Please read `:help ins-completion`, it is really good!
+      mapping = cmp.mapping.preset.insert {
+        -- Select the [n]ext item
+        -- ['<C-j>'] = cmp.mapping.select_next_item(),
+        -- Select the [p]revious item
+        -- ['<C-k>'] = cmp.mapping.select_prev_item(),
+        -- If you prefer more traditional completion keymaps,
+        -- you can uncomment the following lines
+        ['<Tab>'] = cmp.mapping.select_next_item(),
+        ['<S-Tab>'] = cmp.mapping.select_prev_item(),
+
+        -- Scroll the documentation window [b]ack / [f]orward
+        ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+        ['<C-f>'] = cmp.mapping.scroll_docs(4),
+
+        -- Accept ([y]es) the completion.
+        --  This will auto-import if your LSP supports it.
+        --  This will expand snippets if the LSP sent a snippet.
+        -- ['<C-y>'] = cmp.mapping.confirm { select = true },
+        ['<CR>'] = cmp.mapping.confirm { select = false },
+
+        -- Manually trigger a completion from nvim-cmp.
+        --  Generally you don't need this, because nvim-cmp will display
+        --  completions whenever it has completion options available.
+        ['<C-Space>'] = cmp.mapping.complete {},
+        ['<C-e>'] = cmp.mapping.abort(), -- close completion window
+
+        -- Think of <c-l> as moving to the right of your snippet expansion.
+        --  So if you have a snippet that's like:
+        --  function $name($args)
+        --    $body
+        --  end
+        --
+        -- <c-l> will move you to the right of each of the expansion locations.
+        -- <c-h> is similar, except moving you backwards.
+        ['<C-l>'] = cmp.mapping(function()
+          if luasnip.expand_or_locally_jumpable() then
+            luasnip.expand_or_jump()
+          end
+        end, { 'i', 's' }),
+        ['<C-h>'] = cmp.mapping(function()
+          if luasnip.locally_jumpable(-1) then
+            luasnip.jump(-1)
+          end
+        end, { 'i', 's' }),
+
+        -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
+        --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
+      },
+      sources = {
+        {
+          name = 'lazydev',
+          -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
+          group_index = 0,
+        },
+        { name = 'nvim_lsp' },
+        { name = 'luasnip' },
+        { name = 'buffer' },
+        { name = 'path' },
+      },
+
+      -- configure lspkind for VSCode like pictograms in completion menu
+      -- formatting = {
+      --   format = lspkind.cmp_format({
+      --     maxwidth = 50,
+      --     ellipsis_char = '...',
+      --   }),
+      -- },
+    }
+  end,
+}
diff --git a/lua/rakshit/plugins/nvim-tree.lua b/lua/rakshit/plugins/nvim-tree.lua
new file mode 100644
index 00000000..9cfb8ff3
--- /dev/null
+++ b/lua/rakshit/plugins/nvim-tree.lua
@@ -0,0 +1,57 @@
+return {
+  'nvim-tree/nvim-tree.lua',
+  dependencies = 'nvim-tree/nvim-web-devicons',
+  config = function()
+    local nvimtree = require 'nvim-tree'
+
+    -- recommended settings from nvim-tree documentation
+    vim.g.loaded_netrw = 1
+    vim.g.loaded_netrwPlugin = 1
+
+    nvimtree.setup {
+      view = {
+        width = 35,
+        relativenumber = true,
+      },
+      -- change folder arrow icons
+      renderer = {
+        indent_markers = {
+          enable = true,
+        },
+        icons = {
+          glyphs = {
+            folder = {
+              arrow_closed = '๏ก', -- arrow when folder is closed
+              arrow_open = '๏ฃ', -- arrow when folder is open
+            },
+          },
+        },
+      },
+      -- disable window_picker for
+      -- explorer to work well with
+      -- window splits
+      actions = {
+        open_file = {
+          window_picker = {
+            enable = false,
+          },
+        },
+      },
+      filters = {
+        custom = { '.DS_Store' },
+      },
+      git = {
+        ignore = false,
+      },
+    }
+
+    -- set keymaps
+    local keymap = vim.keymap -- for conciseness
+
+    keymap.set('n', '<leader>ee', '<cmd>NvimTreeToggle<CR>', { desc = 'Toggle file explorer' }) -- toggle file explorer
+    keymap.set('n', '<leader>ef', '<cmd>NvimTreeFindFileToggle<CR>', { desc = 'Toggle file explorer on current file' }) -- toggle file explorer on current file
+    -- keymap.set('n', '<C>)', '<cmd>NvimTreeFindFileToggle<CR>', { desc = 'Toggle file explorer on current file' }) -- toggle file explorer on current file
+    keymap.set('n', '<leader>ec', '<cmd>NvimTreeCollapse<CR>', { desc = 'Collapse file explorer' }) -- collapse file explorer
+    keymap.set('n', '<leader>er', '<cmd>NvimTreeRefresh<CR>', { desc = 'Refresh file explorer' }) -- refresh file explorer
+  end,
+}
diff --git a/lua/rakshit/plugins/substitute.lua b/lua/rakshit/plugins/substitute.lua
new file mode 100644
index 00000000..6b94a818
--- /dev/null
+++ b/lua/rakshit/plugins/substitute.lua
@@ -0,0 +1,20 @@
+-- NOTE: Keeping this commented for now since I'm not sure of the merit of using this at this moment. I do use the `s` commad relatively frequently and I don't really do much substitutions
+return {}
+
+-- return {
+--   "gbprod/substitute.nvim",
+--   event = { "BufReadPre", "BufNewFile" },
+--   config = function()
+--     local substitute = require("substitute")
+--
+--     substitute.setup()
+--
+--     -- set keymaps
+--     local keymap = vim.keymap -- for conciseness
+--
+--     vim.keymap.set("n", "s", substitute.operator, { desc = "Substitute with motion" })
+--     vim.keymap.set("n", "ss", substitute.line, { desc = "Substitute line" })
+--     vim.keymap.set("n", "S", substitute.eol, { desc = "Substitute to end of line" })
+--     vim.keymap.set("x", "s", substitute.visual, { desc = "Substitute in visual mode" })
+--   end,
+-- }
diff --git a/lua/rakshit/plugins/surround.lua b/lua/rakshit/plugins/surround.lua
new file mode 100644
index 00000000..9ea9a1af
--- /dev/null
+++ b/lua/rakshit/plugins/surround.lua
@@ -0,0 +1,6 @@
+return {
+  'kylechui/nvim-surround',
+  event = { 'BufReadPre', 'BufNewFile' },
+  version = '*', -- Use for stability; omit to use `main` branch for the latest features
+  config = true,
+}
diff --git a/lua/rakshit/plugins/telescope.lua b/lua/rakshit/plugins/telescope.lua
new file mode 100644
index 00000000..03ce6645
--- /dev/null
+++ b/lua/rakshit/plugins/telescope.lua
@@ -0,0 +1,125 @@
+-- NOTE: Plugins can specify dependencies.
+--
+-- The dependencies are proper plugin specifications as well - anything
+-- you do for a plugin at the top level, you can do for a dependency.
+--
+-- Use the `dependencies` key to specify the dependencies of a particular plugin
+
+return { -- Fuzzy Finder (files, lsp, etc)
+  'nvim-telescope/telescope.nvim',
+  event = 'VimEnter',
+  branch = '0.1.x',
+  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 },
+    'folke/todo-comments.nvim',
+  },
+  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()`
+    local telescope = require 'telescope'
+    local actions = require 'telescope.actions'
+    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-k>'] = actions.move_selection_previous,
+            ['<C-j>'] = actions.move_selection_next,
+            ['<C-q>'] = actions.send_selected_to_qflist + actions.open_qflist,
+          },
+        },
+      },
+      -- pickers = {}
+      extensions = {
+        ['ui-select'] = {
+          require('telescope.themes').get_dropdown(),
+        },
+      },
+    }
+
+    -- 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>s-', builtin.help_tags, { desc = '[S]earch [-]Help' })
+    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 in the cwd' })
+    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 under cursor in cwd' })
+    vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep in cwd' })
+    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' })
+    vim.keymap.set('n', '<leader>st', '<cmd>TodoTelescope<cr>', { desc = '[S]earch [T]odos' })
+
+    -- set keymaps. Keymaps can be set a slightly different way also besides using the `builtin` function
+    -- vim.keymap.set('n', '<leader>ff', '<cmd>Telescope find_files<cr>', { desc = 'Fuzzy find files in cwd' })
+    -- vim.keymap.set('n', '<leader>fr', '<cmd>Telescope oldfiles<cr>', { desc = 'Fuzzy find recent files' })
+    -- vim.keymap.set('n', '<leader>fs', '<cmd>Telescope live_grep<cr>', { desc = 'Find string in cwd' })
+    -- vim.keymap.set('n', '<leader>fc', '<cmd>Telescope grep_string<cr>', { desc = 'Find string under cursor in cwd' })
+
+    -- 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,
+}
diff --git a/lua/rakshit/plugins/todo-comments.lua b/lua/rakshit/plugins/todo-comments.lua
new file mode 100644
index 00000000..dcd50c98
--- /dev/null
+++ b/lua/rakshit/plugins/todo-comments.lua
@@ -0,0 +1,23 @@
+-- Highlight todo, notes, etc in comments
+return {
+  'folke/todo-comments.nvim',
+  event = 'VimEnter',
+  dependencies = { 'nvim-lua/plenary.nvim' },
+  opts = { signs = false },
+  config = function()
+    local todo_comments = require 'todo-comments'
+
+    -- set keymaps
+    local keymap = vim.keymap -- for conciseness
+
+    keymap.set('n', '[t', function()
+      todo_comments.jump_next()
+    end, { desc = 'Next todo comment' })
+
+    keymap.set('n', ']t', function()
+      todo_comments.jump_prev()
+    end, { desc = 'Previous todo comment' })
+
+    todo_comments.setup()
+  end,
+}
diff --git a/lua/rakshit/plugins/treesitter.lua b/lua/rakshit/plugins/treesitter.lua
new file mode 100644
index 00000000..771b393f
--- /dev/null
+++ b/lua/rakshit/plugins/treesitter.lua
@@ -0,0 +1,90 @@
+return { -- Highlight, edit, and navigate code
+  'nvim-treesitter/nvim-treesitter',
+  event = { 'BufReadPre', 'BufNewFile' },
+  build = ':TSUpdate',
+  dependencies = {
+    'windwp/nvim-ts-autotag',
+  },
+  main = 'nvim-treesitter.configs', -- Sets main module to use for opts
+  -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
+  opts = {
+    ensure_installed = {
+      'bash',
+      'c',
+      'diff',
+      'lua',
+      'luadoc',
+      'markdown',
+      'markdown_inline',
+      'query',
+      'vim',
+      'vimdoc',
+      'go',
+      'gomod',
+      'gosum',
+      'helm',
+      'http',
+      'json',
+      'java',
+      'jq',
+      'javascript',
+      'typescript',
+      'tsx',
+      'yaml',
+      'html',
+      'pem',
+      'perl',
+      'proto',
+      'python',
+      'rust',
+      'scss',
+      'sql',
+      'ssh_config',
+      'terraform',
+      'tmux',
+      'make',
+      'css',
+      'graphql',
+      'svelte',
+      'bash',
+      'dockerfile',
+      'gitignore',
+      'git_config',
+      'git_rebase',
+      'gitcommit',
+      'query',
+      'csv',
+    },
+    -- 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' } },
+
+    -- enable auto tagging
+    autotag = {
+      enabled = true,
+    },
+
+    incremental_selection = {
+      enable = true,
+      keymaps = {
+        init_selection = '<C-space>',
+        node_incremental = '<C-space>',
+        scope_incremental = false,
+        node_decremental = '<bs>',
+      },
+    },
+  },
+  -- 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
+}
diff --git a/lua/rakshit/plugins/trouble.lua b/lua/rakshit/plugins/trouble.lua
new file mode 100644
index 00000000..4bfb25c0
--- /dev/null
+++ b/lua/rakshit/plugins/trouble.lua
@@ -0,0 +1,15 @@
+return {
+  'folke/trouble.nvim',
+  dependencies = { 'nvim-tree/nvim-web-devicons', 'folke/todo-comments.nvim' },
+  opts = {
+    focus = true,
+  },
+  cmd = 'Trouble',
+  keys = {
+    { '<leader>xw', '<cmd>Trouble diagnostics toggle<CR>', desc = 'Open trouble workspace diagnostics' },
+    { '<leader>xd', '<cmd>Trouble diagnostics toggle filter.buf=0<CR>', desc = 'Open trouble document diagnostics' },
+    { '<leader>xq', '<cmd>Trouble quickfix toggle<CR>', desc = 'Open trouble quickfix list' },
+    { '<leader>xl', '<cmd>Trouble loclist toggle<CR>', desc = 'Open trouble location list' },
+    { '<leader>xt', '<cmd>Trouble todo toggle<CR>', desc = 'Open todos in trouble' },
+  },
+}
diff --git a/lua/rakshit/plugins/vim-maximizer.lua b/lua/rakshit/plugins/vim-maximizer.lua
new file mode 100644
index 00000000..84604ac5
--- /dev/null
+++ b/lua/rakshit/plugins/vim-maximizer.lua
@@ -0,0 +1,6 @@
+return {
+  'szw/vim-maximizer',
+  keys = {
+    { '<leader>sm', '<cmd>MaximizerToggle<CR>', desc = 'Maximize/minimize a split' },
+  },
+}
diff --git a/lua/rakshit/plugins/which-key.lua b/lua/rakshit/plugins/which-key.lua
new file mode 100644
index 00000000..52af66fb
--- /dev/null
+++ b/lua/rakshit/plugins/which-key.lua
@@ -0,0 +1,69 @@
+-- NOTE: Plugins can also be configured to run Lua code when they are loaded.
+--
+-- This is often very useful to both group configuration, as well as handle
+-- lazy loading plugins that don't need to be loaded immediately at startup.
+--
+-- For example, in the following configuration, we use:
+--  event = 'VimEnter'
+--
+-- which loads which-key before all the UI elements are loaded. Events can be
+-- normal autocommands events (`:help autocmd-events`).
+--
+-- Then, because we use the `config` key, the configuration only runs
+-- after the plugin has been loaded:
+--  config = function() ... end
+
+return { -- Useful plugin to show you pending keybinds.
+  'folke/which-key.nvim',
+  -- event = 'VimEnter', -- Sets the loading event to 'VimEnter'
+  event = 'VeryLazy', -- Sets the loading event to 'VimEnter'
+  opts = {
+    icons = {
+      -- set icon mappings to true if you have a Nerd Font
+      mappings = vim.g.have_nerd_font,
+      -- If you are using a Nerd Font: set icons.keys to an empty table which will use the
+      -- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
+      keys = vim.g.have_nerd_font and {} or {
+        Up = '<Up> ',
+        Down = '<Down> ',
+        Left = '<Left> ',
+        Right = '<Right> ',
+        C = '<C-โ€ฆ> ',
+        M = '<M-โ€ฆ> ',
+        D = '<D-โ€ฆ> ',
+        S = '<S-โ€ฆ> ',
+        CR = '<CR> ',
+        Esc = '<Esc> ',
+        ScrollWheelDown = '<ScrollWheelDown> ',
+        ScrollWheelUp = '<ScrollWheelUp> ',
+        NL = '<NL> ',
+        BS = '<BS> ',
+        Space = '<Space> ',
+        Tab = '<Tab> ',
+        F1 = '<F1>',
+        F2 = '<F2>',
+        F3 = '<F3>',
+        F4 = '<F4>',
+        F5 = '<F5>',
+        F6 = '<F6>',
+        F7 = '<F7>',
+        F8 = '<F8>',
+        F9 = '<F9>',
+        F10 = '<F10>',
+        F11 = '<F11>',
+        F12 = '<F12>',
+      },
+    },
+
+    -- Document existing key chains
+    spec = {
+      { '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
+      { '<leader>d', group = '[D]ocument' },
+      { '<leader>r', group = '[R]ename' },
+      { '<leader>s', group = '[S]earch' },
+      { '<leader>w', group = '[W]orkspace' },
+      { '<leader>t', group = '[T]oggle' },
+      { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
+    },
+  },
+}

From 86b269d5f98300e5a796a6c3f09c4a8f1322743a Mon Sep 17 00:00:00 2001
From: Rakshit Sinha <rakshit.sinha@oracle.com>
Date: Sat, 9 Nov 2024 21:49:28 -0800
Subject: [PATCH 4/4] Modularized all my plugins

---
 .black.toml                           |   3 +
 .stylua.toml                          |   2 +-
 init.lua                              |  14 +++-
 lua/kickstart/plugins/debug.lua       | 106 +-------------------------
 lua/rakshit/plugins/debug.lua         | 105 +++++++++++++++++++++++++
 lua/rakshit/plugins/formatting.lua    |  29 ++++++-
 lua/rakshit/plugins/lsp/lspconfig.lua |  11 +++
 lua/rakshit/plugins/nvim-cmp.lua      |  34 +++++----
 lua/rakshit/plugins/nvim-tree.lua     |  19 ++++-
 9 files changed, 193 insertions(+), 130 deletions(-)
 create mode 100644 .black.toml
 create mode 100644 lua/rakshit/plugins/debug.lua

diff --git a/.black.toml b/.black.toml
new file mode 100644
index 00000000..cde81ae8
--- /dev/null
+++ b/.black.toml
@@ -0,0 +1,3 @@
+column_width = 120
+line_endings = "Unix"
+indent_type = "Spaces"
diff --git a/.stylua.toml b/.stylua.toml
index 48575bec..3c57f372 100644
--- a/.stylua.toml
+++ b/.stylua.toml
@@ -1,4 +1,4 @@
-column_width = 100
+column_width = 120
 line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2
diff --git a/init.lua b/init.lua
index 56e43b15..345d7e0c 100644
--- a/init.lua
+++ b/init.lua
@@ -24,7 +24,7 @@ If you experience any errors while trying to install kickstart, run `:checkhealt
 --]]
 
 -- The file rakshit/core/options.lua will be storing all the options that we want to save n our file
-require 'rakshit.core'
+require('rakshit.core')
 
 -- Set to true if you have a Nerd Font installed and selected in the terminal
 vim.g.have_nerd_font = true
@@ -43,8 +43,18 @@ vim.api.nvim_create_autocmd('TextYankPost', {
   end,
 })
 
-require('rakshit.lazy')
+-- Configure Neovim tab settings for Go files
+-- vim.api.nvim_create_autocmd('FileType', {
+--   pattern = 'go',
+--   callback = function()
+--     vim.bo.expandtab = true -- Use spaces instead of tabs
+--     vim.bo.tabstop = 4 -- Display each tab as 4 spaces
+--     vim.bo.shiftwidth = 4 -- Indentation size of 4 spaces
+--     vim.bo.softtabstop = 4 -- <Tab> key inserts 4 spaces
+--   end,
+-- })
 
+require('rakshit.lazy')
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index 196f2c6d..a5647075 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -1,105 +1 @@
--- debug.lua
---
--- Shows how to use the DAP plugin to debug your code.
---
--- Primarily focused on configuring the debugger for Go, but can
--- be extended to other languages as well. That's why it's called
--- kickstart.nvim and not kitchen-sink.nvim ;)
-
-return {
-  -- NOTE: Yes, you can install new plugins here!
-  'mfussenegger/nvim-dap',
-  -- NOTE: And you can specify dependencies as well
-  dependencies = {
-    -- Creates a beautiful debugger UI
-    'rcarriga/nvim-dap-ui',
-
-    -- Required dependency for nvim-dap-ui
-    'nvim-neotest/nvim-nio',
-
-    -- Installs the debug adapters for you
-    'williamboman/mason.nvim',
-    'jay-babu/mason-nvim-dap.nvim',
-
-    -- Add your own debuggers here
-    'leoluz/nvim-dap-go',
-  },
-  keys = function(_, keys)
-    local dap = require 'dap'
-    local dapui = require 'dapui'
-    return {
-      -- Basic debugging keymaps, feel free to change to your liking!
-      { '<F5>', dap.continue, desc = 'Debug: Start/Continue' },
-      { '<F1>', dap.step_into, desc = 'Debug: Step Into' },
-      { '<F2>', dap.step_over, desc = 'Debug: Step Over' },
-      { '<F3>', dap.step_out, desc = 'Debug: Step Out' },
-      { '<leader>b', dap.toggle_breakpoint, desc = 'Debug: Toggle Breakpoint' },
-      {
-        '<leader>B',
-        function()
-          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>', dapui.toggle, desc = 'Debug: See last session result.' },
-      unpack(keys),
-    }
-  end,
-  config = function()
-    local dap = require 'dap'
-    local dapui = require 'dapui'
-
-    require('mason-nvim-dap').setup {
-      -- Makes a best effort to setup the various debuggers with
-      -- reasonable debug configurations
-      automatic_installation = true,
-
-      -- You can provide additional configuration to the handlers,
-      -- see mason-nvim-dap README for more information
-      handlers = {},
-
-      -- 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',
-      },
-    }
-
-    -- Dap UI setup
-    -- For more information, see |:help nvim-dap-ui|
-    dapui.setup {
-      -- 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.
-      icons = { expanded = 'โ–พ', collapsed = 'โ–ธ', current_frame = '*' },
-      controls = {
-        icons = {
-          pause = 'โธ',
-          play = 'โ–ถ',
-          step_into = 'โŽ',
-          step_over = 'โญ',
-          step_out = 'โฎ',
-          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
-
-    -- Install golang specific config
-    require('dap-go').setup {
-      delve = {
-        -- On Windows delve must be run attached or it crashes.
-        -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
-        detached = vim.fn.has 'win32' == 0,
-      },
-    }
-  end,
-}
+return {}
diff --git a/lua/rakshit/plugins/debug.lua b/lua/rakshit/plugins/debug.lua
new file mode 100644
index 00000000..52c1bd56
--- /dev/null
+++ b/lua/rakshit/plugins/debug.lua
@@ -0,0 +1,105 @@
+-- debug.lua
+--
+-- Shows how to use the DAP plugin to debug your code.
+--
+-- Primarily focused on configuring the debugger for Go, but can
+-- be extended to other languages as well. That's why it's called
+-- kickstart.nvim and not kitchen-sink.nvim ;)
+
+return {}
+--   -- NOTE: Yes, you can install new plugins here!
+--   'mfussenegger/nvim-dap',
+--   -- NOTE: And you can specify dependencies as well
+--   dependencies = {
+--     -- Creates a beautiful debugger UI
+--     'rcarriga/nvim-dap-ui',
+--
+--     -- Required dependency for nvim-dap-ui
+--     'nvim-neotest/nvim-nio',
+--
+--     -- Installs the debug adapters for you
+--     'williamboman/mason.nvim',
+--     'jay-babu/mason-nvim-dap.nvim',
+--
+--     -- Add your own debuggers here
+--     'leoluz/nvim-dap-go',
+--   },
+--   keys = function(_, keys)
+--     local dap = require('dap')
+--     local dapui = require('dapui')
+--     return {
+--       -- Basic debugging keymaps, feel free to change to your liking!
+--       { '<F5>', dap.continue, desc = 'Debug: Start/Continue' },
+--       { '<F1>', dap.step_into, desc = 'Debug: Step Into' },
+--       { '<F2>', dap.step_over, desc = 'Debug: Step Over' },
+--       { '<F3>', dap.step_out, desc = 'Debug: Step Out' },
+--       { '<leader>b', dap.toggle_breakpoint, desc = 'Debug: Toggle Breakpoint' },
+--       {
+--         '<leader>B',
+--         function()
+--           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>', dapui.toggle, desc = 'Debug: See last session result.' },
+--       unpack(keys),
+--     }
+--   end,
+--   config = function()
+--     local dap = require('dap')
+--     local dapui = require('dapui')
+--
+--     require('mason-nvim-dap').setup({
+--       -- Makes a best effort to setup the various debuggers with
+--       -- reasonable debug configurations
+--       automatic_installation = true,
+--
+--       -- You can provide additional configuration to the handlers,
+--       -- see mason-nvim-dap README for more information
+--       handlers = {},
+--
+--       -- 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',
+--       },
+--     })
+--
+--     -- Dap UI setup
+--     -- For more information, see |:help nvim-dap-ui|
+--     dapui.setup({
+--       -- 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.
+--       icons = { expanded = 'โ–พ', collapsed = 'โ–ธ', current_frame = '*' },
+--       controls = {
+--         icons = {
+--           pause = 'โธ',
+--           play = 'โ–ถ',
+--           step_into = 'โŽ',
+--           step_over = 'โญ',
+--           step_out = 'โฎ',
+--           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
+--
+--     -- Install golang specific config
+--     require('dap-go').setup({
+--       delve = {
+--         -- On Windows delve must be run attached or it crashes.
+--         -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
+--         detached = vim.fn.has('win32') == 0,
+--       },
+--     })
+--   end,
+-- }
diff --git a/lua/rakshit/plugins/formatting.lua b/lua/rakshit/plugins/formatting.lua
index 82bc99cb..ea0d5841 100644
--- a/lua/rakshit/plugins/formatting.lua
+++ b/lua/rakshit/plugins/formatting.lua
@@ -17,9 +17,11 @@ return { -- Autoformat
     format_on_save = {
       lsp_fallback = true,
       async = false,
-      timeout_ms = 500,
+      timeout_ms = 5000,
     },
     formatters_by_ft = {
+      go = { 'goimports', 'gofmt' },
+      terraform = { 'terraform_fmt' },
       lua = { 'stylua' },
       javascript = { 'prettier' },
       typescript = { 'prettier' },
@@ -33,7 +35,20 @@ return { -- Autoformat
       markdown = { 'prettier' },
       graphql = { 'prettier' },
       liquid = { 'prettier' },
-      python = { 'isort', 'black' },
+      -- python = { 'isort', 'black' },
+      -- You can use a function here to determine the formatters dynamically
+      python = function(bufnr)
+        if require('conform').get_formatter_info('ruff_format', bufnr).available then
+          return { 'ruff_format' }
+        else
+          return { 'isort', 'black' }
+        end
+      end,
+      -- Use the "*" filetype to run formatters on all filetypes.
+      ['*'] = { 'codespell' },
+      -- Use the "_" filetype to run formatters on filetypes that don't
+      -- have other formatters configured.
+      ['_'] = { 'trim_whitespace' },
       -- Conform can also run multiple formatters sequentially
       -- python = { "isort", "black" },
       --
@@ -41,4 +56,14 @@ return { -- Autoformat
       -- javascript = { "prettierd", "prettier", stop_after_first = true },
     },
   },
+  -- Configure Neovim tab settings for Go files
+  -- vim.api.nvim_create_autocmd('FileType', {
+  --   pattern = 'go',
+  --   callback = function()
+  --     -- vim.bo.expandtab = true -- Use spaces instead of tabs
+  --     vim.bo.tabstop = 4 -- Display each tab as 4 spaces
+  --     vim.bo.shiftwidth = 4 -- Indentation size of 4 spaces
+  --     vim.bo.softtabstop = 4 -- <Tab> key inserts 4 spaces
+  --   end,
+  -- }),
 }
diff --git a/lua/rakshit/plugins/lsp/lspconfig.lua b/lua/rakshit/plugins/lsp/lspconfig.lua
index 1dc19c25..bb578dde 100644
--- a/lua/rakshit/plugins/lsp/lspconfig.lua
+++ b/lua/rakshit/plugins/lsp/lspconfig.lua
@@ -107,6 +107,17 @@ return {
       end,
     })
 
+    -- Configure Neovim tab settings for Go files [Go indendation]
+    vim.api.nvim_create_autocmd('FileType', {
+      pattern = 'go',
+      callback = function()
+        vim.bo.expandtab = true -- Use spaces instead of tabs
+        vim.bo.tabstop = 4 -- Display each tab as 4 spaces
+        vim.bo.shiftwidth = 4 -- Indentation size of 4 spaces
+        vim.bo.softtabstop = 4 -- <Tab> key inserts 4 spaces
+      end,
+    })
+
     local capabilities = cmp_nvim_lsp.default_capabilities()
     -- Change the Diagnostic symbols in the sign column (gutter)
     -- (not in youtube nvim video)
diff --git a/lua/rakshit/plugins/nvim-cmp.lua b/lua/rakshit/plugins/nvim-cmp.lua
index 73cc33bb..3f6cea0c 100644
--- a/lua/rakshit/plugins/nvim-cmp.lua
+++ b/lua/rakshit/plugins/nvim-cmp.lua
@@ -9,7 +9,7 @@ return { -- Autocompletion
         -- 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
+        if vim.fn.has('win32') == 1 or vim.fn.executable('make') == 0 then
           return
         end
         return 'make install_jsregexp'
@@ -39,15 +39,15 @@ return { -- Autocompletion
   },
   config = function()
     -- See `:help cmp`
-    local cmp = require 'cmp'
-    local luasnip = require 'luasnip'
-    local lspkind = require 'lspkind'
+    local cmp = require('cmp')
+    local luasnip = require('luasnip')
+    local lspkind = require('lspkind')
 
     -- loads vscode style snippets from the installed plugins (e.g. friendly-snippets)
     require('luasnip.loaders.from_vscode').lazy_load()
-    luasnip.config.setup {}
+    luasnip.config.setup({})
 
-    cmp.setup {
+    cmp.setup({
       snippet = {
         expand = function(args)
           luasnip.lsp_expand(args.body)
@@ -59,7 +59,7 @@ return { -- Autocompletion
       -- chosen, you will need to read `:help ins-completion`
       --
       -- No, but seriously. Please read `:help ins-completion`, it is really good!
-      mapping = cmp.mapping.preset.insert {
+      mapping = cmp.mapping.preset.insert({
         -- Select the [n]ext item
         -- ['<C-j>'] = cmp.mapping.select_next_item(),
         -- Select the [p]revious item
@@ -77,12 +77,12 @@ return { -- Autocompletion
         --  This will auto-import if your LSP supports it.
         --  This will expand snippets if the LSP sent a snippet.
         -- ['<C-y>'] = cmp.mapping.confirm { select = true },
-        ['<CR>'] = cmp.mapping.confirm { select = false },
+        ['<CR>'] = cmp.mapping.confirm({ select = false }),
 
         -- Manually trigger a completion from nvim-cmp.
         --  Generally you don't need this, because nvim-cmp will display
         --  completions whenever it has completion options available.
-        ['<C-Space>'] = cmp.mapping.complete {},
+        ['<C-Space>'] = cmp.mapping.complete({}),
         ['<C-e>'] = cmp.mapping.abort(), -- close completion window
 
         -- Think of <c-l> as moving to the right of your snippet expansion.
@@ -106,13 +106,13 @@ return { -- Autocompletion
 
         -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
         --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
-      },
+      }),
       sources = {
-        {
-          name = 'lazydev',
-          -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
-          group_index = 0,
-        },
+        -- {
+        --   name = 'lazydev',
+        --   -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
+        --   group_index = 0,
+        -- },
         { name = 'nvim_lsp' },
         { name = 'luasnip' },
         { name = 'buffer' },
@@ -121,11 +121,13 @@ return { -- Autocompletion
 
       -- configure lspkind for VSCode like pictograms in completion menu
       -- formatting = {
+      --   fields = cmp.ItemField.Abbr,
+      --   expandable_indicator = true,
       --   format = lspkind.cmp_format({
       --     maxwidth = 50,
       --     ellipsis_char = '...',
       --   }),
       -- },
-    }
+    })
   end,
 }
diff --git a/lua/rakshit/plugins/nvim-tree.lua b/lua/rakshit/plugins/nvim-tree.lua
index 9cfb8ff3..fe970c1e 100644
--- a/lua/rakshit/plugins/nvim-tree.lua
+++ b/lua/rakshit/plugins/nvim-tree.lua
@@ -2,22 +2,25 @@ return {
   'nvim-tree/nvim-tree.lua',
   dependencies = 'nvim-tree/nvim-web-devicons',
   config = function()
-    local nvimtree = require 'nvim-tree'
+    local nvimtree = require('nvim-tree')
 
     -- recommended settings from nvim-tree documentation
     vim.g.loaded_netrw = 1
     vim.g.loaded_netrwPlugin = 1
 
-    nvimtree.setup {
+    nvimtree.setup({
       view = {
         width = 35,
+        number = true,
         relativenumber = true,
+        centralize_selection = true,
       },
       -- change folder arrow icons
       renderer = {
         indent_markers = {
           enable = true,
         },
+        add_trailing = true,
         icons = {
           glyphs = {
             folder = {
@@ -43,15 +46,23 @@ return {
       git = {
         ignore = false,
       },
-    }
+    })
 
     -- set keymaps
     local keymap = vim.keymap -- for conciseness
 
     keymap.set('n', '<leader>ee', '<cmd>NvimTreeToggle<CR>', { desc = 'Toggle file explorer' }) -- toggle file explorer
-    keymap.set('n', '<leader>ef', '<cmd>NvimTreeFindFileToggle<CR>', { desc = 'Toggle file explorer on current file' }) -- toggle file explorer on current file
+    keymap.set(
+      'n',
+      '<leader>ef',
+      '<cmd>NvimTreeFindFileToggle<CR>',
+      { desc = 'Toggle file explorer on current file' }
+    ) -- toggle file explorer on current file
     -- keymap.set('n', '<C>)', '<cmd>NvimTreeFindFileToggle<CR>', { desc = 'Toggle file explorer on current file' }) -- toggle file explorer on current file
     keymap.set('n', '<leader>ec', '<cmd>NvimTreeCollapse<CR>', { desc = 'Collapse file explorer' }) -- collapse file explorer
     keymap.set('n', '<leader>er', '<cmd>NvimTreeRefresh<CR>', { desc = 'Refresh file explorer' }) -- refresh file explorer
+
+    -- New ones I'm adding just for testing and hopefully that works
+    -- keymap.set('n', 'h', '<cmd>NvimTreeCollapse<CR>', { desc = 'Collapse file explorer' }) -- collapse file explorer
   end,
 }