diff --git a/config-files/.bashrc b/config-files/.bashrc
index 8eb4a687..9718737f 100644
--- a/config-files/.bashrc
+++ b/config-files/.bashrc
@@ -1,5 +1,5 @@
-export EDITOR="nvim";
-export PS1="\n[\[\e[37m\]\u\[\e[0m\]@\[\e[37;2m\]\h\[\e[0m\]] \[\e[1m\]\w \[\e[0;2m\]J:\[\e[0m\]\j\n\$ ";
+export EDITOR="nvim"
+export PS1="\n[\[\e[37m\]\u\[\e[0m\]@\[\e[37;2m\]\h\[\e[0m\]] \[\e[1m\]\w \[\e[0;2m\]J:\[\e[0m\]\j\n\$ "
 
 extract() {
   if [ -f $1 ]; then
@@ -35,37 +35,40 @@ pushall() {
   fi
 }
 
-hex2color(){
-    hex=${1#"#"}
-    r=$(printf '0x%0.2s' "$hex")
-    g=$(printf '0x%0.2s' ${hex#??})
-    b=$(printf '0x%0.2s' ${hex#????})
-    printf '%03d' "$(( (r<75?0:(r-35)/40)*6*6 +
-                       (g<75?0:(g-35)/40)*6   +
-                       (b<75?0:(b-35)/40)     + 16 ))"
+hex2color() {
+  hex=${1#"#"}
+  r=$(printf '0x%0.2s' "$hex")
+  g=$(printf '0x%0.2s' ${hex#??})
+  b=$(printf '0x%0.2s' ${hex#????})
+  printf '%03d' "$(((r < 75 ? 0 : (r - 35) / 40) * 6 * 6 + (\
+  g < 75 ? 0 : (g - 35) / 40) * 6 + (\
+  b < 75 ? 0 : (b - 35) / 40) + 16))"
 }
 
-color2hex(){
-    dec=$(($1%256))   ### input must be a number in range 0-255.
-    if [ "$dec" -lt "16" ]; then
-        bas=$(( dec%16 ))
-        mul=128
-        [ "$bas" -eq "7" ] && mul=192
-        [ "$bas" -eq "8" ] && bas=7
-        [ "$bas" -gt "8" ] && mul=255
-        a="$((  (bas&1)    *mul ))"
-        b="$(( ((bas&2)>>1)*mul ))"
-        c="$(( ((bas&4)>>2)*mul ))"
-        printf 'dec= %3s basic= #%02x%02x%02x\n' "$dec" "$a" "$b" "$c"
-    elif [ "$dec" -gt 15 ] && [ "$dec" -lt 232 ]; then
-        b=$(( (dec-16)%6  )); b=$(( b==0?0: b*40 + 55 ))
-        g=$(( (dec-16)/6%6)); g=$(( g==0?0: g*40 + 55 ))
-        r=$(( (dec-16)/36 )); r=$(( r==0?0: r*40 + 55 ))
-        printf 'dec= %3s color= #%02x%02x%02x\n' "$dec" "$r" "$g" "$b"
-    else
-        gray=$(( (dec-232)*10+8 ))
-        printf 'dec= %3s  gray= #%02x%02x%02x\n' "$dec" "$gray" "$gray" "$gray"
-    fi
+color2hex() {
+  dec=$(($1 % 256)) ### input must be a number in range 0-255.
+  if [ "$dec" -lt "16" ]; then
+    bas=$((dec % 16))
+    mul=128
+    [ "$bas" -eq "7" ] && mul=192
+    [ "$bas" -eq "8" ] && bas=7
+    [ "$bas" -gt "8" ] && mul=255
+    a="$(((bas & 1) * mul))"
+    b="$((((bas & 2) >> 1) * mul))"
+    c="$((((bas & 4) >> 2) * mul))"
+    printf 'dec= %3s basic= #%02x%02x%02x\n' "$dec" "$a" "$b" "$c"
+  elif [ "$dec" -gt 15 ] && [ "$dec" -lt 232 ]; then
+    b=$(((dec - 16) % 6))
+    b=$((b == 0 ? 0 : b * 40 + 55))
+    g=$(((dec - 16) / 6 % 6))
+    g=$((g == 0 ? 0 : g * 40 + 55))
+    r=$(((dec - 16) / 36))
+    r=$((r == 0 ? 0 : r * 40 + 55))
+    printf 'dec= %3s color= #%02x%02x%02x\n' "$dec" "$r" "$g" "$b"
+  else
+    gray=$(((dec - 232) * 10 + 8))
+    printf 'dec= %3s  gray= #%02x%02x%02x\n' "$dec" "$gray" "$gray" "$gray"
+  fi
 }
 
 # Commands that should be applied only for interactive shells.
@@ -92,8 +95,8 @@ alias cpp='rsync -ah --progress'
 set completion-ignore-case On
 
 # Use bash-completion, if available
-[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
-    . /usr/share/bash-completion/bash_completion
+[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] &&
+  . /usr/share/bash-completion/bash_completion
 
 export OFLAGS="--ozone-platform-hint=auto"
 
diff --git a/config-files/.config/git/config b/config-files/.config/git/config
index 12fd5133..e0e8ecef 100644
--- a/config-files/.config/git/config
+++ b/config-files/.config/git/config
@@ -3,9 +3,8 @@ email = "ehtrude@gmail.com"
 name = "TrudeEH"
 
 [credential "https://github.com"]
-        helper =
-        helper = !/usr/bin/gh auth git-credential
+helper =
+helper = !/usr/bin/gh auth git-credential
 [credential "https://gist.github.com"]
-        helper =
-        helper = !/usr/bin/gh auth git-credential
-
+helper =
+helper = !/usr/bin/gh auth git-credential
diff --git a/config-files/.config/nvim/init.lua b/config-files/.config/nvim/init.lua
index 2ffa795a..ae160b87 100644
--- a/config-files/.config/nvim/init.lua
+++ b/config-files/.config/nvim/init.lua
@@ -21,7 +21,11 @@ vim.opt.timeoutlen = 300
 vim.opt.splitright = true
 vim.opt.splitbelow = true
 vim.opt.list = true
-vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
+vim.opt.listchars = {
+  tab = '» ',
+  trail = '·',
+  nbsp = '␣'
+}
 vim.opt.inccommand = 'split' -- Preview substitutions
 vim.opt.cursorline = true
 vim.opt.scrolloff = 10
@@ -34,10 +38,18 @@ 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' })
+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'
+})
 
 -- 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
@@ -45,16 +57,26 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagn
 --
 -- 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' })
+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' })
+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`
@@ -64,10 +86,12 @@ vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper win
 --  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 }),
+  group = vim.api.nvim_create_augroup('kickstart-highlight-yank', {
+    clear = true
+  }),
   callback = function()
     vim.highlight.on_yank()
-  end,
+  end
 })
 
 -- NOTE: Install `lazy.nvim` plugin manager
@@ -75,7 +99,7 @@ vim.api.nvim_create_autocmd('TextYankPost', {
 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 }
+  vim.fn.system {'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath}
 end ---@diagnostic disable-next-line: undefined-field
 vim.opt.rtp:prepend(lazypath)
 
@@ -89,613 +113,676 @@ vim.opt.rtp:prepend(lazypath)
 --  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 = '~' },
+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 = '+'
       },
-    },
-  },
-
-  { -- 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()
-
-      -- 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,
+      change = {
+        text = '~'
       },
-      { 'nvim-telescope/telescope-ui-select.nvim' },
-
-      -- Useful for getting pretty icons, but requires a Nerd Font.
-      { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
-    },
-    config = function()
-      -- 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(),
-          },
-        },
+      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()
 
-      -- Enable Telescope extensions if they are installed
-      pcall(require('telescope').load_extension, 'fzf')
-      pcall(require('telescope').load_extension, 'ui-select')
+    -- 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',
 
-      -- 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' })
+    -- `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',
 
-      -- 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' })
+    -- `cond` is a condition used to determine whether this plugin should be
+    -- installed and loaded.
+    cond = function()
+      return vim.fn.executable 'make' == 1
+    end
+  }, {'nvim-telescope/telescope-ui-select.nvim'}, -- Useful for getting pretty icons, but requires a Nerd Font.
+  {
+    'nvim-tree/nvim-web-devicons',
+    enabled = vim.g.have_nerd_font
+  }},
+  config = function()
+    -- 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()}
+      }
+    }
 
-      -- 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' })
+    -- Enable Telescope extensions if they are installed
+    pcall(require('telescope').load_extension, 'fzf')
+    pcall(require('telescope').load_extension, 'ui-select')
 
-      -- 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,
-  },
+    -- 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'
+    })
 
-  { -- 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,
+    -- 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'
+    })
 
-      -- 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' } },
-            },
-          },
-        },
+    -- 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'
+    })
 
