diff --git a/README.md b/README.md
index 3ba099c..3e348b1 100755
--- a/README.md
+++ b/README.md
@@ -20,4 +20,3 @@ Example: bash ./bootstrap.sh -q --create-links
 
 I have multiple Linux installations on my machine. Linking it from one place (this repository) keeps things tidy. Also, changes to dotfiles automatically get applied to all the distros.
 
-<!-- TODO: Move as many dotfiles inside ~/.config as possible -->
diff --git a/common/.bashrc b/common/.bashrc
index 05c4489..0eaa990 100644
--- a/common/.bashrc
+++ b/common/.bashrc
@@ -93,9 +93,7 @@ if ! shopt -oq posix; then
 fi
 
 ################################################################################
-################################################################################
-############### Everything below this line are customizations
-################################################################################
+############### Everything below this line are customizations ##################
 ################################################################################
 
 # Do not let globbing complain on no match
@@ -182,3 +180,8 @@ HISTFILE="$XDG_STATE_HOME/shell/bash_history"
 if command -v zoxide >/dev/null; then
 	eval "$(zoxide init bash)"
 fi
+
+# [ctrl+r]:replaces shell command search
+# [ctrl+t]:fzf & over the files & directories under the current one & paste it to prompt
+# [alt+c] :fzf & cd into a directory under the current one
+[ -f $XDG_STATE_HOME/shell/fzf.bash ] && source $XDG_STATE_HOME/shell/fzf.bash
diff --git a/common/.config/kitty/.bashrc b/common/.config/kitty/.bashrc
new file mode 100644
index 0000000..b8ade85
--- /dev/null
+++ b/common/.config/kitty/.bashrc
@@ -0,0 +1,176 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+*i*) ;;
+*) return ;;
+esac
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+	debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+xterm-color | *-256color) color_prompt=yes ;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+	if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+		# We have color support; assume it's compliant with Ecma-48
+		# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+		# a case would tend to support setf rather than setaf.)
+		color_prompt=yes
+	else
+		color_prompt=
+	fi
+fi
+
+if [ "$color_prompt" != yes ]; then
+	PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm* | rxvt*)
+	PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+	;;
+*) ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+	test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+	alias ls='ls --color=auto'
+	#alias dir='dir --color=auto'
+	#alias vdir='vdir --color=auto'
+
+	alias grep='grep --color=auto'
+	alias fgrep='fgrep --color=auto'
+	alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# Add an "alert" alias for long running commands.  Use like so:
+#   sleep 10; alert
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+	if [ -f /usr/share/bash-completion/bash_completion ]; then
+		. /usr/share/bash-completion/bash_completion
+	elif [ -f /etc/bash_completion ]; then
+		. /etc/bash_completion
+	fi
+fi
+
+################################################################################
+############### Everything below this line are customizations ##################
+################################################################################
+
+# Do not let globbing complain on no match
+shopt -s nullglob
+
+## When only a directory is entered without cd, cd into it
+shopt -s autocd
+
+function timer_start {
+	timer=${timer:-$SECONDS}
+}
+
+trap 'timer_start' DEBUG
+
+PROMPT_COMMAND=jazz_my_prompt
+
+jazz_my_prompt() {
+	# Capture exit code of last command
+	# Below MUST be the 1st line of the function
+	local ex=$?
+
+	# Capture the last command's execution time
+	timer_show=$(($SECONDS - $timer))
+	unset timer
+
+	#----------------------------------------------------------------------------#
+	# Bash text colour specification:  \e[<COLOUR>;<STYLE>m
+	# Colours: 31=red, 32=green, 33=yellow, 34=blue, 35=purple, 36=cyan, 37=white
+	# Styles:  0=normal, 1=bold, 2=dimmed, 4=underlined, 7=highlighted
+	#----------------------------------------------------------------------------#
+
+	local reset="\[\e[0m\]"
+	local normal=';0m'
+	local bold=';1m'
+	local boldyellow="\[\e[32${bold}\]"
+	local boldwhite="\[\e[37${bold}\]"
+	local normalwhite="\[\e[37${normal}\]"
+	local yellow_highlight="\[\e[31;7m\]"
+
+	# Add color preference BEFORE the item
+	local hostname="${normalwhite}\h"
+	local username="${boldwhite}\u"
+	local jobs="${boldwhite}jobs:\j"
+	local history_cnt="${normalwhite}!\!"
+	local timestamp="${normalwhite}\D{%H:%M:%S(%z) %d%b}"
+	local session_cmd_cnt="${normalwhite}#\#"
+	local pwd="${boldwhite}\w"
+	local isroot="${boldwhite}\$"
+
+	# Set prompt content
+	# If exit code of last command is non-zero, prepend this code to the prompt
+	local exit_code=''
+	if [[ "$ex" -eq 0 ]]; then
+		exit_code="${boldwhite}✓"
+	else
+		exit_code="${yellow_highlight}✗ $ex\a${reset}"
+	fi
+
+	# Style each group separately
+	local groupstart="${boldyellow}["
+	local groupend="${boldyellow}]"
+	group1="${groupstart}${username}@${hostname}${groupend}"
+	group2="${groupstart}${jobs}${groupend}"
+	group3="${groupstart}${history_cnt}${groupend}"
+	group4="${groupstart}${session_cmd_cnt}${groupend}"
+	group5="${groupstart}${timestamp}${groupend}"
+	group6="${groupstart}${exit_code}${groupend}"
+	group8="${groupstart}${pwd}${groupend}"
+	group9="${groupstart}${normalwhite}${timer_show}s${groupend}"
+
+	# Position each group where you would like them
+	PS1="\n${group1}-${group2}-${group3}-${group4}-${group5}\n${group6}-${group9}-${group8}\n${isroot}${reset} "
+}
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=-1
+HISTFILESIZE=-1
+HISTCONTROL=ignorespace
+HISTTIMEFORMAT="%H:%M:%S(%z)%d-%b-%y "
+HISTFILE="$XDG_STATE_HOME/shell/bash_history"
diff --git a/common/.config/kitty/.profile b/common/.config/kitty/.profile
new file mode 100644
index 0000000..db754eb
--- /dev/null
+++ b/common/.config/kitty/.profile
@@ -0,0 +1,39 @@
+# set PATH so it includes user's private bin if it exists
+[ ! -d "$HOME/bin" ] || PATH="$HOME/bin:$PATH"
+
+# set PATH so it includes user's private bin if it exists
+[ ! -d "$HOME/.local/bin" ] || PATH="$HOME/.local/bin:$PATH"
+
+# Set the config directory enviroment variable
+[ ! -z "$XDG_CONFIG_HOME" ] || export XDG_CONFIG_HOME="$HOME/.config"
+
+# Set the cache directory enviroment variable
+[ ! -z "$XDG_CACHE_HOME" ] || export XDG_CACHE_HOME="$HOME/.cache"
+
+# Set the data directory enviroment variable
+[ ! -z "$XDG_DATA_HOME" ] || export XDG_DATA_HOME="$HOME/.local/share"
+
+# Set the state directory enviroment variable
+[ ! -z "$XDG_STATE_HOME" ] || export XDG_STATE_HOME="$HOME/.local/state"
+
+##################################################################################
+
+EDITOR=$(command -v nvim 2>/dev/null || command -v vim 2>/dev/null)
+VISUAL=$EDITOR
+
+# Manually follow steps from https://steamcommunity.com/app/646570/discussions/1/3935537639868400686
+# To disable ~/.oracle_jre_usage/ from being created
+
+# Source aliases
+[ ! -f "$XDG_CONFIG_HOME/shell/aliases" ] || source "$XDG_CONFIG_HOME/shell/aliases"
+[ ! -f "$XDG_CONFIG_HOME/shell/aliases_personal" ] || source "$XDG_CONFIG_HOME/shell/aliases_personal"
+
+export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
+export LESSHISTFILE="$XDG_STATE_HOME/shell/lesshst"
+export WGET_HSTS_FILE="$XDG_STATE_HOME/shell/wget-hsts-history" # wget aliased to use this path
+
+# Setup Python
+export PYENV_ROOT="$XDG_DATA_HOME/pyenv"
+command -v pyenv >/dev/null && export PATH="$PATH:$PYENV_ROOT/bin"
+command -v pyenv >/dev/null && eval "$(pyenv init -)"
+export PYTHON_HISTORY="$XDG_STATE_HOME/shell/python_history" # will be picked up by Python 3.13+
diff --git a/common/.config/kitty/kitty.conf b/common/.config/kitty/kitty.conf
index e96c1d9..f368c14 100644
--- a/common/.config/kitty/kitty.conf
+++ b/common/.config/kitty/kitty.conf
@@ -251,7 +251,6 @@
 font_family JetBrains Mono Nerd Font
 font_size 14
 bold_font auto
-static_font auto
 bold_italic_font auto
 disable_ligatures never
 
@@ -425,7 +424,6 @@ cursor_beam_thickness 1
 
 scrollback_lines 10000
 scrollback_pager_history_size 10
-# scrollback_pager less --chop-long-lines --RAW-CONTROL-CHARS +INPUT_LINE_NUMBER
 scrollback_pager nvim -c 'set ft=man'
 
 #: Mouse {{{
@@ -1186,6 +1184,8 @@ map ctrl+shift+o launch --cwd=current --type=tab nvim
 
 #: }}}
 
+tab_title_template "{sup.index}{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title[title.rfind('/')+1:]} : {tab.active_exe}"
+
 #: Color scheme {{{
 
 # foreground #dddddd
@@ -1654,7 +1654,6 @@ background_blur 65
 
 #: }}}
 
-editor nvim
 update_check_interval 0
 
 # Enable kitty scrollback.nvim plugin
diff --git a/common/.config/nvim/.neoconf.json b/common/.config/nvim/.neoconf.json
deleted file mode 100644
index 7c48087..0000000
--- a/common/.config/nvim/.neoconf.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "neodev": {
-    "library": {
-      "enabled": true,
-      "plugins": true
-    }
-  },
-  "neoconf": {
-    "plugins": {
-      "lua_ls": {
-        "enabled": true
-      }
-    }
-  }
-}
diff --git a/common/.config/nvim/stylua.toml b/common/.config/nvim/.stylua.toml
similarity index 64%
rename from common/.config/nvim/stylua.toml
rename to common/.config/nvim/.stylua.toml
index 3fa292d..cd2462c 100644
--- a/common/.config/nvim/stylua.toml
+++ b/common/.config/nvim/.stylua.toml
@@ -1,4 +1,5 @@
+column_width = 160
+line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 4
-column_width = 120
 quote_style = "AutoPreferDouble"
diff --git a/common/.config/nvim/init.lua b/common/.config/nvim/init.lua
index 278a1b8..1b3c5b4 100644
--- a/common/.config/nvim/init.lua
+++ b/common/.config/nvim/init.lua
@@ -1,68 +1,60 @@
--- General Usage and debugging Nvim hints ---------------------------
--- Use `vim.print()` to printout some variable
+-- TIP: General Usage and debugging Nvim hints:
+-- Use `vim.print()` to printout variables
 -- :lua > `require("plugin-name")` to load a plugin manually
 -- To check all issues in plugins -> :checkhealth
--- To remove a keymaps -> `vim.keymap.del("n", "<leader>someth")`
--- To override plugin's keymap -> inside "/lua/plugins" create a file > refer to the plugin > change whatever you want in the plugins. cmd, event, ft, keys, opts, dependencies properties are merged. All other properties are overridden. But if any property takes a function -> it'll always be overridden.
--- To remove/disable a plugin - in the above step add `enabled = false` property.
--- Show diff: 2 splits with the files -> :windo diffthis. To exit -> :windo diffoff
+-- To check all the keymaps -> :Telescope keymaps
+-- Check all notifications -> :Notifications
+-- Check past messages -> :messages
 
--- NOTE: To check all the keymaps -> :Telescope keymaps
--- NOTE: Check all notifications -> :Notifications
+-- TIP: Keymap structure:
+-- b: buffer
+-- g: git/github
+-- c: Coding things
+-- e: explorer
+-- f: list & find something
+-- s: Grep/Search over something
+-- x: close/dismiss something
+-- r: restore sessions
+-- l: List some stuff
 
--- NOTE: For autoformatting language:
--- 1. Add to :Mason ensure_installed,
--- 2. Add to null-ls sources,
--- 3. Add to conform's formatter_by_ft list.
+-- Load keymaps & options
+require("config")
 
--- NOTE: For supporting a language LSP:
--- 1. Add to treesitter ensure_installed,
--- 2. Add to :Mason ensure_installed,
--- 3. Add to none-ls sources,
--- 4. Add to nvim-lint's linters_by_ft list,
--- 5. Add to nvim-lspconfig's servers
+--    `:help lazy.nvim.txt` for more info
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+    vim.system({
+        "git",
+        "clone",
+        "--filter=blob:none",
+        "https://github.com/folke/lazy.nvim.git",
+        "--branch=stable",
+        lazypath,
+    })
+end
+vim.opt.rtp:prepend(lazypath)
 
----------------------------------------------------------------------
----------------------------TODO Items--------------------------------
----------------------------------------------------------------------
--- Editor
--- TODO: Telescope: search hidden folders (except .git/.idea/.vscode/node_modules etc.)
--- TODO: Telescope: Map opening selected file in different splits/tabs
--- FIXIT: nvim-lsp: Reduce LSP update progress messages-> opts.lsp.progress{}
--- FIXIT: Disable which-key prompts for 'd' - way too much distraction
--- FIXIT: Remove padding from bottom (below lualine) & right border
-
--- Coding General
--- FIXIT: LSP suggestions hides the line being edited
--- Keymap to close LSP hints?
--- FIXIT: ys commands do not work - some paste thing is overriding it
-
--- FIXIT: SymbolsOutline doesn't work sometimes
--- TODO: Which file installs mason?
--- TODO: Configure following:
--- 1. coding-json.lua,
--- 2. coding-markdown.lua,
--- 4. coding-python.lua (+black),
--- 5. coding-rust.lua
--- TODO: Have inline hints - rust-tools + https://github.com/simrat39/inlay-hints.nvim
--- Test autocomplete on Rust projects
--- 6. coding-tailwind.lua,
--- 7. coding-typescript.lua (+eslint+prettier),
--- TODO: Typescript - LSP integration - not being attached right now
--- Test autocomplete on Typescript projects
--- 8. coding-yaml.lua,
--- 9. coding-docker.lua
--- TODO: null-ls + dap + nlua + neotest in coding.lua
-
--- Coding Rust
--- TODO: Rust debugging
-
--- General
--- TODO: Create Ulauncher plugin for reading/searching/quickaccess saved sessions
--- This needs to open the session in desired terminal app
--- TODO: fzf scipt to show pop-up of all saved sessions on nvim <tab>
-
--- TODO: Figure out how to quickly stop all code suggestions & completions
-
--- bootstrap lazy.nvim, LazyVim and your plugins
-require("config.lazy")
+--  You can also configure plugins after the setup call,
+--    as they will be available in your neovim runtime.
+require("lazy").setup({
+    { import = "plugins" },
+}, {
+    lockfile = vim.fn.stdpath("data") .. "/lazy/lazy-lock.json",
+    change_detection = {
+        notify = false,
+    },
+    performance = {
+        rtp = {
+            -- Disable some rtp plugins
+            disabled_plugins = {
+                "gzip",
+                "matchit",
+                -- "matchparen",
+                "netrwPlugin",
+                "tarPlugin",
+                "tutor",
+                "zipPlugin",
+            },
+        },
+    },
+})
diff --git a/common/.config/nvim/lazyvim.json b/common/.config/nvim/lazyvim.json
deleted file mode 100644
index 65feff7..0000000
--- a/common/.config/nvim/lazyvim.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extras": [
-    "lazyvim.plugins.extras.dap.core",
-    "lazyvim.plugins.extras.dap.nlua",
-    "lazyvim.plugins.extras.editor.navic",
-    "lazyvim.plugins.extras.editor.symbols-outline",
-    "lazyvim.plugins.extras.formatting.black",
-    "lazyvim.plugins.extras.formatting.prettier",
-    "lazyvim.plugins.extras.lang.docker",
-    "lazyvim.plugins.extras.lang.markdown",
-    "lazyvim.plugins.extras.lang.omnisharp",
-    "lazyvim.plugins.extras.lang.python",
-    "lazyvim.plugins.extras.lang.rust",
-    "lazyvim.plugins.extras.lang.yaml",
-    "lazyvim.plugins.extras.linting.eslint",
-    "lazyvim.plugins.extras.lsp.none-ls",
-    "lazyvim.plugins.extras.test.core"
-  ],
-  "news": {
-    "NEWS.md": "2123"
-  },
-  "version": 2
-}
\ No newline at end of file
diff --git a/common/.config/nvim/lua/config/autocmds.lua b/common/.config/nvim/lua/config/autocmds.lua
deleted file mode 100644
index 27e9e06..0000000
--- a/common/.config/nvim/lua/config/autocmds.lua
+++ /dev/null
@@ -1,3 +0,0 @@
--- Autocmds are automatically loaded on the VeryLazy event
--- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
--- Add any additional autocmds here
diff --git a/common/.config/nvim/lua/config/init.lua b/common/.config/nvim/lua/config/init.lua
new file mode 100644
index 0000000..919491d
--- /dev/null
+++ b/common/.config/nvim/lua/config/init.lua
@@ -0,0 +1,2 @@
+require("config.keymaps")
+require("config.options")
diff --git a/common/.config/nvim/lua/config/keymaps.lua b/common/.config/nvim/lua/config/keymaps.lua
index abf66a9..bc7b8d7 100644
--- a/common/.config/nvim/lua/config/keymaps.lua
+++ b/common/.config/nvim/lua/config/keymaps.lua
@@ -1,47 +1,13 @@
--- Keymaps are automatically loaded on the VeryLazy event
--- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
--- Add any additional keymaps here
-
 -- Load Keybindings from VIM
 local vim_mappings = os.getenv("HOME") .. "/.vim/key_maps.vim"
 if vim.loop.fs_stat(vim_mappings) then
     vim.cmd("source " .. vim_mappings)
 end
 
--- Delete Lazyvim.keymap that I don't like
-vim.keymap.del("n", "<S-h>")
-vim.keymap.del("n", "<S-l>")
-vim.keymap.del("n", "[b")
-vim.keymap.del("n", "]b")
-vim.keymap.del("n", "<leader>bb")
-vim.keymap.del("n", "<leader>,")
-vim.keymap.del("n", "<leader>`")
-vim.keymap.del("n", "<leader>qq")
-vim.keymap.del("n", "<leader>cd")
-vim.keymap.del("n", "<leader>l")
-vim.keymap.del("i", ",")
-vim.keymap.del("i", ".")
-vim.keymap.del("i", ";")
-vim.keymap.del("n", "<leader>ur")
-vim.keymap.del("n", "<leader>ww")
-vim.keymap.del("n", "<leader>wd")
-vim.keymap.del("n", "<leader>w-")
-vim.keymap.del("n", "<leader>w|")
-vim.keymap.del("n", "<leader>-")
-vim.keymap.del("n", "<leader>|")
-vim.keymap.del("n", "<leader><tab>l")
-vim.keymap.del("n", "<leader><tab>f")
-vim.keymap.del("n", "<leader><tab><tab>")
-vim.keymap.del("n", "<leader><tab>]")
-vim.keymap.del("n", "<leader><tab>d")
-vim.keymap.del("n", "<leader><tab>[")
-
 vim.keymap.set({ "n" }, "<C-c>", "<cmd> %y+ <CR>", { desc = "Copy entire content of the current buffer" })
 vim.keymap.set("n", "<leader>fn", "<cmd>enew<CR>", { desc = "Create new file/buffer" })
 
