diff --git a/init.lua b/init.lua
index eec899a9..625c2f24 100644
--- a/init.lua
+++ b/init.lua
@@ -1,9 +1,6 @@
--- Set <space> as the leader key
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
--- [[ Install `lazy.nvim` plugin manager ]]
---    https://github.com/folke/lazy.nvim
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
 if not vim.loop.fs_stat(lazypath) then
   vim.fn.system {
@@ -17,558 +14,7 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
--- [[ Configure plugins ]]
-require('lazy').setup({
-  -- Git related plugins
-  'tpope/vim-fugitive',
-  'tpope/vim-rhubarb',
-
-  -- Detect tabstop and shiftwidth automatically
-  'tpope/vim-sleuth',
-
-  {
-    -- LSP Configuration & Plugins
-    'neovim/nvim-lspconfig',
-    dependencies = {
-      'williamboman/mason.nvim',
-      'williamboman/mason-lspconfig.nvim',
-
-      -- Useful status updates for LSP
-      { '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 = {
-      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',
-    opts = {
-      options = {
-        icons_enabled = false,
-        theme = 'onedark',
-        component_separators = '|',
-        section_separators = '',
-      },
-    },
-  },
-
-  {
-    -- Add indentation guides even on blank lines
-    'lukas-reineke/indent-blankline.nvim',
-    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.
-      {
-        'nvim-telescope/telescope-fzf-native.nvim',
-        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',
-  },
-
-  -- require 'kickstart.plugins.autoformat',
-  -- require 'kickstart.plugins.debug',
-
-  { import = 'custom.plugins' },
-}, {})
-
--- [[ Setting options ]]
-
--- 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 = 'unnamedplus'
-
--- 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 = '*',
-})
-
--- [[ Configure Telescope ]]
-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, {})
-
-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' })
-
-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 ]]
-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 ]]
-local on_attach = function(_, bufnr)
-  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')
-
-  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
-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
-local servers = {
-  -- clangd = {},
-  -- gopls = {},
-  -- pyright = {},
-  rust_analyzer = { filetypes = {'rust', 'rs'}},
-  tsserver = {},
-  -- html = { filetypes = { 'html', 'twig', 'hbs'} },
-
-  lua_ls = {
-    Lua = {
-      workspace = { checkThirdParty = false },
-      telemetry = { enable = false },
-    },
-  },
-}
-
--- 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 ]]
-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 {},
-    ['<Tab>'] = cmp.mapping.confirm {
-      behavior = cmp.ConfirmBehavior.Replace,
-      select = true,
-    },
-  },
-  sources = {
-    { name = 'nvim_lsp' },
-    { name = 'luasnip' },
-    { name = 'path' },
-  },
-}
--- Configure Oil 
-require('oil').setup()
-vim.keymap.set('n', '<leader>-', '<CMD>Oil --float<CR>', { desc = 'Open current directory' })
-
--- Configure Todo-Comments
-require('todo-comments').setup()
-
--- Configure Theme
-require('catppuccin').setup({
-	flavour = 'macchiato',
-	no_italic = false,
-	styles = {
-		comments = { 'italic' },
-		conditionals = { 'italic' },
-	},
-	integrations = {
-		treesitter = true,
-	},
-})
-
-vim.cmd.colorscheme 'catppuccin'
-vim.opt.spell = true
-vim.opt.spelloptions = 'camel'
+require('lazy').setup('plugins');
+require('settings');
 
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
deleted file mode 100644
index d1f16ecf..00000000
--- a/lua/custom/plugins/init.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-return {
-	-- File Browser
-	{ 'stevearc/oil.nvim' },
-
-	-- Rust Format on Save
-	{
-		'rust-lang/rust.vim',
-		ft = "rust",
-		init = function ()
-			vim.g.rustfmt_autosave = 1
-		end
-	},
-
-	-- Theme
-	{ 'catppuccin/nvim', name='catppuccin', priority = 1000 },
-
-	-- Better Comments
-	{
-		'folke/todo-comments.nvim',
-		dependencies = { 'nvim-lua//plenary.nvim' }
-	},
-}
-
diff --git a/lua/plugins.lua b/lua/plugins.lua
new file mode 100644
index 00000000..ef1a1c08
--- /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 00000000..a85c7202
--- /dev/null
+++ b/lua/plugins/autocompletion.lua
@@ -0,0 +1,49 @@
+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',
+	},
+	config = function()
+		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 {},
+			['<Tab>'] = cmp.mapping.confirm {
+			  behavior = cmp.ConfirmBehavior.Replace,
+			  select = true,
+			},
+		  },
+		  sources = {
+			{ name = 'nvim_lsp' },
+			{ name = 'luasnip' },
+			{ name = 'path' },
+		  },
+		}
+	end
+}
diff --git a/lua/plugins/blankline.lua b/lua/plugins/blankline.lua
new file mode 100644
index 00000000..91babce6
--- /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 00000000..ade84e6c
--- /dev/null
+++ b/lua/plugins/catpuccin.lua
@@ -0,0 +1,16 @@
+return { 'catppuccin/nvim', name='catppuccin', priority = 1000,
+	config = function()
+		require('catppuccin').setup({
+			flavour = "macchiato",
+			no_italic = false,
+			styles = {
+				comments = { 'italic' },
+				conditionals = { 'italic' },
+			},
+			integrations = {
+				treesitter = true,
+			}
+		})
+		vim.cmd.colorscheme 'catppuccin'
+	end
+};
diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua
new file mode 100644
index 00000000..0b1c7378
--- /dev/null
+++ b/lua/plugins/gitsigns.lua
@@ -0,0 +1,73 @@
+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>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
+	}
+}
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
new file mode 100644
index 00000000..122cda60
--- /dev/null
+++ b/lua/plugins/lspconfig.lua
@@ -0,0 +1,98 @@
+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',
+		'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 = {
+		  rust_analyzer = { filetypes = {'rust', 'rs'}},
+		  tsserver = {},
+		  lua_ls = {
+			Lua = {
+			  workspace = { checkThirdParty = false },
+			  telemetry = { enable = false },
+			},
+		  },
+		}
+
+		-- 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 00000000..074ea501
--- /dev/null
+++ b/lua/plugins/lualine.lua
@@ -0,0 +1,12 @@
+return {
+	-- Set lualine as statusline
+    'nvim-lualine/lualine.nvim',
+    opts = {
+		 options = {
+			icons_enabled = false,
+			theme = 'onedark',
+			component_separators = '|',
+			section_separators = '',
+		}
+	}
+}
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
new file mode 100644
index 00000000..36593445
--- /dev/null
+++ b/lua/plugins/oil.lua
@@ -0,0 +1,6 @@
+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/rust.lua b/lua/plugins/rust.lua
new file mode 100644
index 00000000..e2a56aec
--- /dev/null
+++ b/lua/plugins/rust.lua
@@ -0,0 +1,7 @@
+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 00000000..aa12e1ca
--- /dev/null
+++ b/lua/plugins/telescope.lua
@@ -0,0 +1,89 @@
+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 00000000..2797ff53
--- /dev/null
+++ b/lua/plugins/todocomments.lua
@@ -0,0 +1,5 @@
+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 00000000..f440189e
--- /dev/null
+++ b/lua/plugins/treesitter.lua
@@ -0,0 +1,78 @@
+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()
+	-- FIX: Missing required fields in type `TSConfig`
+	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 = text_objects,
+	}
+      end, 0)
+    end
+}
+
diff --git a/lua/plugins/whichkey.lua b/lua/plugins/whichkey.lua
new file mode 100644
index 00000000..7dc820a9
--- /dev/null
+++ b/lua/plugins/whichkey.lua
@@ -0,0 +1,20 @@
+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>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
+		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 00000000..d793e745
--- /dev/null
+++ b/lua/settings.lua
@@ -0,0 +1,76 @@
+-- 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 = ''
+
+-- FIX: shared clipboard not working
+-- Sync clipboard between OS and Neovim.
+vim.opt.clipboard = 'unnamedplus'
+
+-- 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 = '*',
+})
+