-      -- 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,
-        },
+    -- Shortcut for searching your Neovim configuration files
+    vim.keymap.set('n', '<leader>sn', function()
+      builtin.find_files {
+        cwd = vim.fn.stdpath 'config'
       }
-    end,
-  },
+    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',
 
-  { -- 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" },
+  -- 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
         --
-        -- You can use a sub-list to tell conform to run *until* a formatter
-        -- is found.
-        -- javascript = { { "prettierd", "prettier" } },
-      },
-    },
-  },
+        -- 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
+          })
 
-  { -- 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',
+          vim.api.nvim_create_autocmd({'CursorMoved', 'CursorMovedI'}, {
+            buffer = event.buf,
+            group = highlight_augroup,
+            callback = vim.lsp.buf.clear_references
+          })
 
-      -- Adds other completion capabilities.
-      --  nvim-cmp does not ship with all sources by default. They are split
-      --  into multiple repos for maintenance purposes.
-      'hrsh7th/cmp-nvim-lsp',
-      'hrsh7th/cmp-path',
-    },
-    config = function()
-      -- See `:help cmp`
-      local cmp = require 'cmp'
-      local luasnip = require 'luasnip'
-      luasnip.config.setup {}
-
-      cmp.setup {
-        snippet = {
-          expand = function(args)
-            luasnip.lsp_expand(args.body)
-          end,
-        },
-        completion = { completeopt = 'menu,menuone,noinsert' },
-
-        -- For an understanding of why these mappings were
-        -- chosen, you will need to read `:help ins-completion`
-        --
-        -- No, but seriously. Please read `:help ins-completion`, it is really good!
-        mapping = cmp.mapping.preset.insert {
-          -- Select the [n]ext item
-          ['<C-n>'] = cmp.mapping.select_next_item(),
-          -- Select the [p]revious item
-          ['<C-p>'] = cmp.mapping.select_prev_item(),
-
-          -- Scroll the documentation window [b]ack / [f]orward
-          ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-          ['<C-f>'] = cmp.mapping.scroll_docs(4),
-
-          -- Accept ([y]es) the completion.
-          --  This will auto-import if your LSP supports it.
-          --  This will expand snippets if the LSP sent a snippet.
-          ['<C-y>'] = cmp.mapping.confirm { select = true },
-
-          -- If you prefer more traditional completion keymaps,
-          -- you can uncomment the following lines
-          --['<CR>'] = cmp.mapping.confirm { select = true },
-          --['<Tab>'] = cmp.mapping.select_next_item(),
-          --['<S-Tab>'] = cmp.mapping.select_prev_item(),
-
-          -- Manually trigger a completion from nvim-cmp.
-          --  Generally you don't need this, because nvim-cmp will display
-          --  completions whenever it has completion options available.
-          ['<C-Space>'] = cmp.mapping.complete {},
-
-          -- Think of <c-l> as moving to the right of your snippet expansion.
-          --  So if you have a snippet that's like:
-          --  function $name($args)
-          --    $body
-          --  end
-          --
-          -- <c-l> will move you to the right of each of the expansion locations.
-          -- <c-h> is similar, except moving you backwards.
-          ['<C-l>'] = cmp.mapping(function()
-            if luasnip.expand_or_locally_jumpable() then
-              luasnip.expand_or_jump()
+          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, { 'i', 's' }),
-          ['<C-h>'] = cmp.mapping(function()
-            if luasnip.locally_jumpable(-1) then
-              luasnip.jump(-1)
-            end
-          end, { 'i', 's' }),
+          })
+        end
 