--- Following are copied from LazyVim - will use them elsewhere as well
------------------------------------------------------------------------
--- Better up/down
+-- Remap for dealing with word wrap
 vim.keymap.set({ "n", "x" }, "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 vim.keymap.set({ "n", "x" }, "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 
@@ -71,12 +37,22 @@ vim.keymap.set("n", "<S-Tab>", "<cmd>bprevious<CR>", { desc = "Switch to previou
 vim.keymap.set({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save file" })
 vim.keymap.set({ "i", "x", "n", "s" }, "<C-q>", "<cmd>wqa<cr><esc>", { desc = "Save all files and Quit Neovim" })
 
+-- Close Current Buffer
+vim.keymap.set({ "n", "v" }, "<leader>bx", function()
+    if vim.bo.modified then
+        vim.cmd.write()
+    end
+    vim.cmd("bdelete")
+end, { desc = "Save and close current buffer" })
+
 -- Traverse quickfix
 vim.keymap.set("n", "[q", vim.cmd.cprev, { desc = "Previous quickfix" })
 vim.keymap.set("n", "]q", vim.cmd.cnext, { desc = "Next quickfix" })
 
--- Clear search with <esc>
+-- Clear searches
 vim.keymap.set({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and clear hlsearch" })
+vim.keymap.set("n", "<leader>/", "<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>",
+    { desc = "Redraw / clear hlsearch / diff update" })
 
 vim.keymap.set("n", "n", "'Nn'[v:searchforward].'zv'", { expr = true, desc = "Next search result" })
 vim.keymap.set("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
@@ -84,49 +60,3 @@ vim.keymap.set("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next se
 vim.keymap.set("n", "N", "'nN'[v:searchforward].'zv'", { expr = true, desc = "Prev search result" })
 vim.keymap.set("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
 vim.keymap.set("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
-
--- Clear search, diff update and redraw
-vim.keymap.set(
-    "n",
-    "<leader>/",
-    "<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>",
-    { desc = "Redraw / clear hlsearch / diff update" }
-)
-
--- TODO: Remember the default keymaps that are difficult to change right now
--- https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
---
--- map("n", "<leader>xl", "<cmd>lopen<cr>", { desc = "Location List" })
--- map("n", "<leader>xq", "<cmd>copen<cr>", { desc = "Quickfix List" })
--- map({ "n", "v" }, "<leader>cf", function() Util.format({ force = true }) end, { desc = "Format" })
--- map("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" })
--- map("n", "]d", diagnostic_goto(true), { desc = "Next Diagnostic" })
--- map("n", "[d", diagnostic_goto(false), { desc = "Prev Diagnostic" })
--- map("n", "]e", diagnostic_goto(true, "ERROR"), { desc = "Next Error" })
--- map("n", "[e", diagnostic_goto(false, "ERROR"), { desc = "Prev Error" })
--- map("n", "]w", diagnostic_goto(true, "WARN"), { desc = "Next Warning" })
--- map("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" })
--- map("n", "<leader>uf", function() Util.format.toggle() end, { desc = "Toggle auto format (global)" })
--- map("n", "<leader>uF", function() Util.format.toggle(true) end, { desc = "Toggle auto format (buffer)" })
--- map("n", "<leader>us", function() Util.toggle("spell") end, { desc = "Toggle Spelling" })
--- map("n", "<leader>uw", function() Util.toggle("wrap") end, { desc = "Toggle Word Wrap" })
--- map("n", "<leader>uL", function() Util.toggle("relativenumber") end, { desc = "Toggle Relative Line Numbers" })
--- map("n", "<leader>ul", function() Util.toggle.number() end, { desc = "Toggle Line Numbers" })
--- map("n", "<leader>ud", function() Util.toggle.diagnostics() end, { desc = "Toggle Diagnostics" })
--- map("n", "<leader>uc", function() Util.toggle("conceallevel", false, {0, conceallevel}) end, { desc = "Toggle Conceal" })
--- map( "n", "<leader>uh", function() Util.toggle.inlay_hints() end, { desc = "Toggle Inlay Hints" })
--- map("n", "<leader>uT", function() if vim.b.ts_highlight then vim.treesitter.stop() else vim.treesitter.start() end end, { desc = "Toggle Treesitter Highlight" })
--- map("n", "<leader>gg", function() Util.terminal({ "lazygit" }, { cwd = Util.root(), esc_esc = false, ctrl_hjkl = false }) end, { desc = "Lazygit (root dir)" })
--- map("n", "<leader>gG", function() Util.terminal({ "lazygit" }, {esc_esc = false, ctrl_hjkl = false}) end, { desc = "Lazygit (cwd)" })
--- map("n", "<leader>ui", vim.show_pos, { desc = "Inspect Pos" })
--- map("n", "<leader>ft", lazyterm, { desc = "Terminal (root dir)" })
--- map("n", "<leader>fT", function() Util.terminal() end, { desc = "Terminal (cwd)" })
--- map("n", "<c-/>", lazyterm, { desc = "Terminal (root dir)" })
--- map("n", "<c-_>", lazyterm, { desc = "which_key_ignore" })
--- map("t", "<esc><esc>", "<c-\\><c-n>", { desc = "Enter Normal Mode" })
--- map("t", "<C-h>", "<cmd>wincmd h<cr>", { desc = "Go to left window" })
--- map("t", "<C-j>", "<cmd>wincmd j<cr>", { desc = "Go to lower window" })
--- map("t", "<C-k>", "<cmd>wincmd k<cr>", { desc = "Go to upper window" })
--- map("t", "<C-l>", "<cmd>wincmd l<cr>", { desc = "Go to right window" })
--- map("t", "<C-/>", "<cmd>close<cr>", { desc = "Hide Terminal" })
--- map("t", "<c-_>", "<cmd>close<cr>", { desc = "which_key_ignore" })
diff --git a/common/.config/nvim/lua/config/lazy.lua b/common/.config/nvim/lua/config/lazy.lua
deleted file mode 100644
index 343ade4..0000000
--- a/common/.config/nvim/lua/config/lazy.lua
+++ /dev/null
@@ -1,50 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  -- bootstrap lazy.nvim
-  -- stylua: ignore
-  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
-end
-vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
-
-require("lazy").setup({
-    change_detection = {
-        enabled = true,
-        notify = false,
-    },
-    spec = {
-        -- add LazyVim and import its plugins
-        { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-        -- import any extras modules here
-        { import = "lazyvim.plugins.extras.lang.typescript" },
-        { import = "lazyvim.plugins.extras.lang.json" },
-        -- { import = "lazyvim.plugins.extras.ui.mini-animate" },
-        -- import/override with your plugins
-        { import = "plugins" },
-    },
-    defaults = {
-        -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
-        -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
-        lazy = false,
-        -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
-        -- have outdated releases, which may break your Neovim install.
-        version = false, -- always use the latest git commit
-        -- version = "*", -- try installing the latest stable version for plugins that support semver
-    },
-    install = { colorscheme = { "tokyonight" } },
-    --checker = { enabled = true }, -- automatically check for plugin updates
-    performance = {
-        rtp = {
-            -- disable some rtp plugins
-            disabled_plugins = {
-                "gzip",
-                "matchit",
-                "matchparen",
-                "netrwPlugin",
-                "tarPlugin",
-                "tohtml",
-                "tutor",
-                "zipPlugin",
-            },
-        },
-    },
-})
diff --git a/common/.config/nvim/lua/config/options.lua b/common/.config/nvim/lua/config/options.lua
index 2ce7209..0f39e60 100644
--- a/common/.config/nvim/lua/config/options.lua
+++ b/common/.config/nvim/lua/config/options.lua
@@ -1,6 +1,6 @@
--- Options are automatically loaded before lazy.nvim startup
--- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
--- Add any additional options here
+-- Options available as-is: VimScript,
+--      Options starting with nvim_: lua
+--      To set VimScript options in lua: use either vim.opt (:help vim.opt)
 
 -- Load configs from VIM
 local vim_configs = os.getenv("HOME") .. "/.vim/configs.vim"
@@ -13,3 +13,4 @@ vim.opt.backupdir = vim.fn.stdpath("config") .. "/backup/"
 
 vim.opt.wrap = true
 vim.opt.cursorline = true
+vim.opt.inccommand = "split" -- With :%s command, show the preview in a split instead of inline
diff --git a/common/.config/nvim/lua/plugins/coding-cmp.lua b/common/.config/nvim/lua/plugins/coding-cmp.lua
new file mode 100644
index 0000000..eecef14
--- /dev/null
+++ b/common/.config/nvim/lua/plugins/coding-cmp.lua
@@ -0,0 +1,94 @@
+return {
+    {
+        -- Autocompletion
+        "hrsh7th/nvim-cmp",
+        dependencies = {
+            -- Snippet Engine & its associated nvim-cmp source
+            "L3MON4D3/LuaSnip",
+            "saadparwaiz1/cmp_luasnip",
+
+            -- Adds LSP completion capabilities
+            "hrsh7th/cmp-nvim-lsp",
+            "hrsh7th/cmp-path",
+
+            -- Adds a number of user-friendly snippets
+            "rafamadriz/friendly-snippets",
+
+            -- Autocompletion for commands
+            "hrsh7th/cmp-cmdline",
+        },
+        config = function()
+            -- [[ Configure nvim-cmp ]]
+            -- See `:help cmp`
+            local cmp = require("cmp")
+            local luasnip = require("luasnip")
+            require("luasnip.loaders.from_vscode").lazy_load()
+            luasnip.config.setup({})
+
+            cmp.setup({
+                snippet = {
+                    expand = function(args)
+                        luasnip.lsp_expand(args.body)
+                    end,
+                },
+                completion = {
+                    completeopt = "menu,menuone,noinsert",
+                },
+                mapping = cmp.mapping.preset.insert({
+                    ["<C-n>"] = cmp.mapping.select_next_item(),
+                    ["<C-p>"] = cmp.mapping.select_prev_item(),
+                    ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+                    ["<C-f>"] = cmp.mapping.scroll_docs(4),
+                    ["<C-Space>"] = cmp.mapping.complete({}),
+                    ["<CR>"] = cmp.mapping.confirm({
+                        behavior = cmp.ConfirmBehavior.Replace,
+                        select = true,
+                    }),
+                    ["<Tab>"] = cmp.mapping(function(fallback)
+                        if cmp.visible() then
+                            cmp.select_next_item()
+                        elseif luasnip.expand_or_locally_jumpable() then
+                            luasnip.expand_or_jump()
+                        else
+                            fallback()
+                        end
+                    end, { "i", "s" }),
+                    ["<S-Tab>"] = cmp.mapping(function(fallback)
+                        if cmp.visible() then
+                            cmp.select_prev_item()
+                        elseif luasnip.locally_jumpable(-1) then
+                            luasnip.jump(-1)
+                        else
+                            fallback()
+                        end
+                    end, { "i", "s" }),
+                }),
+                sources = {
+                    { name = "nvim_lsp" },
+                    { name = "luasnip" },
+                    { name = "path" },
+                },
+            })
+
+            cmp.setup.cmdline("/", {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = {
+                    { name = "buffer" },
+                }
+            })
+            cmp.setup.cmdline(":", {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = cmp.config.sources({
+                    { name = "path" },
+                }, {
+                    {
+                        name = "cmdline",
+                        option = {
+                            ignore_cmds = { "Man", "!" }
+                        }
+                    }
+                })
+            })
+        end
+    },
+}
diff --git a/common/.config/nvim/lua/plugins/coding-completions.lua b/common/.config/nvim/lua/plugins/coding-completions.lua
deleted file mode 100644
index 7327ce3..0000000
--- a/common/.config/nvim/lua/plugins/coding-completions.lua
+++ /dev/null
@@ -1,81 +0,0 @@
-return {
-
-    -- Auto completion
-    {
-        "hrsh7th/nvim-cmp",
-        opts = function()
-            vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true })
-            local cmp = require("cmp")
-            local defaults = require("cmp.config.default")()
-            return {
-                completion = {
-                    completeopt = "menu,menuone,noinsert",
-                },
-                snippet = {
-                    expand = function(args)
-                        require("luasnip").lsp_expand(args.body)
-                    end,
-                },
-                mapping = cmp.mapping.preset.insert({
-                    ["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
-                    ["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
-                    ["<C-d>"] = cmp.mapping.scroll_docs(-4),
-                    ["<C-u>"] = cmp.mapping.scroll_docs(4),
-                    ["<C-Space>"] = cmp.mapping.complete(),
-                    ["<C-x>"] = cmp.mapping.abort(),
-                    ["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-                    ["<S-CR>"] = cmp.mapping.confirm({
-                        behavior = cmp.ConfirmBehavior.Replace,
-                        select = true,
-                    }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-                    ["<C-CR>"] = function(fallback)
-                        cmp.abort()
-                        fallback()
-                    end,
-                }),
-                sources = cmp.config.sources({
-                    { name = "nvim_lsp" },
-                    { name = "path" },
-                    { name = "luasnip" },
-                }, {
-                    { name = "buffer" },
-                }),
-                formatting = {
-                    format = function(_, item)
-                        local icons = require("lazyvim.config").icons.kinds
-                        if icons[item.kind] then
-                            item.kind = icons[item.kind] .. item.kind
-                        end
-                        return item
-                    end,
-                },
-                experimental = {
-                    ghost_text = {
-                        hl_group = "CmpGhostText",
-                    },
-                },
-                sorting = defaults.sorting,
-            }
-        end,
-    },
-
-    -- Snippets
-    {
-        "L3MON4D3/LuaSnip",
-        -- stylua: ignore
-        keys = {
-            {
-                "<tab>",
-                function()
-                    return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>"
-                end,
-                expr = true, silent = true, mode = "i",
-            },
-            { "<tab>", function() require("luasnip").jump(1) end, mode = "s" },
-            { "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" } },
-        },
-    },
-
-    -- VSCode like Snippets
-    { "rafamadriz/friendly-snippets" },
-}
diff --git a/common/.config/nvim/lua/plugins/coding-csharp.lua b/common/.config/nvim/lua/plugins/coding-csharp.lua
deleted file mode 100644
index cf738f2..0000000
--- a/common/.config/nvim/lua/plugins/coding-csharp.lua
+++ /dev/null
@@ -1,68 +0,0 @@
-return {
-    { "Hoffs/omnisharp-extended-lsp.nvim" },
-    {
-        "nvim-treesitter/nvim-treesitter",
-        opts = function(_, opts)
-            if type(opts.ensure_installed) == "table" then
-                vim.list_extend(opts.ensure_installed, { "c_sharp" })
-            end
-        end,
-    },
-    {
-        "nvimtools/none-ls.nvim",
-        optional = true,
-        opts = function(_, opts)
-            local nls = require("null-ls")
-            opts.sources = opts.sources or {}
-            table.insert(opts.sources, nls.builtins.formatting.csharpier)
-        end,
-    },
-    {
-        "stevearc/conform.nvim",
-        optional = true,
-        opts = {
-            formatters_by_ft = {
-                cs = { "csharpier" },
-            },
-            formatters = {
-                csharpier = {
-                    command = "dotnet-csharpier",
-                    args = { "--write-stdout" },
-                },
-            },
-        },
-    },
-    {
-        "williamboman/mason.nvim",
-        opts = function(_, opts)
-            opts.ensure_installed = opts.ensure_installed or {}
-            table.insert(opts.ensure_installed, "csharpier")
-        end,
-    },
-    {
-        "neovim/nvim-lspconfig",
-        opts = {
-            servers = {
-                omnisharp = {
-                    handlers = {
-                        ["textDocument/definition"] = function(...)
-                            return require("omnisharp_extended").handler(...)
-                        end,
-                    },
-                    keys = {
-                        {
-                            "gd",
-                            function()
-                                require("omnisharp_extended").telescope_lsp_definitions()
-                            end,
-                            desc = "Goto Definition",
-                        },
-                    },
-                    enable_roslyn_analyzers = true,
-                    organize_imports_on_format = true,
-                    enable_import_completion = true,
-                },
-            },
-        },
-    },
-}
diff --git a/common/.config/nvim/lua/plugins/coding-debug.lua b/common/.config/nvim/lua/plugins/coding-debug.lua
new file mode 100644
index 0000000..a1d8a27
--- /dev/null
+++ b/common/.config/nvim/lua/plugins/coding-debug.lua
@@ -0,0 +1,85 @@
+-- debug.lua
+--
+-- Shows how to use the DAP plugin to debug your code.
+--
+-- Primarily focused on configuring the debugger for Go, but can
+-- be extended to other languages as well. That's why it's called
+-- kickstart.nvim and not kitchen-sink.nvim ;)
+
+return {
+    "mfussenegger/nvim-dap",
+    dependencies = {
+        -- Creates a beautiful debugger UI
+        "rcarriga/nvim-dap-ui",
+
+        -- Installs the debug adapters for you
+        "williamboman/mason.nvim",
+        "jay-babu/mason-nvim-dap.nvim",
+
+        -- Add your own debuggers here
+        "leoluz/nvim-dap-go",
+    },
+    config = function()
+        local dap = require("dap")
+        local dapui = require("dapui")
+
+        require("mason-nvim-dap").setup({
+            -- Makes a best effort to setup the various debuggers with
+            -- reasonable debug configurations
+            automatic_setup = true,
+
+            -- You can provide additional configuration to the handlers,
+            -- see mason-nvim-dap README for more information
+            handlers = {},
+
+            -- You'll need to check that you have the required things installed
+            -- online, please don't ask me how to install them :)
+            ensure_installed = {
+                -- Update this to ensure that you have the debuggers for the langs you want
+                "delve",
+            },
+        })
+
+        -- Basic debugging keymaps, feel free to change to your liking!
+        vim.keymap.set("n", "<F5>", dap.continue, { desc = "Debug: Start/Continue" })
+        vim.keymap.set("n", "<F1>", dap.step_into, { desc = "Debug: Step Into" })
+        vim.keymap.set("n", "<F2>", dap.step_over, { desc = "Debug: Step Over" })
+        vim.keymap.set("n", "<F3>", dap.step_out, { desc = "Debug: Step Out" })
+        vim.keymap.set("n", "<leader>b", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" })
+        vim.keymap.set("n", "<leader>B", function()
+            dap.set_breakpoint(vim.fn.input("Breakpoint condition: "))
+        end, { desc = "Debug: Set Breakpoint" })
+
+        -- Dap UI setup
+        -- For more information, see |:help nvim-dap-ui|
+        dapui.setup({
+            -- Set icons to characters that are more likely to work in every terminal.
+            --    Feel free to remove or use ones that you like more! :)
+            --    Don't feel like these are good choices.
+            icons = { expanded = "▾", collapsed = "▸", current_frame = "*" },
+            controls = {
+                icons = {
+                    pause = "⏸",
+                    play = "▶",
+                    step_into = "⏎",
+                    step_over = "⏭",
+                    step_out = "⏮",
+                    step_back = "b",
+                    run_last = "▶▶",
+                    terminate = "⏹",
+                    disconnect = "⏏",
+                },
+            },
+        })
+
+        -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
+        vim.keymap.set("n", "<F7>", dapui.toggle, { desc = "Debug: See last session result." })
+
+        dap.listeners.after.event_initialized["dapui_config"] = dapui.open
+        dap.listeners.before.event_terminated["dapui_config"] = dapui.close
+        dap.listeners.before.event_exited["dapui_config"] = dapui.close
+
+        -- Install golang specific config
+        require("dap-go").setup()
+    end,
+}
diff --git a/common/.config/nvim/lua/plugins/coding-docker.lua b/common/.config/nvim/lua/plugins/coding-docker.lua
deleted file mode 100644
index a564707..0000000
--- a/common/.config/nvim/lua/plugins/coding-docker.lua
+++ /dev/null
@@ -1 +0,0 @@
-return {}
diff --git a/common/.config/nvim/lua/plugins/coding-formatting.lua b/common/.config/nvim/lua/plugins/coding-formatting.lua
new file mode 100644
index 0000000..d6460cb
--- /dev/null
+++ b/common/.config/nvim/lua/plugins/coding-formatting.lua
@@ -0,0 +1,70 @@
+-- autoformat.lua
+return {
+    "neovim/nvim-lspconfig",
+    config = function()
+        -- Switch for controlling whether you want autoformatting.
+        --  Use :KickstartFormatToggle to toggle autoformatting on or off
+        local format_is_enabled = true
+        vim.api.nvim_create_user_command("KickstartFormatToggle", function()
+            format_is_enabled = not format_is_enabled
+            print("Setting autoformatting to: " .. tostring(format_is_enabled))
+        end, {})
+
+        -- Create an augroup that is used for managing our formatting autocmds.
+        --      We need one augroup per client to make sure that multiple clients
+        --      can attach to the same buffer without interfering with each other.
+        local _augroups = {}
+        local get_augroup = function(client)
+            if not _augroups[client.id] then
+                local group_name = "kickstart-lsp-format-" .. client.name
+                local id = vim.api.nvim_create_augroup(group_name, { clear = true })
+                _augroups[client.id] = id
+            end
+
+            return _augroups[client.id]
+        end
+
+        -- Whenever an LSP attaches to a buffer, we will run this function.
+        --
+        -- See `:help LspAttach` for more information about this autocmd event.
+        vim.api.nvim_create_autocmd("LspAttach", {
+            group = vim.api.nvim_create_augroup("kickstart-lsp-attach-format", { clear = true }),
+            -- This is where we attach the autoformatting for reasonable clients
+            callback = function(args)
+                local client_id = args.data.client_id
+                local client = vim.lsp.get_client_by_id(client_id)
+                local bufnr = args.buf
+
+                -- Only attach to clients that support document formatting
+                if not client.server_capabilities.documentFormattingProvider then
+                    return
+                end
+
+                -- Tsserver usually works poorly. Sorry you work with bad languages
+                -- You can remove this line if you know what you're doing :)
+                if client.name == "tsserver" then
+                    return
+                end
+
+                -- Create an autocmd that will run *before* we save the buffer.
+                --  Run the formatting command for the LSP that has just attached.
+                vim.api.nvim_create_autocmd("BufWritePre", {
+                    group = get_augroup(client),
+                    buffer = bufnr,
+                    callback = function()
+                        if not format_is_enabled then
+                            return
+                        end
+
+                        vim.lsp.buf.format({
+                            async = false,
+                            filter = function(c)
+                                return c.id == client.id
+                            end,
+                        })
+                    end,
+                })
+            end,
+        })
+    end,
+}
diff --git a/common/.config/nvim/lua/plugins/coding-generic.lua b/common/.config/nvim/lua/plugins/coding-generic.lua
new file mode 100644
index 0000000..c30ae72
--- /dev/null
+++ b/common/.config/nvim/lua/plugins/coding-generic.lua
@@ -0,0 +1,74 @@
+return {
+    { "tpope/vim-repeat" },
+    { "tpope/vim-surround" },
+    { "easymotion/vim-easymotion" },
+    { "machakann/vim-highlightedyank" },
+
+    -- "gc" to comment visual regions/lines
+    { "numToStr/Comment.nvim",        opts = {} },
+
+    -- auto pairs
+    {
+        "echasnovski/mini.pairs",
+        event = "VeryLazy",
+        opts = {},
+    },
+
+    -- indent guides for Neovim
+    {
+        "lukas-reineke/indent-blankline.nvim",
+        opts = {
+            indent = { char = "│", tab_char = "│", },
+            scope = { enabled = false },
+            exclude = {
+                filetypes = {
+                    "help", "alpha", "dashboard", "neo-tree",
+                    "Trouble", "trouble", "lazy", "mason",
+                    "notify", "toggleterm", "lazyterm",
+                },
+            },
+        },
+        main = "ibl",
+    },
+
+    -- Highlights the current level of indentation, and animates the highlighting.
+    {
+        "echasnovski/mini.indentscope",
+        opts = { symbol = "│", options = { try_as_border = true }, },
+        init = function()
+            vim.api.nvim_create_autocmd("FileType", {
+                pattern = {
+                    "help", "neo-tree", "Trouble", "trouble",
+                    "lazy", "mason", "notify", "toggleterm",
+                    "lazyterm",
+                },
+                callback = function()
+                    vim.b.miniindentscope_disable = true
+                end,
+            })
+        end,
+    },
+
+    -- Finds and lists all of the TODO, HACK, BUG, etc comment
+    {
+        "folke/todo-comments.nvim",
+        lazy = false,
+        dependencies = { "nvim-lua/plenary.nvim" },
+        config = true,
+        opts = {
+            keywords = {
+                HACK = { alt = { "TIP" } },
+            },
+        },
+        keys = {
+            { "]t", function() require("todo-comments").jump_next() end, desc = "Next todo comment" },
+            { "[t", function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" },
+
+            -- TODO: Find better keymaps for below
+            -- { "<leader>xt", "<cmd>TodoTrouble<cr>", desc = "Todo (Trouble)" },
+            -- { "<leader>xT", "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme (Trouble)" },
+            -- { "<leader>st", "<cmd>TodoTelescope<cr>", desc = "Todo" },
+            -- { "<leader>sT", "<cmd>TodoTelescope keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme" },
+        },
+    },
+}
diff --git a/common/.config/nvim/lua/plugins/coding-git.lua b/common/.config/nvim/lua/plugins/coding-git.lua
new file mode 100644
index 0000000..7ddb978
--- /dev/null
+++ b/common/.config/nvim/lua/plugins/coding-git.lua
@@ -0,0 +1,74 @@
+return {
+
+    { "tpope/vim-fugitive", },
+    --{  "tpope/vim-rhubarb" }, --If fugitive.vim is the Git, rhubarb.vim is the Hub.
+
+    {
+        -- Adds git related signs to the gutter, as well as utilities for managing changes
+        "lewis6991/gitsigns.nvim",
+        opts = {
+            -- See `:help gitsigns.txt`
+            signs = {
+                add = { text = "+" },
+                change = { text = "~" },
+                delete = { text = "_" },
+                topdelete = { text = "‾" },
+                changedelete = { text = "~" },
+            },
+            on_attach = function(bufnr)
+                local gs = package.loaded.gitsigns
+
+                local function map(mode, l, r, opts)
+                    opts = opts or {}
+                    opts.buffer = bufnr
+                    vim.keymap.set(mode, l, r, opts)
+                end
+
+                -- Navigation
+                map({ "n", "v" }, "]h", function()
+                    if vim.wo.diff then
+                        return "]h"
+                    end
+                    vim.schedule(function()
+                        gs.next_hunk()
+                    end)
+                    return "<Ignore>"
+                end, { expr = true, desc = "Jump to next git hunk" })
+
+                map({ "n", "v" }, "[h", function()
+                    if vim.wo.diff then
+                        return "[h"
+                    end
+                    vim.schedule(function()
+                        gs.prev_hunk()
+                    end)
+                    return "<Ignore>"
+                end, { expr = true, desc = "Jump to previous git hunk" })
+
+                -- Actions
+                -- visual mode
+                map("v", "<leader>ghr", function()
+                    gs.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
+                end, { desc = "reset git hunk" })
+                -- normal mode
+                map("n", "<leader>ghp", gs.preview_hunk, { desc = "preview git hunk" })
+
+                map("n", "<leader>ghr", gs.reset_hunk, { desc = "git reset hunk" })
+                map("n", "<leader>ghb", function()
+                    gs.blame_line({ full = false })
+                end, { desc = "git blame line" })
+                map("n", "<leader>ghD", gs.diffthis, { desc = "git diff against index" })
+                map("n", "<leader>ghd", function()
+                    gs.diffthis("~")
+                end, { desc = "git diff against last commit" })
+
+                -- Toggles
+                map("n", "<leader>gtb", gs.toggle_current_line_blame, { desc = "toggle git blame line" })
+                map("n", "<leader>gtd", gs.toggle_deleted, { desc = "toggle git show deleted" })
+
+                -- Text object
+                map({ "o", "x" }, "gih", ":<C-U>Gitsigns select_hunk<CR>", { desc = "select git hunk" })
+            end,
+        },
+    },
+}
diff --git a/common/.config/nvim/lua/plugins/coding-json.lua b/common/.config/nvim/lua/plugins/coding-json.lua
deleted file mode 100644
index a564707..0000000
--- a/common/.config/nvim/lua/plugins/coding-json.lua
+++ /dev/null
@@ -1 +0,0 @@
-return {}
diff --git a/common/.config/nvim/lua/plugins/coding-lsp.lua b/common/.config/nvim/lua/plugins/coding-lsp.lua
new file mode 100644
index 0000000..b0cdf0c
--- /dev/null
+++ b/common/.config/nvim/lua/plugins/coding-lsp.lua
@@ -0,0 +1,144 @@
+-- This function gets run when an LSP connects to a particular buffer.
+-- Define mappings specific for LSP related items.
+-- It sets the mode, buffer and description for us each time.
+local on_attach = function(_, bufnr)
+    local nmap = function(keys, func, desc)
+        if desc then
+            desc = "LSP: " .. desc
+        end
+
+        vim.keymap.set("n", keys, func, { buffer = bufnr, desc = desc })
+    end
+
+    nmap("<leader>rn", vim.lsp.buf.rename, "[R]e[n]ame")
+    nmap("<leader>ca", vim.lsp.buf.code_action, "[C]ode [A]ction")
+
+    nmap("gd", require("telescope.builtin").lsp_definitions, "[G]oto [D]efinition")
+    nmap("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
+    nmap("gI", require("telescope.builtin").lsp_implementations, "[G]oto [I]mplementation")
+    nmap("<leader>D", require("telescope.builtin").lsp_type_definitions, "Type [D]efinition")
+    nmap("<leader>ds", require("telescope.builtin").lsp_document_symbols, "[D]ocument [S]ymbols")
+    nmap("<leader>ws", require("telescope.builtin").lsp_dynamic_workspace_symbols, "[W]orkspace [S]ymbols")
+
+    -- See `:help K` for why this keymap
+    nmap("K", vim.lsp.buf.hover, "Hover Documentation")
+    nmap("<C-k>", vim.lsp.buf.signature_help, "Signature Documentation")
+
+    -- Lesser used LSP functionality
+    nmap("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
+    nmap("<leader>wa", vim.lsp.buf.add_workspace_folder, "[W]orkspace [A]dd Folder")
+    nmap("<leader>wr", vim.lsp.buf.remove_workspace_folder, "[W]orkspace [R]emove Folder")
+    nmap("<leader>wl", function()
+        print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+    end, "[W]orkspace [L]ist Folders")
+
+    -- Create a command `:Format` local to the LSP buffer
+    vim.api.nvim_buf_create_user_command(bufnr, "Format", function(_)
+        vim.lsp.buf.format()
+    end, { desc = "Format current buffer with LSP" })
+end
+
+return {
+    {
+        -- LSP Configuration & Plugins
+        "neovim/nvim-lspconfig",
+        dependencies = {
+            -- Automatically install LSPs to stdpath for neovim
+            { "williamboman/mason.nvim", config = true },
+            { "williamboman/mason-lspconfig.nvim" },
+
+            -- Useful status updates for LSP
+            { "j-hui/fidget.nvim", opts = {} },
+
+            { "folke/neodev.nvim" },
+        },
+        -- WARN: DO NOT do config here
+        -- That would override config from autoformat
+    },
+
+    {
+        "williamboman/mason-lspconfig.nvim",
+        config = function()
+            -- NOTE: We configure lsp here instead of in the lspconfig's config
+            -- Reason? read the warnings above
+
+            -- Configure LSP
+
+            -- mason-lspconfig requires that these setup functions are called in this order
+            -- before setting up the servers.
+            require("mason").setup()
+            require("mason-lspconfig").setup()
+
+            -- Enable the following language servers
+            --  Add any additional override configuration in the following tables. They will be passed to
+            --  the `settings` field of the server config. You must look up that documentation yourself.
+            --
+            --  If you want to override the default filetypes that your language server will attach to you can
+            --  define the property 'filetypes' to the map in question.
+            local servers = {
+                -- clangd = {},
+                -- gopls = {},
+                -- pyright = {},
+                -- rust_analyzer = {},
+                -- tsserver = {},
+                -- html = { filetypes = { 'html', 'twig', 'hbs'} },
+
+                lua_ls = {
+                    Lua = {
+                        workspace = { checkThirdParty = false },
+                        telemetry = { enable = false },
+                        -- NOTE: toggle below to ignore Lua_LS's noisy `missing-fields` warnings
+                        -- diagnostics = { disable = { 'missing-fields' } },
+                    },
+                },
+            }
+
+            -- nvim-cmp supports additional completion capabilities, so broadcast that to servers
+            local capabilities = vim.lsp.protocol.make_client_capabilities()
+            capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
+
+            -- Ensure the servers above are installed
+            local mason_lspconfig = require("mason-lspconfig")
+
+            mason_lspconfig.setup({
+                ensure_installed = vim.tbl_keys(servers),
+            })
+
+            mason_lspconfig.setup_handlers({
+                function(server_name)
+                    require("lspconfig")[server_name].setup({
+                        capabilities = capabilities,
+                        on_attach = on_attach,
+                        settings = servers[server_name],
+                        filetypes = (servers[server_name] or {}).filetypes,
+                    })
+                end,
+            })
+        end,
+    },
+
+    {
+        "j-hui/fidget.nvim",
+        opts = {
+            -- Options related to LSP progress subsystem
+            progress = {
+                poll_rate = 1, -- How and when to poll for progress messages
+                suppress_on_insert = true, -- Suppress new messages while in insert mode
+                ignore_done_already = true, -- Ignore new tasks that are already complete
+                ignore_empty_message = true, -- Ignore new tasks that don't contain a message
+                ignore = {}, -- List of LSP servers to ignore
+
+                -- Options related to how LSP progress messages are displayed as notifications
+                display = {
+                    render_limit = 1, -- How many LSP messages to show at once
+                    skip_history = true, -- Whether progress notifications should be omitted from history
+                },
+            },
+
+            -- Options related to notification subsystem
+            notification = {
+                filter = vim.log.levels.WARN, -- Minimum notifications level
+            },
+        },
+    },
+}
diff --git a/common/.config/nvim/lua/plugins/coding-markdown.lua b/common/.config/nvim/lua/plugins/coding-markdown.lua
deleted file mode 100644
index a564707..0000000
--- a/common/.config/nvim/lua/plugins/coding-markdown.lua
+++ /dev/null
@@ -1 +0,0 @@
-return {}
diff --git a/common/.config/nvim/lua/plugins/coding-python.lua b/common/.config/nvim/lua/plugins/coding-python.lua
deleted file mode 100644
index a564707..0000000
--- a/common/.config/nvim/lua/plugins/coding-python.lua
+++ /dev/null
@@ -1 +0,0 @@
-return {}
diff --git a/common/.config/nvim/lua/plugins/coding-rust.lua b/common/.config/nvim/lua/plugins/coding-rust.lua
deleted file mode 100644
index a564707..0000000
--- a/common/.config/nvim/lua/plugins/coding-rust.lua
+++ /dev/null
@@ -1 +0,0 @@
-return {}
diff --git a/common/.config/nvim/lua/plugins/coding-tailwind.lua b/common/.config/nvim/lua/plugins/coding-tailwind.lua
deleted file mode 100644
index a564707..0000000
--- a/common/.config/nvim/lua/plugins/coding-tailwind.lua
+++ /dev/null
@@ -1 +0,0 @@
-return {}
diff --git a/common/.config/nvim/lua/plugins/coding-typescript.lua b/common/.config/nvim/lua/plugins/coding-typescript.lua
deleted file mode 100644
index a564707..0000000
--- a/common/.config/nvim/lua/plugins/coding-typescript.lua
+++ /dev/null
@@ -1 +0,0 @@
-return {}
diff --git a/common/.config/nvim/lua/plugins/coding-yaml.lua b/common/.config/nvim/lua/plugins/coding-yaml.lua
deleted file mode 100644
index a564707..0000000
--- a/common/.config/nvim/lua/plugins/coding-yaml.lua
+++ /dev/null
@@ -1 +0,0 @@
-return {}
diff --git a/common/.config/nvim/lua/plugins/coding.lua b/common/.config/nvim/lua/plugins/coding.lua
deleted file mode 100644
index 35e10cb..0000000
--- a/common/.config/nvim/lua/plugins/coding.lua
+++ /dev/null
@@ -1,293 +0,0 @@
-return {
-
-    -- FIX: Vale (markdown linter) isn't working
-    -- TODO: Configure the linter
-
-    -- Treesitter is a parser generator tool that we can use for syntax highlighting
-    {
-        "nvim-treesitter/nvim-treesitter",
-        lazy = false,
-        keys = {
-            { "<C-Space>", desc = "Increment selection" },
-            { "<C-CR>", desc = "Increment scope selection" },
-            { "<bs>", desc = "Decrement selection", mode = "x" },
-        },
-        ---@type TSConfig
-        ---@diagnostic disable-next-line: missing-fields
-        opts = {
-            highlight = { enable = true },
-            indent = { enable = true },
-            auto_install = true,
-            -- stylua: ignore
-            ensure_installed = {
-                "lua", "luadoc", "luap", "vim", "vimdoc",
-                "diff","query", "regex", "toml", "yaml",
-                "c", "python", "bash",
-                "markdown", "markdown_inline",
-                "html", "javascript", "jsdoc", "json", "jsonc", "tsx", "typescript",
-            },
-            incremental_selection = {
-                enable = true,
-                keymaps = {
-                    init_selection = "<C-space>",
-                    node_incremental = "<C-space>",
-                    scope_incremental = "<C-CR>",
-                    node_decremental = "<bs>",
-                },
-            },
-            textobjects = {
-                -- stylua: ignore
-                -- Defaults(not mentioned below): Select text objects (similar to ip & ap)
-                    -- af: Selects around current function
-                    -- if: Selects inside current function
-                    -- ac: around current Class
-                    -- ic: inside current Class
-                move = {
-                    -- Jump to next and previous text objects
-                    enable = true,
-                    goto_next_start = {
-                        ["]f"] = { query = "@function.outer", desc = "Goto next inner function start" },
-                        ["]c"] = { query = "@class.outer", desc = "Goto next inner class start" },
-                    },
-                    goto_next_end = {
-                        ["]F"] = { query = "@function.outer", desc = "Goto next outer function end" },
-                        ["]C"] = { query = "@class.outer", desc = "Goto next outer class end" },
-                    },
-                    goto_previous_start = {
-                        ["[f"] = { query = "@function.outer", desc = "Goto goto previous inner function start" },
-                        ["[c"] = { query = "@class.outer", desc = "Previous inner class start" },
-                    },
-                    goto_previous_end = {
-                        ["[F"] = { query = "@function.outer", desc = "Goto goto previous outer function start" },
-                        ["[C"] = { query = "@class.outer", desc = "Goto previous outer class start" },
-                    },
-                },
-            },
-        },
-    },
-
-    -- LSP configuration
-    {
-        "neovim/nvim-lspconfig",
-        -- lazy = false,
-        opts = {
-            -- Enable this to enable the builtin LSP inlay hints on Neovim >= 0.10.0
-            -- Be aware that you also will need to properly configure your LSP server to
-            -- provide the inlay hints.
-            inlay_hints = {
-                enabled = true,
-            },
-            -- add any global capabilities here
-            capabilities = {},
-            -- options for vim.lsp.buf.format
-            -- `bufnr` and `filter` is handled by the LazyVim formatter,
-            -- but can be also overridden when specified
-            format = {
-                formatting_options = nil,
-                timeout_ms = nil,
-            },
-            -- LSP Server Settings
-            servers = {
-                lua_ls = {
-                    settings = {
-                        Lua = {
-                            workspace = {
-                                checkThirdParty = false,
-                            },
-                            completion = {
-                                callSnippet = "Replace",
-                            },
-                        },
-                    },
-                },
-                tsserver = {
-                    keys = {
-                        {
-                            "<leader>co",
-                            function()
-                                vim.lsp.buf.code_action({
-                                    apply = true,
-                                    context = {
-                                        only = { "source.organizeImports.ts" },
-                                        diagnostics = {},
-                                    },
-                                })
-                            end,
-                            desc = "Organize Imports",
-                        },
-                        {
-                            "<leader>cR",
-                            function()
-                                vim.lsp.buf.code_action({
-                                    apply = true,
-                                    context = {
-                                        only = { "source.removeUnused.ts" },
-                                        diagnostics = {},
-                                    },
-                                })
-                            end,
-                            desc = "Remove Unused Imports",
-                        },
-                    },
-                    settings = {
-                        typescript = {
-                            format = {},
-                        },
-                        javascript = {
-                            format = {},
-                        },
-                        completions = {
-                            completeFunctionCalls = true,
-                        },
-                    },
-                },
-            },
-        },
-    },
-
-    -- Linting
-    {
-        "mfussenegger/nvim-lint",
-        lazy = false,
-        opts = {
-            -- Event to trigger linters
-            events = { "BufWritePost", "BufReadPost", "InsertLeave" },
-            linters_by_ft = {
-                fish = { "fish" },
-                -- Use the "*" filetype to run linters on all filetypes.
-                -- ['*'] = { 'global linter' },
-                -- Use the "_" filetype to run linters on filetypes that don't have other linters configured.
-                -- ['_'] = { 'fallback linter' },
-            },
-            -- LazyVim extension to easily override linter options
-            -- or add custom linters.
-            ---@type table<string,table>
-            linters = {
-                -- -- Example of using selene only when a selene.toml file is present
-                -- selene = {
-                --   -- `condition` is another LazyVim extension that allows you to
-                --   -- dynamically enable/disable linters based on the context.
-                --   condition = function(ctx)
-                --     return vim.fs.find({ "selene.toml" }, { path = ctx.filename, upward = true })[1]
-                --   end,
-                -- },
-            },
-        },
-    },
-
-    -- Mason configuration
-    {
-        "williamboman/mason.nvim",
-        opts = {
-            ensure_installed = {
-                "prettier",
-                "js-debug-adapter",
-                "eslint-lsp",
-                "json-lsp",
-                "typescript-language-server",
-                "codelldb",
-                "rust-analyzer",
-                "yaml-language-server",
-                "black",
-                "csharpier",
-                "omnisharp",
-                "stylua",
-                "lua-language-server",
-                "shfmt",
-                "pyright",
-                "hadolint",
-                "docker-compose-language-service",
-                "dockerfile-language-server",
-                "vale",
-                "vale-ls",
-                "markdownlint",
-                "marksman",
-                "taplo",
-            },
-        },
-    },
-    { "williamboman/mason-lspconfig.nvim" },
-
-    -- Formatter
-    {
-        "nvimtools/none-ls.nvim",
-        lazy = false,
-        opts = function(_, opts)
-            local nls = require("null-ls")
-            opts.root_dir = opts.root_dir
-                or require("null-ls.utils").root_pattern(".null-ls-root", ".neoconf.json", "Makefile", ".git")
-            opts.sources = vim.list_extend(opts.sources or {}, {
-                nls.builtins.formatting.fish_indent,
-                nls.builtins.diagnostics.fish,
-                nls.builtins.formatting.stylua,
-                nls.builtins.formatting.shfmt,
-                nls.builtins.formatting.eslint_d,
-                nls.builtins.formatting.black,
-                nls.builtins.formatting.prettierd,
-            })
-        end,
-    },
-
-    -- Auto pairs
-    { "echasnovski/mini.pairs" },
-
-    -- Automatically add closing tags for HTML and JSX
-    { "windwp/nvim-ts-autotag" },
-
-    -- Surround things
-    { "tpope/vim-surround" },
-    -- Tpope one(above) is more predictable
-    { "echasnovski/mini.surround", enabled = false },
-
-    -- Comments
-    { "JoosepAlviste/nvim-ts-context-commentstring" },
-    { "echasnovski/mini.comment" },
-
-    -- Better text-objects
-    {
-        -- Extends a & i with the following:
-        -- a/i <space>: around/inside continuous Whitespace
-        -- a/i ": around/inside double quotes
-        -- a/i ': around/inside single quotes
-        -- a/i `: around/inside backticks
-        -- a/i q: around/inside any 2 quotes of any kind (`, ', ")
-
-        -- a/i (: around/inside braces - does NOT include spaces around
-        -- a/i ): around/inside braces - DOES include spaces around
-        -- a/i ]/[
-        -- a/i }/{
-        -- a/i b: around/inside any 2 braces of any kind (), ], }) - NOT including spaces around
-
-        -- a/i >: around/inside tags - does NOT include spaces
-        -- a/i <: around/inside tags - DOES include spaces
-        -- a/i t: around/inside 2 tags of any kind
-
-        -- a/i _: around/inside 2 Underscores
-
-        -- a/i a: around/inside function arguments
-        -- a/i f: around/inside Function
-        -- a/i c: around/inside class
-        -- a/i o: around/inside any block of code (conditional, loop, etc.)
-        "echasnovski/mini.ai",
-    },
-
-    -- Indent guides for Neovim
-    {
-        "lukas-reineke/indent-blankline.nvim",
-        opts = { scope = { enabled = true } },
-    },
-
-    -- This highlights the current level of indentation and animates the highlighting
-    { "echasnovski/mini.indentscope" },
-
-    -- Navic does a much better job without taking any screen space
-    { "nvim-treesitter/nvim-treesitter-context", enabled = false },
-    -- VSCode like breadcrumbs in lualine
-    { "SmiteshP/nvim-navic" },
-
-    -- Shows symbols in the current window on a vsplit on left
-    {
-        "simrat39/symbols-outline.nvim",
-        keys = { { "<leader>cs", "<cmd>SymbolsOutline<cr>", desc = "Symbols Outline" } },
-    },
-}
diff --git a/common/.config/nvim/lua/plugins/colorthemes.lua b/common/.config/nvim/lua/plugins/colorthemes.lua
index de4ca13..c03770b 100644
--- a/common/.config/nvim/lua/plugins/colorthemes.lua
+++ b/common/.config/nvim/lua/plugins/colorthemes.lua
@@ -1,16 +1,10 @@
 return {
-    {
-        "LazyVim/LazyVim",
-        opts = {
-            colorscheme = "github_dark_dimmed",
-        },
-    },
     {
         "projekt0n/github-nvim-theme",
         lazy = false,
         priority = 1000,
         config = function()
-            -- vim.cmd("colorscheme github_dark_dimmed")
+            vim.cmd("colorscheme github_dark_dimmed")
         end,
     },
 }
diff --git a/common/.config/nvim/lua/plugins/editor.lua b/common/.config/nvim/lua/plugins/editor.lua
index e571bd4..18bdecf 100644
--- a/common/.config/nvim/lua/plugins/editor.lua
+++ b/common/.config/nvim/lua/plugins/editor.lua
@@ -1,13 +1,5 @@
--- Most of the code below is for easy reference to lazyvim shortcuts
--- So, I can view and change them easily
-
-local Util = require("lazyvim.util")
-
 return {
 
-    -- icons
-    { "nvim-tree/nvim-web-devicons" },
-
     -- Changes the Nvim root to git root
     {
         "airblade/vim-rooter",
@@ -21,37 +13,14 @@ return {
         "nvim-neo-tree/neo-tree.nvim",
         branch = "v3.x",
         keys = {
-            { "<leader>e", ":Neotree filesystem toggle<CR>", desc = "Explorer NeoTree (root dir)", remap = true },
+            { "<leader>e", ":Neotree filesystem toggle<CR>", desc = "Open NeoTree [E]plorer at Git root", remap = true },
 
-            -- Change the rest if required
-            {
-                "<leader>fe",
-                function()
-                    require("neo-tree.command").execute({ toggle = true, dir = Util.root() })
-                end,
-                desc = "Explorer NeoTree (root dir)",
-            },
-            {
-                "<leader>fE",
-                function()
-                    require("neo-tree.command").execute({ toggle = true, dir = vim.loop.cwd() })
-                end,
-                desc = "Explorer NeoTree (cwd)",
-            },
-            { "<leader>E", "<leader>fE", desc = "Explorer NeoTree (cwd)", remap = true },
-            {
-                "<leader>ge",
-                function()
-                    require("neo-tree.command").execute({ source = "git_status", toggle = true })
-                end,
-                desc = "Git explorer",
-            },
             {
                 "<leader>be",
                 function()
                     require("neo-tree.command").execute({ source = "buffers", toggle = true })
                 end,
-                desc = "Buffer explorer",
+                desc = "NeoTree: Open [B]uffer [E]xplorer",
             },
         },
         opts = {
@@ -72,9 +41,9 @@ return {
             },
             window = {
                 position = "left",
-                width = 30, -- Saner window size
+                width = 30,                -- Saner window size
                 mappings = {
-                    ["s"] = "open_split", -- Default vim keymap for horizontal split
+                    ["s"] = "open_split",  -- Default vim keymap for horizontal split
                     ["v"] = "open_vsplit", -- Default vim keymap for vertical split
                 },
             },
@@ -88,150 +57,11 @@ return {
         },
     },
 
-    -- Search and replace in multiple files
-    {
-        "nvim-pack/nvim-spectre",
-        keys = {
-            {
-                "<leader>sr",
-                function()
-                    require("spectre").open()
-                end,
-                desc = "Replace in files (Spectre)",
-            },
-        },
-    },
-
-    -- Fuzzy finder of many things
-    {
-        "nvim-telescope/telescope.nvim",
-        keys = {
-            -- find
-            { "<leader>ff", Util.telescope("files"), desc = "Find Files (root dir)" },
-            { "<leader><space>", Util.telescope("files"), desc = "Find Files (root dir)" },
-            { "<leader>fb", "<cmd>Telescope buffers sort_mru=true sort_lastused=true<cr>", desc = "Buffers" },
-            { "<leader>fc", Util.telescope.config_files(), desc = "Find Config File" },
-            { "<leader>fF", Util.telescope("files", { cwd = false }), desc = "Find Files (cwd)" },
-            { "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent" },
-            { "<leader>fR", Util.telescope("oldfiles", { cwd = vim.loop.cwd() }), desc = "Recent (cwd)" },
-            { "<leader>/", Util.telescope("live_grep"), desc = "Grep (root dir)" },
-            { "<leader>:", "<cmd>Telescope command_history<cr>", desc = "Command History" },
-
-            -- git
-            { "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "commits" },
-            { "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "status" },
-
-            -- search
-            { '<leader>s"', "<cmd>Telescope registers<cr>", desc = "Registers" },
-            { "<leader>sa", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" },
-            { "<leader>sb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Buffer" },
-            { "<leader>sc", "<cmd>Telescope command_history<cr>", desc = "Command History" },
-            { "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" },
-            { "<leader>sd", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Document diagnostics" },
-            { "<leader>sD", "<cmd>Telescope diagnostics<cr>", desc = "Workspace diagnostics" },
-            { "<leader>sg", Util.telescope("live_grep"), desc = "Grep (root dir)" },
-            { "<leader>sG", Util.telescope("live_grep", { cwd = false }), desc = "Grep (cwd)" },
-            { "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" },
-            { "<leader>sH", "<cmd>Telescope highlights<cr>", desc = "Search Highlight Groups" },
-            { "<leader>sk", "<cmd>Telescope keymaps<cr>", desc = "Key Maps" },
-            { "<leader>sM", "<cmd>Telescope man_pages<cr>", desc = "Man Pages" },
-            { "<leader>sm", "<cmd>Telescope marks<cr>", desc = "Jump to Mark" },
-            { "<leader>so", "<cmd>Telescope vim_options<cr>", desc = "Options" },
-            { "<leader>sR", "<cmd>Telescope resume<cr>", desc = "Resume" },
-            { "<leader>sw", Util.telescope("grep_string", { word_match = "-w" }), desc = "Word (root dir)" },
-            { "<leader>sW", Util.telescope("grep_string", { cwd = false, word_match = "-w" }), desc = "Word (cwd)" },
-            { "<leader>sw", Util.telescope("grep_string"), mode = "v", desc = "Selection (root dir)" },
-            { "<leader>sW", Util.telescope("grep_string", { cwd = false }), mode = "v", desc = "Selection (cwd)" },
-            {
-                "<leader>uC",
-                Util.telescope("colorscheme", { enable_preview = true }),
-                desc = "Colorscheme with preview",
-            },
-            {
-                "<leader>ss",
-                function()
-                    require("telescope.builtin").lsp_document_symbols({
-                        symbols = require("lazyvim.config").get_kind_filter(),
-                    })
-                end,
-                desc = "Goto Symbol",
-            },
-            {
-                "<leader>sS",
-                function()
-                    require("telescope.builtin").lsp_dynamic_workspace_symbols({
-                        symbols = require("lazyvim.config").get_kind_filter(),
-                    })
-                end,
-                desc = "Goto Symbol (Workspace)",
-            },
-        },
-    },
-
-    -- Confusing hence disabled
-    { "folke/flash.nvim", enabled = false },
-    -- EasyMotion is better
-    { "easymotion/vim-easymotion" },
-
-    -- Adds and reads "keys" property in each plugins
-    {
-        "folke/which-key.nvim",
-        opts = {
-            plugins = { spelling = true },
-            defaults = {
-                mode = { "n", "v" },
-                ["g"] = { name = "+goto" },
-                ["ys"] = { name = "+surround" },
-                ["]"] = { name = "+next" },
-                ["["] = { name = "+prev" },
-                ["<leader><tab>"] = { name = "+tabs" },
-                ["<leader>b"] = { name = "+buffer" },
-                ["<leader>c"] = { name = "+code" },
-                ["<leader>f"] = { name = "+file/find" },
-                ["<leader>g"] = { name = "+git" },
-                ["<leader>gh"] = { name = "+hunks" },
-                ["<leader>q"] = { name = "+quit/session" },
-                ["<leader>s"] = { name = "+search" },
-                ["<leader>u"] = { name = "+ui" },
-                ["<leader>w"] = { name = "+windows" },
-                ["<leader>x"] = { name = "+diagnostics/quickfix" },
-            },
-        },
-    },
-
-    -- Display undotree
-    {
-        "mbbill/undotree",
-        config = function()
-            vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
-        end,
-    },
-
-    -- TODO: install gitblame plugin
-
-    -- Highlights text that changed since last commit
-    {
-        "lewis6991/gitsigns.nvim",
-        opts = {
-            on_attach = function(buffer)
-                local gs = package.loaded.gitsigns
-                local function map(mode, l, r, desc)
-                    vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
-                end
-
-                -- stylua: ignore start
-                map("n", "<leader>ghp", gs.preview_hunk, "Preview Hunk")
-                map("n", "<leader>gH", gs.preview_hunk, "Preview Hunk")
-                map("n", "]h", gs.next_hunk, "Next Hunk")
-                map("n", "[h", gs.prev_hunk, "Prev Hunk")
-            end,
-        },
-    },
-
     -- Automatically highlights other instances of the word under cursor
     {
         "RRethy/vim-illuminate",
         config = function(_, opts)
+            -- Copied from LazyNvim
             require("illuminate").configure(opts)
 
             local function map(key, dir, buffer)
@@ -258,168 +88,61 @@ return {
         },
     },
 
-    -- Remove Buffer
+    -- Display undotree
     {
-        "echasnovski/mini.bufremove",
-        keys = {
-            {
-                "<leader>br",
-                function()
-                    if vim.bo.modified then
-                        vim.cmd.write()
-                    end
-                    require("mini.bufremove").delete(0)
-                end,
-                desc = "Save and remove Buffer",
-            },
-            -- stylua: ignore
-            { "<leader>bR", function() require("mini.bufremove").delete(0, true) end, desc = "Force Remove Buffer" },
-        },
+        "mbbill/undotree",
+        config = function()
+            vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
+        end,
     },
 
-    -- Diagnostics lists
+    -- Show buffers like VS Code tabs
     {
-        "folke/trouble.nvim",
+        "akinsho/bufferline.nvim",
+        dependencies = {
+            { "echasnovski/mini.bufremove", version = "*" },
+        },
+        event = "VeryLazy",
         keys = {
-            { "<leader>xx", "<cmd>TroubleToggle document_diagnostics<cr>", desc = "Document Diagnostics (Trouble)" },
-            { "<leader>xX", "<cmd>TroubleToggle workspace_diagnostics<cr>", desc = "Workspace Diagnostics (Trouble)" },
-            { "<leader>xL", "<cmd>TroubleToggle loclist<cr>", desc = "Location List (Trouble)" },
-            { "<leader>xQ", "<cmd>TroubleToggle quickfix<cr>", desc = "Quickfix List (Trouble)" },
-            {
-                "[e",
-                function()
-                    if require("trouble").is_open() then
-                        require("trouble").previous({ skip_groups = true, jump = true })
-                    else
-                        local ok, err = pcall(vim.cmd.cprev)
-                        if not ok then
-                            vim.notify(err, vim.log.levels.ERROR)
-                        end
-                    end
-                end,
-                desc = "Previous trouble/quickfix item",
-            },
-            {
-                "]e",
-                function()
-                    if require("trouble").is_open() then
-                        require("trouble").next({ skip_groups = true, jump = true })
-                    else
-                        local ok, err = pcall(vim.cmd.cnext)
-                        if not ok then
-                            vim.notify(err, vim.log.levels.ERROR)
-                        end
-                    end
-                end,
-                desc = "Next trouble/quickfix item",
+            { "<leader>bp", "<Cmd>BufferLineTogglePin<CR>",   desc = "Toggle buffer-pin" },
+            { "<leader>xo", "<Cmd>BufferLineCloseOthers<CR>", desc = "Delete other buffers" },
+        },
+        opts = {
+            options = {
+                close_command = function(n) require("mini.bufremove").delete(n, false) end,
+                right_mouse_command = function(n) require("mini.bufremove").delete(n, false) end,
+                diagnostics = "nvim_lsp",
+                always_show_bufferline = false,
+                offsets = {
+                    {
+                        filetype = "neo-tree",
+                        text = "Neo-tree",
+                        highlight = "Directory",
+                        text_align = "left",
+                    },
+                },
             },
         },
-    },
-
-    -- Finds and lists all of the TODO, HACK, BUG, etc comment
-    {
-        "folke/todo-comments.nvim",
-        -- stylua: ignore
-        keys = {
-            { "]t", function() require("todo-comments").jump_next() end, desc = "Next todo comment" },
-            { "[t", function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" },
-            { "<leader>xt", "<cmd>TodoTrouble<cr>", desc = "Todo (Trouble)" },
-            { "<leader>xT", "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme (Trouble)" },
-            { "<leader>st", "<cmd>TodoTelescope<cr>", desc = "Todo" },
-            { "<leader>sT", "<cmd>TodoTelescope keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme" },
-        },
+        config = function(_, opts)
+            require("bufferline").setup(opts)
+            -- Fix bufferline when restoring a session
+            vim.api.nvim_create_autocmd("BufAdd", {
+                callback = function()
+                    vim.schedule(function()
+                        pcall(nvim_bufferline)
+                    end)
+                end,
+            })
+        end,
     },
 
     -- UI Stuff ------------------------------------------------------------------------
 
-    -- Fancy-looking tabs, which include filetype icons and close buttons.
-    { "akinsho/bufferline.nvim" },
+    -- icons
+    { "nvim-tree/nvim-web-devicons" },
 
-    -- Fancy Statusline
-    {
-        "nvim-lualine/lualine.nvim",
-        opts = function()
-            local lualine_require = require("lualine_require")
-            lualine_require.require = require
-
-            local icons = require("lazyvim.config").icons
-
-            vim.o.laststatus = vim.g.lualine_laststatus
-
-            return {
-                options = {
-                    theme = "auto",
-                    globalstatus = true,
-                    disabled_filetypes = { statusline = { "dashboard", "alpha", "starter" } },
-                },
-                sections = {
-                    lualine_a = { "mode" },
-                    lualine_b = { "branch" },
-
-                    lualine_c = {
-                        Util.lualine.root_dir(),
-                        {
-                            "diagnostics",
-                            symbols = {
-                                error = icons.diagnostics.Error,
-                                warn = icons.diagnostics.Warn,
-                                info = icons.diagnostics.Info,
-                                hint = icons.diagnostics.Hint,
-                            },
-                        },
-                        { "filetype", icon_only = true, separator = "", padding = { left = 1, right = 0 } },
-                        { Util.lualine.pretty_path() },
-                    },
-                    lualine_x = {
-                        -- stylua: ignore
-                        {
-                            function() return require("noice").api.status.command.get() end,
-                            cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end,
-                            color = Util.ui.fg("Statement"),
-                        },
-                        -- stylua: ignore
-                        {
-                            function() return require("noice").api.status.mode.get() end,
-                            cond = function() return package.loaded["noice"] and require("noice").api.status.mode.has() end,
-                            color = Util.ui.fg("Constant"),
-                        },
-                        -- stylua: ignore
-                        {
-                            function() return "  " .. require("dap").status() end,
-                            cond = function () return package.loaded["dap"] and require("dap").status() ~= "" end,
-                            color = Util.ui.fg("Debug"),
-                        },
-                        {
-                            require("lazy.status").updates,
-                            cond = require("lazy.status").has_updates,
-                            color = Util.ui.fg("Special"),
-                        },
-                        {
-                            "diff",
-                            symbols = {
-                                added = icons.git.added,
-                                modified = icons.git.modified,
-                                removed = icons.git.removed,
-                            },
-                            source = function()
-                                local gitsigns = vim.b.gitsigns_status_dict
-                                if gitsigns then
-                                    return {
-                                        added = gitsigns.added,
-                                        modified = gitsigns.changed,
-                                        removed = gitsigns.removed,
-                                    }
-                                end
-                            end,
-                        },
-                    },
-                    lualine_y = {},
-                    lualine_z = { { "progress" }, { "location" } },
-                },
-                extensions = { "neo-tree", "lazy" },
-            }
-        end,
-    },
+    -- ui components
+    { "MunifTanjim/nui.nvim" },
 
     -- Better vim.ui
     { "stevearc/dressing.nvim" },
@@ -429,7 +152,7 @@ return {
         "rcarriga/nvim-notify",
         keys = {
             {
-                "<leader>un",
+                "<leader>xn",
                 function()
                     require("notify").dismiss({ silent = true, pending = true })
                 end,
@@ -454,13 +177,29 @@ return {
     -- Completely replaces the UI for messages, cmdline and the popupmenu.
     {
         "folke/noice.nvim",
+        event = "VeryLazy",
+        dependencies = {
+            "MunifTanjim/nui.nvim",
+            "rcarriga/nvim-notify",
+        },
         opts = {
+            lsp = {
+                override = {
+                    ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+                    ["vim.lsp.util.stylize_markdown"] = true,
+                    ["cmp.entry.get_documentation"] = true,
+                },
+            },
             routes = {
                 {
                     -- Show popup message when @recording macros
                     view = "notify",
                     filter = { event = "msg_showmode" },
                 },
+                {
+                    filter = { event = "notify", find = "No information available" },
+                    opts = { skin = true },
+                },
                 {
                     -- Direct some messages to bottom - obove lualine
                     view = "mini",
@@ -483,67 +222,43 @@ return {
                         },
                     },
                 },
-                -- TODO: Some messages needs to suppressed completely. Figure out how???
             },
             presets = {
+                lsp_doc_border = true,
                 bottom_search = true,
                 command_palette = true,
                 long_message_to_split = true,
                 inc_rename = true,
             },
         },
-        -- stylua: ignore
         keys = {
-            { "<S-Enter>", function() require("noice").redirect(vim.fn.getcmdline()) end, mode = "c", desc = "Redirect Cmdline" },
-            { "<leader>snl", function() require("noice").cmd("last") end, desc = "Noice Last Message" },
-            { "<leader>snh", function() require("noice").cmd("history") end, desc = "Noice History" },
-            { "<leader>sna", function() require("noice").cmd("all") end, desc = "Noice All" },
-            { "<leader>snd", function() require("noice").cmd("dismiss") end, desc = "Dismiss All" },
-            { "<c-f>", function() if not require("noice.lsp").scroll(4) then return "<c-f>" end end, silent = true, expr = true, desc = "Scroll forward", mode = {"i", "n", "s"} },
-            { "<c-b>", function() if not require("noice.lsp").scroll(-4) then return "<c-b>" end end, silent = true, expr = true, desc = "Scroll backward", mode = {"i", "n", "s"}},
+            { "<leader>nx", "<cmd>NoiceDismiss<CR>", desc = "Dismiss all [N]oice notifications" },
+            -- TODO: Find better keymaps
+            -- { "<S-Enter>",   function() require("noice").redirect(vim.fn.getcmdline()) end,                 mode = "c",                 desc = "Redirect Cmdline" },
+            -- { "<leader>snl", function() require("noice").cmd("last") end,                                   desc = "Noice Last Message" },
+            -- { "<leader>snh", function() require("noice").cmd("history") end,                                desc = "Noice History" },
+            -- { "<leader>sna", function() require("noice").cmd("all") end,                                    desc = "Noice All" },
+            -- { "<leader>snd", function() require("noice").cmd("dismiss") end,                                desc = "Dismiss All" },
+            -- { "<leader>snd", function() require("noice").cmd("dismiss") end,                                desc = "Dismiss All" },
+            -- { "<c-f>",       function() if not require("noice.lsp").scroll(4) then return "<c-f>" end end,  silent = true,              expr = true,              desc = "Scroll forward",  mode = { "i", "n", "s" } },
+            -- { "<c-b>",       function() if not require("noice.lsp").scroll(-4) then return "<c-b>" end end, silent = true,              expr = true,              desc = "Scroll backward", mode = { "i", "n", "s" } },
         },
     },
 
-    -- ui components
-    { "MunifTanjim/nui.nvim" },
-
-    { "goolord/alpha-nvim", enabled = false },
+    -- Set lualine as statusline
     {
-        "akinsho/toggleterm.nvim",
-        cmd = "ToggleTerm",
-        build = ":ToggleTerm",
-        keys = {
-            -- NOTE: Do not use <leader> for terminals, there would be issue escaping
-            -- F13 = Shift + F1
-            { "<F13>", "<cmd>ToggleTerm direction=horizontal<cr>", desc = "Toggle horizontal terminal" },
-        },
+        "nvim-lualine/lualine.nvim",
+        -- See `:help lualine.txt`
         opts = {
-            open_mapping = [[<F13>]],
-            direction = "horizontal",
-            shade_filetypes = {},
-            hide_numbers = true,
-            insert_mappings = true,
-            terminal_mappings = true,
-            start_in_insert = true,
-            close_on_exit = true,
-            float_opts = {
-                border = "curved",
+            -- TODO: Need the following:
+            -- - Remove encoding & OS
+            -- - Add Breadcrumb
+            -- - Show command that was typed
+            options = {
+                icons_enabled = false,
+                component_separators = "|",
+                section_separators = "",
             },
         },
     },
-    {
-        "mikesmithgh/kitty-scrollback.nvim",
-        lazy = true,
-        cmd = { "KittyScrollbackGenerateKittens", "KittyScrollbackCheckHealth" },
-        event = { "User KittyScrollbackLaunch" },
-        version = "^3.0.0",
-        opts = {
-            status_window = {
-                icons = { nvim = "" },
-            },
-        },
-        config = function()
-            require("kitty-scrollback").setup()
-        end,
-    },
 }
diff --git a/common/.config/nvim/lua/plugins/formatting.lua b/common/.config/nvim/lua/plugins/formatting.lua
deleted file mode 100644
index 6c47662..0000000
--- a/common/.config/nvim/lua/plugins/formatting.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-return {
-    {
-        "stevearc/conform.nvim",
-        keys = {
-            {
-                "<leader>cF",
-                function()
-                    require("conform").format({ formatters = { "injected" } })
-                end,
-                mode = { "n", "v" },
-                desc = "Format Injected Langs",
-            },
-        },
-    },
-}
diff --git a/common/.config/nvim/lua/plugins/init.lua b/common/.config/nvim/lua/plugins/init.lua
new file mode 100644
index 0000000..f2adbd1
--- /dev/null
+++ b/common/.config/nvim/lua/plugins/init.lua
@@ -0,0 +1,3 @@
+return {
+    -- NOTE: Placeholder for new plugins I'm trying out
+}
diff --git a/common/.config/nvim/lua/plugins/linting.lua b/common/.config/nvim/lua/plugins/linting.lua
deleted file mode 100644
index 4a854ef..0000000
--- a/common/.config/nvim/lua/plugins/linting.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-return {
-    {
-        "mfussenegger/nvim-lint",
-        opts = {
-            linters_by_ft = {
-                text = { "vale" },
-                json = { "jsonlint" },
-                markdown = { "markdownlint", "vale" },
-                rst = { "vale" },
-                dockerfile = { "hadolint" },
-                go = { "golangcilint" },
-                jq = { "jq" },
-                bash = { "shellcheck" },
-                shell = { "shellcheck" },
-                yaml = { "yamllint" },
-                zsh = { "zsh" },
-                typescript = { "eslint_d" },
-                javascript = { "eslint_d" },
-                -- Use the "*" filetype to run linters on all filetypes.
-                -- ['*'] = { 'global linter' },
-                -- Use the "_" filetype to run linters on filetypes that don't have other linters configured.
-                -- ['_'] = { 'fallback linter' },
-            },
-        },
-    },
-}
diff --git a/common/.config/nvim/lua/plugins/telescope.lua b/common/.config/nvim/lua/plugins/telescope.lua
new file mode 100644
index 0000000..c7ef3dd
--- /dev/null
+++ b/common/.config/nvim/lua/plugins/telescope.lua
@@ -0,0 +1,119 @@
+return {
+    -- Fuzzy Finder (files, lsp, etc)
+    {
+        "nvim-telescope/telescope.nvim",
+        branch = "0.1.x",
+        lazy = false,
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+            {
+                "nvim-telescope/telescope-fzf-native.nvim",
+                build = "make",
+                cond = function()
+                    return vim.fn.executable("make") == 1
+                end,
+            },
+        },
+        config = function()
+            -- NOTE: Search in hidden files trick taken from: https://stackoverflow.com/a/75500661/11057673
+            local telescopeConfig = require("telescope.config")
+
+            -- Clone the default Telescope configuration
+            local vimgrep_arguments = { unpack(telescopeConfig.values.vimgrep_arguments) }
+
+            -- Add flag to search hidden files/folders
+            table.insert(vimgrep_arguments, "--hidden")
+            table.insert(vimgrep_arguments, "--glob")
+            -- And to ignore .git directory. Needed since its not `.gitignore`d
+            table.insert(vimgrep_arguments, "!**/.git/*")
+
+            require("telescope").setup({
+                defaults = {
+                    -- `hidden = true` is not supported in text grep commands.
+                    hidden = true,
+                    -- Without this live_grep would show .git entries
+                    vimgrep_arguments = vimgrep_arguments,
+                    mappings = {
+                        i = {
+                            ["<C-u>"] = false,
+                            ["<C-d>"] = false,
+                        },
+                    },
+                },
+                pickers = {
+                    colorscheme = { enable_preview = true },
+                    find_files = {
+                        hidden = true,
+                        -- Redoing the vimgrep_arguments changes for find_files as well
+                        find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*" },
+                    },
+                },
+            })
+
+            -- Load some required Telescope extensions
+            pcall(require("telescope").load_extension, "fzf")
+            pcall(require("telescope").load_extension, "noice")
+            pcall(require("telescope").load_extension, "undo")
+
+            -- Special Things: [T]elescope
+            vim.keymap.set("n", "<leader>tr", require("telescope.builtin").resume,
+                { desc = "[T]elescope [R]esume Last Search" })
+            vim.keymap.set("n", "<leader>tc", require("telescope.builtin").colorscheme,
+                { desc = "List Colorschemes (with preview)" })
+
+            -- Grep things -> [S]earch
+            vim.keymap.set("n", "<leader>sb", function()
+                require("telescope.builtin").live_grep({
+                    grep_open_files = true,
+                    prompt_title = "Live Grep in Open Files",
+                })
+            end, { desc = "[S]earch Open [B]uffers" })
+            vim.keymap.set("n", "<leader>sg", require("telescope.builtin").live_grep,
+                { desc = "[S]earch/Live[G]rep the Project" })
+            vim.keymap.set("n", "<leader>sw", require("telescope.builtin").grep_string,
+                { desc = "[S]earch current [W]ord in Project" })
+
+            -- [L]ist
+            vim.keymap.set("n", "<leader>lb", require("telescope.builtin").buffers, { desc = "[L]ist [B]uffers" })
+            vim.keymap.set("n", "<leader>lc", require("telescope.builtin").command_history,
+                { desc = "[L]ist NeoVIM [C]ommand History" })
+            vim.keymap.set("n", "<leader>lf", require("telescope.builtin").find_files,
+                { desc = "[L]ist & Search [F]iles" })
+            vim.keymap.set("n", "<leader>lh", require("telescope.builtin").help_tags,
+                { desc = "[L]ist & Search NeoVIM [H]elp" })
+            vim.keymap.set("n", "<leader>lk", require("telescope.builtin").keymaps,
+                { desc = "[L]ist & Search NeoVIM [K]eymaps" })
+            vim.keymap.set("n", "<leader>lm", require("telescope.builtin").marks, { desc = "[L]ist [M]arks" })
+            vim.keymap.set("n", "<leader>ln", require("telescope.builtin").man_pages,
+                { desc = "[L]ist & Search System Ma[n] Pages" })
+            vim.keymap.set("n", "<leader>lq", require("telescope.builtin").quickfixhistory,
+                { desc = "[L]ist [Q]uickfix History" })
+            vim.keymap.set("n", "<leader>ls", require("telescope.builtin").search_history,
+                { desc = "[L]ist [S]earch History" })
+            vim.keymap.set("n", "<leader>lv", require("telescope.builtin").vim_options, { desc = "[L]ist [V]im Options" })
+
+            -- Git things -> [G]it
+            vim.keymap.set("n", "<leader>gb", require("telescope.builtin").git_branches,
+                { desc = "List [G]it [B]ranches" })
+            vim.keymap.set("n", "<leader>gc", require("telescope.builtin").git_commits, { desc = "List [G]it [C]ommits" })
+
+            -- LSP Things -> [C]oding
+            vim.keymap.set("n", "<leader>cd", require("telescope.builtin").diagnostics,
+                { desc = "[C]ode: List [D]iagnostics" })
+            vim.keymap.set(
+                "n",
+                "<leader>ci",
+                require("telescope.builtin").lsp_implementations,
+                { desc = "[C]ode: Goto [I]mplementation of the word under cursor" }
+            )
+            vim.keymap.set("n", "<leader>cr", require("telescope.builtin").lsp_references,
+                { desc = "[C]ode: List [R]eferences for word under cursor" })
+            vim.keymap.set(
+                "n",
+                "<leader>ct",
+                require("telescope.builtin").lsp_type_definitions,
+                { desc = "[C]ode: Goto definition of the [T]ype under cursor" }
+            )
+        end,
+    },
+}
diff --git a/common/.config/nvim/lua/plugins/treesitter.lua b/common/.config/nvim/lua/plugins/treesitter.lua
new file mode 100644
index 0000000..6153b96
--- /dev/null
+++ b/common/.config/nvim/lua/plugins/treesitter.lua
@@ -0,0 +1,129 @@
+return {
+    {
+        -- nvim-treesitter provides parsers for individual languages
+        -- Output of these parses are fed to the NVIM's native treesitter(vim.treesitter)
+        -- What is fed to the native treesitter is essentially the AST
+        -- This AST is then used for syntax-highlighting and many other operations on the code
+        -- Hence, this plugin is only to make installing parsers easier
+
+        "nvim-treesitter/nvim-treesitter",
+        lazy = false,
+        build = ":TSUpdate",
+        init = function(plugin)
+            -- PERF: add nvim-treesitter queries to the rtp and it's custom query predicates early
+            -- This is needed because a bunch of plugins no longer `require("nvim-treesitter")`, which
+            -- no longer trigger the **nvim-treeitter** module to be loaded in time.
+            -- Luckily, the only thing that those plugins need are the custom queries, which we make available
+            -- during startup.
+            require("lazy.core.loader").add_to_rtp(plugin)
+            require("nvim-treesitter.query_predicates")
+        end,
+        dependencies = {
+            "nvim-treesitter/nvim-treesitter-textobjects",
+            config = function()
+                -- When in diff mode, we want to use the default
+                -- vim text objects c & C instead of the treesitter ones.
+                local move = require("nvim-treesitter.textobjects.move") ---@type table<string,fun(...)>
+                local configs = require("nvim-treesitter.configs")
+                for name, fn in pairs(move) do
+                    if name:find("goto") == 1 then
+                        move[name] = function(q, ...)
+                            if vim.wo.diff then
+                                local config = configs.get_module("textobjects.move")
+                                    [name] ---@type table<string,string>
+                                for key, query in pairs(config or {}) do
+                                    if q == query and key:find("[%]%[][cC]") then
+                                        vim.cmd("normal! " .. key)
+                                        return
+                                    end
+                                end
+                            end
+                            return fn(q, ...)
+                        end
+                    end
+                end
+            end,
+        },
+
+        config = function()
+            -- See `:help nvim-treesitter`
+            -- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
+            vim.defer_fn(function()
+                require("nvim-treesitter.configs").setup({
+                    ensure_installed = {
+                        -- These 2 are required for cmdline
+                        "regex",
+                        "markdown_inline",
+                    },
+
+                    auto_install = true,
+                    highlight = { enable = true },
+                    indent = { enable = true },
+
+                    incremental_selection = {
+                        enable = true,
+                        keymaps = {
+                            init_selection = "<C-space>",
+                            node_incremental = "<C-space>",
+                            scope_incremental = "<C-CR>",
+                            node_decremental = "<bs>",
+                        },
+                    },
+
+                    textobjects = {
+
+                        select = {
+                            enable = true,
+                            lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
+                            keymaps = {
+                                -- You can use the capture groups defined in textobjects.scm (:TSEditQuery textobjects)
+                                ["aa"] = { query = "@parameter.outer", desc = "Select around the parameter" },
+                                ["ia"] = { query = "@parameter.inner", desc = "Select inside the parameter" },
+                                ["af"] = { query = "@function.outer", desc = "Select around the function" },
+                                ["if"] = { query = "@function.inner", desc = "Select inside of the function" },
+                                ["ac"] = { query = "@class.outer", desc = "Select around the class" },
+                                ["ic"] = { query = "@class.inner", desc = "Select inside of the class" },
+
+                                ["al"] = { query = "@loop.outer", desc = "Select around the loop" },
+                                ["il"] = { query = "@loop.inner", desc = "Select inside of the loop" },
+                                ["as"] = { query = "@scope", query_group = "locals", desc = "Select around the scope" },
+                            },
+                        },
+
+                        move = {
+                            -- Jump to next and previous text objects
+                            enable = true,
+                            goto_next_start = {
+                                ["]f"] = { query = "@function.outer", desc = "Goto next inner function start" },
+                                ["]c"] = { query = "@class.outer", desc = "Goto next inner class start" },
+                            },
+                            goto_next_end = {
+                                ["]F"] = { query = "@function.outer", desc = "Goto next outer function end" },
+                                ["]C"] = { query = "@class.outer", desc = "Goto next outer class end" },
+                            },
+                            goto_previous_start = {
+                                ["[f"] = { query = "@function.outer", desc = "Goto goto previous inner function start" },
+                                ["[c"] = { query = "@class.outer", desc = "Previous inner class start" },
+                            },
+                            goto_previous_end = {
+                                ["[F"] = { query = "@function.outer", desc = "Goto goto previous outer function start" },
+                                ["[C"] = { query = "@class.outer", desc = "Goto previous outer class start" },
+                            },
+                        },
+
+                        lsp_interop = {
+                            enable = true,
+                            border = "none",
+                            floating_preview_opts = {},
+                            peek_definition_code = {
+                                -- TIP: Press the shortcut 2 times to enter the floating window
+                                ["<leader>df"] = { query = "@function.outer", desc = "Peek function definition on a popup" },
+                                ["<leader>dF"] = { query = "@class.outer", desc = "Peek class definition on a popup" },
+                            },
+                        },
+                    },
+                })
+            end, 0)
+        end,
+    },
+}
diff --git a/common/.config/nvim/lua/plugins/utilities.lua b/common/.config/nvim/lua/plugins/utilities.lua
deleted file mode 100644
index 4319c7c..0000000
--- a/common/.config/nvim/lua/plugins/utilities.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-return {
-    -- Don't measure startuptime
-    { "dstein64/vim-startuptime", enabled = false },
-
-    -- Session management.
-    {
-        "folke/persistence.nvim",
-        opts = {
-            dir = vim.fn.expand(vim.fn.stdpath("config") .. "/sessions/"),
-        },
-    },
-}
diff --git a/common/.config/nvim/lua/plugins/utility-plugs.lua b/common/.config/nvim/lua/plugins/utility-plugs.lua
new file mode 100644
index 0000000..f0231bb
--- /dev/null
+++ b/common/.config/nvim/lua/plugins/utility-plugs.lua
@@ -0,0 +1,62 @@
+return {
+    -- Navigate between NVIM & Tmux splits seamlessly
+    { "christoomey/vim-tmux-navigator" },
+
+    -- Open Kitty terminal scrollback as buffer
+    {
+        "mikesmithgh/kitty-scrollback.nvim",
+        lazy = true,
+        cmd = { "KittyScrollbackGenerateKittens", "KittyScrollbackCheckHealth" },
+        event = { "User KittyScrollbackLaunch" },
+        version = "^3.0.0",
+        opts = {
+            status_window = {
+                icons = { nvim = "" },
+            },
+        },
+        config = function()
+            require("kitty-scrollback").setup()
+        end,
+    },
+
+    {
+        "folke/which-key.nvim",
+        config = function()
+            -- document existing key chains
+            require("which-key").register({
+                ["<leader>e"] = { name = "[E]xplorer", _ = "which_key_ignore" },
+                ["<leader>c"] = { name = "[C]ode", _ = "which_key_ignore" },
+                ["<leader>d"] = { name = "[D]ocument", _ = "which_key_ignore" },
+                ["<leader>g"] = { name = "[G]it", _ = "which_key_ignore" },
+                ["<leader>h"] = { name = "Git [H]unk", _ = "which_key_ignore" },
+                ["<leader>r"] = { name = "[R]ename", _ = "which_key_ignore" },
+                ["<leader>s"] = { name = "[S]earch", _ = "which_key_ignore" },
+                ["<leader>t"] = { name = "[T]oggle", _ = "which_key_ignore" },
+                ["<leader>w"] = { name = "[W]orkspace", _ = "which_key_ignore" },
+            })
+            -- register which-key VISUAL mode
+            -- required for visual <leader>hs (hunk stage) to work
+            require("which-key").register({
+                ["<leader>"] = { name = "VISUAL <leader>" },
+                ["<leader>h"] = { "Git [H]unk" },
+            }, { mode = "v" })
+        end,
+    },
+
+    -- Session management. This saves your session in the background,
+    -- keeping track of open buffers, window arrangement, and more.
+    -- You can restore sessions when returning through the dashboard.
+    {
+        -- TODO:
+        -- 1. Find out where they are stored exactly.
+        -- 2. Add them to source control
+        -- 3. Need a startup dashboard with options for loading last session
+        "folke/persistence.nvim",
+        event = "BufReadPre",
+        opts = { options = vim.opt.sessionoptions:get() },
+        keys = {
+            { "<leader>sr", function() require("persistence").load() end,                desc = "[R]estore [S]ession" },
+            { "<leader>sl", function() require("persistence").load({ last = true }) end, desc = "[R]estore [L]ast Session" },
+        },
+    },
+}
diff --git a/common/.config/nvim_switch/nvchad b/common/.config/nvim_switch/nvchad
deleted file mode 160000
index b22c7b3..0000000
--- a/common/.config/nvim_switch/nvchad
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b22c7b37c3fe26c24b332291c39d39b0c588c543
diff --git a/common/.config/nvim_switch/nvim_old/init.lua b/common/.config/nvim_switch/nvim_old/init.lua
deleted file mode 100644
index da2acd7..0000000
--- a/common/.config/nvim_switch/nvim_old/init.lua
+++ /dev/null
@@ -1,32 +0,0 @@
--- TODO: Git: Add a plugin
--- TODO: System install and setup lazygit
--- TODO: Setup auto complete
--- TODO: Provide description to each keymap
--- TODO: tpope/vim-obsession configure to work with tmux-resurrection
--- TODO: Check why Nvim can't find todos
--- TODO: Put all plugin configs inside /after/plugin directory
-
--- Setup Lazy.nvim package manager
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-	vim.fn.system({
-		"git",
-		"clone",
-		"--filter=blob:none",
-		"https://github.com/folke/lazy.nvim.git",
-		"--branch=stable",
-		lazypath,
-	})
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("lazy").setup("plugins", {
-	change_detection = {
-		enabled = true,
-		notify = false,
-	},
-})
-
-require("configs.autocommands")
-require("configs.configs")
-require("configs.keymaps")
diff --git a/common/.config/nvim_switch/nvim_old/lua/configs/autocommands.lua b/common/.config/nvim_switch/nvim_old/lua/configs/autocommands.lua
deleted file mode 100644
index ffd4e95..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/configs/autocommands.lua
+++ /dev/null
@@ -1,9 +0,0 @@
--- Highlight on yank
-local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
-vim.api.nvim_create_autocmd('TextYankPost', {
-    callback = function()
-        vim.highlight.on_yank()
-    end,
-    group = highlight_group,
-    pattern = '*',
-})
diff --git a/common/.config/nvim_switch/nvim_old/lua/configs/configs.lua b/common/.config/nvim_switch/nvim_old/lua/configs/configs.lua
deleted file mode 100644
index 6320171..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/configs/configs.lua
+++ /dev/null
@@ -1,8 +0,0 @@
--- Load configs from VIM
-local vim_configs = os.getenv("HOME") .. "/.vim/configs.vim"
-if vim.loop.fs_stat(vim_configs) then
-    vim.cmd("source " .. vim_configs)
-end
-
-vim.opt.undodir = vim.fn.stdpath("config") .. "/undo"
-vim.opt.backupdir = vim.fn.stdpath("config") .. "/backup/"
diff --git a/common/.config/nvim_switch/nvim_old/lua/configs/keymaps.lua b/common/.config/nvim_switch/nvim_old/lua/configs/keymaps.lua
deleted file mode 100644
index afe9759..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/configs/keymaps.lua
+++ /dev/null
@@ -1,11 +0,0 @@
--- Load Keybindings from VIM
-local vim_mappings = os.getenv("HOME") .. "/.vim/key_maps.vim"
-if vim.loop.fs_stat(vim_mappings) then
-    vim.cmd("source " .. vim_mappings)
-end
-
--- Remap for dealing with word wrap
-vim.keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
-vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
-
--- map <leader>j <Plug>(easymotion-s)
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins.lua b/common/.config/nvim_switch/nvim_old/lua/plugins.lua
deleted file mode 100644
index 94c0ca1..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins.lua
+++ /dev/null
@@ -1,14 +0,0 @@
--- Keeps the plugin list that Lazy uses at one place
-return {
-    -- From VIM
-    { "tpope/vim-sensible" },
-    { "tpope/vim-fugitive" },
-    { "tpope/vim-surround" },
-    { "tpope/vim-repeat" },
-    { "tpope/vim-commentary" },
-    { "rstacruz/vim-closer" },
-    { "airblade/vim-gitgutter" },
-    { "easymotion/vim-easymotion" },
-    { "tpope/vim-obsession" },
-    { "mg979/vim-visual-multi" },
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/bufferline.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/bufferline.lua
deleted file mode 100644
index 58d164d..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/bufferline.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-return {
--- TODO: Throws git pull issue when downloading through Lazy
---     "askinsho/bufferline.nvim",
---     dependencies = "nvim-tree/nvim-web-devicons",
---     config = function()
---         require("bufferline").setup({
---             options = {
---                 indicator = { style = "underline" },
---             }
---         })
-
---         vim.keymap.set('n', '<tab>', ":BufferLineCycleNext<CR>")
---         vim.keymap.set('n', '<S-tab>', ":BufferLineCyclePrev<CR>")
---         vim.keymap.set('n', '<leader>bo', ":BufferLineCloseOthers<CR>")
---         vim.keymap.set('n', '<leader>bp', ":BufferLinePick<CR>")
---     end
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/coding-debugging.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/coding-debugging.lua
deleted file mode 100644
index dd18c68..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/coding-debugging.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-    {
-        "folke/trouble.nvim",
-        config = function ()
-            require("trouble").setup({})
-        end
-    },
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/coding-highlighting.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/coding-highlighting.lua
deleted file mode 100644
index e46b968..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/coding-highlighting.lua
+++ /dev/null
@@ -1,40 +0,0 @@
-return {
-    {
-        "nvim-treesitter/nvim-treesitter",
-        build = ":TSUpdate",
-        config = function()
-            local tree_config = require("nvim-treesitter.configs")
-            tree_config.setup({
-                auto_install = true,
-                highlight = { enable = true },
-                indent = { enable = true },
-                incremental_selection = {
-                    enable = true,
-                    keymaps = {
-                        init_selection = "<C-space>",
-                        node_incremental = "<C-space>",
-                        scope_incremental = "<C-CR>",
-                        node_decremental = "<bs>",
-                    }
-                }
-            })
-        end
-    },
-    {
-        "lukas-reineke/indent-blankline.nvim",
-        main = "ibl",
-        config = function()
-            require("ibl").setup({
-                indent = { char = "┆" },
-            })
-        end
-    },
-    -- { "windwp/nvim-autopairs" },
-    -- {
-    --     "akinsho/toggleterm.nvim",
-    --     version = "*",
-    --     config = function ()
-    --         require("toggleterm").setup({})
-    --     end
-    -- },
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/coding-lsp.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/coding-lsp.lua
deleted file mode 100644
index e9f4551..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/coding-lsp.lua
+++ /dev/null
@@ -1,123 +0,0 @@
--- TODO: Autocompletion is a hit and miss. Way too complicated at this point
--- TODO: Try doing LazyVim.nvim instead
-
--- TODO: Use nvim-lint for linting - newer thing
-
-return {
-    -- LSP Configuration
-    {
-        "neovim/nvim-lspconfig",
-        lazy = false,
-        config = function()
-            -- local capabilities = require("cmp_nvim_lsp").default_capabilities()
-
-            -- local lspconfig = require("lspconfig")
-            -- lspconfig.tsserver.setup({
-            --     capabilities = capabilities,
-            -- })
-            -- lspconfig.html.setup({
-            --     capabilities = capabilities,
-            -- })
-            -- lspconfig.lua_ls.setup({
-            --     capabilities = capabilities,
-            -- })
-        end
-    },
-    {
-        -- Provides :Mason command which installs Language Servers
-        "williamboman/mason.nvim",
-        lazy = false,
-        config = function()
-            require("mason").setup()
-        end
-    },
-    {
-        -- Helps to auto install Language Servers by specifying them
-        "williamboman/mason-lspconfig.nvim",
-        lazy = false,
-        opts = {
-            auto_install = true,
-        },
-        config = function()
-            require("mason-lspconfig").setup({})
-        end
-    },
-    {
-        -- Spawns linters, parses their outputs & reports results via nvim.diagnostic
-        "mfussenegger/nvim-lint",
-        event = {
-            "BufReadPre",
-            "BufNewFile"
-        },
-        config = function()
-            local lint = require("lint")
-            local linters = require("lint").linters
-            local linterConfig = vim.fn.stdpath("config") .. "linter_configs"
-
-            lint.linters_by_ft = {
-                json = { "jsonlint" },
-                protobuf = { "buf", "codespell" },
-
-                text = { "vale" },
-                markdown = { "vale", "markdownlint" },
-                rst = { "vale" },
-
-                html = { "markuplint", "htmlhint" },
-
-                bash = { "shellcheck", "codespell" },
-                shell = { "shellcheck", "codespell" },
-                lua = { "compiler", "selene", "codespell" },
-                luau = { "compiler", "selene", "codespell" },
-
-                javascript = { "eslint_d", "codespell" },
-                typescript = { "eslint_d", "codespell" },
-                javascriptreact = { "eslint_d", "codespell" },
-                typescriptreact = { "eslint_d", "codespell" },
-
-                python = { "pyre", "codespell" },
-            }
-
-            -- use for codespell for all except css
-            for ft, _ in pairs(lint.linters_by_ft) do
-                if ft ~= "css" then table.insert(lint.linters_by_ft[ft], "codespell") end
-            end
-
-            linters.codespell.args = {
-                "--ignore-words",
-                linterConfig .. "/codespell-ignore.txt",
-                "--builtin=pratik,kumar,tripathy",
-            }
-
-            linters.shellcheck.args = {
-                "--shell=bash", -- force to work with zsh
-                "--format=json",
-                "-",
-            }
-
-            linters.yamllint.args = {
-                "--config-file",
-                linterConfig .. "/yamllint.yaml",
-                "--format=parsable",
-                "-",
-            }
-
-            linters.markdownlint.args = {
-                "--disable=no-trailing-spaces", -- not disabled in config, so it's enabled for formatting
-                "--disable=no-multiple-blanks",
-                "--config=" .. linterConfig .. "/markdownlint.yaml",
-            }
-
-            local lint_group = vim.api.nvim_create_augroup("lint", { clear = true })
-            vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
-                group = lint_group,
-                callback = function ()
-                    lint.try_lint()
-                end,
-            })
-
-            vim.keymap.set("n", "<leader>ll", function ()
-                lint.try_lint()
-            end, { desc = "Lint current file" })
-        end,
-    },
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/coding-others.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/coding-others.lua
deleted file mode 100644
index 3e5d4ab..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/coding-others.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-    {
-        "theprimeagen/refactoring.nvim"
-    },
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/colorthemes.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/colorthemes.lua
deleted file mode 100644
index 01313ae..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/colorthemes.lua
+++ /dev/null
@@ -1,27 +0,0 @@
-return {
-    {
-        "rebelot/kanagawa.nvim",
-        name = "kanagawa",
-        priority = 1000,
-        lazy = false,
-        config = function()
-            vim.cmd.colorscheme "kanagawa-wave"
-        end
-    },
-    {
-        "catppuccin/nvim",
-        name = "catppuccin",
-        priority = 1000,
-        config = function()
-            require("catppuccin").setup({
-                show_end_of_buffer = true,
-                integrations = {
-                    cmp = true,
-                    gitsigns = true,
-                    nvimtree = true,
-                },
-            })
-            -- vim.cmd.colorscheme "catppuccin-mocha"
-        end
-    },
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/lualine.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/lualine.lua
deleted file mode 100644
index db590ed..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/lualine.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-return {
-    "nvim-lualine/lualine.nvim",
-    config = function()
-        local lazy_status = require("lazy.status")
-
-        require("lualine").setup({
-            options = {
-                -- theme = "horizon",
-                -- TODO: Following ain't taking effect. Why?
-                sections = {
-                    lualine_a = {'mode','filename'},
-                    lualine_b = {'branch'},
-                    lualine_c = {'diff', 'diagnostics'},
-                    lualine_x = { { lazy_status.updates, cond = lazy_status.has_updates } },
-                    lualine_y = {'progress'},
-                    lualine_z = {'location', 'searchcount'}
-                },
-            }
-        })
-    end
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/neo-tree.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/neo-tree.lua
deleted file mode 100644
index f7d46f2..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/neo-tree.lua
+++ /dev/null
@@ -1,50 +0,0 @@
-return {
-	{
-		"airblade/vim-rooter",
-		config = function()
-			vim.g.rooter_cd_cmd = "tcd"
-		end,
-	},
-	{
-		"nvim-neo-tree/neo-tree.nvim",
-		branch = "v3.x",
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-			"nvim-tree/nvim-web-devicons",
-			"MunifTanjim/nui.nvim",
-		},
-		config = function()
-			require("neo-tree").setup({
-				filesystem = {
-					follow_current_file = {
-						enabled = true, -- Highlight the current buffer
-						leave_dirs_open = true,
-					},
-					use_libuv_file_watcher = true, -- Sync file system changes
-					filtered_items = {
-						visible = true,
-						show_hidden_count = true,
-						hide_dotfile = false,
-						hide_gitignore = false,
-					},
-				},
-				window = {
-					position = "left",
-					width = 25, -- Saner window size
-					mappings = {
-						["s"] = "open_split", -- Default vim keymap for horizontal split
-						["v"] = "open_vsplit", -- Default vim keymap for vertical split
-					},
-				},
-				default_component_configs = {
-					indent = {
-						indent_size = 1, -- Compact tree display
-						padding = 0, -- Compact tree display
-					},
-				},
-			})
-			-- Keymaps for Neotree
-			vim.keymap.set("n", "<Leader>e", ":Neotree filesystem toggle<CR>")
-		end,
-	},
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/telescope.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/telescope.lua
deleted file mode 100644
index 290b71f..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/telescope.lua
+++ /dev/null
@@ -1,68 +0,0 @@
-return {
-    {
-        "nvim-telescope/telescope.nvim", tag = "0.1.5",
-        dependencies = {
-            "nvim-lua/plenary.nvim",
-            "nvim-treesitter/nvim-treesitter",
-            "neovim/nvim-lspconfig",
-            "nvim-tree/nvim-web-devicons"
-        },
-        config = function()
-            local actions = require("telescope.actions")
-
-            require("telescope").setup({
-                pickers = {
-                    find_files = {
-                        mappings = {
-                            i = {
-                                -- Ctrl + s to open in horizontal split
-                                ["<C-s>"] = actions.select_horizontal
-                            }
-                        }
-                    }
-                }
-            })
-            require("telescope").load_extension("fzf")
-
-            -- Keymaps for Telescope
-            local builtin = require("telescope.builtin")
-            vim.keymap.set("n", "<leader>ff", "<cmd>lua require'telescope.builtin'.find_files({ find_command = {'rg', '--files', '--hidden', '-g', '!{**/.git/*,**/node_modules/*,**/package-lock.json,**/yarn.lock}' }})<cr>", {})
-            -- TODO: Live grep ain't working
-            -- vim.keymap.set("n", "<Leader>fl", builtin.live_grep, {})
-            vim.keymap.set("n", "<Leader>fm", builtin.marks, {})
-            vim.keymap.set("n", "<Leader>fc", builtin.colorscheme, {})
-            vim.keymap.set("n", "<Leader>fr", builtin.registers, {})
-            vim.keymap.set("n", "<Leader>fs", builtin.lsp_document_symbols, {})
-            vim.keymap.set("n", "<Leader>fw", builtin.grep_string, {})
-            vim.keymap.set("n", "<Leader>fg", "<cmd>AdvancedGitSearch<CR>", {})
-            vim.keymap.set("n", "<Leader>ft", builtin.treesitter, {})
-            -- TODO: Find TODO ain't working either
-            vim.keymap.set("n", "<Leader>fd", ":TodoTelescope<CR>", {})
-        end
-    },
-    {
-        "nvim-telescope/telescope-fzf-native.nvim",
-        build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'
-    },
-    {
-        -- For displaying LSP Code Actions
-        "nvim-telescope/telescope-ui-select.nvim",
-        config = function()
-            require("telescope").setup({
-                extensions = {
-                    ["ui-select"] = {
-                        require("telescope.themes").get_dropdown{
-                        }
-                    }
-                }
-            })
-            require("telescope").load_extension("ui-select")
-        end
-    },
-    {
-        "aaronhallaert/advanced-git-search.nvim",
-        config = function()
-            require("telescope").load_extension("advanced_git_search")
-        end
-    }
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/todo-comments.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/todo-comments.lua
deleted file mode 100644
index e6ed28f..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/todo-comments.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-return {
-    "folke/todo-comments.nvim",
-    dependencies = { "nvim-lua/plenary.nvim" },
-    config = function()
-        require("todo-comments").setup({})
-
-        vim.keymap.set("n", "]t", function()
-            require("todo-comments").jump_next()
-        end, { desc = "Next todo comment" }
-        )
-        vim.keymap.set("n", "[t", function()
-            require("todo-comments").jump_prev()
-        end, { desc = "Previous todo comment" }
-        )
-    end
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/undotree.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/undotree.lua
deleted file mode 100644
index be6243b..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/undotree.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return{
-    "mbbill/undotree",
-    config = function()
-        vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
-    end
-}
diff --git a/common/.config/nvim_switch/nvim_old/lua/plugins/vim-tmux-navigator.lua b/common/.config/nvim_switch/nvim_old/lua/plugins/vim-tmux-navigator.lua
deleted file mode 100644
index 9caca98..0000000
--- a/common/.config/nvim_switch/nvim_old/lua/plugins/vim-tmux-navigator.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return {
-    "christoomey/vim-tmux-navigator",
-    lazy = false,
-    config = function()
-
-    end
-}
diff --git a/common/.config/shell/aliases b/common/.config/shell/aliases
index c16678a..2cfa246 100644
--- a/common/.config/shell/aliases
+++ b/common/.config/shell/aliases
@@ -5,8 +5,7 @@ alias sb="source ~/.bashrc"
 alias bashreload="source ~/.bashrc"
 alias sz="source ~/.zshrc"
 alias zshreload="source ~/.zshrc"
-alias bashrc="${EDITOR:-vim} +116 ~/.bashrc"
-alias zshrc="${EDITOR:-vim} ~/.zshrc"
+alias zshrc="${EDITOR} ~/.zshrc"
 alias free="free -ht"
 alias type="type -a"
 alias grep='grep --color=auto'
@@ -14,10 +13,11 @@ alias egrep='egrep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias usersearch="awk -F: '{print \"UserName: \" \$1 \", UserID: \" \$3 \", Home Dir: \" \$6 \", Shell Used: \" \$7}' /etc/passwd | grep"
 alias untar='tar -zxvf '
-alias v=nvim
-alias n=nvim
 alias wget="wget --hsts-file ${WGET_HSTS_FILE}"
 
+alias v="${EDITOR}"
+alias snvim="${HOMEBREW_PREFIX}"/bin/nvim # Stable nvim
+
 url_encode(){
     python3 -c "import urllib.parse, sys; print(urllib.parse.quote(sys.stdin.read()))" <<< "$1"
 }
@@ -78,9 +78,8 @@ alias tnew="tmux new"
 alias tnewt="tmux new -t"
 
 # Nvim Distro-Switcher
-alias nvim-lazy=nvim
+alias nvim-lazy="NVIM_APPNAME=nvim-lazy nvim"
 alias OldConfig="NVIM_APPNAME=oldconfig nvim"
-alias nvim-chad="NVIM_APPNAME=nvchad nvim"
 nvims() {
     items=$(find -L "$HOME"/.config -maxdepth 2 -name "init.lua" -type f -execdir sh -c 'pwd | xargs basename' \;)
     config=$(printf "%s\n" "${items[@]}" | fzf --prompt=" Neovim Config  " --height=~50% --layout=reverse --border --exit-0)
diff --git a/common/.config/shell/p10k.zsh b/common/.config/shell/p10k.zsh
new file mode 100644
index 0000000..2c52d66
--- /dev/null
+++ b/common/.config/shell/p10k.zsh
@@ -0,0 +1,1580 @@
+# Generated by Powerlevel10k configuration wizard on 2024-01-15 at 21:46 IST.
+# Based on romkatv/powerlevel10k/config/p10k-lean.zsh, checksum 43791.
+# Wizard options: nerdfont-complete + powerline, small icons, unicode, lean, 24h time,
+# 2 lines, solid, left frame, darkest-ornaments, compact, many icons, concise,
+# instant_prompt=quiet.
+# Type `p10k configure` to generate another config.
+#
+# Config for Powerlevel10k with lean prompt style. Type `p10k configure` to generate
+# your own config based on it.
+#
+# Tip: Looking for a nice color? Here's a one-liner to print colormap.
+#
+#   for i in {0..255}; do print -Pn "%K{$i}  %k%F{$i}${(l:3::0:)i}%f " ${${(M)$((i%6)):#3}:+$'\n'}; done
+
+# Temporarily change options.
+'builtin' 'local' '-a' 'p10k_config_opts'
+[[ ! -o 'aliases'         ]] || p10k_config_opts+=('aliases')
+[[ ! -o 'sh_glob'         ]] || p10k_config_opts+=('sh_glob')
+[[ ! -o 'no_brace_expand' ]] || p10k_config_opts+=('no_brace_expand')
+'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand'
+
+() {
+  emulate -L zsh -o extended_glob
+
+  # Unset all configuration options. This allows you to apply configuration changes without
+  # restarting zsh. Edit ~/.p10k.zsh and type `source ~/.p10k.zsh`.
+  unset -m '(POWERLEVEL9K_*|DEFAULT_USER)~POWERLEVEL9K_GITSTATUS_DIR'
+
+  # Zsh >= 5.1 is required.
+  autoload -Uz is-at-least && is-at-least 5.1 || return
+
+  # The list of segments shown on the left. Fill it with the most important segments.
+  typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(
+    # =========================[ Line #1 ]=========================
+    os_icon                 # os identifier
+    dir                     # current directory
+    vcs                     # git status
+    # =========================[ Line #2 ]=========================
+    newline                 # \n
+    prompt_char             # prompt symbol
+  )
+
+  # The list of segments shown on the right. Fill it with less important segments.
+  # Right prompt on the last prompt line (where you are typing your commands) gets
+  # automatically hidden when the input line reaches it. Right prompt above the
+  # last prompt line gets hidden if it would overlap with left prompt.
+  typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(
+    # =========================[ Line #1 ]=========================
+    status                  # exit code of the last command
+    command_execution_time  # duration of the last command
+    background_jobs         # presence of background jobs
+    direnv                  # direnv status (https://direnv.net/)
+    asdf                    # asdf version manager (https://github.com/asdf-vm/asdf)
+    virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
+    anaconda                # conda environment (https://conda.io/)
+    pyenv                   # python environment (https://github.com/pyenv/pyenv)
+    goenv                   # go environment (https://github.com/syndbg/goenv)
+    nodenv                  # node.js version from nodenv (https://github.com/nodenv/nodenv)
+    nvm                     # node.js version from nvm (https://github.com/nvm-sh/nvm)
+    nodeenv                 # node.js environment (https://github.com/ekalinin/nodeenv)
+    # node_version          # node.js version
+    # go_version            # go version (https://golang.org)
+    # rust_version          # rustc version (https://www.rust-lang.org)
+    # dotnet_version        # .NET version (https://dotnet.microsoft.com)
+    # php_version           # php version (https://www.php.net/)
+    # laravel_version       # laravel php framework version (https://laravel.com/)
+    # java_version          # java version (https://www.java.com/)
+    # package               # name@version from package.json (https://docs.npmjs.com/files/package.json)
+    rbenv                   # ruby version from rbenv (https://github.com/rbenv/rbenv)
+    rvm                     # ruby version from rvm (https://rvm.io)
+    fvm                     # flutter version management (https://github.com/leoafarias/fvm)
+    luaenv                  # lua version from luaenv (https://github.com/cehoffman/luaenv)
+    jenv                    # java version from jenv (https://github.com/jenv/jenv)
+    plenv                   # perl version from plenv (https://github.com/tokuhirom/plenv)
+    phpenv                  # php version from phpenv (https://github.com/phpenv/phpenv)
+    scalaenv                # scala version from scalaenv (https://github.com/scalaenv/scalaenv)
+    haskell_stack           # haskell version from stack (https://haskellstack.org/)
+    kubecontext             # current kubernetes context (https://kubernetes.io/)
+    terraform               # terraform workspace (https://www.terraform.io)
+    aws                     # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html)
+    aws_eb_env              # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/)
+    azure                   # azure account name (https://docs.microsoft.com/en-us/cli/azure)
+    gcloud                  # google cloud cli account and project (https://cloud.google.com/)
+    google_app_cred         # google application credentials (https://cloud.google.com/docs/authentication/production)
+    context                 # user@hostname
+    nordvpn                 # nordvpn connection status, linux only (https://nordvpn.com/)
+    ranger                  # ranger shell (https://github.com/ranger/ranger)
+    nnn                     # nnn shell (https://github.com/jarun/nnn)
+    vim_shell               # vim shell indicator (:sh)
+    midnight_commander      # midnight commander shell (https://midnight-commander.org/)
+    nix_shell               # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
+    # vpn_ip                # virtual private network indicator
+    # load                  # CPU load
+    # disk_usage            # disk usage
+    # ram                   # free RAM
+    # swap                  # used swap
+    todo                    # todo items (https://github.com/todotxt/todo.txt-cli)
+    timewarrior             # timewarrior tracking status (https://timewarrior.net/)
+    taskwarrior             # taskwarrior task count (https://taskwarrior.org/)
+    time                    # current time
+    # =========================[ Line #2 ]=========================
+    newline
+    # ip                    # ip address and bandwidth usage for a specified network interface
+    # public_ip             # public IP address
+    # proxy                 # system-wide http/https/ftp proxy
+    # battery               # internal battery
+    # wifi                  # wifi speed
+    # example               # example user-defined segment (see prompt_example function below)
+  )
+
+  # Defines character set used by powerlevel10k. It's best to let `p10k configure` set it for you.
+  typeset -g POWERLEVEL9K_MODE=nerdfont-complete
+  # When set to `moderate`, some icons will have an extra space after them. This is meant to avoid
+  # icon overlap when using non-monospace fonts. When set to `none`, spaces are not added.
+  typeset -g POWERLEVEL9K_ICON_PADDING=none
+
+  # Basic style options that define the overall look of your prompt. You probably don't want to
+  # change them.
+  typeset -g POWERLEVEL9K_BACKGROUND=                            # transparent background
+  typeset -g POWERLEVEL9K_{LEFT,RIGHT}_{LEFT,RIGHT}_WHITESPACE=  # no surrounding whitespace
+  typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SUBSEGMENT_SEPARATOR=' '  # separate segments with a space
+  typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SEGMENT_SEPARATOR=        # no end-of-line symbol
+
+  # When set to true, icons appear before content on both sides of the prompt. When set
+  # to false, icons go after content. If empty or not set, icons go before content in the left
+  # prompt and after content in the right prompt.
+  #
+  # You can also override it for a specific segment:
+  #
+  #   POWERLEVEL9K_STATUS_ICON_BEFORE_CONTENT=false
+  #
+  # Or for a specific segment in specific state:
+  #
+  #   POWERLEVEL9K_DIR_NOT_WRITABLE_ICON_BEFORE_CONTENT=false
+  typeset -g POWERLEVEL9K_ICON_BEFORE_CONTENT=true
+
+  # Add an empty line before each prompt.
+  typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=false
+
+  # Connect left prompt lines with these symbols.
+  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%238F╭─'
+  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%238F├─'
+  typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%238F╰─'
+  # Connect right prompt lines with these symbols.
+  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX=
+  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX=
+  typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX=
+
+  # The left end of left prompt.
+  typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL=' '
+  # The right end of right prompt.
+  typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL=
+
+  # Ruler, a.k.a. the horizontal line before each prompt. If you set it to true, you'll
+  # probably want to set POWERLEVEL9K_PROMPT_ADD_NEWLINE=false above and
+  # POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR=' ' below.
+  typeset -g POWERLEVEL9K_SHOW_RULER=false
+  typeset -g POWERLEVEL9K_RULER_CHAR='─'        # reasonable alternative: '·'
+  typeset -g POWERLEVEL9K_RULER_FOREGROUND=238
+
+  # Filler between left and right prompt on the first prompt line. You can set it to '·' or '─'
+  # to make it easier to see the alignment between left and right prompt and to separate prompt
+  # from command output. It serves the same purpose as ruler (see above) without increasing
+  # the number of prompt lines. You'll probably want to set POWERLEVEL9K_SHOW_RULER=false
+  # if using this. You might also like POWERLEVEL9K_PROMPT_ADD_NEWLINE=false for more compact
+  # prompt.
+  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='─'
+  if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then
+    # The color of the filler.
+    typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=238
+    # Add a space between the end of left prompt and the filler.
+    typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL=' '
+    # Add a space between the filler and the start of right prompt.
+    typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL=' '
+    # Start filler from the edge of the screen if there are no left segments on the first line.
+    typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_FIRST_SEGMENT_END_SYMBOL='%{%}'
+    # End filler on the edge of the screen if there are no right segments on the first line.
+    typeset -g POWERLEVEL9K_EMPTY_LINE_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='%{%}'
+  fi
+
+  #################################[ os_icon: os identifier ]##################################
+  # OS identifier color.
+  typeset -g POWERLEVEL9K_OS_ICON_FOREGROUND=
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='⭐'
+
+  ################################[ prompt_char: prompt symbol ]################################
+  # Green prompt symbol if the last command succeeded.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=76
+  # Red prompt symbol if the last command failed.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=196
+  # Default prompt symbol.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='❯'
+  # Prompt symbol in command vi mode.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='❮'
+  # Prompt symbol in visual vi mode.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='V'
+  # Prompt symbol in overwrite vi mode.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIOWR_CONTENT_EXPANSION='▶'
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=true
+  # No line terminator if prompt_char is the last segment.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL=''
+  # No line introducer if prompt_char is the first segment.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL=
+
+  ##################################[ dir: current directory ]##################################
+  # Default current directory color.
+  typeset -g POWERLEVEL9K_DIR_FOREGROUND=31
+  # If directory is too long, shorten some of its segments to the shortest possible unique
+  # prefix. The shortened directory can be tab-completed to the original.
+  typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique
+  # Replace removed segment suffixes with this symbol.
+  typeset -g POWERLEVEL9K_SHORTEN_DELIMITER=
+  # Color of the shortened directory segments.
+  typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=103
+  # Color of the anchor directory segments. Anchor segments are never shortened. The first
+  # segment is always an anchor.
+  typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=39
+  # Display anchor directory segments in bold.
+  typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=true
+  # Don't shorten directories that contain any of these files. They are anchors.
+  local anchor_files=(
+    .bzr
+    .citc
+    .git
+    .hg
+    .node-version
+    .python-version
+    .go-version
+    .ruby-version
+    .lua-version
+    .java-version
+    .perl-version
+    .php-version
+    .tool-version
+    .shorten_folder_marker
+    .svn
+    .terraform
+    CVS
+    Cargo.toml
+    composer.json
+    go.mod
+    package.json
+    stack.yaml
+  )
+  typeset -g POWERLEVEL9K_SHORTEN_FOLDER_MARKER="(${(j:|:)anchor_files})"
+  # If set to "first" ("last"), remove everything before the first (last) subdirectory that contains
+  # files matching $POWERLEVEL9K_SHORTEN_FOLDER_MARKER. For example, when the current directory is
+  # /foo/bar/git_repo/nested_git_repo/baz, prompt will display git_repo/nested_git_repo/baz (first)
+  # or nested_git_repo/baz (last). This assumes that git_repo and nested_git_repo contain markers
+  # and other directories don't.
+  #
+  # Optionally, "first" and "last" can be followed by ":<offset>" where <offset> is an integer.
+  # This moves the truncation point to the right (positive offset) or to the left (negative offset)
+  # relative to the marker. Plain "first" and "last" are equivalent to "first:0" and "last:0"
+  # respectively.
+  typeset -g POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER=false
+  # Don't shorten this many last directory segments. They are anchors.
+  typeset -g POWERLEVEL9K_SHORTEN_DIR_LENGTH=1
+  # Shorten directory if it's longer than this even if there is space for it. The value can
+  # be either absolute (e.g., '80') or a percentage of terminal width (e.g, '50%'). If empty,
+  # directory will be shortened only when prompt doesn't fit or when other parameters demand it
+  # (see POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS and POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT below).
+  # If set to `0`, directory will always be shortened to its minimum length.
+  typeset -g POWERLEVEL9K_DIR_MAX_LENGTH=80
+  # When `dir` segment is on the last prompt line, try to shorten it enough to leave at least this
+  # many columns for typing commands.
+  typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS=40
+  # When `dir` segment is on the last prompt line, try to shorten it enough to leave at least
+  # COLUMNS * POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT * 0.01 columns for typing commands.
+  typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT=50
+  # If set to true, embed a hyperlink into the directory. Useful for quickly
+  # opening a directory in the file manager simply by clicking the link.
+  # Can also be handy when the directory is shortened, as it allows you to see
+  # the full directory that was used in previous commands.
+  typeset -g POWERLEVEL9K_DIR_HYPERLINK=false
+
+  # Enable special styling for non-writable and non-existent directories. See POWERLEVEL9K_LOCK_ICON
+  # and POWERLEVEL9K_DIR_CLASSES below.
+  typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=v3
+
+  # The default icon shown next to non-writable and non-existent directories when
+  # POWERLEVEL9K_DIR_SHOW_WRITABLE is set to v3.
+  # typeset -g POWERLEVEL9K_LOCK_ICON='⭐'
+
+  # POWERLEVEL9K_DIR_CLASSES allows you to specify custom icons and colors for different
+  # directories. It must be an array with 3 * N elements. Each triplet consists of:
+  #
+  #   1. A pattern against which the current directory ($PWD) is matched. Matching is done with
+  #      extended_glob option enabled.
+  #   2. Directory class for the purpose of styling.
+  #   3. An empty string.
+  #
+  # Triplets are tried in order. The first triplet whose pattern matches $PWD wins.
+  #
+  # If POWERLEVEL9K_DIR_SHOW_WRITABLE is set to v3, non-writable and non-existent directories
+  # acquire class suffix _NOT_WRITABLE and NON_EXISTENT respectively.
+  #
+  # For example, given these settings:
+  #
+  #   typeset -g POWERLEVEL9K_DIR_CLASSES=(
+  #     '~/work(|/*)'  WORK     ''
+  #     '~(|/*)'       HOME     ''
+  #     '*'            DEFAULT  '')
+  #
+  # Whenever the current directory is ~/work or a subdirectory of ~/work, it gets styled with one
+  # of the following classes depending on its writability and existence: WORK, WORK_NOT_WRITABLE or
+  # WORK_NON_EXISTENT.
+  #
+  # Simply assigning classes to directories doesn't have any visible effects. It merely gives you an
+  # option to define custom colors and icons for different directory classes.
+  #
+  #   # Styling for WORK.
+  #   typeset -g POWERLEVEL9K_DIR_WORK_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  #   typeset -g POWERLEVEL9K_DIR_WORK_FOREGROUND=31
+  #   typeset -g POWERLEVEL9K_DIR_WORK_SHORTENED_FOREGROUND=103
+  #   typeset -g POWERLEVEL9K_DIR_WORK_ANCHOR_FOREGROUND=39
+  #
+  #   # Styling for WORK_NOT_WRITABLE.
+  #   typeset -g POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  #   typeset -g POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_FOREGROUND=31
+  #   typeset -g POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_SHORTENED_FOREGROUND=103
+  #   typeset -g POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_ANCHOR_FOREGROUND=39
+  #
+  #   # Styling for WORK_NON_EXISTENT.
+  #   typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  #   typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_FOREGROUND=31
+  #   typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_SHORTENED_FOREGROUND=103
+  #   typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_ANCHOR_FOREGROUND=39
+  #
+  # If a styling parameter isn't explicitly defined for some class, it falls back to the classless
+  # parameter. For example, if POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_FOREGROUND is not set, it falls
+  # back to POWERLEVEL9K_DIR_FOREGROUND.
+  #
+  # typeset -g POWERLEVEL9K_DIR_CLASSES=()
+
+  # Custom prefix.
+  # typeset -g POWERLEVEL9K_DIR_PREFIX='%fin '
+
+  #####################################[ vcs: git status ]######################################
+  # Branch icon. Set this parameter to '\uF126 ' for the popular Powerline branch icon.
+  typeset -g POWERLEVEL9K_VCS_BRANCH_ICON='\uF126 '
+
+  # Untracked files icon. It's really a question mark, your font isn't broken.
+  # Change the value of this parameter to show a different icon.
+  typeset -g POWERLEVEL9K_VCS_UNTRACKED_ICON='?'
+
+  # Formatter for Git status.
+  #
+  # Example output: master ⇣42⇡42 *42 merge ~42 +42 !42 ?42.
+  #
+  # You can edit the function to customize how Git status looks.
+  #
+  # VCS_STATUS_* parameters are set by gitstatus plugin. See reference:
+  # https://github.com/romkatv/gitstatus/blob/master/gitstatus.plugin.zsh.
+  function my_git_formatter() {
+    emulate -L zsh
+
+    if [[ -n $P9K_CONTENT ]]; then
+      # If P9K_CONTENT is not empty, use it. It's either "loading" or from vcs_info (not from
+      # gitstatus plugin). VCS_STATUS_* parameters are not available in this case.
+      typeset -g my_git_format=$P9K_CONTENT
+      return
+    fi
+
+    if (( $1 )); then
+      # Styling for up-to-date Git status.
+      local       meta='%f'     # default foreground
+      local      clean='%76F'   # green foreground
+      local   modified='%178F'  # yellow foreground
+      local  untracked='%39F'   # blue foreground
+      local conflicted='%196F'  # red foreground
+    else
+      # Styling for incomplete and stale Git status.
+      local       meta='%244F'  # grey foreground
+      local      clean='%244F'  # grey foreground
+      local   modified='%244F'  # grey foreground
+      local  untracked='%244F'  # grey foreground
+      local conflicted='%244F'  # grey foreground
+    fi
+
+    local res
+
+    if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then
+      local branch=${(V)VCS_STATUS_LOCAL_BRANCH}
+      # If local branch name is at most 32 characters long, show it in full.
+      # Otherwise show the first 12 … the last 12.
+      # Tip: To always show local branch name in full without truncation, delete the next line.
+      (( $#branch > 32 )) && branch[13,-13]="…"  # <-- this line
+      res+="${clean}${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}${branch//\%/%%}"
+    fi
+
+    if [[ -n $VCS_STATUS_TAG
+          # Show tag only if not on a branch.
+          # Tip: To always show tag, delete the next line.
+          && -z $VCS_STATUS_LOCAL_BRANCH  # <-- this line
+        ]]; then
+      local tag=${(V)VCS_STATUS_TAG}
+      # If tag name is at most 32 characters long, show it in full.
+      # Otherwise show the first 12 … the last 12.
+      # Tip: To always show tag name in full without truncation, delete the next line.
+      (( $#tag > 32 )) && tag[13,-13]="…"  # <-- this line
+      res+="${meta}#${clean}${tag//\%/%%}"
+    fi
+
+    # Display the current Git commit if there is no branch and no tag.
+    # Tip: To always display the current Git commit, delete the next line.
+    [[ -z $VCS_STATUS_LOCAL_BRANCH && -z $VCS_STATUS_TAG ]] &&  # <-- this line
+      res+="${meta}@${clean}${VCS_STATUS_COMMIT[1,8]}"
+
+    # Show tracking branch name if it differs from local branch.
+    if [[ -n ${VCS_STATUS_REMOTE_BRANCH:#$VCS_STATUS_LOCAL_BRANCH} ]]; then
+      res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}"
+    fi
+
+    # ⇣42 if behind the remote.
+    (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}"
+    # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42.
+    (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && res+=" "
+    (( VCS_STATUS_COMMITS_AHEAD  )) && res+="${clean}⇡${VCS_STATUS_COMMITS_AHEAD}"
+    # ⇠42 if behind the push remote.
+    (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" ${clean}⇠${VCS_STATUS_PUSH_COMMITS_BEHIND}"
+    (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" "
+    # ⇢42 if ahead of the push remote; no leading space if also behind: ⇠42⇢42.
+    (( VCS_STATUS_PUSH_COMMITS_AHEAD  )) && res+="${clean}⇢${VCS_STATUS_PUSH_COMMITS_AHEAD}"
+    # *42 if have stashes.
+    (( VCS_STATUS_STASHES        )) && res+=" ${clean}*${VCS_STATUS_STASHES}"
+    # 'merge' if the repo is in an unusual state.
+    [[ -n $VCS_STATUS_ACTION     ]] && res+=" ${conflicted}${VCS_STATUS_ACTION}"
+    # ~42 if have merge conflicts.
+    (( VCS_STATUS_NUM_CONFLICTED )) && res+=" ${conflicted}~${VCS_STATUS_NUM_CONFLICTED}"
+    # +42 if have staged changes.
+    (( VCS_STATUS_NUM_STAGED     )) && res+=" ${modified}+${VCS_STATUS_NUM_STAGED}"
+    # !42 if have unstaged changes.
+    (( VCS_STATUS_NUM_UNSTAGED   )) && res+=" ${modified}!${VCS_STATUS_NUM_UNSTAGED}"
+    # ?42 if have untracked files. It's really a question mark, your font isn't broken.
+    # See POWERLEVEL9K_VCS_UNTRACKED_ICON above if you want to use a different icon.
+    # Remove the next line if you don't want to see untracked files at all.
+    (( VCS_STATUS_NUM_UNTRACKED  )) && res+=" ${untracked}${(g::)POWERLEVEL9K_VCS_UNTRACKED_ICON}${VCS_STATUS_NUM_UNTRACKED}"
+    # "─" if the number of unstaged files is unknown. This can happen due to
+    # POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY (see below) being set to a non-negative number lower
+    # than the number of files in the Git index, or due to bash.showDirtyState being set to false
+    # in the repository config. The number of staged and untracked files may also be unknown
+    # in this case.
+    (( VCS_STATUS_HAS_UNSTAGED == -1 )) && res+=" ${modified}─"
+
+    typeset -g my_git_format=$res
+  }
+  functions -M my_git_formatter 2>/dev/null
+
+  # Don't count the number of unstaged, untracked and conflicted files in Git repositories with
+  # more than this many files in the index. Negative value means infinity.
+  #
+  # If you are working in Git repositories with tens of millions of files and seeing performance
+  # sagging, try setting POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY to a number lower than the output
+  # of `git ls-files | wc -l`. Alternatively, add `bash.showDirtyState = false` to the repository's
+  # config: `git config bash.showDirtyState false`.
+  typeset -g POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY=-1
+
+  # Don't show Git status in prompt for repositories whose workdir matches this pattern.
+  # For example, if set to '~', the Git repository at $HOME/.git will be ignored.
+  # Multiple patterns can be combined with '|': '~(|/foo)|/bar/baz/*'.
+  typeset -g POWERLEVEL9K_VCS_DISABLED_WORKDIR_PATTERN='~'
+
+  # Disable the default Git status formatting.
+  typeset -g POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING=true
+  # Install our own Git status formatter.
+  typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${$((my_git_formatter(1)))+${my_git_format}}'
+  typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION='${$((my_git_formatter(0)))+${my_git_format}}'
+  # Enable counters for staged, unstaged, etc.
+  typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1
+
+  # Icon color.
+  typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76
+  typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR=244
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # Custom prefix.
+  # typeset -g POWERLEVEL9K_VCS_PREFIX='%fon '
+
+  # Show status of repositories of these types. You can add svn and/or hg if you are
+  # using them. If you do, your prompt may become slow even when your current directory
+  # isn't in an svn or hg reposotiry.
+  typeset -g POWERLEVEL9K_VCS_BACKENDS=(git)
+
+  # These settings are used for repositories other than Git or when gitstatusd fails and
+  # Powerlevel10k has to fall back to using vcs_info.
+  typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=76
+  typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=76
+  typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=178
+
+  ##########################[ status: exit code of the last command ]###########################
+  # Enable OK_PIPE, ERROR_PIPE and ERROR_SIGNAL status states to allow us to enable, disable and
+  # style them independently from the regular OK and ERROR state.
+  typeset -g POWERLEVEL9K_STATUS_EXTENDED_STATES=true
+
+  # Status on success. No content, just an icon. No need to show it if prompt_char is enabled as
+  # it will signify success by turning green.
+  typeset -g POWERLEVEL9K_STATUS_OK=false
+  typeset -g POWERLEVEL9K_STATUS_OK_FOREGROUND=70
+  typeset -g POWERLEVEL9K_STATUS_OK_VISUAL_IDENTIFIER_EXPANSION='✔'
+
+  # Status when some part of a pipe command fails but the overall exit status is zero. It may look
+  # like this: 1|0.
+  typeset -g POWERLEVEL9K_STATUS_OK_PIPE=true
+  typeset -g POWERLEVEL9K_STATUS_OK_PIPE_FOREGROUND=70
+  typeset -g POWERLEVEL9K_STATUS_OK_PIPE_VISUAL_IDENTIFIER_EXPANSION='✔'
+
+  # Status when it's just an error code (e.g., '1'). No need to show it if prompt_char is enabled as
+  # it will signify error by turning red.
+  typeset -g POWERLEVEL9K_STATUS_ERROR=false
+  typeset -g POWERLEVEL9K_STATUS_ERROR_FOREGROUND=160
+  typeset -g POWERLEVEL9K_STATUS_ERROR_VISUAL_IDENTIFIER_EXPANSION='✘'
+
+  # Status when the last command was terminated by a signal.
+  typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL=true
+  typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_FOREGROUND=160
+  # Use terse signal names: "INT" instead of "SIGINT(2)".
+  typeset -g POWERLEVEL9K_STATUS_VERBOSE_SIGNAME=false
+  typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_VISUAL_IDENTIFIER_EXPANSION='✘'
+
+  # Status when some part of a pipe command fails and the overall exit status is also non-zero.
+  # It may look like this: 1|0.
+  typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE=true
+  typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_FOREGROUND=160
+  typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_VISUAL_IDENTIFIER_EXPANSION='✘'
+
+  ###################[ command_execution_time: duration of the last command ]###################
+  # Show duration of the last command if takes at least this many seconds.
+  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=3
+  # Show this many fractional digits. Zero means round to seconds.
+  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0
+  # Execution time color.
+  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=101
+  # Duration format: 1d 2h 3m 4s.
+  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s'
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # Custom prefix.
+  # typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PREFIX='%ftook '
+
+  #######################[ background_jobs: presence of background jobs ]#######################
+  # Don't show the number of background jobs.
+  typeset -g POWERLEVEL9K_BACKGROUND_JOBS_VERBOSE=false
+  # Background jobs color.
+  typeset -g POWERLEVEL9K_BACKGROUND_JOBS_FOREGROUND=70
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_BACKGROUND_JOBS_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #######################[ direnv: direnv status (https://direnv.net/) ]########################
+  # Direnv color.
+  typeset -g POWERLEVEL9K_DIRENV_FOREGROUND=178
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_DIRENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ###############[ asdf: asdf version manager (https://github.com/asdf-vm/asdf) ]###############
+  # Default asdf color. Only used to display tools for which there is no color override (see below).
+  # Tip:  Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_FOREGROUND.
+  typeset -g POWERLEVEL9K_ASDF_FOREGROUND=66
+
+  # There are four parameters that can be used to hide asdf tools. Each parameter describes
+  # conditions under which a tool gets hidden. Parameters can hide tools but not unhide them. If at
+  # least one parameter decides to hide a tool, that tool gets hidden. If no parameter decides to
+  # hide a tool, it gets shown.
+  #
+  # Special note on the difference between POWERLEVEL9K_ASDF_SOURCES and
+  # POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW. Consider the effect of the following commands:
+  #
+  #   asdf local  python 3.8.1
+  #   asdf global python 3.8.1
+  #
+  # After running both commands the current python version is 3.8.1 and its source is "local" as
+  # it takes precedence over "global". If POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW is set to false,
+  # it'll hide python version in this case because 3.8.1 is the same as the global version.
+  # POWERLEVEL9K_ASDF_SOURCES will hide python version only if the value of this parameter doesn't
+  # contain "local".
+
+  # Hide tool versions that don't come from one of these sources.
+  #
+  # Available sources:
+  #
+  # - shell   `asdf current` says "set by ASDF_${TOOL}_VERSION environment variable"
+  # - local   `asdf current` says "set by /some/not/home/directory/file"
+  # - global  `asdf current` says "set by /home/username/file"
+  #
+  # Note: If this parameter is set to (shell local global), it won't hide tools.
+  # Tip:  Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SOURCES.
+  typeset -g POWERLEVEL9K_ASDF_SOURCES=(shell local global)
+
+  # If set to false, hide tool versions that are the same as global.
+  #
+  # Note: The name of this parameter doesn't reflect its meaning at all.
+  # Note: If this parameter is set to true, it won't hide tools.
+  # Tip:  Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_PROMPT_ALWAYS_SHOW.
+  typeset -g POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW=false
+
+  # If set to false, hide tool versions that are equal to "system".
+  #
+  # Note: If this parameter is set to true, it won't hide tools.
+  # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SHOW_SYSTEM.
+  typeset -g POWERLEVEL9K_ASDF_SHOW_SYSTEM=true
+
+  # If set to non-empty value, hide tools unless there is a file matching the specified file pattern
+  # in the current directory, or its parent directory, or its grandparent directory, and so on.
+  #
+  # Note: If this parameter is set to empty value, it won't hide tools.
+  # Note: SHOW_ON_UPGLOB isn't specific to asdf. It works with all prompt segments.
+  # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SHOW_ON_UPGLOB.
+  #
+  # Example: Hide nodejs version when there is no package.json and no *.js files in the current
+  # directory, in `..`, in `../..` and so on.
+  #
+  #   typeset -g POWERLEVEL9K_ASDF_NODEJS_SHOW_ON_UPGLOB='*.js|package.json'
+  typeset -g POWERLEVEL9K_ASDF_SHOW_ON_UPGLOB=
+
+  # Ruby version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_RUBY_FOREGROUND=168
+  # typeset -g POWERLEVEL9K_ASDF_RUBY_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_RUBY_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Python version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_PYTHON_FOREGROUND=37
+  # typeset -g POWERLEVEL9K_ASDF_PYTHON_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_PYTHON_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Go version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_GOLANG_FOREGROUND=37
+  # typeset -g POWERLEVEL9K_ASDF_GOLANG_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_GOLANG_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Node.js version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_NODEJS_FOREGROUND=70
+  # typeset -g POWERLEVEL9K_ASDF_NODEJS_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_NODEJS_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Rust version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_RUST_FOREGROUND=37
+  # typeset -g POWERLEVEL9K_ASDF_RUST_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_RUST_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # .NET Core version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_FOREGROUND=134
+  # typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_DOTNET_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Flutter version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_FLUTTER_FOREGROUND=38
+  # typeset -g POWERLEVEL9K_ASDF_FLUTTER_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_FLUTTER_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Lua version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_LUA_FOREGROUND=32
+  # typeset -g POWERLEVEL9K_ASDF_LUA_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_LUA_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Java version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_JAVA_FOREGROUND=32
+  # typeset -g POWERLEVEL9K_ASDF_JAVA_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_JAVA_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Perl version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_PERL_FOREGROUND=67
+  # typeset -g POWERLEVEL9K_ASDF_PERL_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_PERL_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Erlang version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_ERLANG_FOREGROUND=125
+  # typeset -g POWERLEVEL9K_ASDF_ERLANG_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_ERLANG_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Elixir version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_ELIXIR_FOREGROUND=129
+  # typeset -g POWERLEVEL9K_ASDF_ELIXIR_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_ELIXIR_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Postgres version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_POSTGRES_FOREGROUND=31
+  # typeset -g POWERLEVEL9K_ASDF_POSTGRES_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_POSTGRES_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # PHP version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_PHP_FOREGROUND=99
+  # typeset -g POWERLEVEL9K_ASDF_PHP_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_PHP_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Haskell version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_HASKELL_FOREGROUND=172
+  # typeset -g POWERLEVEL9K_ASDF_HASKELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_HASKELL_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  # Julia version from asdf.
+  typeset -g POWERLEVEL9K_ASDF_JULIA_FOREGROUND=70
+  # typeset -g POWERLEVEL9K_ASDF_JULIA_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_ASDF_JULIA_SHOW_ON_UPGLOB='*.foo|*.bar'
+
+  ##########[ nordvpn: nordvpn connection status, linux only (https://nordvpn.com/) ]###########
+  # NordVPN connection indicator color.
+  typeset -g POWERLEVEL9K_NORDVPN_FOREGROUND=39
+  # Hide NordVPN connection indicator when not connected.
+  typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_CONTENT_EXPANSION=
+  typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_VISUAL_IDENTIFIER_EXPANSION=
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_NORDVPN_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #################[ ranger: ranger shell (https://github.com/ranger/ranger) ]##################
+  # Ranger shell color.
+  typeset -g POWERLEVEL9K_RANGER_FOREGROUND=178
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_RANGER_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ######################[ nnn: nnn shell (https://github.com/jarun/nnn) ]#######################
+  # Nnn shell color.
+  typeset -g POWERLEVEL9K_NNN_FOREGROUND=72
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_NNN_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ###########################[ vim_shell: vim shell indicator (:sh) ]###########################
+  # Vim shell indicator color.
+  typeset -g POWERLEVEL9K_VIM_SHELL_FOREGROUND=34
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_VIM_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ######[ midnight_commander: midnight commander shell (https://midnight-commander.org/) ]######
+  # Midnight Commander shell color.
+  typeset -g POWERLEVEL9K_MIDNIGHT_COMMANDER_FOREGROUND=178
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_MIDNIGHT_COMMANDER_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #[ nix_shell: nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) ]##
+  # Nix shell color.
+  typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=74
+
+  # Tip: If you want to see just the icon without "pure" and "impure", uncomment the next line.
+  # typeset -g POWERLEVEL9K_NIX_SHELL_CONTENT_EXPANSION=
+
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##################################[ disk_usage: disk usage ]##################################
+  # Colors for different levels of disk usage.
+  typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=35
+  typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_FOREGROUND=220
+  typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_FOREGROUND=160
+  # Thresholds for different levels of disk usage (percentage points).
+  typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL=90
+  typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_LEVEL=95
+  # If set to true, hide disk usage when below $POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL percent.
+  typeset -g POWERLEVEL9K_DISK_USAGE_ONLY_WARNING=false
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_DISK_USAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ######################################[ ram: free RAM ]#######################################
+  # RAM color.
+  typeset -g POWERLEVEL9K_RAM_FOREGROUND=66
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_RAM_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #####################################[ swap: used swap ]######################################
+  # Swap color.
+  typeset -g POWERLEVEL9K_SWAP_FOREGROUND=96
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_SWAP_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ######################################[ load: CPU load ]######################################
+  # Show average CPU load over this many last minutes. Valid values are 1, 5 and 15.
+  typeset -g POWERLEVEL9K_LOAD_WHICH=5
+  # Load color when load is under 50%.
+  typeset -g POWERLEVEL9K_LOAD_NORMAL_FOREGROUND=66
+  # Load color when load is between 50% and 70%.
+  typeset -g POWERLEVEL9K_LOAD_WARNING_FOREGROUND=178
+  # Load color when load is over 70%.
+  typeset -g POWERLEVEL9K_LOAD_CRITICAL_FOREGROUND=166
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_LOAD_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ################[ todo: todo items (https://github.com/todotxt/todo.txt-cli) ]################
+  # Todo color.
+  typeset -g POWERLEVEL9K_TODO_FOREGROUND=110
+  # Hide todo when the total number of tasks is zero.
+  typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_TOTAL=true
+  # Hide todo when the number of tasks after filtering is zero.
+  typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_FILTERED=false
+
+  # Todo format. The following parameters are available within the expansion.
+  #
+  # - P9K_TODO_TOTAL_TASK_COUNT     The total number of tasks.
+  # - P9K_TODO_FILTERED_TASK_COUNT  The number of tasks after filtering.
+  #
+  # These variables correspond to the last line of the output of `todo.sh -p ls`:
+  #
+  #   TODO: 24 of 42 tasks shown
+  #
+  # Here 24 is P9K_TODO_FILTERED_TASK_COUNT and 42 is P9K_TODO_TOTAL_TASK_COUNT.
+  #
+  # typeset -g POWERLEVEL9K_TODO_CONTENT_EXPANSION='$P9K_TODO_FILTERED_TASK_COUNT'
+
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_TODO_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ###########[ timewarrior: timewarrior tracking status (https://timewarrior.net/) ]############
+  # Timewarrior color.
+  typeset -g POWERLEVEL9K_TIMEWARRIOR_FOREGROUND=110
+  # If the tracked task is longer than 24 characters, truncate and append "…".
+  # Tip: To always display tasks without truncation, delete the following parameter.
+  # Tip: To hide task names and display just the icon when time tracking is enabled, set the
+  # value of the following parameter to "".
+  typeset -g POWERLEVEL9K_TIMEWARRIOR_CONTENT_EXPANSION='${P9K_CONTENT:0:24}${${P9K_CONTENT:24}:+…}'
+
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_TIMEWARRIOR_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##############[ taskwarrior: taskwarrior task count (https://taskwarrior.org/) ]##############
+  # Taskwarrior color.
+  typeset -g POWERLEVEL9K_TASKWARRIOR_FOREGROUND=74
+
+  # Taskwarrior segment format. The following parameters are available within the expansion.
+  #
+  # - P9K_TASKWARRIOR_PENDING_COUNT   The number of pending tasks: `task +PENDING count`.
+  # - P9K_TASKWARRIOR_OVERDUE_COUNT   The number of overdue tasks: `task +OVERDUE count`.
+  #
+  # Zero values are represented as empty parameters.
+  #
+  # The default format:
+  #
+  #   '${P9K_TASKWARRIOR_OVERDUE_COUNT:+"!$P9K_TASKWARRIOR_OVERDUE_COUNT/"}$P9K_TASKWARRIOR_PENDING_COUNT'
+  #
+  # typeset -g POWERLEVEL9K_TASKWARRIOR_CONTENT_EXPANSION='$P9K_TASKWARRIOR_PENDING_COUNT'
+
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_TASKWARRIOR_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##################################[ context: user@hostname ]##################################
+  # Context color when running with privileges.
+  typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=178
+  # Context color in SSH without privileges.
+  typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_FOREGROUND=180
+  # Default context color (no privileges, no SSH).
+  typeset -g POWERLEVEL9K_CONTEXT_FOREGROUND=180
+
+  # Context format when running with privileges: bold user@hostname.
+  typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE='%B%n@%m'
+  # Context format when in SSH without privileges: user@hostname.
+  typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_TEMPLATE='%n@%m'
+  # Default context format (no privileges, no SSH): user@hostname.
+  typeset -g POWERLEVEL9K_CONTEXT_TEMPLATE='%n@%m'
+
+  # Don't show context unless running with privileges or in SSH.
+  # Tip: Remove the next line to always show context.
+  typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_{CONTENT,VISUAL_IDENTIFIER}_EXPANSION=
+
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_CONTEXT_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # Custom prefix.
+  # typeset -g POWERLEVEL9K_CONTEXT_PREFIX='%fwith '
+
+  ###[ virtualenv: python virtual environment (https://docs.python.org/3/library/venv.html) ]###
+  # Python virtual environment color.
+  typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=37
+  # Don't show Python version next to the virtual environment name.
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false
+  # If set to "false", won't show virtualenv if pyenv is already shown.
+  # If set to "if-different", won't show virtualenv if it's the same as pyenv.
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false
+  # Separate environment name from Python version only with a space.
+  typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_VIRTUALENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #####################[ anaconda: conda environment (https://conda.io/) ]######################
+  # Anaconda environment color.
+  typeset -g POWERLEVEL9K_ANACONDA_FOREGROUND=37
+
+  # Anaconda segment format. The following parameters are available within the expansion.
+  #
+  # - CONDA_PREFIX                 Absolute path to the active Anaconda/Miniconda environment.
+  # - CONDA_DEFAULT_ENV            Name of the active Anaconda/Miniconda environment.
+  # - CONDA_PROMPT_MODIFIER        Configurable prompt modifier (see below).
+  # - P9K_ANACONDA_PYTHON_VERSION  Current python version (python --version).
+  #
+  # CONDA_PROMPT_MODIFIER can be configured with the following command:
+  #
+  #   conda config --set env_prompt '({default_env}) '
+  #
+  # The last argument is a Python format string that can use the following variables:
+  #
+  # - prefix       The same as CONDA_PREFIX.
+  # - default_env  The same as CONDA_DEFAULT_ENV.
+  # - name         The last segment of CONDA_PREFIX.
+  # - stacked_env  Comma-separated list of names in the environment stack. The first element is
+  #                always the same as default_env.
+  #
+  # Note: '({default_env}) ' is the default value of env_prompt.
+  #
+  # The default value of POWERLEVEL9K_ANACONDA_CONTENT_EXPANSION expands to $CONDA_PROMPT_MODIFIER
+  # without the surrounding parentheses, or to the last path component of CONDA_PREFIX if the former
+  # is empty.
+  typeset -g POWERLEVEL9K_ANACONDA_CONTENT_EXPANSION='${${${${CONDA_PROMPT_MODIFIER#\(}% }%\)}:-${CONDA_PREFIX:t}}'
+
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_ANACONDA_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ################[ pyenv: python environment (https://github.com/pyenv/pyenv) ]################
+  # Pyenv color.
+  typeset -g POWERLEVEL9K_PYENV_FOREGROUND=37
+  # Hide python version if it doesn't come from one of these sources.
+  typeset -g POWERLEVEL9K_PYENV_SOURCES=(shell local global)
+  # If set to false, hide python version if it's the same as global:
+  # $(pyenv version-name) == $(pyenv global).
+  typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false
+  # If set to false, hide python version if it's equal to "system".
+  typeset -g POWERLEVEL9K_PYENV_SHOW_SYSTEM=true
+
+  # Pyenv segment format. The following parameters are available within the expansion.
+  #
+  # - P9K_CONTENT                Current pyenv environment (pyenv version-name).
+  # - P9K_PYENV_PYTHON_VERSION   Current python version (python --version).
+  #
+  # The default format has the following logic:
+  #
+  # 1. Display "$P9K_CONTENT $P9K_PYENV_PYTHON_VERSION" if $P9K_PYENV_PYTHON_VERSION is not
+  #   empty and unequal to $P9K_CONTENT.
+  # 2. Otherwise display just "$P9K_CONTENT".
+  typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_PYENV_PYTHON_VERSION:#$P9K_CONTENT}:+ $P9K_PYENV_PYTHON_VERSION}'
+
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_PYENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ################[ goenv: go environment (https://github.com/syndbg/goenv) ]################
+  # Goenv color.
+  typeset -g POWERLEVEL9K_GOENV_FOREGROUND=37
+  # Hide go version if it doesn't come from one of these sources.
+  typeset -g POWERLEVEL9K_GOENV_SOURCES=(shell local global)
+  # If set to false, hide go version if it's the same as global:
+  # $(goenv version-name) == $(goenv global).
+  typeset -g POWERLEVEL9K_GOENV_PROMPT_ALWAYS_SHOW=false
+  # If set to false, hide go version if it's equal to "system".
+  typeset -g POWERLEVEL9K_GOENV_SHOW_SYSTEM=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_GOENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##########[ nodenv: node.js version from nodenv (https://github.com/nodenv/nodenv) ]##########
+  # Nodenv color.
+  typeset -g POWERLEVEL9K_NODENV_FOREGROUND=70
+  # Hide node version if it doesn't come from one of these sources.
+  typeset -g POWERLEVEL9K_NODENV_SOURCES=(shell local global)
+  # If set to false, hide node version if it's the same as global:
+  # $(nodenv version-name) == $(nodenv global).
+  typeset -g POWERLEVEL9K_NODENV_PROMPT_ALWAYS_SHOW=false
+  # If set to false, hide node version if it's equal to "system".
+  typeset -g POWERLEVEL9K_NODENV_SHOW_SYSTEM=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_NODENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##############[ nvm: node.js version from nvm (https://github.com/nvm-sh/nvm) ]###############
+  # Nvm color.
+  typeset -g POWERLEVEL9K_NVM_FOREGROUND=70
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_NVM_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ############[ nodeenv: node.js environment (https://github.com/ekalinin/nodeenv) ]############
+  # Nodeenv color.
+  typeset -g POWERLEVEL9K_NODEENV_FOREGROUND=70
+  # Don't show Node version next to the environment name.
+  typeset -g POWERLEVEL9K_NODEENV_SHOW_NODE_VERSION=false
+  # Separate environment name from Node version only with a space.
+  typeset -g POWERLEVEL9K_NODEENV_{LEFT,RIGHT}_DELIMITER=
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_NODEENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##############################[ node_version: node.js version ]###############################
+  # Node version color.
+  typeset -g POWERLEVEL9K_NODE_VERSION_FOREGROUND=70
+  # Show node version only when in a directory tree containing package.json.
+  typeset -g POWERLEVEL9K_NODE_VERSION_PROJECT_ONLY=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_NODE_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #######################[ go_version: go version (https://golang.org) ]########################
+  # Go version color.
+  typeset -g POWERLEVEL9K_GO_VERSION_FOREGROUND=37
+  # Show go version only when in a go project subdirectory.
+  typeset -g POWERLEVEL9K_GO_VERSION_PROJECT_ONLY=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_GO_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #################[ rust_version: rustc version (https://www.rust-lang.org) ]##################
+  # Rust version color.
+  typeset -g POWERLEVEL9K_RUST_VERSION_FOREGROUND=37
+  # Show rust version only when in a rust project subdirectory.
+  typeset -g POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_RUST_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ###############[ dotnet_version: .NET version (https://dotnet.microsoft.com) ]################
+  # .NET version color.
+  typeset -g POWERLEVEL9K_DOTNET_VERSION_FOREGROUND=134
+  # Show .NET version only when in a .NET project subdirectory.
+  typeset -g POWERLEVEL9K_DOTNET_VERSION_PROJECT_ONLY=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_DOTNET_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #####################[ php_version: php version (https://www.php.net/) ]######################
+  # PHP version color.
+  typeset -g POWERLEVEL9K_PHP_VERSION_FOREGROUND=99
+  # Show PHP version only when in a PHP project subdirectory.
+  typeset -g POWERLEVEL9K_PHP_VERSION_PROJECT_ONLY=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_PHP_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##########[ laravel_version: laravel php framework version (https://laravel.com/) ]###########
+  # Laravel version color.
+  typeset -g POWERLEVEL9K_LARAVEL_VERSION_FOREGROUND=161
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_LARAVEL_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ####################[ java_version: java version (https://www.java.com/) ]####################
+  # Java version color.
+  typeset -g POWERLEVEL9K_JAVA_VERSION_FOREGROUND=32
+  # Show java version only when in a java project subdirectory.
+  typeset -g POWERLEVEL9K_JAVA_VERSION_PROJECT_ONLY=true
+  # Show brief version.
+  typeset -g POWERLEVEL9K_JAVA_VERSION_FULL=false
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_JAVA_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ###[ package: name@version from package.json (https://docs.npmjs.com/files/package.json) ]####
+  # Package color.
+  typeset -g POWERLEVEL9K_PACKAGE_FOREGROUND=117
+  # Package format. The following parameters are available within the expansion.
+  #
+  # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
+  # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
+  #
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #############[ rbenv: ruby version from rbenv (https://github.com/rbenv/rbenv) ]##############
+  # Rbenv color.
+  typeset -g POWERLEVEL9K_RBENV_FOREGROUND=168
+  # Hide ruby version if it doesn't come from one of these sources.
+  typeset -g POWERLEVEL9K_RBENV_SOURCES=(shell local global)
+  # If set to false, hide ruby version if it's the same as global:
+  # $(rbenv version-name) == $(rbenv global).
+  typeset -g POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW=false
+  # If set to false, hide ruby version if it's equal to "system".
+  typeset -g POWERLEVEL9K_RBENV_SHOW_SYSTEM=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_RBENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #######################[ rvm: ruby version from rvm (https://rvm.io) ]########################
+  # Rvm color.
+  typeset -g POWERLEVEL9K_RVM_FOREGROUND=168
+  # Don't show @gemset at the end.
+  typeset -g POWERLEVEL9K_RVM_SHOW_GEMSET=false
+  # Don't show ruby- at the front.
+  typeset -g POWERLEVEL9K_RVM_SHOW_PREFIX=false
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_RVM_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ###########[ fvm: flutter version management (https://github.com/leoafarias/fvm) ]############
+  # Fvm color.
+  typeset -g POWERLEVEL9K_FVM_FOREGROUND=38
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_FVM_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##########[ luaenv: lua version from luaenv (https://github.com/cehoffman/luaenv) ]###########
+  # Lua color.
+  typeset -g POWERLEVEL9K_LUAENV_FOREGROUND=32
+  # Hide lua version if it doesn't come from one of these sources.
+  typeset -g POWERLEVEL9K_LUAENV_SOURCES=(shell local global)
+  # If set to false, hide lua version if it's the same as global:
+  # $(luaenv version-name) == $(luaenv global).
+  typeset -g POWERLEVEL9K_LUAENV_PROMPT_ALWAYS_SHOW=false
+  # If set to false, hide lua version if it's equal to "system".
+  typeset -g POWERLEVEL9K_LUAENV_SHOW_SYSTEM=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_LUAENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ###############[ jenv: java version from jenv (https://github.com/jenv/jenv) ]################
+  # Java color.
+  typeset -g POWERLEVEL9K_JENV_FOREGROUND=32
+  # Hide java version if it doesn't come from one of these sources.
+  typeset -g POWERLEVEL9K_JENV_SOURCES=(shell local global)
+  # If set to false, hide java version if it's the same as global:
+  # $(jenv version-name) == $(jenv global).
+  typeset -g POWERLEVEL9K_JENV_PROMPT_ALWAYS_SHOW=false
+  # If set to false, hide java version if it's equal to "system".
+  typeset -g POWERLEVEL9K_JENV_SHOW_SYSTEM=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_JENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ###########[ plenv: perl version from plenv (https://github.com/tokuhirom/plenv) ]############
+  # Perl color.
+  typeset -g POWERLEVEL9K_PLENV_FOREGROUND=67
+  # Hide perl version if it doesn't come from one of these sources.
+  typeset -g POWERLEVEL9K_PLENV_SOURCES=(shell local global)
+  # If set to false, hide perl version if it's the same as global:
+  # $(plenv version-name) == $(plenv global).
+  typeset -g POWERLEVEL9K_PLENV_PROMPT_ALWAYS_SHOW=false
+  # If set to false, hide perl version if it's equal to "system".
+  typeset -g POWERLEVEL9K_PLENV_SHOW_SYSTEM=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_PLENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ############[ phpenv: php version from phpenv (https://github.com/phpenv/phpenv) ]############
+  # PHP color.
+  typeset -g POWERLEVEL9K_PHPENV_FOREGROUND=99
+  # Hide php version if it doesn't come from one of these sources.
+  typeset -g POWERLEVEL9K_PHPENV_SOURCES=(shell local global)
+  # If set to false, hide php version if it's the same as global:
+  # $(phpenv version-name) == $(phpenv global).
+  typeset -g POWERLEVEL9K_PHPENV_PROMPT_ALWAYS_SHOW=false
+  # If set to false, hide php version if it's equal to "system".
+  typeset -g POWERLEVEL9K_PHPENV_SHOW_SYSTEM=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_PHPENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #######[ scalaenv: scala version from scalaenv (https://github.com/scalaenv/scalaenv) ]#######
+  # Scala color.
+  typeset -g POWERLEVEL9K_SCALAENV_FOREGROUND=160
+  # Hide scala version if it doesn't come from one of these sources.
+  typeset -g POWERLEVEL9K_SCALAENV_SOURCES=(shell local global)
+  # If set to false, hide scala version if it's the same as global:
+  # $(scalaenv version-name) == $(scalaenv global).
+  typeset -g POWERLEVEL9K_SCALAENV_PROMPT_ALWAYS_SHOW=false
+  # If set to false, hide scala version if it's equal to "system".
+  typeset -g POWERLEVEL9K_SCALAENV_SHOW_SYSTEM=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_SCALAENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##########[ haskell_stack: haskell version from stack (https://haskellstack.org/) ]###########
+  # Haskell color.
+  typeset -g POWERLEVEL9K_HASKELL_STACK_FOREGROUND=172
+  # Hide haskell version if it doesn't come from one of these sources.
+  #
+  #   shell:  version is set by STACK_YAML
+  #   local:  version is set by stack.yaml up the directory tree
+  #   global: version is set by the implicit global project (~/.stack/global-project/stack.yaml)
+  typeset -g POWERLEVEL9K_HASKELL_STACK_SOURCES=(shell local)
+  # If set to false, hide haskell version if it's the same as in the implicit global project.
+  typeset -g POWERLEVEL9K_HASKELL_STACK_ALWAYS_SHOW=true
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_HASKELL_STACK_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]#############
+  # Show kubecontext only when the the command you are typing invokes one of these tools.
+  # Tip: Remove the next line to always show kubecontext.
+  typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc|istioctl|kogito|k9s|helmfile|fluxctl|stern'
+
+  # Kubernetes context classes for the purpose of using different colors, icons and expansions with
+  # different contexts.
+  #
+  # POWERLEVEL9K_KUBECONTEXT_CLASSES is an array with even number of elements. The first element
+  # in each pair defines a pattern against which the current kubernetes context gets matched.
+  # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below)
+  # that gets matched. If you unset all POWERLEVEL9K_KUBECONTEXT_*CONTENT_EXPANSION parameters,
+  # you'll see this value in your prompt. The second element of each pair in
+  # POWERLEVEL9K_KUBECONTEXT_CLASSES defines the context class. Patterns are tried in order. The
+  # first match wins.
+  #
+  # For example, given these settings:
+  #
+  #   typeset -g POWERLEVEL9K_KUBECONTEXT_CLASSES=(
+  #     '*prod*'  PROD
+  #     '*test*'  TEST
+  #     '*'       DEFAULT)
+  #
+  # If your current kubernetes context is "deathray-testing/default", its class is TEST
+  # because "deathray-testing/default" doesn't match the pattern '*prod*' but does match '*test*'.
+  #
+  # You can define different colors, icons and content expansions for different classes:
+  #
+  #   typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_FOREGROUND=28
+  #   typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  #   typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <'
+  typeset -g POWERLEVEL9K_KUBECONTEXT_CLASSES=(
+      # '*prod*'  PROD    # These values are examples that are unlikely
+      # '*test*'  TEST    # to match your needs. Customize them as needed.
+      '*'       DEFAULT)
+  typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_FOREGROUND=134
+  # typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  # Use POWERLEVEL9K_KUBECONTEXT_CONTENT_EXPANSION to specify the content displayed by kubecontext
+  # segment. Parameter expansions are very flexible and fast, too. See reference:
+  # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion.
+  #
+  # Within the expansion the following parameters are always available:
+  #
+  # - P9K_CONTENT                The content that would've been displayed if there was no content
+  #                              expansion defined.
+  # - P9K_KUBECONTEXT_NAME       The current context's name. Corresponds to column NAME in the
+  #                              output of `kubectl config get-contexts`.
+  # - P9K_KUBECONTEXT_CLUSTER    The current context's cluster. Corresponds to column CLUSTER in the
+  #                              output of `kubectl config get-contexts`.
+  # - P9K_KUBECONTEXT_NAMESPACE  The current context's namespace. Corresponds to column NAMESPACE
+  #                              in the output of `kubectl config get-contexts`. If there is no
+  #                              namespace, the parameter is set to "default".
+  # - P9K_KUBECONTEXT_USER       The current context's user. Corresponds to column AUTHINFO in the
+  #                              output of `kubectl config get-contexts`.
+  #
+  # If the context points to Google Kubernetes Engine (GKE) or Elastic Kubernetes Service (EKS),
+  # the following extra parameters are available:
+  #
+  # - P9K_KUBECONTEXT_CLOUD_NAME     Either "gke" or "eks".
+  # - P9K_KUBECONTEXT_CLOUD_ACCOUNT  Account/project ID.
+  # - P9K_KUBECONTEXT_CLOUD_ZONE     Availability zone.
+  # - P9K_KUBECONTEXT_CLOUD_CLUSTER  Cluster.
+  #
+  # P9K_KUBECONTEXT_CLOUD_* parameters are derived from P9K_KUBECONTEXT_CLUSTER. For example,
+  # if P9K_KUBECONTEXT_CLUSTER is "gke_my-account_us-east1-a_my-cluster-01":
+  #
+  #   - P9K_KUBECONTEXT_CLOUD_NAME=gke
+  #   - P9K_KUBECONTEXT_CLOUD_ACCOUNT=my-account
+  #   - P9K_KUBECONTEXT_CLOUD_ZONE=us-east1-a
+  #   - P9K_KUBECONTEXT_CLOUD_CLUSTER=my-cluster-01
+  #
+  # If P9K_KUBECONTEXT_CLUSTER is "arn:aws:eks:us-east-1:123456789012:cluster/my-cluster-01":
+  #
+  #   - P9K_KUBECONTEXT_CLOUD_NAME=eks
+  #   - P9K_KUBECONTEXT_CLOUD_ACCOUNT=123456789012
+  #   - P9K_KUBECONTEXT_CLOUD_ZONE=us-east-1
+  #   - P9K_KUBECONTEXT_CLOUD_CLUSTER=my-cluster-01
+  typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION=
+  # Show P9K_KUBECONTEXT_CLOUD_CLUSTER if it's not empty and fall back to P9K_KUBECONTEXT_NAME.
+  POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${P9K_KUBECONTEXT_CLOUD_CLUSTER:-${P9K_KUBECONTEXT_NAME}}'
+  # Append the current context's namespace if it's not "default".
+  POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${${:-/$P9K_KUBECONTEXT_NAMESPACE}:#/default}'
+
+  # Custom prefix.
+  # typeset -g POWERLEVEL9K_KUBECONTEXT_PREFIX='%fat '
+
+  ################[ terraform: terraform workspace (https://www.terraform.io) ]#################
+  # Don't show terraform workspace if it's literally "default".
+  typeset -g POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT=false
+  # POWERLEVEL9K_TERRAFORM_CLASSES is an array with even number of elements. The first element
+  # in each pair defines a pattern against which the current terraform workspace gets matched.
+  # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below)
+  # that gets matched. If you unset all POWERLEVEL9K_TERRAFORM_*CONTENT_EXPANSION parameters,
+  # you'll see this value in your prompt. The second element of each pair in
+  # POWERLEVEL9K_TERRAFORM_CLASSES defines the workspace class. Patterns are tried in order. The
+  # first match wins.
+  #
+  # For example, given these settings:
+  #
+  #   typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=(
+  #     '*prod*'  PROD
+  #     '*test*'  TEST
+  #     '*'       OTHER)
+  #
+  # If your current terraform workspace is "project_test", its class is TEST because "project_test"
+  # doesn't match the pattern '*prod*' but does match '*test*'.
+  #
+  # You can define different colors, icons and content expansions for different classes:
+  #
+  #   typeset -g POWERLEVEL9K_TERRAFORM_TEST_FOREGROUND=28
+  #   typeset -g POWERLEVEL9K_TERRAFORM_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  #   typeset -g POWERLEVEL9K_TERRAFORM_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <'
+  typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=(
+      # '*prod*'  PROD    # These values are examples that are unlikely
+      # '*test*'  TEST    # to match your needs. Customize them as needed.
+      '*'         OTHER)
+  typeset -g POWERLEVEL9K_TERRAFORM_OTHER_FOREGROUND=38
+  # typeset -g POWERLEVEL9K_TERRAFORM_OTHER_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #[ aws: aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) ]#
+  # Show aws only when the the command you are typing invokes one of these tools.
+  # Tip: Remove the next line to always show aws.
+  typeset -g POWERLEVEL9K_AWS_SHOW_ON_COMMAND='aws|awless|terraform|pulumi|terragrunt'
+
+  # POWERLEVEL9K_AWS_CLASSES is an array with even number of elements. The first element
+  # in each pair defines a pattern against which the current AWS profile gets matched.
+  # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below)
+  # that gets matched. If you unset all POWERLEVEL9K_AWS_*CONTENT_EXPANSION parameters,
+  # you'll see this value in your prompt. The second element of each pair in
+  # POWERLEVEL9K_AWS_CLASSES defines the profile class. Patterns are tried in order. The
+  # first match wins.
+  #
+  # For example, given these settings:
+  #
+  #   typeset -g POWERLEVEL9K_AWS_CLASSES=(
+  #     '*prod*'  PROD
+  #     '*test*'  TEST
+  #     '*'       DEFAULT)
+  #
+  # If your current AWS profile is "company_test", its class is TEST
+  # because "company_test" doesn't match the pattern '*prod*' but does match '*test*'.
+  #
+  # You can define different colors, icons and content expansions for different classes:
+  #
+  #   typeset -g POWERLEVEL9K_AWS_TEST_FOREGROUND=28
+  #   typeset -g POWERLEVEL9K_AWS_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  #   typeset -g POWERLEVEL9K_AWS_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <'
+  typeset -g POWERLEVEL9K_AWS_CLASSES=(
+      # '*prod*'  PROD    # These values are examples that are unlikely
+      # '*test*'  TEST    # to match your needs. Customize them as needed.
+      '*'       DEFAULT)
+  typeset -g POWERLEVEL9K_AWS_DEFAULT_FOREGROUND=208
+  # typeset -g POWERLEVEL9K_AWS_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #[ aws_eb_env: aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/) ]#
+  # AWS Elastic Beanstalk environment color.
+  typeset -g POWERLEVEL9K_AWS_EB_ENV_FOREGROUND=70
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_AWS_EB_ENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##########[ azure: azure account name (https://docs.microsoft.com/en-us/cli/azure) ]##########
+  # Show azure only when the the command you are typing invokes one of these tools.
+  # Tip: Remove the next line to always show azure.
+  typeset -g POWERLEVEL9K_AZURE_SHOW_ON_COMMAND='az|terraform|pulumi|terragrunt'
+  # Azure account name color.
+  typeset -g POWERLEVEL9K_AZURE_FOREGROUND=32
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_AZURE_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ##########[ gcloud: google cloud account and project (https://cloud.google.com/) ]###########
+  # Show gcloud only when the the command you are typing invokes one of these tools.
+  # Tip: Remove the next line to always show gcloud.
+  typeset -g POWERLEVEL9K_GCLOUD_SHOW_ON_COMMAND='gcloud|gcs'
+   # Google cloud color.
+  typeset -g POWERLEVEL9K_GCLOUD_FOREGROUND=32
+
+  # Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION and/or
+  # POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION if the default is too verbose or not informative
+  # enough. You can use the following parameters in the expansions. Each of them corresponds to the
+  # output of `gcloud` tool.
+  #
+  #   Parameter                | Source
+  #   -------------------------|--------------------------------------------------------------------
+  #   P9K_GCLOUD_CONFIGURATION | gcloud config configurations list --format='value(name)'
+  #   P9K_GCLOUD_ACCOUNT       | gcloud config get-value account
+  #   P9K_GCLOUD_PROJECT_ID    | gcloud config get-value project
+  #   P9K_GCLOUD_PROJECT_NAME  | gcloud projects describe $P9K_GCLOUD_PROJECT_ID --format='value(name)'
+  #
+  # Note: ${VARIABLE//\%/%%} expands to ${VARIABLE} with all occurrences of '%' replaced with '%%'.
+  #
+  # Obtaining project name requires sending a request to Google servers. This can take a long time
+  # and even fail. When project name is unknown, P9K_GCLOUD_PROJECT_NAME is not set and gcloud
+  # prompt segment is in state PARTIAL. When project name gets known, P9K_GCLOUD_PROJECT_NAME gets
+  # set and gcloud prompt segment transitions to state COMPLETE.
+  #
+  # You can customize the format, icon and colors of gcloud segment separately for states PARTIAL
+  # and COMPLETE. You can also hide gcloud in state PARTIAL by setting
+  # POWERLEVEL9K_GCLOUD_PARTIAL_VISUAL_IDENTIFIER_EXPANSION and
+  # POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION to empty.
+  typeset -g POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_ID//\%/%%}'
+  typeset -g POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_NAME//\%/%%}'
+
+  # Send a request to Google (by means of `gcloud projects describe ...`) to obtain project name
+  # this often. Negative value disables periodic polling. In this mode project name is retrieved
+  # only when the current configuration, account or project id changes.
+  typeset -g POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS=60
+
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #[ google_app_cred: google application credentials (https://cloud.google.com/docs/authentication/production) ]#
+  # Show google_app_cred only when the the command you are typing invokes one of these tools.
+  # Tip: Remove the next line to always show google_app_cred.
+  typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_SHOW_ON_COMMAND='terraform|pulumi|terragrunt'
+
+  # Google application credentials classes for the purpose of using different colors, icons and
+  # expansions with different credentials.
+  #
+  # POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES is an array with even number of elements. The first
+  # element in each pair defines a pattern against which the current kubernetes context gets
+  # matched. More specifically, it's P9K_CONTENT prior to the application of context expansion
+  # (see below) that gets matched. If you unset all POWERLEVEL9K_GOOGLE_APP_CRED_*CONTENT_EXPANSION
+  # parameters, you'll see this value in your prompt. The second element of each pair in
+  # POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES defines the context class. Patterns are tried in order.
+  # The first match wins.
+  #
+  # For example, given these settings:
+  #
+  #   typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES=(
+  #     '*:*prod*:*'  PROD
+  #     '*:*test*:*'  TEST
+  #     '*'           DEFAULT)
+  #
+  # If your current Google application credentials is "service_account deathray-testing x@y.com",
+  # its class is TEST because it doesn't match the pattern '* *prod* *' but does match '* *test* *'.
+  #
+  # You can define different colors, icons and content expansions for different classes:
+  #
+  #   typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_FOREGROUND=28
+  #   typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  #   typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_CONTENT_EXPANSION='$P9K_GOOGLE_APP_CRED_PROJECT_ID'
+  typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES=(
+      # '*:*prod*:*'  PROD    # These values are examples that are unlikely
+      # '*:*test*:*'  TEST    # to match your needs. Customize them as needed.
+      '*'             DEFAULT)
+  typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_FOREGROUND=32
+  # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  # Use POWERLEVEL9K_GOOGLE_APP_CRED_CONTENT_EXPANSION to specify the content displayed by
+  # google_app_cred segment. Parameter expansions are very flexible and fast, too. See reference:
+  # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion.
+  #
+  # You can use the following parameters in the expansion. Each of them corresponds to one of the
+  # fields in the JSON file pointed to by GOOGLE_APPLICATION_CREDENTIALS.
+  #
+  #   Parameter                        | JSON key file field
+  #   ---------------------------------+---------------
+  #   P9K_GOOGLE_APP_CRED_TYPE         | type
+  #   P9K_GOOGLE_APP_CRED_PROJECT_ID   | project_id
+  #   P9K_GOOGLE_APP_CRED_CLIENT_EMAIL | client_email
+  #
+  # Note: ${VARIABLE//\%/%%} expands to ${VARIABLE} with all occurrences of '%' replaced by '%%'.
+  typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_CONTENT_EXPANSION='${P9K_GOOGLE_APP_CRED_PROJECT_ID//\%/%%}'
+
+  ###############################[ public_ip: public IP address ]###############################
+  # Public IP color.
+  typeset -g POWERLEVEL9K_PUBLIC_IP_FOREGROUND=94
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_PUBLIC_IP_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ########################[ vpn_ip: virtual private network indicator ]#########################
+  # VPN IP color.
+  typeset -g POWERLEVEL9K_VPN_IP_FOREGROUND=81
+  # When on VPN, show just an icon without the IP address.
+  # Tip: To display the private IP address when on VPN, remove the next line.
+  typeset -g POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION=
+  # Regular expression for the VPN network interface. Run `ifconfig` or `ip -4 a show` while on VPN
+  # to see the name of the interface.
+  typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(gpd|wg|(.*tun)|tailscale)[0-9]*'
+  # If set to true, show one segment per matching network interface. If set to false, show only
+  # one segment corresponding to the first matching network interface.
+  # Tip: If you set it to true, you'll probably want to unset POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION.
+  typeset -g POWERLEVEL9K_VPN_IP_SHOW_ALL=false
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_VPN_IP_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ###########[ ip: ip address and bandwidth usage for a specified network interface ]###########
+  # IP color.
+  typeset -g POWERLEVEL9K_IP_FOREGROUND=38
+  # The following parameters are accessible within the expansion:
+  #
+  #   Parameter             | Meaning
+  #   ----------------------+---------------
+  #   P9K_IP_IP         | IP address
+  #   P9K_IP_INTERFACE  | network interface
+  #   P9K_IP_RX_BYTES   | total number of bytes received
+  #   P9K_IP_TX_BYTES   | total number of bytes sent
+  #   P9K_IP_RX_RATE    | receive rate (since last prompt)
+  #   P9K_IP_TX_RATE    | send rate (since last prompt)
+  typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='$P9K_IP_IP${P9K_IP_RX_RATE:+ %70F⇣$P9K_IP_RX_RATE}${P9K_IP_TX_RATE:+ %215F⇡$P9K_IP_TX_RATE}'
+  # Show information for the first network interface whose name matches this regular expression.
+  # Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces.
+  typeset -g POWERLEVEL9K_IP_INTERFACE='[ew].*'
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_IP_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  #########################[ proxy: system-wide http/https/ftp proxy ]##########################
+  # Proxy color.
+  typeset -g POWERLEVEL9K_PROXY_FOREGROUND=68
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_PROXY_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ################################[ battery: internal battery ]#################################
+  # Show battery in red when it's below this level and not connected to power supply.
+  typeset -g POWERLEVEL9K_BATTERY_LOW_THRESHOLD=20
+  typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=160
+  # Show battery in green when it's charging or fully charged.
+  typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=70
+  # Show battery in yellow when it's discharging.
+  typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178
+  # Battery pictograms going from low to high level of charge.
+  typeset -g POWERLEVEL9K_BATTERY_STAGES='\uf58d\uf579\uf57a\uf57b\uf57c\uf57d\uf57e\uf57f\uf580\uf581\uf578'
+  # Don't show the remaining time to charge/discharge.
+  typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false
+
+  #####################################[ wifi: wifi speed ]#####################################
+  # WiFi color.
+  typeset -g POWERLEVEL9K_WIFI_FOREGROUND=68
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_WIFI_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  # Use different colors and icons depending on signal strength ($P9K_WIFI_BARS).
+  #
+  #   # Wifi colors and icons for different signal strength levels (low to high).
+  #   typeset -g my_wifi_fg=(68 68 68 68 68)                           # <-- change these values
+  #   typeset -g my_wifi_icon=('WiFi' 'WiFi' 'WiFi' 'WiFi' 'WiFi')     # <-- change these values
+  #
+  #   typeset -g POWERLEVEL9K_WIFI_CONTENT_EXPANSION='%F{${my_wifi_fg[P9K_WIFI_BARS+1]}}$P9K_WIFI_LAST_TX_RATE Mbps'
+  #   typeset -g POWERLEVEL9K_WIFI_VISUAL_IDENTIFIER_EXPANSION='%F{${my_wifi_fg[P9K_WIFI_BARS+1]}}${my_wifi_icon[P9K_WIFI_BARS+1]}'
+  #
+  # The following parameters are accessible within the expansions:
+  #
+  #   Parameter             | Meaning
+  #   ----------------------+---------------
+  #   P9K_WIFI_SSID         | service set identifier, a.k.a. network name
+  #   P9K_WIFI_LINK_AUTH    | authentication protocol such as "wpa2-psk" or "none"; empty if unknown
+  #   P9K_WIFI_LAST_TX_RATE | wireless transmit rate in megabits per second
+  #   P9K_WIFI_RSSI         | signal strength in dBm, from -120 to 0
+  #   P9K_WIFI_NOISE        | noise in dBm, from -120 to 0
+  #   P9K_WIFI_BARS         | signal strength in bars, from 0 to 4 (derived from P9K_WIFI_RSSI and P9K_WIFI_NOISE)
+
+  ####################################[ time: current time ]####################################
+  # Current time color.
+  typeset -g POWERLEVEL9K_TIME_FOREGROUND=66
+  # Format for the current time: 09:51:02. See `man 3 strftime`.
+  typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}'
+  # If set to true, time will update when you hit enter. This way prompts for the past
+  # commands will contain the start times of their commands as opposed to the default
+  # behavior where they contain the end times of their preceding commands.
+  typeset -g POWERLEVEL9K_TIME_UPDATE_ON_COMMAND=false
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_TIME_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # Custom prefix.
+  # typeset -g POWERLEVEL9K_TIME_PREFIX='%fat '
+
+  # Example of a user-defined prompt segment. Function prompt_example will be called on every
+  # prompt if `example` prompt segment is added to POWERLEVEL9K_LEFT_PROMPT_ELEMENTS or
+  # POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS. It displays an icon and orange text greeting the user.
+  #
+  # Type `p10k help segment` for documentation and a more sophisticated example.
+  function prompt_example() {
+    p10k segment -f 208 -i '⭐' -t 'hello, %n'
+  }
+
+  # User-defined prompt segments may optionally provide an instant_prompt_* function. Its job
+  # is to generate the prompt segment for display in instant prompt. See
+  # https://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt.
+  #
+  # Powerlevel10k will call instant_prompt_* at the same time as the regular prompt_* function
+  # and will record all `p10k segment` calls it makes. When displaying instant prompt, Powerlevel10k
+  # will replay these calls without actually calling instant_prompt_*. It is imperative that
+  # instant_prompt_* always makes the same `p10k segment` calls regardless of environment. If this
+  # rule is not observed, the content of instant prompt will be incorrect.
+  #
+  # Usually, you should either not define instant_prompt_* or simply call prompt_* from it. If
+  # instant_prompt_* is not defined for a segment, the segment won't be shown in instant prompt.
+  function instant_prompt_example() {
+    # Since prompt_example always makes the same `p10k segment` calls, we can call it from
+    # instant_prompt_example. This will give us the same `example` prompt segment in the instant
+    # and regular prompts.
+    prompt_example
+  }
+
+  # User-defined prompt segments can be customized the same way as built-in segments.
+  # typeset -g POWERLEVEL9K_EXAMPLE_FOREGROUND=208
+  # typeset -g POWERLEVEL9K_EXAMPLE_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  # Transient prompt works similarly to the builtin transient_rprompt option. It trims down prompt
+  # when accepting a command line. Supported values:
+  #
+  #   - off:      Don't change prompt when accepting a command line.
+  #   - always:   Trim down prompt when accepting a command line.
+  #   - same-dir: Trim down prompt when accepting a command line unless this is the first command
+  #               typed after changing current working directory.
+  typeset -g POWERLEVEL9K_TRANSIENT_PROMPT=off
+
+  # Instant prompt mode.
+  #
+  #   - off:     Disable instant prompt. Choose this if you've tried instant prompt and found
+  #              it incompatible with your zsh configuration files.
+  #   - quiet:   Enable instant prompt and don't print warnings when detecting console output
+  #              during zsh initialization. Choose this if you've read and understood
+  #              https://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt.
+  #   - verbose: Enable instant prompt and print a warning when detecting console output during
+  #              zsh initialization. Choose this if you've never tried instant prompt, haven't
+  #              seen the warning, or if you are unsure what this all means.
+  typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet
+
+  # Hot reload allows you to change POWERLEVEL9K options after Powerlevel10k has been initialized.
+  # For example, you can type POWERLEVEL9K_BACKGROUND=red and see your prompt turn red. Hot reload
+  # can slow down prompt by 1-2 milliseconds, so it's better to keep it turned off unless you
+  # really need it.
+  typeset -g POWERLEVEL9K_DISABLE_HOT_RELOAD=true
+
+  # If p10k is already loaded, reload configuration.
+  # This works even with POWERLEVEL9K_DISABLE_HOT_RELOAD=true.
+  (( ! $+functions[p10k] )) || p10k reload
+}
+
+# Tell `p10k configure` which file it should overwrite.
+typeset -g POWERLEVEL9K_CONFIG_FILE=${${(%):-%x}:a}
+
+(( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]}
+'builtin' 'unset' 'p10k_config_opts'
diff --git a/common/.config/tmux/tmux.conf b/common/.config/tmux/tmux.conf
index 7dcff1b..9876166 100644
--- a/common/.config/tmux/tmux.conf
+++ b/common/.config/tmux/tmux.conf
@@ -1,14 +1,14 @@
 # Keybinding Summary
 #========================================================
-# Rename Session    -> <alt-a> $
-# Rename Tab        -> <alt-a> ,
-# Next/prev tab     -> <alt-a> n/p
-# H-split/V-split   -> <alt-a> s/v
-# Resize Pane       -> <alt-a> leave alt -> h,j,k,l (repeat press)
+# Rename Session    -> <ctrl-a> $
+# Rename Tab        -> <ctrl-a> ,
+# Next/prev tab     -> <ctrl-a> n/p
+# H-split/V-split   -> <ctrl-a> s/v
+# Resize Pane       -> <ctrl-a> leave alt -> h,j,k,l (repeat press)
 # Switch Pane       -> <ctrl-h,j,k,l>
-# Enter copy mode   -> <alt-a>[
+# Enter copy mode   -> <ctrl-a>[
 # Exit copy mode    -> <enter>
-# Reload tmux.conf  -> <alt-a> r
+# Reload tmux.conf  -> <ctrl-a> r
 
 # More at: https://tmuxcheatsheet.com
 
@@ -17,10 +17,10 @@
 #========================================================
 # KEY BINDINGS
 #========================================================
-# Change Tmux leader key to -> <alt-a>
+# Change Tmux leader key to -> <ctrl-a>
 unbind C-b
-set -g prefix M-a
-bind-key M-a send-prefix
+set -g prefix C-a
+bind-key C-a send-prefix
 
 # Kill current session with q
 bind q confirm-before kill-session
@@ -52,11 +52,11 @@ bind C-p previous-window
 bind C-n next-window
 bind C-a send-prefix
 bind a last-window
-bind r source-file ~/.config/tmux/tmux.conf \; display-message "Tmux config reloaded."
+bind r source-file "$XDG_CONFIG_HOME/tmux/tmux.conf" \; display-message "Tmux config reloaded."
 
-# Change resurrect keys to <alt-s>(Save) & <alt-r>(Resurrect)
-set -g @resurrect-save "M-s"
-set -g @resurrect-restore "M-r"
+# Change resurrect keys to <ctrl-s>(Save) & <ctrl-r>(Resurrect)
+set -g @resurrect-save "C-s"
+set -g @resurrect-restore "C-r"
 
 #========================================================
 # OPTIONS
@@ -77,7 +77,7 @@ setw -g aggressive-resize on    # For grouped sessions
 # Resurrection Options
 set -g @resurrect-capture-pane-contents "on"
 set -g @resurrect-strategy-nvim "session"
-set -g @resurrect-dir "$HOME/.config/tmux/resurrect"
+set -g @resurrect-dir "$XDG_CONFIG_HOME/tmux/resurrect"
 
 # Don't exit tmux when closing a session
 set -g detach-on-destroy off
@@ -102,9 +102,7 @@ set -g status-position top
 #========================================================
 # PLUGINS
 #========================================================
-run "~/.config/tmux/plugins/tpm/tpm" # Init Tmux Plugin Manager
-
-# TODO: Get into Tmux copy stuff when required
+run "$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm" # Init Tmux Plugin Manager
 
 set -g @plugin "christoomey/vim-tmux-navigator" # sync pane nav with Vim window nav
 set -g @plugin "tmux-plugins/tmux-resurrect" # Persist sessions
diff --git a/common/.gitconfig b/common/.gitconfig
index b946d31..75bebf9 100644
--- a/common/.gitconfig
+++ b/common/.gitconfig
@@ -1,14 +1,14 @@
 [user]
-	email = mail@pratik.live
-	name = Pratik Tripathy
+    email = mail@pratik.live
+    name = Pratik Tripathy
 [core]
-	autocrlf = input
-	editor = code --wait
+    autocrlf = input
+    editor = code --wait
 [diff]
-	tool = vscode
+    tool = vscode
 [difftool "vscode"]
-	cmd = "code --wait --diff $LOCAL $REMOTE"
+    cmd = "code --wait --diff $LOCAL $REMOTE"
 [alias]
-	ll = log --pretty=format:'%Cblue%cn (%ce)%Creset commited %Cred%h%Creset %Cgreen%cr%Creset:%n%B'
-	unstage = restore --staged .
+    ll = log --pretty=format:'%Cblue%cn (%ce)%Creset commited %Cred%h%Creset %Cgreen%cr%Creset:%n%B'
+    unstage = restore --staged .
 
diff --git a/common/.gitignore b/common/.gitignore
index 98bdfa3..b6b8a77 100644
--- a/common/.gitignore
+++ b/common/.gitignore
@@ -98,3 +98,5 @@ lerna-debug.log*
 **/contents/fonts
 *kpluginindex.json
 
+*.bak
+nvim_switch/
diff --git a/common/.profile b/common/.profile
index 7eb7980..4dc1cd3 100644
--- a/common/.profile
+++ b/common/.profile
@@ -1,38 +1,31 @@
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ]; then
-	PATH="$HOME/bin:$PATH"
-fi
+[ ! -f "/home/linuxbrew/.linuxbrew/bin/brew" ] || eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
 
 # set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/.local/bin" ]; then
-	PATH="$HOME/.local/bin:$PATH"
-fi
+[ ! -d "$HOME/bin" ] || PATH="$HOME/bin:$PATH"
+
+# set PATH so it includes user's private bin if it exists
+[ ! -d "$HOME/.local/bin" ] || PATH="$HOME/.local/bin:$PATH"
 
 # Set the config directory enviroment variable
-if [ -z "$XDG_CONFIG_HOME" ]; then
-	export XDG_CONFIG_HOME="$HOME/.config"
-fi
+[ ! -z "$XDG_CONFIG_HOME" ] || export XDG_CONFIG_HOME="$HOME/.config"
 
 # Set the cache directory enviroment variable
-if [ -z "$XDG_CACHE_HOME" ]; then
-	export XDG_CACHE_HOME="$HOME/.cache"
-fi
+[ ! -z "$XDG_CACHE_HOME" ] || export XDG_CACHE_HOME="$HOME/.cache"
 
 # Set the data directory enviroment variable
-if [ -z "$XDG_DATA_HOME" ]; then
-	export XDG_DATA_HOME="$HOME/.local/share"
-fi
+[ ! -z "$XDG_DATA_HOME" ] || export XDG_DATA_HOME="$HOME/.local/share"
 
 # Set the state directory enviroment variable
-if [ -z "$XDG_STATE_HOME" ]; then
-	export XDG_STATE_HOME="$HOME/.local/state"
-fi
+[ ! -z "$XDG_STATE_HOME" ] || export XDG_STATE_HOME="$HOME/.local/state"
 
 ##################################################################################
 
 eval "$(ssh-agent -s)" >/dev/null
 ulimit -n 10240
 
+EDITOR=$(command -v nvim 2>/dev/null || command -v vim 2>/dev/null)
+VISUAL=$EDITOR
+
 # Manually follow steps from https://steamcommunity.com/app/646570/discussions/1/3935537639868400686
 # To disable ~/.oracle_jre_usage/ from being created
 
@@ -43,13 +36,12 @@ ulimit -n 10240
 [ ! -f "$XDG_CONFIG_HOME/shell/aliases_personal" ] || source "$XDG_CONFIG_HOME/shell/aliases_personal"
 
 if [ "$(uname -s)" = "Linux" ]; then
-	export QT_PLUGIN_PATH="~/.local/lib/qt/plugins/:"
+	export QT_PLUGIN_PATH="~/.local/lib/qt/plugins/:" # TODO: Mac as well?
 	export __GL_SHADER_DISK_CACHE_PATH="$XDG_CACHE_HOME/nvidia"
 
 	# Needs upstream fix to work: https://bugs.kde.org/show_bug.cgi?id=415770
 	export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
-
-	eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+	export CUDA_CACHE_PATH="XDG_CACHE_HOME/nv"
 fi
 
 if [ "$XDG_SESSION_DESKTOP" = "KDE" ]; then
@@ -65,27 +57,32 @@ export ADB_VENDOR_KEYS="$XDG_CONFIG_HOME/android"
 
 # Setup Python
 export PYENV_ROOT="$XDG_DATA_HOME/pyenv"
-command -v pyenv >/dev/null || export PATH="$PATH:$PYENV_ROOT/bin"
-command -v pyenv >/dev/null || eval "$(pyenv init -)"
-export PYTHON_HISTORY="$XDG_STATE_HOME/shell/python_history" # will become availble in python 3.13
+command -v pyenv >/dev/null && export PATH="$PATH:$PYENV_ROOT/bin"
+command -v pyenv >/dev/null && eval "$(pyenv init -)"
+export PYTHON_HISTORY="$XDG_STATE_HOME/shell/python_history" # will be picked up by Python 3.13+
 
 # Setup Rust
 export CARGO_HOME="$XDG_DATA_HOME/rust/cargo"
 export RUSTUP_HOME="$XDG_DATA_HOME/rust/rustup"
 export PATH="$PATH:$CARGO_HOME/bin"
-export RUSTC_WRAPPER=sccache # Setup Shared cache for Rust
+export RUSTC_WRAPPER=sccache
 export SCCACHE_CACHE_SIZE="20G"
 
 # Setup DotNet
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export DOTNET_CLI_HOME="$XDG_CONFIG_HOME/dotnet"
 
-# Setup Node & nvm
+# Cause we need it available on login
+alias code="code --extensions-dir $XDG_DATA_HOME/vscode"
+
+# Java
+export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java"
+
+# Setup Node & n
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/node/npmrc"
 export NODE_REPL_HISTORY="$XDG_CONFIG_HOME/node/node_repl_history"
-export NVM_DIR="$XDG_DATA_HOME/nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+export N_PREFIX="$XDG_DATA_HOME/nvm" # "n" would be confusing
+export PATH="$N_PREFIX/bin:$PATH"
 
 export AWS_CONFIG_FILE="$XDG_CONFIG_HOME/aws/config"
 export AWS_SHARED_CREDENTIALS_FILE="$XDG_CONFIG_HOME/aws/credentials"
diff --git a/common/.vim/configs.vim b/common/.vim/configs.vim
index 95670ef..ae760dc 100644
--- a/common/.vim/configs.vim
+++ b/common/.vim/configs.vim
@@ -1,77 +1,65 @@
+syntax on                   " Syntax highlighting.
+set nocompatible            " Do not worry about backward compatibility with VI
+set cursorline              " Hightlight cursor line
+set showmatch               " Highlight matching braces
+set noshowmode              " Donot write "--INSERT--" etc.
+set showcmd                 " Write out commands on status line
+set laststatus=2            " Show a status line
+set wrap                    " Wrap text
+set number                  " Show line numbers
+set relativenumber          " Relative line numbers
+set ruler                   " Show the line & column number of the cursor
+set shortmess+=I            " Disable the default Vim startup message.
+set shortmess+=s            " Less verbose search messages
+set mouse+=a                " Enable mouse support
+set encoding=utf-8          " Encoding
+set autoread                " Auto reload file if externally changed
+set nrformats-=octal        " Do not let Ctrl-a + Ctrl-x work on octal format numbers
+set formatoptions+=j        " When joining lines with J, delete comment characters
+set display+=truncate       " @@@ is displayed in the 1st column of the last screen line
+set tabpagemax=50           " Max number of tabs
+set viminfo^=!
+set viewoptions-=options
+set nolangremap             " Do not use non-English keyboards to define keymaps
+set list                    " Show tabs as >, trailing spaces as -, non-breakable space as +
+set signcolumn=yes          " Always show the signs column (before line number column)
+set scrolloff=5           " Cursor always at middle of the screen
+set updatetime=249          " No typing for this millisec -> write to swap file
+set timeoutlen=500          " Multiple keys in keymaps must be pressed in these millisecs
+set noswapfile              " Turn off swapfiles
+set history=10000           " Number of : commands to save
+set undofile                " Turn on undofiles (files not compatible across Vim & Nvim
+set undolevels=10000        " Number of undos per file (will be stored in memory)
+set undoreload=100000       " Amount of memory to use when reloading the buffer with :e!
+set sessionoptions-=options " Do NOT save options and mappings in session
+set splitbelow              " Split new windows at bottom instead of top
+set splitright              " New vertical windows on right instead of left
+set hidden                  " Allows to change buffer without saving it 1st
+set virtualedit=block       " Makes visual block better when selecting different line sizes
+set ignorecase              " When trying to autocomplete commands or searching, ignore case
+set noerrorbells novisualbell t_vb= " Disable all bells
+
+" Make sure tabs are 4 character wide
+set shiftwidth=4 tabstop=4 softtabstop=4 expandtab smarttab
+set autoindent smartindent breakindent  " Proper indentation
+
+" Enable searching as you type, rather than waiting till you press enter. Highlight search pattern. Intelligently handle cases in search.
+set incsearch hlsearch ignorecase smartcase
+" Comments in Grey color and italic
+hi Comment guifg=#5C6370 ctermfg=50 cterm=italic
+
 " Better autocompletes
 filetype plugin indent on
 set omnifunc=syntaxcomplete#Complete
 set complete+=kspell
 set complete-=i
-set completeopt="menuone,noselect"
-set wildmenu        " List and cycle through autocomplete on <Tab>
-set wildignorecase  " Case insensitive path completion
+set completeopt="menuone,noselect"  " Better completion experience
+set wildmenu                        " List and cycle through autocomplete on <Tab>
+set wildignorecase                  " Case insensitive path completion
 
-" Make sure tabs are 4 character wide
-set shiftwidth=4 tabstop=4 softtabstop=4 expandtab smarttab
-set autoindent smartindent breakindent
-
-syntax on           " Syntax highlighting.
-syntax enable
-set cursorline      " Hightlight cursor line
-set showmatch       " Highlight matching braces
-set noshowmode      " Donot write "--INSERT--" etc.
-set showcmd         " Write out commands on status line
-set laststatus=2    " Show a status line
-set wrap            " Wrap text
-set number          " Show line numbers
-set relativenumber  " Relative line numbers
-set ruler
-set shortmess+=I    " Disable the default Vim startup message.
-set noerrorbells novisualbell t_vb= " Disable audible bell because it's annoying.
-set mouse+=a        " Enable mouse support
-set encoding=utf-8  " Encoding
-set autoread
-set nrformats-=octal
-set formatoptions+=j
-set display+=lastline
-set display+=truncate
-set tabpagemax=50
-set viminfo^=!
-set viewoptions-=options
-set nolangremap
-set list
-set signcolumn=yes
-set scrolloff=5
-set isfname+={,},@-@
-set updatetime=50
-set noswapfile
-set history=1000
-set undofile
-set undolevels=10000
-set undoreload=100000
-set sessionoptions-=options
-set timeoutlen=500
-
-" Vim, by default, won't let you jump to a different file without saving the
-" current one. With the below, unsaved files are just hidden.
-set hidden
-
-" Enable searching as you type, rather than waiting till you press enter. Highlight search pattern. Intelligently handle cases in search.
-set incsearch hlsearch ignorecase smartcase
-
-" Comments in Grey color and italic
-hi Comment guifg=#5C6370 ctermfg=50 cterm=italic
-
-" Highlight and remove trailing blank spaces on save
-" highlight ExtraWhitespace ctermbg=red guibg=red
-" match ExtraWhitespace /\s\+$/
+" Remove trailing blank spaces on save
 autocmd BufWritePre * %s/\s\+$//e
 
-" Vim is based on Vi. Setting `nocompatible` switches from the default
-" Vi-compatibility mode and enables useful Vim functionality. This
-" configuration option turns out not to be necessary for the file named
-" '~/.vimrc', because Vim automatically enters nocompatible mode if that file
-" is present. But we're including it here just in case this config file is
-" loaded some other way (e.g. saved as `foo`, and then Vim started with
-" `vim -u foo`).
-set nocompatible
-
 " Normally, backspace works only if you have made an edit. This fixes that.
 set backspace=indent,eol,start
 
@@ -87,5 +75,4 @@ if !has('gui_running')
   set t_Co=256
   set termguicolors
   hi LineNr ctermbg=NONE guibg=NONE
-  set termguicolors
 endif
diff --git a/common/.vim/key_maps.vim b/common/.vim/key_maps.vim
index dc393ec..5529dc4 100644
--- a/common/.vim/key_maps.vim
+++ b/common/.vim/key_maps.vim
@@ -1,3 +1,11 @@
+" Make space-bar the leader-key
+let mapleader = " "
+let maplocalleader = " "
+
+" Don't do anything on pressing space itself
+nnoremap <Space> <Nop>
+vnoremap <Space> <Nop>
+
 " Disable left, right, up and down keys
 " In normal mode...
 nnoremap <Left>  :echoe "Use h"<CR>
@@ -13,14 +21,6 @@ inoremap <Down>  <ESC>:echoe "Use j"<CR>
 " Unbind some useless/annoying default key bindings.
 nmap Q <Nop>
 
-" Don't do anything on pressing space itself
-nnoremap <Space> <Nop>
-vnoremap <Space> <Nop>
-
-" Make space-bar the leader-key
-let mapleader = " "
-let maplocalleader = " "
-
 " Center the cursor when moving through document
 nnoremap <C-d> <C-d>zz
 nnoremap <C-u> <C-u>zz
diff --git a/common/.zshrc b/common/.zshrc
index 4048f6a..89b1687 100644
--- a/common/.zshrc
+++ b/common/.zshrc
@@ -8,12 +8,10 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
     source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
 
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
-
 # Path to your oh-my-zsh installation.
-export ZSH="$XDG_CONFIG_HOME/shell/oh-my-zsh"
-source "${ZSH}/custom/themes/powerlevel10k/powerlevel10k.zsh-theme"
+export ZSH="$XDG_DATA_HOME/shell/oh-my-zsh"
+export ZSH_CUSTOM="$ZSH/custom"
+source "${ZSH_CUSTOM}/themes/powerlevel10k/powerlevel10k.zsh-theme"
 
 ZSH_THEME="powerlevel10k/powerlevel10k"
 
@@ -50,27 +48,29 @@ HIST_STAMPS="dd.mm.yyyy"
 plugins=(
     git
     # dotenv
+    # dotnet
+    gitignore
     # colored-man-pages
-    # docker
+    docker
     # fd
-    # nvm
     per-directory-history
     # ripgrep
     sudo
     zsh-syntax-highlighting
     zsh-autosuggestions
     vi-mode
-    # exercism
+    exercism
 )
 VI_MODE_SET_CURSOR=true
 VI_MODE_CURSOR_INSERT=3
-zstyle ':omz:plugins:nvm' lazy yes
 HISTORY_BASE="$XDG_STATE_HOME/shell/per-directory-history"
 
-source $ZSH/oh-my-zsh.sh
-compinit -d "$XDG_CACHE_HOME/zcompdump"
+# NOTE: Should be exported before sourcing oh-my-zsh, to avoid the dumpfiles on $HOME
+export ZSH_COMPDUMP=$XDG_CACHE_HOME/zsh/zcompdump-$HOST
 
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+source $ZSH/oh-my-zsh.sh
+
+# To customize prompt, run `p10k configure`
 [[ ! -f "$XDG_CONFIG_HOME/shell/p10k.zsh" ]] || source "$XDG_CONFIG_HOME/shell/p10k.zsh"
 
 # User configuration
@@ -91,8 +91,27 @@ setopt HIST_IGNORE_SPACE          # Don't add commands that start with whitespac
 # enable vi-mode
 bindkey -v
 
-# [ ! -f "$XDG_CONFIG_HOME/exercism/exercism_completion.zsh" ] || source "$XDG_CONFIG_HOME/exercism/exercism_completion.zsh"
+# Basic auto/tab completions
+autoload -U compinit
+zstyle ':completion:*' menu select cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
+zmodload zsh/complist
+compinit -d "$XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION"
+_comp_options+=(globdots)  # Include hidden files
+
+# [ctrl+r]:replaces shell command search
+# [ctrl+t]:fzf & over the files & directories under the current one & paste it to prompt
+# [alt+c] :fzf & cd into a directory under the current one
+[ -f $XDG_STATE_HOME/shell/fzf.zsh ] && source $XDG_STATE_HOME/shell/fzf.zsh
+
+# FPATH="$FPATH:$HOMEBREW_PREFIX/share/zsh/site-functions" # TODO: Make the completions here work
+
+command -v zoxide >/dev/null && eval "$(zoxide init zsh)"
+
+# TODO: Use fzf + fd + kitty to auto create kitty sessions: use only the following directories
+# 1. /media/pratik/Office/Code/
+# 2. /media/pratik/Projects/LearningProjects/
+# 3. /media/pratik/Projects/PersonalProjects/
+# 4. /media/pratik/Projects/Interviews/
+# - Ignore hidden directories
+# - Put it in one of the aliases
 
-if command -v zoxide >/dev/null; then
-	eval "$(zoxide init zsh)"
-fi
diff --git a/kde-neon/.config/shell/aliases_neon b/kde-neon/.config/shell/aliases_neon
index 623a39d..4ac1c60 100644
--- a/kde-neon/.config/shell/aliases_neon
+++ b/kde-neon/.config/shell/aliases_neon
@@ -23,7 +23,7 @@ alias listening_apps="sudo netstat -nutlp | grep ':' | awk '{print \$1,\$4,\$NF}
 
 
 # Update & Upgrades
-alias up="sudo pkcon refresh && sudo pkcon update && sudo apt dist-upgrade && sudo apt autoremove && rustup update && brew upgrade && npm update -g"
+alias up="sudo pkcon refresh && sudo pkcon update && sudo apt dist-upgrade && sudo apt autoremove && rustup update && brew upgrade && brew autoremove && npm update -g"
 alias distup="sudo apt dist-upgrade"
 alias autorem="sudo apt autoremove"
 alias update="sudo apt-get update"
diff --git a/macos/.aliases_mac b/macos/.aliases_mac
index 0711d32..eff9c3f 100644
--- a/macos/.aliases_mac
+++ b/macos/.aliases_mac
@@ -1,17 +1,16 @@
 #!/bin/sh
 
 # Directories and Directory listings
-dir_size(){
-    local dir
-    if [[ -z "$1" ]]; then
-        dir="${PWD}"
-    else
-        dir="$1"
-    fi
+dir_size() {
+	local dir
+	if [[ -z "$1" ]]; then
+		dir="${PWD}"
+	else
+		dir="$1"
+	fi
 
-    du -ah "${dir}" -d 1 | sort -hr
+	du -ah "${dir}" -d 1 | sort -hr
 }
 
-
 # Update & Upgrades
-alias up="brew upgrade --cask && brew upgrade --formula && rustup update && npm update -g"
+alias up="brew upgrade --cask && brew upgrade --formula && brew autoremove && rustup update && npm update -g"