diff --git a/config-files/.config/nvim/.stylua.toml b/config-files/.config/nvim/.stylua.toml
deleted file mode 100644
index 139e9397..00000000
--- a/config-files/.config/nvim/.stylua.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-column_width = 160
-line_endings = "Unix"
-indent_type = "Spaces"
-indent_width = 2
-quote_style = "AutoPreferSingle"
-call_parentheses = "None"
diff --git a/config-files/.config/nvim/doc/kickstart.txt b/config-files/.config/nvim/doc/kickstart.txt
deleted file mode 100644
index cb87ac3f..00000000
--- a/config-files/.config/nvim/doc/kickstart.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-================================================================================
-INTRODUCTION                                                  *kickstart.nvim*
-
-Kickstart.nvim is a project to help you get started on your neovim journey.
-
-                                                            *kickstart-is-not*
-It is not:
-- Complete framework for every plugin under the sun
-- Place to add every plugin that could ever be useful
-
-                                                                *kickstart-is*
-It is:
-- Somewhere that has a good start for the most common "IDE" type features:
-    - autocompletion
-    - goto-definition
-    - find references
-    - fuzzy finding
-    - and hinting at what more can be done :)
-- A place to _kickstart_ your journey.
-    - You should fork this project and use/modify it so that it matches your
-      style and preferences. If you don't want to do that, there are probably
-      other projects that would fit much better for you (and that's great!)!
-
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/config-files/.config/nvim/doc/tags b/config-files/.config/nvim/doc/tags
deleted file mode 100644
index 687ae772..00000000
--- a/config-files/.config/nvim/doc/tags
+++ /dev/null
@@ -1,3 +0,0 @@
-kickstart-is	kickstart.txt	/*kickstart-is*
-kickstart-is-not	kickstart.txt	/*kickstart-is-not*
-kickstart.nvim	kickstart.txt	/*kickstart.nvim*
diff --git a/config-files/.config/nvim/init.lua b/config-files/.config/nvim/init.lua
index ae160b87..25e61c25 100644
--- a/config-files/.config/nvim/init.lua
+++ b/config-files/.config/nvim/init.lua
@@ -1,10 +1,16 @@
+------------------------------------------------------------------------------
+-- GLOBAL
+------------------------------------------------------------------------------
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 vim.g.have_nerd_font = true
+vim.wo.fillchars = 'eob: '
 
--- NOTE: OPTIONS
+------------------------------------------------------------------------------
+--  OPTIONS
 --  See `:help vim.opt`
 --  For more options, you can see `:help option-list`
+------------------------------------------------------------------------------
 
 vim.opt.number = true -- Enable line numbers
 vim.opt.relativenumber = true -- Lines are relative (helps with jumping)
@@ -29,781 +35,159 @@ vim.opt.listchars = {
 vim.opt.inccommand = 'split' -- Preview substitutions
 vim.opt.cursorline = true
 vim.opt.scrolloff = 10
+vim.o.termguicolors = true
 
--- NOTE: Basic Keymaps
+------------------------------------------------------------------------------
+-- KEYMAPS
 --  See `:help vim.keymap.set()`
+------------------------------------------------------------------------------
 
 -- Set highlight on search, but clear on pressing <Esc> in normal mode
 vim.opt.hlsearch = true
 vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
 
--- Diagnostic keymaps
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, {
-  desc = 'Go to previous [D]iagnostic message'
-})
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, {
-  desc = 'Go to next [D]iagnostic message'
-})
-vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, {
-  desc = 'Show diagnostic [E]rror messages'
-})
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, {
-  desc = 'Open diagnostic [Q]uickfix list'
-})
+------------------------------------------------------------------------------
+-- INSTALL LAZY.NVIM
+------------------------------------------------------------------------------
 
--- 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.
---
--- 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'
-})
-
--- 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'
-})
-
--- NOTE: Basic Autocommands
---  See `:help lua-guide-autocommands`
-
--- Highlight when yanking (copying) text
---  Try it with `yap` in normal mode
---  See `:help vim.highlight.on_yank()`
-vim.api.nvim_create_autocmd('TextYankPost', {
-  desc = 'Highlight when yanking (copying) text',
-  group = vim.api.nvim_create_augroup('kickstart-highlight-yank', {
-    clear = true
-  }),
-  callback = function()
-    vim.highlight.on_yank()
+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
+    vim.api.nvim_echo(
+      {{"Failed to clone lazy.nvim:\n", "ErrorMsg"}, {out, "WarningMsg"}, {"\nPress any key to exit..."}}, true, {})
+    vim.fn.getchar()
+    os.exit(1)
   end
-})
-
--- NOTE: 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.loop.fs_stat(lazypath) then
-  local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
-  vim.fn.system {'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath}
-end ---@diagnostic disable-next-line: undefined-field
+end
 vim.opt.rtp:prepend(lazypath)
 
--- NOTE: 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
---
-require('lazy').setup({'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
-{
-  'numToStr/Comment.nvim',
-  opts = {}
-}, -- "gc" to comment visual regions/lines
-{ -- 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 = '~'
-      }
-    }
-  }
-}, { -- Useful plugin to show you pending keybinds.
-  'folke/which-key.nvim',
-  event = 'VimEnter', -- Sets the loading event to 'VimEnter'
-  config = function() -- This is the function that runs, AFTER loading
-    require('which-key').setup()
+------------------------------------------------------------------------------
+-- SET UP PLUGINS
+------------------------------------------------------------------------------
 
-    -- 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>r'] = {
-        name = '[R]ename',
-        _ = 'which_key_ignore'
-      },
-      ['<leader>s'] = {
-        name = '[S]earch',
-        _ = 'which_key_ignore'
-      },
-      ['<leader>w'] = {
-        name = '[W]orkspace',
-        _ = 'which_key_ignore'
-      },
-      ['<leader>t'] = {
-        name = '[T]oggle',
-        _ = 'which_key_ignore'
-      },
-      ['<leader>h'] = {
-        name = 'Git [H]unk',
-        _ = 'which_key_ignore'
-      }
-    }
-    -- visual mode
-    require('which-key').register({
-      ['<leader>h'] = {'Git [H]unk'}
-    }, {
-      mode = 'v'
-    })
-  end
-}, { -- 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
-  }},
+require('lazy').setup({{ -- Syntax Highlighting / Simple Code Completion
+  "nvim-treesitter/nvim-treesitter",
   config = function()
-    -- Two important keymaps to use while in Telescope are:
-    --  - Insert mode: <c-/>
-    --  - Normal mode: ?
-    -- [[ 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()}
+    require'nvim-treesitter.configs'.setup {
+      ensure_installed = {"c", "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline", "bash", "python"},
+      auto_install = true,
+      highlight = {
+        enable = true
       }
     }
-
-    -- 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
-}, { -- NOTE: LSP Configuration & Plugins
-  'neovim/nvim-lspconfig',
-  dependencies = { -- Automatically install LSPs and related tools to stdpath for Neovim
-  {
-    'williamboman/mason.nvim',
-    config = true
-  }, 'williamboman/mason-lspconfig.nvim', 'WhoIsSethDaniel/mason-tool-installer.nvim',
-
-  -- Useful status updates for LSP.
-  -- `opts = {}` is the same as calling `require('fidget').setup({})`
-  {
-    'j-hui/fidget.nvim',
-    opts = {}
-  }, -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins
-  -- used for completion, annotations and signatures of Neovim apis
-  {
-    'folke/neodev.nvim',
-    opts = {}
-  }},
-  config = function()
-    vim.api.nvim_create_autocmd('LspAttach', {
-      group = vim.api.nvim_create_augroup('kickstart-lsp-attach', {
-        clear = true
-      }),
-      callback = function(event)
-        local map = function(keys, func, desc)
-          vim.keymap.set('n', 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')
-
-        -- Opens a popup that displays documentation about the word under your cursor
-        --  See `:help K` for why this keymap.
-        map('K', vim.lsp.buf.hover, 'Hover Documentation')
-
-        -- 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.server_capabilities.documentHighlightProvider 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 autocommand is used to enable 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.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then
-          map('<leader>th', function()
-            vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
-          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 (`tsserver`) will work just fine
-      -- tsserver = {},
-      --
-
-      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 tsserver)
-        server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
-        require('lspconfig')[server_name].setup(server)
-      end}
-    }
   end
-}, { -- Autoformat
-  'stevearc/conform.nvim',
-  lazy = false,
-  keys = {{
-    '<leader>f',
-    function()
-      require('conform').format {
-        async = true,
-        lsp_fallback = true
-      }
-    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
-      }
-      return {
-        timeout_ms = 500,
-        lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype]
-      }
-    end,
-    formatters_by_ft = {
-      lua = {'stylua'}
-      -- Conform can also run multiple formatters sequentially
-      -- python = { "isort", "black" },
-      --
-      -- You can use a sub-list to tell conform to run *until* a formatter
-      -- is found.
-      -- javascript = { { "prettierd", "prettier" } },
-    }
-  }
-}, { -- 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'},
+}, {
+  "Mofiqul/adwaita.nvim",
+  priority = 1000,
   config = function()
-    -- See `:help cmp`
-    local cmp = require 'cmp'
-    local luasnip = require 'luasnip'
-    luasnip.config.setup {}
+    vim.g.adwaita_transparent = true
+    vim.cmd.colorscheme "adwaita"
+  end
+}, {
+  'nvim-lualine/lualine.nvim',
+  dependencies = {'nvim-tree/nvim-web-devicons'},
+  config = function()
+    local colors = {
+      cyan = '#2aa1b3',
+      black = '#1f1f1f',
+      white = '#ffffff',
+      red = '#c01c28',
+      grey = '#303030',
+      yellow = '#a2734c',
+      green = '#26a269'
+    }
 
-    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
+    local bubbles_theme = {
+      normal = {
+        a = {
+          fg = colors.black,
+          bg = colors.green
         },
-
-        -- 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
+        b = {
+          fg = colors.white,
+          bg = colors.grey
+        },
+        c = {
+          fg = colors.white
+        }
       },
-      sources = {{
-        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`.
-  'ellisonleao/gruvbox.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 'gruvbox'
 
-    -- 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 [']quote
-    --  - ci'  - [C]hange [I]nside [']quote
-    require('mini.ai').setup {
-      n_lines = 500
-    }
+      insert = {
+        a = {
+          fg = colors.black,
+          bg = colors.yellow
+        }
+      },
+      visual = {
+        a = {
+          fg = colors.black,
+          bg = colors.cyan
+        }
+      },
+      replace = {
+        a = {
+          fg = colors.black,
+          bg = colors.red
+        }
+      },
 
-    -- 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',
-  opts = {
-    ensure_installed = {'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', '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'}
-    }
-  },
-  config = function(_, opts)
-    -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
-
-    -- Prefer git instead of curl in order to improve connectivity in some environments
-    require('nvim-treesitter.install').prefer_git = true
-    ---@diagnostic disable-next-line: missing-fields
-    require('nvim-treesitter.configs').setup(opts)
-
-    -- 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
-  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.
-{
-  'windwp/nvim-autopairs',
-  event = 'InsertEnter',
-  -- Optional dependency
-  dependencies = {'hrsh7th/nvim-cmp'},
-  config = function()
-    require('nvim-autopairs').setup {}
-    -- If you want to automatically add `(` after selecting a function or method
-    local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
-    local cmp = require 'cmp'
-    cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
-  end
-}, {
-  'nvim-neo-tree/neo-tree.nvim',
-  version = '*',
-  dependencies = {'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
-  'MunifTanjim/nui.nvim'},
-  cmd = 'Neotree',
-  keys = {{'\\', ':Neotree reveal<CR>', {
-    desc = 'NeoTree reveal'
-  }}},
-  opts = {
-    filesystem = {
-      window = {
-        mappings = {
-          ['\\'] = 'close_window'
+      inactive = {
+        a = {
+          fg = colors.white,
+          bg = colors.black
+        },
+        b = {
+          fg = colors.white,
+          bg = colors.black
+        },
+        c = {
+          fg = colors.white
         }
       }
     }
-  }
-} -- 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.gitsigns', -- adds gitsigns recommend keymaps
--- 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' },
-}, {
-  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
+    require('lualine').setup {
+      options = {
+        icons_enabled = true,
+        theme = bubbles_theme,
+        component_separators = '',
+        section_separators = {
+          left = '',
+          right = ''
+        }
+      },
+      sections = {
+        lualine_a = {{
+          'mode',
+          separator = {
+            left = ''
+          },
+          right_padding = 2
+        }},
+        lualine_b = {'filename', 'branch'},
+        lualine_c = {'%=' --[[ add your center compoentnts here in place of this comment ]] },
+        lualine_x = {},
+        lualine_y = {'filetype', 'progress'},
+        lualine_z = {{
+          'location',
+          separator = {
+            right = ''
+          },
+          left_padding = 2
+        }}
+      },
+      inactive_sections = {
+        lualine_a = {'filename'},
+        lualine_b = {},
+        lualine_c = {},
+        lualine_x = {},
+        lualine_y = {},
+        lualine_z = {'location'}
+      },
+      tabline = {},
+      extensions = {}
+    }
+  end
+}})
diff --git a/config-files/.config/nvim/lua/custom/plugins/init.lua b/config-files/.config/nvim/lua/custom/plugins/init.lua
deleted file mode 100644
index be0eb9d8..00000000
--- a/config-files/.config/nvim/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/config-files/.config/nvim/lua/kickstart/health.lua b/config-files/.config/nvim/lua/kickstart/health.lua
deleted file mode 100644
index ae790d6d..00000000
--- a/config-files/.config/nvim/lua/kickstart/health.lua
+++ /dev/null
@@ -1,50 +0,0 @@
---[[
---
--- This file is not required for your own configuration,
--- but helps people determine if their system is setup correctly.
---
---]] local check_version = function()
-  local verstr = string.format('%s.%s.%s', vim.version().major, vim.version().minor, vim.version().patch)
-  if not vim.version.cmp then
-    vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
-    return
-  end
-
-  if vim.version.cmp(vim.version(), {0, 9, 4}) >= 0 then
-    vim.health.ok(string.format("Neovim version is: '%s'", verstr))
-  else
-    vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
-  end
-end
-
-local check_external_reqs = function()
-  -- Basic utils: `git`, `make`, `unzip`
-  for _, exe in ipairs {'git', 'make', 'unzip', 'rg'} do
-    local is_executable = vim.fn.executable(exe) == 1
-    if is_executable then
-      vim.health.ok(string.format("Found executable: '%s'", exe))
-    else
-      vim.health.warn(string.format("Could not find executable: '%s'", exe))
-    end
-  end
-
-  return true
-end
-
-return {
-  check = function()
-    vim.health.start 'kickstart.nvim'
-
-    vim.health.info [[NOTE: Not every warning is a 'must-fix' in `:checkhealth`
-
-  Fix only warnings for plugins and languages you intend to use.
-    Mason will give warnings for languages that are not installed.
-    You do not need to install, unless you want to use those languages!]]
-
-    local uv = vim.uv or vim.loop
-    vim.health.info('System Information: ' .. vim.inspect(uv.os_uname()))
-
-    check_version()
-    check_external_reqs()
-  end
-}
diff --git a/config-files/.config/nvim/lua/kickstart/plugins/debug.lua b/config-files/.config/nvim/lua/kickstart/plugins/debug.lua
deleted file mode 100644
index ea67698c..00000000
--- a/config-files/.config/nvim/lua/kickstart/plugins/debug.lua
+++ /dev/null
@@ -1,102 +0,0 @@
--- 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'},
-  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'}
-    }
-
-    -- Basic debugging keymaps, feel free to change to your liking!
-    vim.keymap.set('n', '<F5>', dap.continue, {
-      desc = 'Debug: Start/Continue'
-    })
-    vim.keymap.set('n', '<F1>', dap.step_into, {
-      desc = 'Debug: Step Into'
-    })
-    vim.keymap.set('n', '<F2>', dap.step_over, {
-      desc = 'Debug: Step Over'
-    })
-    vim.keymap.set('n', '<F3>', dap.step_out, {
-      desc = 'Debug: Step Out'
-    })
-    vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint, {
-      desc = 'Debug: Toggle Breakpoint'
-    })
-    vim.keymap.set('n', '<leader>B', function()
-      dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
-    end, {
-      desc = 'Debug: Set Breakpoint'
-    })
-
-    -- 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 = '⏏'
-        }
-      }
-    }
-
-    -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
-    vim.keymap.set('n', '<F7>', dapui.toggle, {
-      desc = 'Debug: See last session result.'
-    })
-
-    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/config-files/.config/nvim/lua/kickstart/plugins/gitsigns.lua b/config-files/.config/nvim/lua/kickstart/plugins/gitsigns.lua
deleted file mode 100644
index 83487cdd..00000000
--- a/config-files/.config/nvim/lua/kickstart/plugins/gitsigns.lua
+++ /dev/null
@@ -1,94 +0,0 @@
--- Adds git related signs to the gutter, as well as utilities for managing changes
--- NOTE: gitsigns is already included in init.lua but contains only the base
--- config. This will add also the recommended keymaps.
-return {{
-  'lewis6991/gitsigns.nvim',
-  opts = {
-    on_attach = function(bufnr)
-      local gitsigns = require 'gitsigns'
-
-      local function map(mode, l, r, opts)
-        opts = opts or {}
-        opts.buffer = bufnr
-        vim.keymap.set(mode, l, r, opts)
-      end
-
-      -- Navigation
-      map('n', ']c', function()
-        if vim.wo.diff then
-          vim.cmd.normal {
-            ']c',
-            bang = true
-          }
-        else
-          gitsigns.nav_hunk 'next'
-        end
-      end, {
-        desc = 'Jump to next git [c]hange'
-      })
-
-      map('n', '[c', function()
-        if vim.wo.diff then
-          vim.cmd.normal {
-            '[c',
-            bang = true
-          }
-        else
-          gitsigns.nav_hunk 'prev'
-        end
-      end, {
-        desc = 'Jump to previous git [c]hange'
-      })
-
-      -- Actions
-      -- visual mode
-      map('v', '<leader>hs', function()
-        gitsigns.stage_hunk {vim.fn.line '.', vim.fn.line 'v'}
-      end, {
-        desc = 'stage git hunk'
-      })
-      map('v', '<leader>hr', function()
-        gitsigns.reset_hunk {vim.fn.line '.', vim.fn.line 'v'}
-      end, {
-        desc = 'reset git hunk'
-      })
-      -- normal mode
-      map('n', '<leader>hs', gitsigns.stage_hunk, {
-        desc = 'git [s]tage hunk'
-      })
-      map('n', '<leader>hr', gitsigns.reset_hunk, {
-        desc = 'git [r]eset hunk'
-      })
-      map('n', '<leader>hS', gitsigns.stage_buffer, {
-        desc = 'git [S]tage buffer'
-      })
-      map('n', '<leader>hu', gitsigns.undo_stage_hunk, {
-        desc = 'git [u]ndo stage hunk'
-      })
-      map('n', '<leader>hR', gitsigns.reset_buffer, {
-        desc = 'git [R]eset buffer'
-      })
-      map('n', '<leader>hp', gitsigns.preview_hunk, {
-        desc = 'git [p]review hunk'
-      })
-      map('n', '<leader>hb', gitsigns.blame_line, {
-        desc = 'git [b]lame line'
-      })
-      map('n', '<leader>hd', gitsigns.diffthis, {
-        desc = 'git [d]iff against index'
-      })
-      map('n', '<leader>hD', function()
-        gitsigns.diffthis '@'
-      end, {
-        desc = 'git [D]iff against last commit'
-      })
-      -- Toggles
-      map('n', '<leader>tb', gitsigns.toggle_current_line_blame, {
-        desc = '[T]oggle git show [b]lame line'
-      })
-      map('n', '<leader>tD', gitsigns.toggle_deleted, {
-        desc = '[T]oggle git show [D]eleted'
-      })
-    end
-  }
-}}
diff --git a/config-files/.config/nvim/lua/kickstart/plugins/indent_line.lua b/config-files/.config/nvim/lua/kickstart/plugins/indent_line.lua
deleted file mode 100644
index 402eb808..00000000
--- a/config-files/.config/nvim/lua/kickstart/plugins/indent_line.lua
+++ /dev/null
@@ -1,7 +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/config-files/.config/nvim/lua/kickstart/plugins/lint.lua b/config-files/.config/nvim/lua/kickstart/plugins/lint.lua
deleted file mode 100644
index ae18f696..00000000
--- a/config-files/.config/nvim/lua/kickstart/plugins/lint.lua
+++ /dev/null
@@ -1,54 +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()
-        require('lint').try_lint()
-      end
-    })
-  end
-}}
diff --git a/config-files/.config/nvim/lua/kickstart/plugins/neo-tree.lua b/config-files/.config/nvim/lua/kickstart/plugins/neo-tree.lua
deleted file mode 100644
index 9927d0b4..00000000
--- a/config-files/.config/nvim/lua/kickstart/plugins/neo-tree.lua
+++ /dev/null
@@ -1,21 +0,0 @@
--- Neo-tree is a Neovim plugin to browse the file system
--- https://github.com/nvim-neo-tree/neo-tree.nvim
-return {
-  'nvim-neo-tree/neo-tree.nvim',
-  version = '*',
-  dependencies = {'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
-  'MunifTanjim/nui.nvim'},
-  cmd = 'Neotree',
-  keys = {{'\\', ':Neotree reveal<CR>', {
-    desc = 'NeoTree reveal'
-  }}},
-  opts = {
-    filesystem = {
-      window = {
-        mappings = {
-          ['\\'] = 'close_window'
-        }
-      }
-    }
-  }
-}
diff --git a/config-files/.config/tmux/tmux.conf b/config-files/.config/tmux/tmux.conf
index aca34c5f..d4249e18 100644
--- a/config-files/.config/tmux/tmux.conf
+++ b/config-files/.config/tmux/tmux.conf
@@ -1,9 +1,6 @@
 # easy reload config
 bind-key r source-file ~/.config/tmux/tmux.conf \; display-message "Config reloaded."
 
-# Enable full colors
-set-option -sa terminal-overrides ",xterm*:Tc"
-
 # set window split
 bind-key v split-window -h -c "#{pane_current_path}"
 bind-key b split-window -v -c "#{pane_current_path}"
@@ -49,11 +46,17 @@ set -g mouse on
 
 # VIM Options
 set-option -g focus-events on
-set-option -sa terminal-features ',foot:RGB'
+
+# Truecolor support
+set -g default-terminal "$TERM"
+set -ag terminal-overrides ",$TERM:Tc"
 
 # Remove confirm prompt when closing pane
 bind-key x kill-pane
 
+# Place statusbar at the top
+set-option -g status-position top
+
 # Load TMUX Plugins
 set -g @catppuccin_window_left_separator ""
 set -g @catppuccin_window_right_separator " "
diff --git a/config-files/.vim/autoload/plug.vim b/config-files/.config/vim/autoload/plug.vim
similarity index 100%
rename from config-files/.vim/autoload/plug.vim
rename to config-files/.config/vim/autoload/plug.vim
diff --git a/config-files/.vim/pack/themes/start/gruvbox/autoload/airline/themes/gruvbox.vim b/config-files/.config/vim/pack/themes/start/gruvbox/autoload/airline/themes/gruvbox.vim
similarity index 100%
rename from config-files/.vim/pack/themes/start/gruvbox/autoload/airline/themes/gruvbox.vim
rename to config-files/.config/vim/pack/themes/start/gruvbox/autoload/airline/themes/gruvbox.vim
diff --git a/config-files/.vim/pack/themes/start/gruvbox/autoload/gruvbox.vim b/config-files/.config/vim/pack/themes/start/gruvbox/autoload/gruvbox.vim
similarity index 100%
rename from config-files/.vim/pack/themes/start/gruvbox/autoload/gruvbox.vim
rename to config-files/.config/vim/pack/themes/start/gruvbox/autoload/gruvbox.vim
diff --git a/config-files/.vim/pack/themes/start/gruvbox/autoload/lightline/colorscheme/gruvbox.vim b/config-files/.config/vim/pack/themes/start/gruvbox/autoload/lightline/colorscheme/gruvbox.vim
similarity index 100%
rename from config-files/.vim/pack/themes/start/gruvbox/autoload/lightline/colorscheme/gruvbox.vim
rename to config-files/.config/vim/pack/themes/start/gruvbox/autoload/lightline/colorscheme/gruvbox.vim
diff --git a/config-files/.vim/pack/themes/start/gruvbox/colors/gruvbox.vim b/config-files/.config/vim/pack/themes/start/gruvbox/colors/gruvbox.vim
similarity index 100%
rename from config-files/.vim/pack/themes/start/gruvbox/colors/gruvbox.vim
rename to config-files/.config/vim/pack/themes/start/gruvbox/colors/gruvbox.vim
diff --git a/config-files/.vim/pack/themes/start/gruvbox/gruvbox_256palette.sh b/config-files/.config/vim/pack/themes/start/gruvbox/gruvbox_256palette.sh
similarity index 100%
rename from config-files/.vim/pack/themes/start/gruvbox/gruvbox_256palette.sh
rename to config-files/.config/vim/pack/themes/start/gruvbox/gruvbox_256palette.sh
diff --git a/config-files/.vim/pack/themes/start/gruvbox/gruvbox_256palette_osx.sh b/config-files/.config/vim/pack/themes/start/gruvbox/gruvbox_256palette_osx.sh
similarity index 100%
rename from config-files/.vim/pack/themes/start/gruvbox/gruvbox_256palette_osx.sh
rename to config-files/.config/vim/pack/themes/start/gruvbox/gruvbox_256palette_osx.sh
diff --git a/config-files/.vim/pack/themes/start/vim-code-dark/autoload/airline/themes/codedark.vim b/config-files/.config/vim/pack/themes/start/vim-code-dark/autoload/airline/themes/codedark.vim
similarity index 100%
rename from config-files/.vim/pack/themes/start/vim-code-dark/autoload/airline/themes/codedark.vim
rename to config-files/.config/vim/pack/themes/start/vim-code-dark/autoload/airline/themes/codedark.vim
diff --git a/config-files/.vim/pack/themes/start/vim-code-dark/autoload/lightline/colorscheme/codedark.vim b/config-files/.config/vim/pack/themes/start/vim-code-dark/autoload/lightline/colorscheme/codedark.vim
similarity index 100%
rename from config-files/.vim/pack/themes/start/vim-code-dark/autoload/lightline/colorscheme/codedark.vim
rename to config-files/.config/vim/pack/themes/start/vim-code-dark/autoload/lightline/colorscheme/codedark.vim
diff --git a/config-files/.vim/pack/themes/start/vim-code-dark/base16/schemes/codedark/codedark.yaml b/config-files/.config/vim/pack/themes/start/vim-code-dark/base16/schemes/codedark/codedark.yaml
similarity index 100%
rename from config-files/.vim/pack/themes/start/vim-code-dark/base16/schemes/codedark/codedark.yaml
rename to config-files/.config/vim/pack/themes/start/vim-code-dark/base16/schemes/codedark/codedark.yaml
diff --git a/config-files/.vim/pack/themes/start/vim-code-dark/base16/templates/putty/putty/base16-codedark.reg b/config-files/.config/vim/pack/themes/start/vim-code-dark/base16/templates/putty/putty/base16-codedark.reg
similarity index 100%
rename from config-files/.vim/pack/themes/start/vim-code-dark/base16/templates/putty/putty/base16-codedark.reg
rename to config-files/.config/vim/pack/themes/start/vim-code-dark/base16/templates/putty/putty/base16-codedark.reg
diff --git a/config-files/.vim/pack/themes/start/vim-code-dark/base16/templates/shell/scripts/base16-codedark.sh b/config-files/.config/vim/pack/themes/start/vim-code-dark/base16/templates/shell/scripts/base16-codedark.sh
similarity index 100%
rename from config-files/.vim/pack/themes/start/vim-code-dark/base16/templates/shell/scripts/base16-codedark.sh
rename to config-files/.config/vim/pack/themes/start/vim-code-dark/base16/templates/shell/scripts/base16-codedark.sh
diff --git a/config-files/.vim/pack/themes/start/vim-code-dark/colors/codedark.vim b/config-files/.config/vim/pack/themes/start/vim-code-dark/colors/codedark.vim
similarity index 100%
rename from config-files/.vim/pack/themes/start/vim-code-dark/colors/codedark.vim
rename to config-files/.config/vim/pack/themes/start/vim-code-dark/colors/codedark.vim
diff --git a/config-files/.vim/vimrc b/config-files/.config/vim/vimrc
similarity index 100%
rename from config-files/.vim/vimrc
rename to config-files/.config/vim/vimrc
diff --git a/config-files/.config/zed/settings.json b/config-files/.config/zed/settings.json
deleted file mode 100644
index 0d03861f..00000000
--- a/config-files/.config/zed/settings.json
+++ /dev/null
@@ -1,139 +0,0 @@
-// Trude's Zed Settings
-//
-// For information on how to configure Zed, see the Zed
-// documentation: https://zed.dev/docs/configuring-zed
-//
-// To see all of Zed's default settings without changing your
-// custom settings, run the `open default settings` command
-// from the command palette or from `Zed` application menu.
-{
-  "base_keymap": "VSCode",
-  "vim_mode": false,
-  "telemetry": {
-    "diagnostics": false,
-    "metrics": false
-  },
-  "ui_font_size": 14,
-  "buffer_font_size": 14,
-  "buffer_font_family": "JetBrainsMono NF",
-  "buffer_font_features": {
-    // Enable ligatures:
-    "calt": true
-  },
-  "buffer_font_weight": 300,
-  "buffer_line_height": "comfortable",
-  "ui_font_family": "JetBrainsMono NF",
-  // The OpenType features to enable for text in the UI
-  "ui_font_features": {
-    "calt": true
-  },
-  "hover_popover_enabled": true,
-  "confirm_quit": false,
-  "restore_on_startup": "last_workspace",
-  "show_completions_on_input": true,
-  "show_completion_documentation": true,
-  "show_wrap_guides": true,
-  "redact_private_values": true,
-  "private_files": [
-    "**/.env*",
-    "**/*.pem",
-    "**/*.key",
-    "**/*.cert",
-    "**/*.crt",
-    "**/secrets.yml"
-  ],
-  "use_on_type_format": true,
-  "use_autoclose": true,
-  "use_auto_surround": true,
-  "always_treat_brackets_as_autoclosed": false,
-  "show_inline_completions": true,
-  "calls": {
-    "mute_on_join": true,
-    "share_on_join": false
-  },
-  "toolbar": {
-    "breadcrumbs": true,
-    "quick_actions": true,
-    "selections_menu": true
-  },
-  "message_editor": {
-    "auto_replace_emoji_shortcode": false
-  },
-  "enable_language_server": true,
-  "autosave": "off",
-  "tab_bar": {
-    "show": true,
-    "show_nav_history_buttons": true
-  },
-  "tabs": {
-    "git_status": false,
-    "close_position": "right"
-  },
-  "format_on_save": "on",
-  "formatter": "auto",
-  "auto_update": true,
-  "file_scan_exclusions": [
-    "**/.git",
-    "**/.svn",
-    "**/.hg",
-    "**/CVS",
-    "**/.DS_Store",
-    "**/Thumbs.db",
-    "**/.classpath",
-    "**/.settings"
-  ],
-  "auto_install_extensions": {
-    "html": true,
-    "make": true,
-    "emmet": true
-  },
-  "languages": {
-    "C": {
-      "format_on_save": "on"
-    },
-    "C++": {
-      "format_on_save": "on"
-    }
-  },
-  "vim": {
-    "use_system_clipboard": "always",
-    "use_multiline_find": false,
-    "use_smartcase_find": false
-  },
-  "server_url": "https://zed.dev",
-  "terminal": {
-    "shell": "system",
-    "dock": "bottom",
-    "default_width": 640,
-    "default_height": 320,
-    "working_directory": "current_project_directory",
-    "blinking": "terminal_controlled",
-    "alternate_scroll": "on",
-    "option_as_meta": false,
-    "copy_on_select": true,
-    "button": true,
-    "env": {
-      // "KEY": "value1:value2"
-    },
-    "line_height": "standard",
-    "detect_venv": {
-      "on": {
-        "directories": [".env", "env", ".venv", "venv"],
-        "activate_script": "default"
-      }
-    },
-    "toolbar": {
-      "title": true
-    }
-  },
-  "code_actions_on_format": {},
-  "tasks": {
-    "variables": {}
-  },
-  "show_whitespaces": "selection",
-  "theme": {
-    "mode": "system",
-    "light": "One Light",
-    "dark": "Ayu Dark"
-  }
-}