-          -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
-          --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
-        },
-        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 }
-
-      -- 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'
+        -- 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
+    })
 
-      -- ... 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`
+    -- 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())
 
-      -- 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:
+    -- 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
       --
-      --    - 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
+      -- 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,
-  },
-
-  -- 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())
+    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
   {
-    'nvim-neo-tree/neo-tree.nvim',
-    version = '*',
+    '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 = {
-      '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',
-          },
-        },
-      },
-    },
-  },
-  -- 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
+      -- `friendly-snippets` contains a variety of premade snippets.
+      --    See the README about individual language/framework/plugin snippets:
+      --    https://github.com/rafamadriz/friendly-snippets
+      -- {
+      --   'rafamadriz/friendly-snippets',
+      --   config = function()
+      --     require('luasnip.loaders.from_vscode').lazy_load()
+      --   end,
+      -- },
+    }
+  }, 'saadparwaiz1/cmp_luasnip', -- Adds other completion capabilities.
+  --  nvim-cmp does not ship with all sources by default. They are split
+  --  into multiple repos for maintenance purposes.
+  'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-path'},
+  config = function()
+    -- See `:help cmp`
+    local cmp = require 'cmp'
+    local luasnip = require 'luasnip'
+    luasnip.config.setup {}
 
-  -- 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.
+    cmp.setup {
+      snippet = {
+        expand = function(args)
+          luasnip.lsp_expand(args.body)
+        end
+      },
+      completion = {
+        completeopt = 'menu,menuone,noinsert'
+      },
+
+      -- For an understanding of why these mappings were
+      -- chosen, you will need to read `:help ins-completion`
+      --
+      -- No, but seriously. Please read `:help ins-completion`, it is really good!
+      mapping = cmp.mapping.preset.insert {
+        -- Select the [n]ext item
+        ['<C-n>'] = cmp.mapping.select_next_item(),
+        -- Select the [p]revious item
+        ['<C-p>'] = cmp.mapping.select_prev_item(),
+
+        -- Scroll the documentation window [b]ack / [f]orward
+        ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+        ['<C-f>'] = cmp.mapping.scroll_docs(4),
+
+        -- Accept ([y]es) the completion.
+        --  This will auto-import if your LSP supports it.
+        --  This will expand snippets if the LSP sent a snippet.
+        ['<C-y>'] = cmp.mapping.confirm {
+          select = true
+        },
+
+        -- If you prefer more traditional completion keymaps,
+        -- you can uncomment the following lines
+        -- ['<CR>'] = cmp.mapping.confirm { select = true },
+        -- ['<Tab>'] = cmp.mapping.select_next_item(),
+        -- ['<S-Tab>'] = cmp.mapping.select_prev_item(),
+
+        -- Manually trigger a completion from nvim-cmp.
+        --  Generally you don't need this, because nvim-cmp will display
+        --  completions whenever it has completion options available.
+        ['<C-Space>'] = cmp.mapping.complete {},
+
+        -- Think of <c-l> as moving to the right of your snippet expansion.
+        --  So if you have a snippet that's like:
+        --  function $name($args)
+        --    $body
+        --  end
+        --
+        -- <c-l> will move you to the right of each of the expansion locations.
+        -- <c-h> is similar, except moving you backwards.
+        ['<C-l>'] = cmp.mapping(function()
+          if luasnip.expand_or_locally_jumpable() then
+            luasnip.expand_or_jump()
+          end
+        end, {'i', 's'}),
+        ['<C-h>'] = cmp.mapping(function()
+          if luasnip.locally_jumpable(-1) then
+            luasnip.jump(-1)
+          end
+        end, {'i', 's'})
+
+        -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
+        --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
+      },
+      sources = {{
+        name = '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.
   --
-  --  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' },
+  -- 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
+    }
+
+    -- 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'
+        }
+      }
+    }
+  }
+} -- 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
@@ -713,9 +800,9 @@ require('lazy').setup({
       source = '📄',
       start = '🚀',
       task = '📌',
-      lazy = '💤 ',
-    },
-  },
+      lazy = '💤 '
+    }
+  }
 })
 
 -- The line beneath this is called `modeline`. See `:help modeline`
diff --git a/config-files/.config/nvim/lua/kickstart/health.lua b/config-files/.config/nvim/lua/kickstart/health.lua
index 04df77b3..ae790d6d 100644
--- a/config-files/.config/nvim/lua/kickstart/health.lua
+++ b/config-files/.config/nvim/lua/kickstart/health.lua
@@ -3,16 +3,14 @@
 -- This file is not required for your own configuration,
 -- but helps people determine if their system is setup correctly.
 --
---]]
-
-local check_version = function()
+--]] 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
+  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))
@@ -21,7 +19,7 @@ end
 
 local check_external_reqs = function()
   -- Basic utils: `git`, `make`, `unzip`
-  for _, exe in ipairs { 'git', 'make', 'unzip', 'rg' } do
+  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))
@@ -48,5 +46,5 @@ return {
 
     check_version()
     check_external_reqs()
-  end,
+  end
 }
diff --git a/config-files/.config/nvim/lua/kickstart/plugins/debug.lua b/config-files/.config/nvim/lua/kickstart/plugins/debug.lua
index 31dfecf5..ea67698c 100644
--- a/config-files/.config/nvim/lua/kickstart/plugins/debug.lua
+++ b/config-files/.config/nvim/lua/kickstart/plugins/debug.lua
@@ -5,25 +5,15 @@
 -- 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',
-  },
+  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'
@@ -39,21 +29,31 @@ return {
 
       -- 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',
-      },
+      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', '<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' })
+    end, {
+      desc = 'Debug: Set Breakpoint'
+    })
 
     -- Dap UI setup
     -- For more information, see |:help nvim-dap-ui|
@@ -61,7 +61,11 @@ return {
       -- 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 = '*' },
+      icons = {
+        expanded = '▾',
+        collapsed = '▸',
+        current_frame = '*'
+      },
       controls = {
         icons = {
           pause = '⏸',
@@ -72,13 +76,15 @@ return {
           step_back = 'b',
           run_last = '▶▶',
           terminate = '⏹',
-          disconnect = '⏏',
-        },
-      },
+          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.' })
+    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
@@ -89,8 +95,8 @@ return {
       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,
-      },
+        detached = vim.fn.has 'win32' == 0
+      }
     }
-  end,
+  end
 }
diff --git a/config-files/.config/nvim/lua/kickstart/plugins/gitsigns.lua b/config-files/.config/nvim/lua/kickstart/plugins/gitsigns.lua
index 4bcc70f4..83487cdd 100644
--- a/config-files/.config/nvim/lua/kickstart/plugins/gitsigns.lua
+++ b/config-files/.config/nvim/lua/kickstart/plugins/gitsigns.lua
@@ -1,61 +1,94 @@
 -- 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'
 
-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
 
-        local function map(mode, l, r, opts)
-          opts = opts or {}
-          opts.buffer = bufnr
-          vim.keymap.set(mode, l, r, opts)
+      -- 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'
+      })
 
-        -- 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'
+      })
 
-        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,
-    },
-  },
-}
+      -- 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
index ed7f2693..402eb808 100644
--- a/config-files/.config/nvim/lua/kickstart/plugins/indent_line.lua
+++ b/config-files/.config/nvim/lua/kickstart/plugins/indent_line.lua
@@ -1,9 +1,7 @@
-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 = {},
-  },
-}
+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
index 7f0dc42f..ae18f696 100644
--- a/config-files/.config/nvim/lua/kickstart/plugins/lint.lua
+++ b/config-files/.config/nvim/lua/kickstart/plugins/lint.lua
@@ -1,55 +1,54 @@
-return {
+return {{ -- Linting
+  'mfussenegger/nvim-lint',
+  event = {'BufReadPre', 'BufNewFile'},
+  config = function()
+    local lint = require 'lint'
+    lint.linters_by_ft = {
+      markdown = {'markdownlint'}
+    }
 
-  { -- 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
 
-      -- 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,
-  },
-}
+    -- 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
index c793b885..9927d0b4 100644
--- a/config-files/.config/nvim/lua/kickstart/plugins/neo-tree.lua
+++ b/config-files/.config/nvim/lua/kickstart/plugins/neo-tree.lua
@@ -1,25 +1,21 @@
 -- 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',
-  },
+  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' } },
-  },
+  keys = {{'\\', ':Neotree reveal<CR>', {
+    desc = 'NeoTree reveal'
+  }}},
   opts = {
     filesystem = {
       window = {
         mappings = {
-          ['\\'] = 'close_window',
-        },
-      },
-    },
-  },
+          ['\\'] = 'close_window'
+        }
+      }
+    }
+  }
 }
diff --git a/config-files/.config/picom/picom.conf b/config-files/.config/picom/picom.conf
index f0038ea6..84a8bf29 100644
--- a/config-files/.config/picom/picom.conf
+++ b/config-files/.config/picom/picom.conf
@@ -1,11 +1,11 @@
-backend = "glx";
-glx-no-stencil = true;
-glx-copy-from-front = false;
+backend = "glx"
+glx-no-stencil = true
+glx-copy-from-front = false
 
 # Opacity
-active-opacity = 1;
-inactive-opacity = 1;
-frame-opacity = 1;
+active-opacity = 1
+inactive-opacity = 1
+frame-opacity = 1
 #inactive-opacity-override = false;
 #blur-background = false;
 #blur-background-exclude = [
@@ -16,7 +16,7 @@ frame-opacity = 1;
 #blur-strength = 8;
 
 # Fading
-fading = false;
+fading = false
 #fade-delta = 2;
 #no-fading-openclose = false;
 
@@ -27,8 +27,8 @@ fading = false;
 #mark-ovredir-focused = true;
 #detect-rounded-corners = true;
 #detect-clien-opacity = true;
-vsync = true;
-dbe = false;
+vsync = true
+dbe = false
 #unredir-if-possible = false;
 #focus-exclude = [ ];
 #detect-transient = true;
@@ -44,10 +44,10 @@ dbe = false;
 
 # Window transparency
 opacity-rule = [
-  #"90:class_g = 'st'",
-];
+#"90:class_g = 'st'",
+]
 
-shadow = false;
+shadow = false
 #shadow-radius = 12;
 #shadow-offset-x = -5;
 #shadow-offset-y = -5;
@@ -58,4 +58,4 @@ shadow = false;
 
 #corner-radius = 0;
 
-xrender-sync-fence = true;
+xrender-sync-fence = true
diff --git a/config-files/.homepage/index.html b/config-files/.homepage/index.html
index bd89ed61..35e30360 100644
--- a/config-files/.homepage/index.html
+++ b/config-files/.homepage/index.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="stylesheet" href="style.css">
-  <title>Homepage</title>
-</head>
-<body>
-  <div class="clock" id="clock">
-    <span id="clock-text"></span>
-  </div>
-  <div class="date" id="date">
-    <span id="date-text"></span>
-  </div>
-  <script src="script.js"></script>
-</body>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="stylesheet" href="style.css" />
+    <title>Homepage</title>
+  </head>
+  <body>
+    <div class="clock" id="clock">
+      <span id="clock-text"></span>
+    </div>
+    <div class="date" id="date">
+      <span id="date-text"></span>
+    </div>
+    <script src="script.js"></script>
+  </body>
 </html>
diff --git a/config-files/.homepage/script.js b/config-files/.homepage/script.js
index 7128f308..f64544f7 100644
--- a/config-files/.homepage/script.js
+++ b/config-files/.homepage/script.js
@@ -1,7 +1,7 @@
 // Load the config.json file (using JavaScript vanilla)
 
-let clock_text = document.getElementById('clock-text');
-let date_text = document.getElementById('date-text');
+let clock_text = document.getElementById("clock-text");
+let date_text = document.getElementById("date-text");
 
 displayTime();
 setInterval(displayTime, 1000);
@@ -12,20 +12,28 @@ function displayTime() {
   let date = new Date();
   let hours = date.getHours();
   let minutes = date.getMinutes();
-  let ampm = hours >= 12 ? 'PM' : 'AM';
+  let ampm = hours >= 12 ? "PM" : "AM";
   hours = hours % 12;
   hours = hours ? hours : 12;
-  minutes = minutes < 10 ? '0'+minutes : minutes;
+  minutes = minutes < 10 ? "0" + minutes : minutes;
   let time = hours + ":" + minutes + " " + ampm;
   clock_text.innerHTML = time;
 }
 
 function displayDate() {
   let date = new Date();
-  let days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+  let days = [
+    "Sunday",
+    "Monday",
+    "Tuesday",
+    "Wednesday",
+    "Thursday",
+    "Friday",
+    "Saturday",
+  ];
   let day = days[date.getDay()];
   let dayNumber = date.getDate();
-  let month = date.toLocaleString('default', { month: 'long' });
+  let month = date.toLocaleString("default", { month: "long" });
   let year = date.getFullYear();
 
   if (dayNumber == 1 || dayNumber == 21 || dayNumber == 31) {
@@ -41,4 +49,3 @@ function displayDate() {
   let dateText = day + ", " + dayNumber + " " + month + " " + year;
   date_text.innerHTML = dateText;
 }
-
diff --git a/config-files/.homepage/style.css b/config-files/.homepage/style.css
index 32a77fe6..f30673b4 100644
--- a/config-files/.homepage/style.css
+++ b/config-files/.homepage/style.css
@@ -1,19 +1,21 @@
-html, body {
-    font-family: "JetBrainsMono NF", system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-    color: #ebdbb2;
-    text-align: center;
-    background: #282828;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
+html,
+body {
+  font-family: "JetBrainsMono NF", system-ui, -apple-system, BlinkMacSystemFont,
+    "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue",
+    sans-serif;
+  color: #ebdbb2;
+  text-align: center;
+  background: #282828;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
 }
 
 .clock {
-    font-size: 8rem;
+  font-size: 8rem;
 }
 
 .date {
-    font-size: 2rem;
+  font-size: 2rem;
 }
-
diff --git a/install.sh b/install.sh
index df054d7b..051af1b1 100755
--- a/install.sh
+++ b/install.sh
@@ -2,18 +2,18 @@
 
 # Sudo auth
 auth() {
-    echo "$sudopass" | sudo -S -k $*
+  echo "$sudopass" | sudo -S -k $*
 }
 export HISTIGNORE='*sudo -S*'
 for (( ; ; )); do
-    sudopass=$(zenity --password)
-    if [ -z "${sudopass}" ]; then
-        exit
-    fi
-    auth echo "Test sudo password."
-    if [[ $? == 0 ]]; then
-        break
-    fi
+  sudopass=$(zenity --password)
+  if [ -z "${sudopass}" ]; then
+    exit
+  fi
+  auth echo "Test sudo password."
+  if [[ $? == 0 ]]; then
+    break
+  fi
 done
 
 if ! command -v zenity; then
@@ -22,30 +22,30 @@ fi
 
 # Update System
 (
-auth apt-get update
-echo "20"
-echo "# Updating distro packages..."
-auth apt-get dist-upgrade -y
-echo "40"
-echo "# Updating installed packages..."
-auth apt-get upgrade -y
-echo "60"
-echo "# Cleaning cache..."
-auth apt-get clean
-echo "80"
-echo "# Removing unused dependencies..."
-auth apt-get autoremove -y
-echo "100"
+  auth apt-get update
+  echo "20"
+  echo "# Updating distro packages..."
+  auth apt-get dist-upgrade -y
+  echo "40"
+  echo "# Updating installed packages..."
+  auth apt-get upgrade -y
+  echo "60"
+  echo "# Cleaning cache..."
+  auth apt-get clean
+  echo "80"
+  echo "# Removing unused dependencies..."
+  auth apt-get autoremove -y
+  echo "100"
 ) |
-zenity --progress --title="Update System" --text="Updating repositories..." --percentage=0 --no-cancel
+  zenity --progress --title="Update System" --text="Updating repositories..." --percentage=0 --no-cancel
 
 # Dotfiles
 zenity --question \
---title="Dotfiles" \
---text="Apply Trude's configuration files?"
+  --title="Dotfiles" \
+  --text="Apply Trude's configuration files?"
 
 if [[ $? == 0 ]]; then
-    (
+  (
     auth apt-get install -y htop fzf git wget curl bash-completion
     echo "20"
     echo "# Copying dotfiles..."
@@ -54,22 +54,22 @@ if [[ $? == 0 ]]; then
     cp -vrf config-files/* $HOME
     echo "50"
     echo "# Configure GNOME/GTK..."
-    dconf load -f / < ./settings.dconf
+    dconf load -f / <./settings.dconf
     echo "60"
     echo "# Reloading font cache..."
     fc-cache -f
     echo "100"
-    ) |
+  ) |
     zenity --progress --title="Configuration" --text="Installing common utilities..." --percentage=0 --no-cancel
 fi
 
 # Flatpak
 zenity --question \
---title="Install Apps" \
---text="Enable Flatpak support?"
+  --title="Install Apps" \
+  --text="Enable Flatpak support?"
 
 if [[ $? == 0 ]]; then
-    (
+  (
     auth apt-get install -y flatpak
     echo "30"
     echo "# Install the gnome-software plugin..."
@@ -81,7 +81,7 @@ if [[ $? == 0 ]]; then
     echo "# Installing Adw GTK3 theme for flatpak apps..."
     flatpak install org.gtk.Gtk3theme.adw-gtk3 org.gtk.Gtk3theme.adw-gtk3-dark
     echo "100"
-    ) |
+  ) |
     zenity --progress --title="Enabling Flatpak" --text="Installing Flatpak..." --percentage=0 --no-cancel
 fi
 
@@ -94,8 +94,7 @@ options=(
   FALSE "Install Tailscale"
   FALSE "Install Firefox + Adw theme"
 )
-checkbox=$(zenity --list --checklist --height=500\
-  --title="Install Apps" \
+checkbox=$(zenity --list --checklist --height=500 --title="Install Apps" \
   --column="Select" \
   --column="Tasks" "${options[@]}")
 readarray -td '|' choices < <(printf '%s' "$checkbox")
@@ -103,30 +102,30 @@ readarray -td '|' choices < <(printf '%s' "$checkbox")
 for selection in "${choices[@]}"; do
   if [ "$selection" = "Install Neovim" ]; then
     (
-    auth apt install -y ninja-build gettext cmake unzip curl build-essential
-    echo "30"
-    git clone https://github.com/neovim/neovim --depth 1
-    echo "50"
-    cd neovim
-    git checkout stable
-    echo "60"
-    make CMAKE_BUILD_TYPE=RelWithDebInfo
-    echo "80"
-    auth make install
-    cd ..
-    rm -rf neovim
-    echo "100"
+      auth apt install -y ninja-build gettext cmake unzip curl build-essential
+      echo "30"
+      git clone https://github.com/neovim/neovim --depth 1
+      echo "50"
+      cd neovim
+      git checkout stable
+      echo "60"
+      make CMAKE_BUILD_TYPE=RelWithDebInfo
+      echo "80"
+      auth make install
+      cd ..
+      rm -rf neovim
+      echo "100"
     ) |
-    zenity --progress --title="Neovim" --text="Installing Neovim..." --percentage=0 --no-cancel
+      zenity --progress --title="Neovim" --text="Installing Neovim..." --percentage=0 --no-cancel
   fi
 
   if [ "$selection" = "Install Zed" ]; then
     zenity --notification --window-icon="info" --text="Installing Zed..."
     curl https://zed.dev/install.sh | sh
     if [[ $? == 0 ]]; then
-        zenity --notification --window-icon="info" --text="Zed is now installed."
+      zenity --notification --window-icon="info" --text="Zed is now installed."
     else
-        zenity --notification --window-icon="error" --text="Zed failed to install."
+      zenity --notification --window-icon="error" --text="Zed failed to install."
     fi
   fi
 
@@ -134,58 +133,58 @@ for selection in "${choices[@]}"; do
     zenity --notification --window-icon="info" --text="Installing Ollama..."
     curl -fsSL https://ollama.com/install.sh | sh
     if [[ $? == 0 ]]; then
-        zenity --notification --window-icon="info" --text="Ollama is now installed."
+      zenity --notification --window-icon="info" --text="Ollama is now installed."
     else
-        zenity --notification --window-icon="error" --text="Ollama failed to install."
+      zenity --notification --window-icon="error" --text="Ollama failed to install."
     fi
   fi
 
   if [ "$selection" = "Install GitHub CLI" ]; then
     (
-    auth apt-get install wget -y
-    echo "20"
-    auth mkdir -p -m 755 /etc/apt/keyrings
-    auth rm -f /etc/apt/sources.list.d/github-cli.list
-    wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | auth tee /etc/apt/keyrings/githubcli-archive-keyring.gpg
-    echo "40"
-    auth chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | auth tee /etc/apt/sources.list.d/github-cli.list
-    auth apt-get update
-    echo "60"
-    auth apt-get install gh -y
-    echo "100"
+      auth apt-get install wget -y
+      echo "20"
+      auth mkdir -p -m 755 /etc/apt/keyrings
+      auth rm -f /etc/apt/sources.list.d/github-cli.list
+      wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | auth tee /etc/apt/keyrings/githubcli-archive-keyring.gpg
+      echo "40"
+      auth chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg
+      echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | auth tee /etc/apt/sources.list.d/github-cli.list
+      auth apt-get update
+      echo "60"
+      auth apt-get install gh -y
+      echo "100"
     ) |
-    zenity --progress --title="GitHub CLI" --text="Installing GitHub CLI..." --percentage=0 --no-cancel
+      zenity --progress --title="GitHub CLI" --text="Installing GitHub CLI..." --percentage=0 --no-cancel
   fi
 
   if [ "$selection" = "Install Tailscale" ]; then
     (
-    curl -fsSL https://tailscale.com/install.sh | sh
-    echo "80"
-    auth tailscale up
-    echo "100"
+      curl -fsSL https://tailscale.com/install.sh | sh
+      echo "80"
+      auth tailscale up
+      echo "100"
     ) |
-    zenity --progress --title="Tailscale" --text="Installing Tailscale..." --percentage=0 --no-cancel
+      zenity --progress --title="Tailscale" --text="Installing Tailscale..." --percentage=0 --no-cancel
   fi
 
   if [ "$selection" = "Install Firefox + Adw theme" ]; then
     (
-    auth apt install -y firefox-esr
-    echo "60"
-    firefox &
-    sleep 5
-    echo "80"
-    echo "# Applying Adw theme..."
-    curl -s -o- https://raw.githubusercontent.com/rafaelmardojai/firefox-gnome-theme/master/scripts/install-by-curl.sh | bash
-    echo "100"
+      auth apt install -y firefox-esr
+      echo "60"
+      firefox &
+      sleep 5
+      echo "80"
+      echo "# Applying Adw theme..."
+      curl -s -o- https://raw.githubusercontent.com/rafaelmardojai/firefox-gnome-theme/master/scripts/install-by-curl.sh | bash
+      echo "100"
     ) |
-    zenity --progress --title="Firefox" --text="Installing Firefox..." --percentage=0 --no-cancel
+      zenity --progress --title="Firefox" --text="Installing Firefox..." --percentage=0 --no-cancel
   fi
 done
 
 # Flatpak Apps
 if command -v flatpak; then
-    options=(
+  options=(
     FALSE "io.github.mrvladus.List" "Errands (Tasks)"
     FALSE "io.gitlab.news_flash.NewsFlash" "Newsflash (RSS)"
     FALSE "org.gnome.gitlab.somas.Apostrophe" "Apostrophe (Markdown Editor)"
@@ -203,26 +202,26 @@ if command -v flatpak; then
     FALSE "re.sonny.Workbench" "Workbench"
     FALSE "org.prismlauncher.PrismLauncher" "Prism Launcher"
     FALSE "md.obsidian.Obsidian" "Obsidian"
-    )
-    checkbox=$(zenity --list --checklist --width=800 --height=600 \
+  )
+  checkbox=$(zenity --list --checklist --width=800 --height=600 \
     --title="Install Apps" \
     --column="Select" \
-    --column="App ID"\
+    --column="App ID" \
     --column="App Name" "${options[@]}")
-    readarray -td '|' choices < <(printf '%s' "$checkbox")
+  readarray -td '|' choices < <(printf '%s' "$checkbox")
 
-    declare -i app_counter=0
-    declare -i app_total="${#choices[@]}"
+  declare -i app_counter=0
+  declare -i app_total="${#choices[@]}"
 
-    for app in "${choices[@]}"; do
-        app_counter+=1
-        echo "Installing $app ($app_counter/$app_total)..."
-        zenity --notification --icon="info" --text="Installing $app ($app_counter/$app_total)..."
-        flatpak install -y flathub $app
-        if [[ $? == 0 ]]; then
-            zenity --notification --icon="info" --text="$app is now installed."
-        else
-            zenity --notification --icon="error" --text="$app failed to install."
-        fi
-    done
+  for app in "${choices[@]}"; do
+    app_counter+=1
+    echo "Installing $app ($app_counter/$app_total)..."
+    zenity --notification --icon="info" --text="Installing $app ($app_counter/$app_total)..."
+    flatpak install -y flathub $app
+    if [[ $? == 0 ]]; then
+      zenity --notification --icon="info" --text="$app is now installed."
+    else
+      zenity --notification --icon="error" --text="$app failed to install."
+    fi
+  done
 fi
diff --git a/scripts/colors.sh b/scripts/colors.sh
index 048e699f..729a961b 100755
--- a/scripts/colors.sh
+++ b/scripts/colors.sh
@@ -1,6 +1,6 @@
-for i in {0..255} ; do
+for i in {0..255}; do
     printf "\x1b[48;5;%sm%3d\e[0m " "$i" "$i"
-    if (( i == 15 )) || (( i > 15 )) && (( (i-15) % 6 == 0 )); then
-        printf "\n";
+    if ((i == 15)) || ((i > 15)) && (((i - 15) % 6 == 0)); then
+        printf "\n"
     fi
 done