diff --git a/README.md b/README.md
index c1c94c2..f0f632a 100644
--- a/README.md
+++ b/README.md
@@ -40,22 +40,39 @@
-## Overview
+## System dependencies
-nvim has a easy to understand config structure that promotes personalization, so go ahead, bring your keybindings, functions and plugins over, and truly make nvim: Your Personalized Development Environment!
+Important system dependencies:
+
+- **Nerd fonts** ([information source](https://gist.github.com/matthewjberger/7dd7e079f282f8138a9dc3b045ebefa0)):
+
+ - Download a [Nerd Font](https://www.nerdfonts.com/) (good choice is "JetBrainsMono Nerd Font").
+ - Unzip and copy to '~/.local/share/fonts'.
+ - Run the command `fc-cache -fv` to manually rebuild the font cache.
+
+- **Tools for finding stuff**:
+ - [ripgrep](https://github.com/BurntSushi/ripgrep#installation)
## Installation
-To install `nvim` clone the repo and setup the symlink
+Delete old nvim configuration
```bash
-git clone https://github.com/S4NKALP/nvim
+rm -rf ~/.config/nvim
+rm -rf ~/.local/state/nvim
+rm -rf ~/.local/share/nvim
```
-On Linux and Mac
+Clone the repository to ~/.config
```bash
-ln -sfnv $PWD/nvim $HOME/.config/nvim
+git clone --filter=blob:none https://github.com/amanhex/nvim.git ~/.config/nvim
+```
+
+Run neovim to complete the setup
+
+```bash
+nvim
```
### 🧰 Tools Used
diff --git a/dotfyle.json b/dotfyle.json
index 8db5dd8..8277ccc 100644
--- a/dotfyle.json
+++ b/dotfyle.json
@@ -1 +1 @@
-{"distribution": "custom", "masonTools": ["actionlint", "bash-language-server", "biome", "black", "clang-format", "clangd", "emmet-ls", "eslint_d", "goimports-reviser", "golangci-lint", "graphql-lsp", "hadolint", "isort", "jdtls", "lua-language-server", "prettier", "prisma-language-server", "proselint", "pylint", "pylsp", "pyright", "pyright-langserver", "rubocop", "ruff-lsp", "rust-analyzer", "shellcheck", "shfmt", "solargraph", "stylua", "svelteserver", "tailwindcss-language-server", "typescript-language-server", "typos-lsp", "vim-language-server", "vint", "vscode-css-language-server", "vscode-eslint-language-server", "vscode-html-language-server", "vscode-json-language-server", "write-good"], "keymaps": [{"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ":bnext"}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": "nohlsearch"}, {"desc": "Buffer Local Keymaps (which-key)", "noremap": true, "lhs": "?", "mode": "n", "rhs": ""}, {"desc": "Dismiss All Notifications", "noremap": true, "lhs": "un", "mode": "n", "rhs": ""}, {"desc": "Float File Explorer", "noremap": true, "lhs": "ee", "mode": "n", "rhs": ":Neotree toggle float"}, {"desc": "Left File Explorer", "noremap": true, "lhs": "", "mode": "n", "rhs": ":Neotree toggle left"}, {"desc": "Toggle TS Context", "noremap": true, "lhs": "tc", "mode": "n", "rhs": ""}, {"desc": "Quit Buffer", "noremap": true, "lhs": "q", "mode": "n", "rhs": ""}, {"desc": "Delete Comment Style", "noremap": true, "lhs": "cd", "mode": "v", "rhs": ""}, {"desc": "Delete Comment Style", "noremap": true, "lhs": "cd", "mode": "n", "rhs": ""}, {"desc": "Catalog", "noremap": true, "lhs": "cc", "mode": "n", "rhs": ""}, {"desc": "Marked", "noremap": true, "lhs": "cm", "mode": "v", "rhs": ""}, {"desc": "Marked", "noremap": true, "lhs": "cm", "mode": "n", "rhs": ""}, {"desc": "Line", "noremap": true, "lhs": "cl", "mode": "n", "rhs": ""}, {"desc": "Tiled line", "noremap": true, "lhs": "ct", "mode": "v", "rhs": ""}, {"desc": "Tiled line", "noremap": true, "lhs": "ct", "mode": "n", "rhs": ""}, {"desc": "Comment Box", "noremap": true, "lhs": "cb", "mode": "v", "rhs": ""}, {"desc": "Comment Box", "noremap": true, "lhs": "cb", "mode": "n", "rhs": ""}, {"desc": "Nav", "noremap": true, "lhs": "nv", "mode": "n", "rhs": ""}, {"desc": "toggle markdown preview", "noremap": true, "lhs": "mp", "mode": "n", "rhs": ""}, {"desc": "Horizontal Terminal", "noremap": true, "lhs": "th", "mode": "n", "rhs": ""}, {"desc": "Vertical Terminal", "noremap": true, "lhs": "tv", "mode": "n", "rhs": ""}, {"desc": "Screenshot (Clipboard)", "noremap": true, "lhs": "cp", "mode": "v", "rhs": ""}, {"desc": "Screenshot (Save)", "noremap": true, "lhs": "cP", "mode": "v", "rhs": ""}, {"desc": "Maximize/minimize a split", "noremap": true, "lhs": "sm", "mode": "n", "rhs": ""}, {"desc": "Toggle zen mode", "noremap": true, "lhs": "zz", "mode": "n", "rhs": ""}, {"desc": "Find File (CWD)", "noremap": true, "lhs": "sf", "mode": "n", "rhs": ""}, {"desc": "Commands", "noremap": true, "lhs": "sC", "mode": "n", "rhs": ""}, {"desc": "File Browser", "noremap": true, "lhs": "sF", "mode": "n", "rhs": ""}, {"desc": "Open Recent File", "noremap": true, "lhs": "so", "mode": "n", "rhs": ""}, {"desc": "Map Pages", "noremap": true, "lhs": "sM", "mode": "n", "rhs": ""}, {"desc": "Find highlight groups", "noremap": true, "lhs": "sH", "mode": "n", "rhs": ""}, {"desc": "Find Help", "noremap": true, "lhs": "sh", "mode": "n", "rhs": ""}, {"desc": "Keymaps", "noremap": true, "lhs": "sk", "mode": "n", "rhs": ""}, {"desc": "Grep String", "noremap": true, "lhs": "sw", "mode": "n", "rhs": ""}, {"desc": "Live Grep", "noremap": true, "lhs": "sg", "mode": "n", "rhs": ""}, {"desc": "Buffers", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "Toggle Output Panel", "noremap": true, "lhs": "tO", "mode": "n", "rhs": ""}, {"desc": "Show Output", "noremap": true, "lhs": "to", "mode": "n", "rhs": ""}, {"desc": "Toggle Summary", "noremap": true, "lhs": "ts", "mode": "n", "rhs": ""}, {"desc": "Run Nearest", "noremap": true, "lhs": "tr", "mode": "n", "rhs": ""}, {"desc": "Run All Test Files", "noremap": true, "lhs": "tT", "mode": "n", "rhs": ""}, {"desc": "Run File", "noremap": true, "lhs": "tw", "mode": "n", "rhs": ""}, {"desc": "Stop", "noremap": true, "lhs": "tS", "mode": "n", "rhs": ""}, {"desc": "Quickfix List (Trouble)", "noremap": true, "lhs": "xQ", "mode": "n", "rhs": ""}, {"desc": "Location List (Trouble)", "noremap": true, "lhs": "xL", "mode": "n", "rhs": ""}, {"desc": "LSP references/definitions/... (Trouble)", "noremap": true, "lhs": "cS", "mode": "n", "rhs": ""}, {"desc": "Symbols (Trouble)", "noremap": true, "lhs": "cs", "mode": "n", "rhs": ""}, {"desc": "Buffer Diagnostics (Trouble)", "noremap": true, "lhs": "xX", "mode": "n", "rhs": ""}, {"desc": "Diagnostics (Trouble)", "noremap": true, "lhs": "xx", "mode": "n", "rhs": ""}, {"desc": "DB Rename buffer", "noremap": true, "lhs": "dr", "mode": "n", "rhs": ""}, {"desc": "DB Find buffer", "noremap": true, "lhs": "db", "mode": "n", "rhs": ""}, {"desc": "Toggle DB UI", "noremap": true, "lhs": "du", "mode": "n", "rhs": ""}, {"desc": "DB Last query", "noremap": true, "lhs": "dl", "mode": "n", "rhs": ""}, {"desc": "Toggle Undotree", "noremap": true, "lhs": "uu", "mode": "n", "rhs": ""}, {"desc": "Replace in Files (Spectre)", "noremap": true, "lhs": "sr", "mode": "n", "rhs": ""}, {"desc": "toggle barbecue", "noremap": true, "lhs": "bq", "mode": "n", "rhs": ""}, {"desc": "Restore Session", "noremap": true, "lhs": "ss", "mode": "n", "rhs": ""}, {"desc": "Don't Save Current Session", "noremap": true, "lhs": "sd", "mode": "n", "rhs": ""}, {"desc": "Restore Last Session", "noremap": true, "lhs": "sl", "mode": "n", "rhs": ""}, {"desc": "Toggle keys", "noremap": true, "lhs": "kt", "mode": "n", "rhs": "Screenkey"}, {"desc": "", "noremap": true, "lhs": "se", "mode": "n", "rhs": "IconPickerInsert emoji"}, {"desc": " Insert Macro Breakpoint.", "noremap": true, "lhs": "##", "mode": "n", "rhs": ""}, {"desc": "Search Selected Text (Backwards)", "noremap": true, "lhs": "#", "mode": "x", "rhs": "y?\\V=escape(@\", '?\\')"}, {"desc": ":help &-default", "noremap": true, "lhs": "&", "mode": "n", "rhs": ":&&"}, {"desc": "Search Selected Text", "noremap": true, "lhs": "*", "mode": "x", "rhs": "y/\\V=escape(@\", '/\\')"}, {"desc": "", "noremap": true, "lhs": "+", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": ",", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": ",", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "-", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": ";", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": ";", "mode": "n", "rhs": ""}, {"desc": "(V) Indent to left", "noremap": true, "lhs": "<", "mode": "v", "rhs": "gv"}, {"desc": "(V) Indent to right", "noremap": true, "lhs": ">", "mode": "v", "rhs": ">gv"}, {"desc": ":help v_@-default", "noremap": true, "lhs": "@", "mode": "x", "rhs": "mode() ==# 'V' ? ':normal! @'.getcharstr().'' : '@'"}, {"desc": "Change without yanking", "noremap": true, "lhs": "C", "mode": "x", "rhs": "\"_C"}, {"desc": "Change without yanking", "noremap": true, "lhs": "C", "mode": "n", "rhs": "\"_C"}, {"desc": "", "noremap": true, "lhs": "F", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "F", "mode": "n", "rhs": ""}, {"desc": "Join line without moving the cursor", "noremap": true, "lhs": "J", "mode": "n", "rhs": "mzJ`z"}, {"desc": "", "noremap": true, "lhs": "J", "mode": "v", "rhs": ":m '>+1gv=gv"}, {"desc": "", "noremap": true, "lhs": "K", "mode": "v", "rhs": ":m '>-2gv=gv"}, {"desc": "", "noremap": true, "lhs": "N", "mode": "n", "rhs": "Nzzzv"}, {"desc": " Play Macro", "noremap": true, "lhs": "Q", "mode": "n", "rhs": ""}, {"desc": ":help v_Q-default", "noremap": true, "lhs": "Q", "mode": "x", "rhs": "mode() ==# 'V' ? ':normal! @=reg_recorded()' : 'Q'"}, {"desc": "Treesitter Search", "noremap": true, "lhs": "R", "mode": "x", "rhs": ""}, {"desc": "Flash Treesitter", "noremap": true, "lhs": "S", "mode": "x", "rhs": ""}, {"desc": "Flash Treesitter", "noremap": true, "lhs": "S", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "T", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "T", "mode": "n", "rhs": ""}, {"desc": ":help Y-default", "noremap": true, "lhs": "Y", "mode": "n", "rhs": "y$"}, {"desc": "Go to TS context", "noremap": true, "lhs": "[c", "mode": "n", "rhs": ""}, {"desc": "Previous Trouble/Quickfix Item", "noremap": true, "lhs": "[q", "mode": "n", "rhs": ""}, {"desc": "Jump to the previous diagnostic", "noremap": true, "lhs": "[d", "mode": "n", "rhs": ""}, {"desc": "Previous location list item", "noremap": true, "lhs": "\\lp", "mode": "n", "rhs": "lprev"}, {"desc": "Next location list item", "noremap": true, "lhs": "\\ln", "mode": "n", "rhs": "lnext"}, {"desc": "Close location list", "noremap": true, "lhs": "\\lc", "mode": "n", "rhs": "lclose"}, {"desc": "Open location list", "noremap": true, "lhs": "\\lo", "mode": "n", "rhs": "lopen"}, {"desc": "Paste from system clipboard", "noremap": true, "lhs": "\\p", "mode": "n", "rhs": "\"+p"}, {"desc": "Copy to system clipboard", "noremap": true, "lhs": "\\y", "mode": "v", "rhs": "\"+y"}, {"desc": "Copy to system clipboard", "noremap": true, "lhs": "\\y", "mode": "n", "rhs": "\"+y"}, {"desc": "Select pasted text", "noremap": true, "lhs": "\\vp", "mode": "n", "rhs": "`[v`]"}, {"desc": "", "noremap": true, "lhs": "\\r", "mode": "v", "rhs": "\"hy:%s/h//g"}, {"desc": "Force save and quit", "noremap": true, "lhs": "\\Q", "mode": "n", "rhs": "wq!"}, {"desc": "Save file", "noremap": true, "lhs": "\\w", "mode": "n", "rhs": ":w"}, {"desc": "Paste from system clipboard", "noremap": true, "lhs": "\\p", "mode": "v", "rhs": "\"+p"}, {"desc": "Next Trouble/Quickfix Item", "noremap": true, "lhs": "]q", "mode": "n", "rhs": ""}, {"desc": "Jump to the next diagnostic", "noremap": true, "lhs": "]d", "mode": "n", "rhs": ""}, {"desc": " Edit Macro", "noremap": true, "lhs": "cq", "mode": "n", "rhs": ""}, {"desc": "Change without yanking", "noremap": true, "lhs": "cc", "mode": "x", "rhs": "\"_cc"}, {"desc": "Change without yanking", "noremap": true, "lhs": "cc", "mode": "n", "rhs": "\"_cc"}, {"desc": "Change without yanking", "noremap": true, "lhs": "c", "mode": "x", "rhs": "\"_c"}, {"desc": "Change without yanking", "noremap": true, "lhs": "c", "mode": "n", "rhs": "\"_c"}, {"desc": "Change previous match by pressing dot (.)", "noremap": true, "lhs": "cN", "mode": "n", "rhs": "*``cgN"}, {"desc": "Change next match by pressing dot (.)", "noremap": true, "lhs": "cn", "mode": "n", "rhs": "*``cgn"}, {"desc": " Delete All Macros", "noremap": true, "lhs": "dq", "mode": "n", "rhs": ""}, {"desc": "Don't Yank Empty Line to Clipboard", "noremap": true, "lhs": "dd", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "f", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "f", "mode": "n", "rhs": ""}, {"desc": "Search Inside Visual Selection", "noremap": true, "lhs": "g/", "mode": "x", "rhs": "/\\%V"}, {"desc": "Toggle comment line", "noremap": true, "lhs": "gcc", "mode": "n", "rhs": ""}, {"desc": "Toggle comment", "noremap": true, "lhs": "gc", "mode": "x", "rhs": ""}, {"desc": "Toggle comment", "noremap": true, "lhs": "gc", "mode": "n", "rhs": ""}, {"desc": "Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)", "noremap": true, "lhs": "gx", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "gx", "mode": "n", "rhs": ":URLOpenUnderCursor"}, {"desc": "", "noremap": true, "lhs": "hs", "mode": "n", "rhs": ":sp"}, {"desc": "", "noremap": true, "lhs": "j", "mode": "v", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "k", "mode": "v", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "n", "mode": "n", "rhs": "nzzzv"}, {"desc": " Start/Stop Recording", "noremap": true, "lhs": "q", "mode": "n", "rhs": ""}, {"desc": "Flash", "noremap": true, "lhs": "s", "mode": "x", "rhs": ""}, {"desc": "Flash", "noremap": true, "lhs": "s", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "t", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "t", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "vs", "mode": "n", "rhs": ":vsp"}, {"desc": "delete without yanking", "noremap": true, "lhs": "x", "mode": "x", "rhs": "\"_x"}, {"desc": "delete without yanking", "noremap": true, "lhs": "x", "mode": "n", "rhs": "\"_x"}, {"desc": " Yank Macro", "noremap": true, "lhs": "yq", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "zb", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "zb", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "zz", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "zz", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "zt", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "zt", "mode": "n", "rhs": ""}, {"desc": " Switch Macro Slot", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "x", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "Resize split right", "noremap": true, "lhs": "", "mode": "n", "rhs": "vertical resize +2"}, {"desc": "Resize split left", "noremap": true, "lhs": "", "mode": "n", "rhs": "vertical resize -2"}, {"desc": "Resize split down", "noremap": true, "lhs": "", "mode": "n", "rhs": "resize +2"}, {"desc": "Resize split up", "noremap": true, "lhs": "", "mode": "n", "rhs": "resize -2"}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ""}, {"desc": "", "noremap": true, "lhs": "", "mode": "n", "rhs": ":bprev"}, {"desc": "", "noremap": true, "lhs": "