diff --git a/.gitignore b/.gitignore
index d699e1d68cc..770c212db00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ tags
 test.sh
 .luarc.json
 nvim
+spell
diff --git a/init.lua b/init.lua
index cf4a3790026..625c2f24b2e 100644
--- a/init.lua
+++ b/init.lua
@@ -1,52 +1,6 @@
---[[
-
-=====================================================================
-==================== READ THIS BEFORE CONTINUING ====================
-=====================================================================
-
-Kickstart.nvim is *not* a distribution.
-
-Kickstart.nvim is a template for your own configuration.
-  The goal is that you can read every line of code, top-to-bottom, understand
-  what your configuration is doing, and modify it to suit your needs.
-
-  Once you've done that, you should start exploring, configuring and tinkering to
-  explore Neovim!
-
-  If you don't know anything about Lua, I recommend taking some time to read through
-  a guide. One possible example:
-  - https://learnxinyminutes.com/docs/lua/
-
-
-  And then you can explore or search through `:help lua-guide`
-  - https://neovim.io/doc/user/lua-guide.html
-
-
-Kickstart Guide:
-
-I have left several `:help X` comments throughout the init.lua
-You should run that command and read that help section for more information.
-
-In addition, I have some `NOTE:` items throughout the file.
-These are for you, the reader to help understand what is happening. Feel free to delete
-them once you know what you're doing, but they should serve as a guide for when you
-are first encountering a few different constructs in your nvim config.
-
-I hope you enjoy your Neovim journey,
-- TJ
-
-P.S. You can delete this when you're done too. It's your config now :)
---]]
-
--- Set <space> as the leader key
--- See `:help mapleader`
---  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
--- [[ Install `lazy.nvim` plugin manager ]]
---    https://github.com/folke/lazy.nvim
---    `:help lazy.nvim.txt` for more info
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
 if not vim.loop.fs_stat(lazypath) then
   vim.fn.system {
@@ -60,602 +14,7 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
--- [[ Configure plugins ]]
--- NOTE: Here is where you install your plugins.
---  You can configure plugins using the `config` key.
---
---  You can also configure plugins after the setup call,
---    as they will be available in your neovim runtime.
-require('lazy').setup({
-  -- NOTE: First, some plugins that don't require any configuration
-
-  -- Git related plugins
-  'tpope/vim-fugitive',
-  'tpope/vim-rhubarb',
-
-  -- Detect tabstop and shiftwidth automatically
-  'tpope/vim-sleuth',
-
-  -- NOTE: This is where your plugins related to LSP can be installed.
-  --  The configuration is done below. Search for lspconfig to find it below.
-  {
-    -- LSP Configuration & Plugins
-    'neovim/nvim-lspconfig',
-    dependencies = {
-      -- Automatically install LSPs to stdpath for neovim
-      'williamboman/mason.nvim',
-      'williamboman/mason-lspconfig.nvim',
-
-      -- Useful status updates for LSP
-      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { 'j-hui/fidget.nvim', opts = {} },
-
-      -- Additional lua configuration, makes nvim stuff amazing!
-      'folke/neodev.nvim',
-    },
-  },
-
-  {
-    -- Autocompletion
-    'hrsh7th/nvim-cmp',
-    dependencies = {
-      -- Snippet Engine & its associated nvim-cmp source
-      'L3MON4D3/LuaSnip',
-      'saadparwaiz1/cmp_luasnip',
-
-      -- Adds LSP completion capabilities
-      'hrsh7th/cmp-nvim-lsp',
-      'hrsh7th/cmp-path',
-
-      -- Adds a number of user-friendly snippets
-      'rafamadriz/friendly-snippets',
-    },
-  },
-
-  -- Useful plugin to show you pending keybinds.
-  { 'folke/which-key.nvim', opts = {} },
-  {
-    -- Adds git related signs to the gutter, as well as utilities for managing changes
-    'lewis6991/gitsigns.nvim',
-    opts = {
-      -- See `:help gitsigns.txt`
-      signs = {
-        add = { text = '+' },
-        change = { text = '~' },
-        delete = { text = '_' },
-        topdelete = { text = '‾' },
-        changedelete = { text = '~' },
-      },
-      on_attach = function(bufnr)
-        local gs = package.loaded.gitsigns
-
-        local function map(mode, l, r, opts)
-          opts = opts or {}
-          opts.buffer = bufnr
-          vim.keymap.set(mode, l, r, opts)
-        end
-
-        -- Navigation
-        map({ 'n', 'v' }, ']c', function()
-          if vim.wo.diff then
-            return ']c'
-          end
-          vim.schedule(function()
-            gs.next_hunk()
-          end)
-          return '<Ignore>'
-        end, { expr = true, desc = 'Jump to next hunk' })
-
-        map({ 'n', 'v' }, '[c', function()
-          if vim.wo.diff then
-            return '[c'
-          end
-          vim.schedule(function()
-            gs.prev_hunk()
-          end)
-          return '<Ignore>'
-        end, { expr = true, desc = 'Jump to previous hunk' })
-
-        -- Actions
-        -- visual mode
-        map('v', '<leader>hs', function()
-          gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
-        end, { desc = 'stage git hunk' })
-        map('v', '<leader>hr', function()
-          gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
-        end, { desc = 'reset git hunk' })
-        -- normal mode
-        map('n', '<leader>hs', gs.stage_hunk, { desc = 'git stage hunk' })
-        map('n', '<leader>hr', gs.reset_hunk, { desc = 'git reset hunk' })
-        map('n', '<leader>hS', gs.stage_buffer, { desc = 'git Stage buffer' })
-        map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'undo stage hunk' })
-        map('n', '<leader>hR', gs.reset_buffer, { desc = 'git Reset buffer' })
-        map('n', '<leader>hp', gs.preview_hunk, { desc = 'preview git hunk' })
-        map('n', '<leader>hb', function()
-          gs.blame_line { full = false }
-        end, { desc = 'git blame line' })
-        map('n', '<leader>hd', gs.diffthis, { desc = 'git diff against index' })
-        map('n', '<leader>hD', function()
-          gs.diffthis '~'
-        end, { desc = 'git diff against last commit' })
-
-        -- Toggles
-        map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = 'toggle git blame line' })
-        map('n', '<leader>td', gs.toggle_deleted, { desc = 'toggle git show deleted' })
-
-        -- Text object
-        map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select git hunk' })
-      end,
-    },
-  },
-
-  {
-    -- Theme inspired by Atom
-    'navarasu/onedark.nvim',
-    priority = 1000,
-    config = function()
-      vim.cmd.colorscheme 'onedark'
-    end,
-  },
-
-  {
-    -- Set lualine as statusline
-    'nvim-lualine/lualine.nvim',
-    -- See `:help lualine.txt`
-    opts = {
-      options = {
-        icons_enabled = false,
-        theme = 'onedark',
-        component_separators = '|',
-        section_separators = '',
-      },
-    },
-  },
-
-  {
-    -- Add indentation guides even on blank lines
-    'lukas-reineke/indent-blankline.nvim',
-    -- Enable `lukas-reineke/indent-blankline.nvim`
-    -- See `:help ibl`
-    main = 'ibl',
-    opts = {},
-  },
-
-  -- "gc" to comment visual regions/lines
-  { 'numToStr/Comment.nvim', opts = {} },
-
-  -- Fuzzy Finder (files, lsp, etc)
-  {
-    'nvim-telescope/telescope.nvim',
-    branch = '0.1.x',
-    dependencies = {
-      'nvim-lua/plenary.nvim',
-      -- Fuzzy Finder Algorithm which requires local dependencies to be built.
-      -- Only load if `make` is available. Make sure you have the system
-      -- requirements installed.
-      {
-        'nvim-telescope/telescope-fzf-native.nvim',
-        -- NOTE: If you are having trouble with this installation,
-        --       refer to the README for telescope-fzf-native for more instructions.
-        build = 'make',
-        cond = function()
-          return vim.fn.executable 'make' == 1
-        end,
-      },
-    },
-  },
-
-  {
-    -- Highlight, edit, and navigate code
-    'nvim-treesitter/nvim-treesitter',
-    dependencies = {
-      'nvim-treesitter/nvim-treesitter-textobjects',
-    },
-    build = ':TSUpdate',
-  },
-
-  -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
-  --       These are some example plugins that I've included in the kickstart repository.
-  --       Uncomment any of the lines below to enable them.
-  -- require 'kickstart.plugins.autoformat',
-  -- require 'kickstart.plugins.debug',
-
-  -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
-  --    You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping
-  --    up-to-date with whatever is in the kickstart repo.
-  --    Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-  --
-  --    For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
-  -- { import = 'custom.plugins' },
-}, {})
-
--- [[ Setting options ]]
--- See `:help vim.o`
--- NOTE: You can change these options as you wish!
-
--- Set highlight on search
-vim.o.hlsearch = false
-
--- Make line numbers default
-vim.wo.number = true
-
--- Enable mouse mode
-vim.o.mouse = 'a'
-
--- Sync clipboard between OS and Neovim.
---  Remove this option if you want your OS clipboard to remain independent.
---  See `:help 'clipboard'`
-vim.o.clipboard = 'unnamedplus'
-
--- Enable break indent
-vim.o.breakindent = true
-
--- Save undo history
-vim.o.undofile = true
-
--- Case-insensitive searching UNLESS \C or capital in search
-vim.o.ignorecase = true
-vim.o.smartcase = true
-
--- Keep signcolumn on by default
-vim.wo.signcolumn = 'yes'
-
--- Decrease update time
-vim.o.updatetime = 250
-vim.o.timeoutlen = 300
-
--- Set completeopt to have a better completion experience
-vim.o.completeopt = 'menuone,noselect'
-
--- NOTE: You should make sure your terminal supports this
-vim.o.termguicolors = true
-
--- [[ Basic Keymaps ]]
-
--- Keymaps for better default experience
--- See `:help vim.keymap.set()`
-vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
-
--- Remap for dealing with word wrap
-vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
-vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
-
--- Diagnostic keymaps
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
-vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
-
--- [[ Highlight on yank ]]
--- See `:help vim.highlight.on_yank()`
-local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
-vim.api.nvim_create_autocmd('TextYankPost', {
-  callback = function()
-    vim.highlight.on_yank()
-  end,
-  group = highlight_group,
-  pattern = '*',
-})
-
--- [[ Configure Telescope ]]
--- See `:help telescope` and `:help telescope.setup()`
-require('telescope').setup {
-  defaults = {
-    mappings = {
-      i = {
-        ['<C-u>'] = false,
-        ['<C-d>'] = false,
-      },
-    },
-  },
-}
-
--- Enable telescope fzf native, if installed
-pcall(require('telescope').load_extension, 'fzf')
-
--- Telescope live_grep in git root
--- Function to find the git root directory based on the current buffer's path
-local function find_git_root()
-  -- Use the current buffer's path as the starting point for the git search
-  local current_file = vim.api.nvim_buf_get_name(0)
-  local current_dir
-  local cwd = vim.fn.getcwd()
-  -- If the buffer is not associated with a file, return nil
-  if current_file == '' then
-    current_dir = cwd
-  else
-    -- Extract the directory from the current file's path
-    current_dir = vim.fn.fnamemodify(current_file, ':h')
-  end
-
-  -- Find the Git root directory from the current file's path
-  local git_root = vim.fn.systemlist('git -C ' .. vim.fn.escape(current_dir, ' ') .. ' rev-parse --show-toplevel')[1]
-  if vim.v.shell_error ~= 0 then
-    print 'Not a git repository. Searching on current working directory'
-    return cwd
-  end
-  return git_root
-end
-
--- Custom live_grep function to search in git root
-local function live_grep_git_root()
-  local git_root = find_git_root()
-  if git_root then
-    require('telescope.builtin').live_grep {
-      search_dirs = { git_root },
-    }
-  end
-end
-
-vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {})
-
--- See `:help telescope.builtin`
-vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
-vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
-vim.keymap.set('n', '<leader>/', function()
-  -- You can pass additional configuration to telescope to change theme, layout, etc.
-  require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
-    winblend = 10,
-    previewer = false,
-  })
-end, { desc = '[/] Fuzzily search in current buffer' })
-
-local function telescope_live_grep_open_files()
-  require('telescope.builtin').live_grep {
-    grep_open_files = true,
-    prompt_title = 'Live Grep in Open Files',
-  }
-end
-vim.keymap.set('n', '<leader>s/', telescope_live_grep_open_files, { desc = '[S]earch [/] in Open Files' })
-vim.keymap.set('n', '<leader>ss', require('telescope.builtin').builtin, { desc = '[S]earch [S]elect Telescope' })
-vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
-vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
-vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
-vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
-vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
-vim.keymap.set('n', '<leader>sG', ':LiveGrepGitRoot<cr>', { desc = '[S]earch by [G]rep on Git Root' })
-vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
-vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' })
-
--- [[ Configure Treesitter ]]
--- See `:help nvim-treesitter`
--- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
-vim.defer_fn(function()
-  require('nvim-treesitter.configs').setup {
-    -- Add languages to be installed here that you want installed for treesitter
-    ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
-
-    -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
-    auto_install = false,
-
-    highlight = { enable = true },
-    indent = { enable = true },
-    incremental_selection = {
-      enable = true,
-      keymaps = {
-        init_selection = '<c-space>',
-        node_incremental = '<c-space>',
-        scope_incremental = '<c-s>',
-        node_decremental = '<M-space>',
-      },
-    },
-    textobjects = {
-      select = {
-        enable = true,
-        lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
-        keymaps = {
-          -- You can use the capture groups defined in textobjects.scm
-          ['aa'] = '@parameter.outer',
-          ['ia'] = '@parameter.inner',
-          ['af'] = '@function.outer',
-          ['if'] = '@function.inner',
-          ['ac'] = '@class.outer',
-          ['ic'] = '@class.inner',
-        },
-      },
-      move = {
-        enable = true,
-        set_jumps = true, -- whether to set jumps in the jumplist
-        goto_next_start = {
-          [']m'] = '@function.outer',
-          [']]'] = '@class.outer',
-        },
-        goto_next_end = {
-          [']M'] = '@function.outer',
-          [']['] = '@class.outer',
-        },
-        goto_previous_start = {
-          ['[m'] = '@function.outer',
-          ['[['] = '@class.outer',
-        },
-        goto_previous_end = {
-          ['[M'] = '@function.outer',
-          ['[]'] = '@class.outer',
-        },
-      },
-      swap = {
-        enable = true,
-        swap_next = {
-          ['<leader>a'] = '@parameter.inner',
-        },
-        swap_previous = {
-          ['<leader>A'] = '@parameter.inner',
-        },
-      },
-    },
-  }
-end, 0)
-
--- [[ Configure LSP ]]
---  This function gets run when an LSP connects to a particular buffer.
-local on_attach = function(_, bufnr)
-  -- NOTE: Remember that lua is a real programming language, and as such it is possible
-  -- to define small helper and utility functions so you don't have to repeat yourself
-  -- many times.
-  --
-  -- In this case, we create a function that lets us more easily define mappings specific
-  -- for LSP related items. It sets the mode, buffer and description for us each time.
-  local nmap = function(keys, func, desc)
-    if desc then
-      desc = 'LSP: ' .. desc
-    end
-
-    vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
-  end
-
-  nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
-  nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
-
-  nmap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-  nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-  nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
-  nmap('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
-  nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-  nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-
-  -- See `:help K` for why this keymap
-  nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
-  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
-
-  -- Lesser used LSP functionality
-  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-  nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
-  nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
-  nmap('<leader>wl', function()
-    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, '[W]orkspace [L]ist Folders')
-
-  -- Create a command `:Format` local to the LSP buffer
-  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
-    vim.lsp.buf.format()
-  end, { desc = 'Format current buffer with LSP' })
-end
-
--- document existing key chains
-require('which-key').register {
-  ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
-  ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
-  ['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
-  ['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
-  ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
-  ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
-  ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
-  ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
-}
--- register which-key VISUAL mode
--- required for visual <leader>hs (hunk stage) to work
-require('which-key').register({
-  ['<leader>'] = { name = 'VISUAL <leader>' },
-  ['<leader>h'] = { 'Git [H]unk' },
-}, { mode = 'v' })
-
--- mason-lspconfig requires that these setup functions are called in this order
--- before setting up the servers.
-require('mason').setup()
-require('mason-lspconfig').setup()
-
--- Enable the following language servers
---  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
---
---  Add any additional override configuration in the following tables. They will be passed to
---  the `settings` field of the server config. You must look up that documentation yourself.
---
---  If you want to override the default filetypes that your language server will attach to you can
---  define the property 'filetypes' to the map in question.
-local servers = {
-  -- clangd = {},
-  -- gopls = {},
-  -- pyright = {},
-  -- rust_analyzer = {},
-  -- tsserver = {},
-  -- html = { filetypes = { 'html', 'twig', 'hbs'} },
-
-  lua_ls = {
-    Lua = {
-      workspace = { checkThirdParty = false },
-      telemetry = { enable = false },
-      -- NOTE: toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-      -- diagnostics = { disable = { 'missing-fields' } },
-    },
-  },
-}
-
--- Setup neovim lua configuration
-require('neodev').setup()
-
--- nvim-cmp supports additional completion capabilities, so broadcast that to servers
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
-
--- Ensure the servers above are installed
-local mason_lspconfig = require 'mason-lspconfig'
-
-mason_lspconfig.setup {
-  ensure_installed = vim.tbl_keys(servers),
-}
-
-mason_lspconfig.setup_handlers {
-  function(server_name)
-    require('lspconfig')[server_name].setup {
-      capabilities = capabilities,
-      on_attach = on_attach,
-      settings = servers[server_name],
-      filetypes = (servers[server_name] or {}).filetypes,
-    }
-  end,
-}
-
--- [[ Configure nvim-cmp ]]
--- See `:help cmp`
-local cmp = require 'cmp'
-local luasnip = require 'luasnip'
-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',
-  },
-  mapping = cmp.mapping.preset.insert {
-    ['<C-n>'] = cmp.mapping.select_next_item(),
-    ['<C-p>'] = cmp.mapping.select_prev_item(),
-    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
-    ['<C-Space>'] = cmp.mapping.complete {},
-    ['<CR>'] = cmp.mapping.confirm {
-      behavior = cmp.ConfirmBehavior.Replace,
-      select = true,
-    },
-    ['<Tab>'] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_next_item()
-      elseif luasnip.expand_or_locally_jumpable() then
-        luasnip.expand_or_jump()
-      else
-        fallback()
-      end
-    end, { 'i', 's' }),
-    ['<S-Tab>'] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_prev_item()
-      elseif luasnip.locally_jumpable(-1) then
-        luasnip.jump(-1)
-      else
-        fallback()
-      end
-    end, { 'i', 's' }),
-  },
-  sources = {
-    { name = 'nvim_lsp' },
-    { name = 'luasnip' },
-    { name = 'path' },
-  },
-}
+require('lazy').setup('plugins');
+require('settings');
 
--- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lazy-lock.json b/lazy-lock.json
new file mode 100644
index 00000000000..de42eca37cf
--- /dev/null
+++ b/lazy-lock.json
@@ -0,0 +1,39 @@
+{
+  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "LuaSnip": { "branch": "master", "commit": "6a001360cea89df50f7c5cc8c7a75e6a21f1ef5c" },
+  "catppuccin": { "branch": "main", "commit": "64dc309bc157779691be38bbfc5123584e0a4a85" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "fidget.nvim": { "branch": "main", "commit": "7b9c383438a2e490e37d57b07ddeae3ab4f4cf69" },
+  "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
+  "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" },
+  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" },
+  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
+  "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
+  "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
+  "mini.nvim": { "branch": "main", "commit": "f24747266a047617d06605a2316aa6c071662fa2" },
+  "neodev.nvim": { "branch": "main", "commit": "ef351fae5df2559956398923c5d38c9b64e7d898" },
+  "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" },
+  "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
+  "nvim-lspconfig": { "branch": "master", "commit": "84f2dd42efffa20d505ac44c78568d778ca7e0a1" },
+  "nvim-treesitter": { "branch": "master", "commit": "ab818bf5a2ee21515ade9afcf428e98056b6197b" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" },
+  "oil.nvim": { "branch": "master", "commit": "24027ed8d7f3ee5c38cfd713915e2e16d89e79b3" },
+  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
+  "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" },
+  "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "1280db1f835bd6b73a485d6f1149e02df67533c4" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
+  "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
+  "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
+  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
+  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" },
+  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
+}
\ No newline at end of file
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
deleted file mode 100644
index be0eb9d8d7a..00000000000
--- a/lua/custom/plugins/init.lua
+++ /dev/null
@@ -1,5 +0,0 @@
--- You can add your own plugins here or in other files in this directory!
---  I promise not to create any merge conflicts in this directory :)
---
--- See the kickstart.nvim README for more information
-return {}
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index 7fc783fabd4..2e8962b116a 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -7,9 +7,9 @@
 -- kickstart.nvim and not kitchen-sink.nvim ;)
 
 return {
-  -- NOTE: Yes, you can install new plugins here!
+  -- NOTE Yes, you can install new plugins here!
   'mfussenegger/nvim-dap',
-  -- NOTE: And you can specify dependencies as well
+  -- NOTE And you can specify dependencies as well
   dependencies = {
     -- Creates a beautiful debugger UI
     'rcarriga/nvim-dap-ui',
diff --git a/lua/plugins.lua b/lua/plugins.lua
new file mode 100644
index 00000000000..ef1a1c08c2a
--- /dev/null
+++ b/lua/plugins.lua
@@ -0,0 +1,9 @@
+return {
+  'tpope/vim-fugitive',
+  'tpope/vim-rhubarb',
+  'tpope/vim-sleuth',
+  { 'numToStr/Comment.nvim', opts = {} },
+
+  -- require 'kickstart.plugins.autoformat',
+  -- require 'kickstart.plugins.debug',
+};
diff --git a/lua/plugins/autocompletion.lua b/lua/plugins/autocompletion.lua
new file mode 100644
index 00000000000..f46633fe2e4
--- /dev/null
+++ b/lua/plugins/autocompletion.lua
@@ -0,0 +1,60 @@
+return {
+	-- Autocompletion
+	'hrsh7th/nvim-cmp',
+	dependencies = {
+		-- Snippet Engine & its associated nvim-cmp source
+		'L3MON4D3/LuaSnip',
+		'saadparwaiz1/cmp_luasnip',
+
+		-- Adds LSP completion capabilities
+		'hrsh7th/cmp-nvim-lsp',
+		'hrsh7th/cmp-path',
+
+		-- Adds a number of user-friendly snippets
+		'rafamadriz/friendly-snippets',
+
+		-- Auto-closing brackets, quotes, etc.
+		'windwp/nvim-autopairs',
+	},
+	config = function()
+		local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+		local cmp = require 'cmp'
+		local luasnip = require 'luasnip'
+
+		require('nvim-autopairs').setup();
+		cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
+
+		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',
+			},
+			mapping = cmp.mapping.preset.insert {
+				['<C-j>'] = cmp.mapping.select_next_item(),
+				['<C-k>'] = cmp.mapping.select_prev_item(),
+				['<C-u>'] = cmp.mapping.scroll_docs(-4),
+				['<C-d>'] = cmp.mapping.scroll_docs(4),
+				['<C-Space>'] = cmp.mapping.complete {},
+				['<Tab>'] = cmp.mapping.confirm {
+					behavior = cmp.ConfirmBehavior.Replace,
+					select = true,
+				},
+			},
+			sources = {
+				{ name = 'nvim_lsp' },
+				{ name = 'luasnip' },
+				{ name = 'path' },
+			},
+			experimental = {
+				ghost_text = true,
+			}
+		}
+	end
+}
diff --git a/lua/plugins/blankline.lua b/lua/plugins/blankline.lua
new file mode 100644
index 00000000000..91babce6554
--- /dev/null
+++ b/lua/plugins/blankline.lua
@@ -0,0 +1,5 @@
+return {
+	'lukas-reineke/indent-blankline.nvim',
+	main = 'ibl',
+	opts = {},
+}
diff --git a/lua/plugins/catpuccin.lua b/lua/plugins/catpuccin.lua
new file mode 100644
index 00000000000..4e7767b5cca
--- /dev/null
+++ b/lua/plugins/catpuccin.lua
@@ -0,0 +1,25 @@
+-- Default theme
+return {
+	'catppuccin/nvim',
+	name = 'catppuccin',
+	priority = 1000,
+	config = function()
+		require('catppuccin').setup({
+			flavour = "macchiato",
+			no_italic = false,
+			styles = {
+				comments = { 'italic' },
+				conditionals = { 'italic' },
+			},
+			integrations = {
+				cmp = true,
+				gitsigns = true,
+				harpoon = true,
+				mason = true,
+				telescope = true,
+				treesitter = true,
+			}
+		})
+		vim.cmd.colorscheme 'catppuccin'
+	end
+};
diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua
new file mode 100644
index 00000000000..de7b9232a1e
--- /dev/null
+++ b/lua/plugins/fugitive.lua
@@ -0,0 +1,10 @@
+-- UI for git commands
+return { 'tpope/vim-fugitive',
+	config = function()
+		vim.keymap.set('n', '<leader>gs', '<CMD>Git<CR>', { desc = '[G]it [S]tatus' });
+		vim.keymap.set('n', '<leader>ga', '<CMD>Git add -A<CR>', { desc = 'Stage [A]ll [G]it files' });
+		vim.keymap.set('n', '<leader>gc', '<CMD>Git commit<CR>', { desc = '[C]ommit staged [G]it files' });
+		vim.keymap.set('n', '<leader>gg', '<CMD>Git log --graph --oneline --decorate=short<CR>', { desc = '[G]it log [G]raph' });
+		vim.keymap.set('n', '<leader>gb', '<CDM>Git blame<CR>', { desc =  '[G]it [B]lame' });
+	end
+};
diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua
new file mode 100644
index 00000000000..50f9d25103a
--- /dev/null
+++ b/lua/plugins/gitsigns.lua
@@ -0,0 +1,69 @@
+-- Displays git changes in gutter
+return {
+	-- 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 = '~' },
+		},
+		on_attach = function(bufnr)
+			local gs = package.loaded.gitsigns
+
+			local function map(mode, l, r, opts)
+				opts = opts or {}
+				opts.buffer = bufnr
+				vim.keymap.set(mode, l, r, opts)
+			end
+
+			-- Navigation
+			map({ 'n', 'v' }, ']c', function()
+					if vim.wo.diff then
+						return ']c'
+					end
+					vim.schedule(function()
+						gs.next_hunk()
+					end)
+				return '<Ignore>'
+			end, { expr = true, desc = 'Jump to next hunk' })
+
+			map({ 'n', 'v' }, '[c', function()
+				if vim.wo.diff then
+					return '[c'
+				end
+				vim.schedule(function()
+					gs.prev_hunk()
+				end)
+				return '<Ignore>'
+			end, { expr = true, desc = 'Jump to previous hunk' })
+
+			-- Actions
+			-- visual mode
+			map('v', '<leader>ghs', function()
+				gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
+			end, { desc = '[S]tage [G]it [H]unk' })
+			map('v', '<leader>ghr', function()
+				gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
+			end, { desc = '[R]eset [G]it [H]unk' })
+			-- normal mode
+			map('n', '<leader>ghs', gs.stage_hunk, { desc = '[G]it [S]tage [H]unk' })
+			map('n', '<leader>ghr', gs.reset_hunk, { desc = '[G]it [R]eset [H]unk' })
+			map('n', '<leader>ghS', gs.stage_buffer, { desc = '[G]it [S]tage buffer' })
+			map('n', '<leader>ghu', gs.undo_stage_hunk, { desc = '[U]ndo stage [H]unk' })
+			map('n', '<leader>ghR', gs.reset_buffer, { desc = '[G]it [R]eset buffer' })
+			map('n', '<leader>ghp', gs.preview_hunk, { desc = '[P]review [G]it [H]unk' })
+			map('n', '<leader>ghb', function()
+				gs.blame_line { full = false }
+			end, { desc = '[G]it blame line' })
+
+			-- Toggles
+			map('n', '<leader>ghx', gs.toggle_deleted, { desc = 'toggle [G]it show deleted' })
+
+			-- Text object
+			map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select [G]it [H]unk' })
+		end
+	}
+}
diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua
new file mode 100644
index 00000000000..38a16cfc367
--- /dev/null
+++ b/lua/plugins/harpoon.lua
@@ -0,0 +1,52 @@
+-- tag and quickly switch between buffers
+return {
+		'thePrimeagen/harpoon',
+	config = function()
+		local harpoon_mark = require('harpoon.mark')
+		local harpoon_ui = require("harpoon.ui")
+
+		vim.keymap.set('n', '<leader>ho', function()
+			harpoon_ui.toggle_quick_menu()
+		end, { desc = '[O]pen [H]arpoon' })
+
+		vim.keymap.set('n', '<leader>ha', function()
+			harpoon_mark.add_file()
+		end, { desc = '[A]dd [H]arpoon file' })
+
+		vim.keymap.set('n', '<leader>hr', function()
+			harpoon_mark.rm_file()
+		end, { desc = '[R]emove [H]arpoon file' })
+
+		vim.keymap.set('n', '<leader>hc', function()
+			harpoon_mark.clear_all()
+		end, { desc = '[C]lear [H]arpoon files' })
+
+		vim.keymap.set('n', '<leader>hl', function()
+			harpoon_ui.nav_next()
+		end, { desc = 'Next [H]arpoon file' })
+
+		vim.keymap.set('n', '<leader>hh', function()
+			harpoon_ui.nav_prev()
+		end, { desc = 'Previous [H]arpoon file' })
+
+		vim.keymap.set('n', '<leader>1', function()
+			harpoon_ui.nav_file(1)
+		end, { desc = 'Navigate to file [1]' })
+
+		vim.keymap.set('n', '<leader>2', function()
+			harpoon_ui.nav_file(2)
+		end, { desc = 'Navigate to file [2]' })
+
+		vim.keymap.set('n', '<leader>3', function()
+			harpoon_ui.nav_file(3)
+		end, { desc = 'Navigate to file [3]' })
+
+		vim.keymap.set('n', '<leader>4', function()
+			harpoon_ui.nav_file(4)
+		end, { desc = 'Navigate to file [4]' })
+
+		vim.keymap.set('n', '<leader>5', function()
+			harpoon_ui.nav_file(5)
+		end, { desc = 'Navigate to file [5]' })
+	end
+}
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
new file mode 100644
index 00000000000..95b3ffa5148
--- /dev/null
+++ b/lua/plugins/lspconfig.lua
@@ -0,0 +1,99 @@
+-- Configuration for language servers
+local function keymaps(bufnr)
+	local keymap = function(keys, func, desc)
+		if desc then
+			desc = 'LSP: ' .. desc
+		end
+
+		vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
+	end
+
+	keymap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
+	keymap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
+
+	keymap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
+	keymap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
+	keymap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
+	keymap('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
+	keymap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
+	keymap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+
+	keymap('K', vim.lsp.buf.hover, 'Hover Documentation')
+	keymap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
+
+	-- Lesser used LSP functionality
+	keymap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+	keymap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
+	keymap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
+	keymap('<leader>wl', function()
+		print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+	end, '[W]orkspace [L]ist Folders')
+end
+
+return {
+	-- LSP Configuration & Plugins
+	'neovim/nvim-lspconfig',
+	dependencies = {
+		{ 'williamboman/mason.nvim', config = true },
+		'williamboman/mason-lspconfig.nvim',
+
+		-- Useful status updates for LSP
+		{ 'j-hui/fidget.nvim',       opts = {} },
+
+		-- Additional lua configuration, makes nvim stuff amazing!
+		'folke/neodev.nvim',
+	},
+	config = function()
+		local on_attach = function(_, bufnr)
+			keymaps(bufnr)
+
+			-- Create a command `:Format` local to the LSP buffer
+			vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
+				vim.lsp.buf.format()
+			end, { desc = 'Format current buffer with LSP' })
+		end
+
+		-- mason-lspconfig requires that these setup functions are called in this order
+		-- before setting up the servers.
+		require('mason').setup()
+		require('mason-lspconfig').setup()
+
+		-- Enable the following language servers
+		local servers = {
+			lua_ls = {
+				Lua = {
+					workspace = { checkThirdParty = false },
+					telemetry = { enable = false },
+				},
+			},
+			rust_analyzer = { filetypes = { 'rust', 'rs' } },
+			svelte = { filetypes = { 'svelte' } },
+			tsserver = {},
+		}
+
+		-- Setup neovim lua configuration
+		require('neodev').setup()
+
+		-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
+		local capabilities = vim.lsp.protocol.make_client_capabilities()
+		capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
+
+		-- Ensure the servers above are installed
+		local mason_lspconfig = require 'mason-lspconfig'
+
+		mason_lspconfig.setup {
+			ensure_installed = vim.tbl_keys(servers),
+		}
+
+		mason_lspconfig.setup_handlers {
+			function(server_name)
+				require('lspconfig')[server_name].setup {
+					capabilities = capabilities,
+					on_attach = on_attach,
+					settings = servers[server_name],
+					filetypes = (servers[server_name] or {}).filetypes,
+				}
+			end,
+		}
+	end
+}
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
new file mode 100644
index 00000000000..ef96d38b026
--- /dev/null
+++ b/lua/plugins/lualine.lua
@@ -0,0 +1,16 @@
+-- Informational status line at bottom of screen
+return {
+	'nvim-lualine/lualine.nvim',
+	opts = {
+		options = {
+			theme = 'catppuccin',
+			component_separators = '|',
+			section_separators = '',
+		},
+		sections = {
+			lualine_c = {
+				{ "filename", path = 1 }
+			}
+		}
+	}
+}
diff --git a/lua/plugins/markdownpreview.lua b/lua/plugins/markdownpreview.lua
new file mode 100644
index 00000000000..5ea063bf0c1
--- /dev/null
+++ b/lua/plugins/markdownpreview.lua
@@ -0,0 +1,12 @@
+return {
+	'iamcco/markdown-preview.nvim',
+	ft = 'markdown',
+	build = function()
+		vim.fn['mkdp#util#install']()
+	end,
+	cmd = {
+		'MarkdownPreviewToggle',
+		'MarkdownPreview',
+		'MarkdownStop',
+	},
+}
diff --git a/lua/plugins/ministarter.lua b/lua/plugins/ministarter.lua
new file mode 100644
index 00000000000..c88ad161d01
--- /dev/null
+++ b/lua/plugins/ministarter.lua
@@ -0,0 +1,26 @@
+-- startup screen
+return {
+	'echasnovski/mini.nvim',
+    dependencies = {
+		'nvim-telescope/telescope-file-browser.nvim',
+    },
+	config = function()
+		local mini = require('mini.starter');
+		mini.setup({
+			items = {
+				mini.sections.telescope(),
+				mini.sections.recent_files(5, true, true),
+				mini.sections.builtin_actions(),
+			},
+			content_hooks = {
+				mini.gen_hook.adding_bullet(' '),
+				mini.gen_hook.aligning('center', 'center'),
+			},
+			footer = '',
+		})
+
+		vim.keymap.set('n', '<leader>=', function()
+			mini.open()
+		end, { desc = 'Open starter' })
+	end
+}
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
new file mode 100644
index 00000000000..fe5a871d10b
--- /dev/null
+++ b/lua/plugins/oil.lua
@@ -0,0 +1,8 @@
+-- file browser
+return {
+	'stevearc/oil.nvim',
+	config = function()
+		require('oil').setup()
+		vim.keymap.set('n', '<leader>-', '<CMD>Oil --float<CR>', { desc = 'Open current directory' })
+	end
+};
diff --git a/lua/plugins/rosepine.lua b/lua/plugins/rosepine.lua
new file mode 100644
index 00000000000..0791580d6d8
--- /dev/null
+++ b/lua/plugins/rosepine.lua
@@ -0,0 +1 @@
+return { "rose-pine/neovim", name = "rose-pine" };
diff --git a/lua/plugins/rust.lua b/lua/plugins/rust.lua
new file mode 100644
index 00000000000..9fec3d2fcef
--- /dev/null
+++ b/lua/plugins/rust.lua
@@ -0,0 +1,8 @@
+-- rust language integrations
+return {
+	'rust-lang/rust.vim',
+	ft = "rust",
+	init = function ()
+		vim.g.rustfmt_autosave = 1
+	end
+};
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
new file mode 100644
index 00000000000..c77ae8b6db8
--- /dev/null
+++ b/lua/plugins/telescope.lua
@@ -0,0 +1,90 @@
+-- Fuzzy finder
+local function telescope_live_grep_open_files()
+	require('telescope.builtin').live_grep {
+		grep_open_files = true,
+		prompt_title = 'Live Grep in Open Files',
+	}
+end
+
+local function keymaps()
+	vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
+	vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
+	vim.keymap.set('n', '<leader>/', function()
+	  require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
+		winblend = 10,
+		previewer = false,
+	  })
+	end, { desc = '[/] Fuzzily search in current buffer' })
+	vim.keymap.set('n', '<leader>s/', telescope_live_grep_open_files, { desc = '[S]earch [/] in Open Files' })
+	vim.keymap.set('n', '<leader>ss', require('telescope.builtin').builtin, { desc = '[S]earch [S]elect Telescope' })
+	vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
+	vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
+	vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
+	vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
+	vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
+	vim.keymap.set('n', '<leader>sG', ':LiveGrepGitRoot<cr>', { desc = '[S]earch by [G]rep on Git Root' })
+	vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
+	vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' })
+end
+
+return {
+	'nvim-telescope/telescope.nvim',
+	branch = '0.1.x',
+	dependencies = {
+		'nvim-lua/plenary.nvim',
+
+		-- Fuzzy Finder Algorithm which requires local dependencies to be built.
+		{
+			'nvim-telescope/telescope-fzf-native.nvim',
+			build = 'make',
+			cond = function()
+				return vim.fn.executable 'make' == 1
+			end,
+		},
+	},
+	config = function()
+		require('telescope').setup {
+		  defaults = {
+			mappings = {
+			  i = {
+				['<C-u>'] = false,
+				['<C-d>'] = false,
+			  },
+			},
+		  },
+		}
+
+		pcall(require('telescope').load_extension, 'fzf')
+
+		local function find_git_root()
+		  local current_file = vim.api.nvim_buf_get_name(0)
+		  local current_dir
+		  local cwd = vim.fn.getcwd()
+		  if current_file == '' then
+			current_dir = cwd
+		  else
+			current_dir = vim.fn.fnamemodify(current_file, ':h')
+		  end
+
+		  local git_root = vim.fn.systemlist('git -C ' .. vim.fn.escape(current_dir, ' ') .. ' rev-parse --show-toplevel')[1]
+		  if vim.v.shell_error ~= 0 then
+			print 'Not a git repository. Searching on current working directory'
+			return cwd
+		  end
+		  return git_root
+		end
+
+		local function live_grep_git_root()
+		  local git_root = find_git_root()
+		  if git_root then
+			require('telescope.builtin').live_grep {
+			  search_dirs = { git_root },
+			}
+		  end
+		end
+
+		vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {})
+
+		keymaps()
+	end
+}
diff --git a/lua/plugins/todocomments.lua b/lua/plugins/todocomments.lua
new file mode 100644
index 00000000000..e4ef92f9a5d
--- /dev/null
+++ b/lua/plugins/todocomments.lua
@@ -0,0 +1,6 @@
+-- Comment highlighting for specific comment types (TODO, NOTE, HACK, FIX)
+return {
+	'folke/todo-comments.nvim',
+	dependencies = { 'nvim-lua//plenary.nvim' },
+	config = {}
+};
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
new file mode 100644
index 00000000000..246f6d4bdc5
--- /dev/null
+++ b/lua/plugins/treesitter.lua
@@ -0,0 +1,79 @@
+-- code token highlighting
+local  text_objects = {
+  select = {
+    enable = true,
+    lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
+    keymaps = {
+      -- You can use the capture groups defined in textobjects.scm
+      ['aa'] = '@parameter.outer',
+      ['ia'] = '@parameter.inner',
+      ['af'] = '@function.outer',
+      ['if'] = '@function.inner',
+      ['ac'] = '@class.outer',
+      ['ic'] = '@class.inner',
+    },
+  },
+  move = {
+    enable = true,
+    set_jumps = true, -- whether to set jumps in the jumplist
+    goto_next_start = {
+      [']m'] = '@function.outer',
+      [']]'] = '@class.outer',
+    },
+    goto_next_end = {
+      [']M'] = '@function.outer',
+      [']['] = '@class.outer',
+    },
+    goto_previous_start = {
+      ['[m'] = '@function.outer',
+      ['[['] = '@class.outer',
+    },
+    goto_previous_end = {
+      ['[M'] = '@function.outer',
+      ['[]'] = '@class.outer',
+    },
+  },
+  swap = {
+    enable = true,
+    swap_next = {
+      ['<leader>a'] = '@parameter.inner',
+    },
+    swap_previous = {
+      ['<leader>A'] = '@parameter.inner',
+    },
+  },
+}
+
+return {
+    'nvim-treesitter/nvim-treesitter',
+    dependencies = {
+		'nvim-treesitter/nvim-treesitter-textobjects',
+    },
+    build = ':TSUpdate',
+    config = function()
+      vim.defer_fn(function()
+	require('nvim-treesitter.configs').setup {
+	  -- Add languages to be installed here that you want installed for treesitter
+	  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'svelte', 'vimdoc', 'vim', 'bash' },
+
+	  auto_install = false,
+	  sync_install = false,
+	  ignore_install = {},
+	  modules = {},
+	  highlight = { enable = true },
+	  indent = { enable = true },
+	  incremental_selection = {
+	    enable = true,
+	    keymaps = {
+	      init_selection = '<c-space>',
+	      node_incremental = '<c-space>',
+	      scope_incremental = '<c-s>',
+	      node_decremental = '<M-space>',
+	    },
+	  },
+	  textobjects = text_objects,
+	}
+      end, 0)
+    end
+}
+
diff --git a/lua/plugins/vimsurround.lua b/lua/plugins/vimsurround.lua
new file mode 100644
index 00000000000..4f101a3ad84
--- /dev/null
+++ b/lua/plugins/vimsurround.lua
@@ -0,0 +1,5 @@
+return {
+	{
+		'tpope/vim-surround'
+	}
+}
diff --git a/lua/plugins/vimtmuxnavigator.lua b/lua/plugins/vimtmuxnavigator.lua
new file mode 100644
index 00000000000..e5e9aa73cc1
--- /dev/null
+++ b/lua/plugins/vimtmuxnavigator.lua
@@ -0,0 +1,5 @@
+return {
+	{
+		'christoomey/vim-tmux-navigator'
+	}
+}
diff --git a/lua/plugins/whichkey.lua b/lua/plugins/whichkey.lua
new file mode 100644
index 00000000000..f0a90b209e8
--- /dev/null
+++ b/lua/plugins/whichkey.lua
@@ -0,0 +1,21 @@
+-- displays command and key chain options and help
+return { 'folke/which-key.nvim', opts = {},
+	config = function()
+		-- document existing key chains
+		require('which-key').register {
+			['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
+			['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
+			['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
+			['<leader>gh'] = { name = '[G]it [H]unk', _ = 'which_key_ignore' },
+			['<leader>h'] = { name = '[H]arpoon'},
+			['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
+			['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
+			['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
+		}
+		-- register which-key VISUAL mode
+		require('which-key').register({
+			['<leader>'] = { name = 'VISUAL <leader>' },
+			['<leader>h'] = { 'Git [H]unk' },
+		}, { mode = 'v' })
+	end
+}
diff --git a/lua/settings.lua b/lua/settings.lua
new file mode 100644
index 00000000000..43f38458663
--- /dev/null
+++ b/lua/settings.lua
@@ -0,0 +1,78 @@
+-- Line numbers
+vim.opt.nu = true
+vim.opt.relativenumber = true
+
+-- Highlighting on search
+vim.opt.hlsearch = true
+vim.opt.incsearch = true
+
+-- Enable mouse mode
+vim.opt.mouse = ''
+
+-- Sync clipboard between OS and Neovim.
+vim.opt.clipboard = 'unnamed,unnamedplus'
+
+-- Enables cursor-line highlighting
+vim.opt.cursorline = true
+
+-- Enable spell check
+vim.opt.spell = true
+vim.opt.spelloptions = 'camel'
+
+-- FIX: tabs do not seem to be working as expected
+-- Handle indentation
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true
+vim.opt.smartindent = true
+vim.opt.breakindent = true
+
+-- Remove line wrapping
+vim.opt.wrap = false
+
+-- Scroll buffer
+vim.opt.scrolloff = 8
+
+-- Save undo history
+vim.o.undofile = true
+
+-- Case-insensitive searching UNLESS \C or capital in search
+vim.o.ignorecase = true
+vim.o.smartcase = true
+
+-- Keep signcolumn on by default
+vim.wo.signcolumn = 'yes'
+
+-- Decrease update time
+vim.o.updatetime = 250
+vim.o.timeoutlen = 300
+
+-- Set completeopt to have a better completion experience
+vim.o.completeopt = 'menuone,noselect'
+
+vim.o.termguicolors = true
+
+-- [[ Basic Keymaps ]]
+vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
+
+-- Remap for dealing with word wrap
+vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+
+-- Diagnostic keymaps
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
+vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
+vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
+vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
+
+-- Highlight on yank
+local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
+vim.api.nvim_create_autocmd('TextYankPost', {
+  callback = function()
+    vim.highlight.on_yank()
+  end,
+  group = highlight_group,
+  pattern = '*',
+})
+