feat: removed nvim-lazy, nvim-kickstart

feat(nvim): plugins, cleanup, ign lazy-lock.json
feat(nvim): new nvim config (#28 )
2026-01-27 21:45:41 +00:00 · 2024-09-22 04:31:44 +03:00 · 2024-09-22 04:26:02 +03:00 · 2024-09-22 03:52:02 +03:00 · 2024-09-19 17:02:14 +03:00 · 2024-09-19 12:40:16 +03:00
64 changed files with 2052 additions and 1035 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -220,8 +220,3 @@ git/*              text
 **/alias           text
 ssh/*              text

-# Git Crypt special files
-*-secret   filter=git-crypt diff=git-crypt
-*.key      filter=git-crypt diff=git-crypt
-secrets/** filter=git-crypt diff=git-crypt
-
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 Brewfile.lock.json
+lazy-lock.json
 config/nvim/lazy-lock.json
 *.log
 *-secret
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,9 +58,6 @@
 [submodule "cheat-tldr"]
 	path = config/cheat/cheatsheets/tldr
 	url = https://github.com/ivuorinen/cheatsheet-tldr.git
-[submodule "nvim-kickstart"]
-	path = config/nvim-kickstart
-	url = https://github.com/ivuorinen/kickstart.nvim
 [submodule "tmux/tmux-dark-notify"]
 	path = config/tmux/plugins/tmux-dark-notify
 	url = https://github.com/erikw/tmux-dark-notify.git
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-22.9.0
--- a/.python-version
+++ b/.python-version
@@ -1 +0,0 @@
-3.12.6
--- a/.tool-versions
+++ b/.tool-versions
@@ -0,0 +1,2 @@
+python 3.12.6
+nodejs 22.9.0
--- a/add-submodules.sh
+++ b/add-submodules.sh
@@ -10,9 +10,6 @@ git submodule add --name dotbot-include \
 git submodule add --name dotbot-pip \
  -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip

-git submodule add --name nvim-kickstart \
-  -f https://github.com/ivuorinen/kickstart.nvim config/nvim-kickstart
-
 # other repos
 git submodule add --name cheat-community \
  -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
@@ -54,3 +51,4 @@ done
 [ -d "config/tmux/plugins/tmux-menus" ] && rm -rf config/tmux/plugins/tmux-menus
 [ -d "tools/dotbot-crontab" ] && rm -rf tools/dotbot-crontab
 [ -d "tools/dotbot-snap" ] && rm -rf tools/dotbot-snap
+[ -d "config/nvim-kickstart" ] && rm -rf config/nvim-kickstart
--- a/base/zshrc
+++ b/base/zshrc
@@ -6,7 +6,7 @@

 export DOTFILES="$HOME/.dotfiles"
 LOCAL_SHARE="$HOME/.local/share"
-export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$LOCAL_SHARE/bob/nvim-bin:$LOCAL_SHARE/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
+export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$LOCAL_SHARE/nvim-kickstart/mason/bin:$LOCAL_SHARE/bob/nvim-bin:$LOCAL_SHARE/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
 export SHARED_SCRIPTS_SOURCED=0

 source "$DOTFILES/config/shared.sh"
@@ -48,15 +48,9 @@ load_antigen()
    export ZSHZ_DATA="$XDG_STATE_HOME/z"
    antigen bundle z

-    x-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
-
    # these should be always available
    antigen bundle jreese/zsh-titles
-    antigen bundle gnu-utils
-    antigen bundle ssh-agent
-    antigen bundle gpg-agent
    antigen bundle brew
-    # antigen bundle tmux
    antigen bundle colored-man-pages
    antigen bundle zsh-users/zsh-completions
    antigen bundle eza
--- a/config/alias
+++ b/config/alias
@@ -52,14 +52,21 @@ alias flush="dscacheutil -flushcache"
 # Update locatedb
 alias updatedb="sudo /usr/libexec/locate.updatedb"

+# Date helpers
+alias isodate="date +'%Y-%m-%d'"
+alias x-datetime="date +'%Y-%m-%d %H:%M:%S'"
+alias x-timestamp="date +'%s'"
+
 # tmux: automatically attach or create session with name 'main'
 alias tm='command tmux new-session -A -s main'
 # tmux: attach or create new session
 alias ta='command tmux attach || command tmux'

 # nvim
-alias nvim-ks='NVIM_APPNAME="nvim-kickstart" nvim'
-alias ks='NVIM_APPNAME="nvim-kickstart" nvim'
+alias c='nvim'
+alias ks='nvim'
+alias vi='nvim'
+alias vim='nvim'

 # xdg-ninja aliases for better experience
 alias xdg='xdg-ninja --skip-ok --skip-unsupported'
--- a/config/asdf/golang-packages
+++ b/config/asdf/golang-packages
@@ -1,8 +1,6 @@
 // These are golang packages I use,
 // so they should be available with all versions

-// sysadmin/scripting utilities, distributed as a single binary
-github.com/skx/sysbox@release-0.18.0
 // Git Profile allows you to switch between user profiles in git repos
 github.com/dotzero/git-profile@v1.4.0
 // An extensible command line tool or library to format yaml files.
--- a/config/asdf/python-packages
+++ b/config/asdf/python-packages
@@ -1,2 +1,3 @@
 ansible
 pipenv
+semgrep
--- a/config/exports
+++ b/config/exports
@@ -9,6 +9,7 @@
 [ -z "$XDG_CACHE_HOME" ] && export XDG_CACHE_HOME="$HOME/.cache"
 [ -z "$XDG_STATE_HOME" ] && export XDG_STATE_HOME="$HOME/.local/state"
 [ -z "$XDG_BIN_HOME" ] && export XDG_BIN_HOME="$HOME/.local/bin"
+[ -z "$XDG_RUNTIME_DIR" ] && export XDG_RUNTIME_DIR="$HOME/.local/run"

 # if DOTFILES is not set, set it to the default location
 [ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles"
@@ -17,8 +18,8 @@ export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_

 # Load bash completions if available for zsh
 if [[ -n "$ZSH_VERSION" ]]; then
-    autoload bashcompinit
-    bashcompinit
+  autoload bashcompinit
+  bashcompinit
 fi

 # Load asdf
@@ -399,12 +400,6 @@ x-dc "$DOCKER_CONFIG"
 # Docker: Disable snyk ad
 export DOCKER_SCAN_SUGGEST=false

-# ffmpeg
-# https://ffmpeg.org/ffmpeg.html
-msg "Setting up FFmpeg configuration"
-export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
-x-have ffmpeg && x-dc "$FFMPEG_DATADIR"
-
 # GnuPG
 # https://gnupg.org/documentation/manuals/gnupg/Invoking-GPG.html
 msg "Setting up GnuPG configuration"
@@ -416,11 +411,6 @@ msg "Setting up Go configuration"
 export GOPATH="$XDG_DATA_HOME/go"
 export GOBIN="$XDG_BIN_HOME"

-# nb, https://xwmx.github.io/nb/
-msg "Setting up nb configuration"
-export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
-export NB_DIR="$XDG_STATE_HOME/nb"
-
 # NPM: Add npm packages to path
 msg "Setting up NPM configuration"
 x-have node && {
@@ -445,29 +435,9 @@ export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
 ## for MichaelAquilina/zsh-autoswitch-virtualenv
 export AUTOSWITCH_VIRTUAL_ENV_DIR="$WORKON_HOME"
 export PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
-x-have pyenv && {
-  eval "$(pyenv init -)"
-  eval "$(pyenv virtualenv-init -)"
-}
-
-# Ruby
-#
-# including: bundler, rbenv
-msg "Setting up Ruby configuration"
-export GEM_HOME="${XDG_DATA_HOME}"/gem
-export GEM_SPEC_CACHE="${XDG_CACHE_HOME}"/gem
-export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle
-export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
-export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle
-export RBENV_ROOT="$XDG_STATE_HOME/rbenv"
-x-dc "$RBENV_ROOT"
-x-have gem && export PATH="${GEM_HOME}/bin:$PATH"

 # Rust / cargo
 msg "Setting up Rust/Cargo configuration"
-export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-export CARGO_HOME="$XDG_DATA_HOME/cargo"
-export PATH="$CARGO_HOME/bin:$PATH"
 export RUST_WITHOUT=rust-docs

 # screen
@@ -488,10 +458,6 @@ export TF_DATA_DIR="$XDG_STATE_HOME/terraform"
 export TF_CLI_CONFIG_FILE="$XDG_CONFIG_HOME/terraform/terraformrc"
 export TF_PLUGIN_CACHE_DIR="$XDG_CACHE_HOME/terraform/plugin-cache"

-# tldr / tealdeer
-msg "Setting up tldr configuration"
-export TEALDEER_CONFIG_DIR="$XDG_CONFIG_HOME/tealdeer/"
-
 # tmux
 # https://tmux.github.io/
 msg "Setting up tmux configuration"
--- a/config/homebrew/Brewfile
+++ b/config/homebrew/Brewfile
@@ -16,24 +16,11 @@ tap "mongodb/brew"
 tap "reviewdog/tap"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
+tap "snyk/tap"
 tap "teamookla/speedtest"
 tap "xwmx/taps"
 # Run your GitHub Actions locally
 brew "act"
-# Simple, modern, secure file encryption
-brew "age"
-# Mozilla CA certificate store
-brew "ca-certificates"
-# Mozilla CA bundle for Python
-brew "certifi"
-# Cryptographic recipes and primitives for Python
-brew "cryptography"
-# YAML Parser
-brew "libyaml"
-# Automate deployment, configuration, and upgrading
-brew "ansible"
-# Checks ansible playbooks for practices and behaviour
-brew "ansible-lint"
 # Generic-purpose lossless compression algorithm by Google
 brew "brotli"
 # Library and utilities for processing GIFs
@@ -52,32 +39,28 @@ brew "jpeg-xl"
 brew "aom"
 # Apache Portable Runtime library
 brew "apr"
+# Mozilla CA certificate store
+brew "ca-certificates"
+# Cryptography and SSL/TLS Toolkit
+brew "openssl@3"
 # Companion library to apr, the Apache Portable Runtime library
 brew "apr-util"
 # Password hashing library and CLI utility
 brew "argon2"
+# Spell checker with better logic than ispell
+brew "aspell"
 # Automatic configure script builder
 brew "autoconf"
-# Tool for generating GNU Standards-compliant Makefiles
-brew "automake"
+# Collection of over 500 reusable autoconf macros
+brew "autoconf-archive"
+# Bourne-Again SHell, a UNIX command interpreter
+brew "bash"
 # GNU multiple precision arithmetic library
 brew "gmp"
 # GNU File, Shell, and Text utilities
 brew "coreutils"
-# Extendable version manager with support for Ruby, Node.js, Erlang & more
-brew "asdf"
-# Spell checker with better logic than ispell
-brew "aspell"
-# Collection of over 500 reusable autoconf macros
-brew "autoconf-archive"
-# Manage compile and link flags for libraries
-brew "pkg-config"
-# Automated text file generator
-brew "autogen"
-# Bourne-Again SHell, a UNIX command interpreter
-brew "bash"
-# Clone of cat(1) with syntax highlighting and Git integration
-brew "bat"
+# Bash Automated Testing System
+brew "bats-core"
 # Software library to render fonts
 brew "freetype"
 # XML-based font configuration API for X Windows
@@ -86,56 +69,32 @@ brew "fontconfig"
 brew "gettext"
 # Core application library for C
 brew "glib"
-# Human-friendly and fast alternative to cut and (sometimes) awk
-brew "choose-rust"
-# Cross-platform make
-brew "cmake"
+# Mozilla CA bundle for Python
+brew "certifi"
+# Cryptographic recipes and primitives for Python
+brew "cryptography"
 # Get a file from an HTTP, HTTPS or FTP server
 brew "curl"
 # Lightweight DNS forwarder and DHCP server
 brew "dnsmasq"
-# Spellchecker wrapping library
-brew "enchant"
-# Perl lib for reading and writing EXIF metadata
-brew "exiftool"
-# Banner-like program prints strings as ASCII art
-brew "figlet"
 # Lock file during command
 brew "flock"
 # Libraries to talk to Microsoft SQL Server and Sybase databases
 brew "freetds"
-# Monitor a directory for changes and run a shell command
-brew "fswatch"
-# Command-line fuzzy finder written in Go
-brew "fzf"
 # Graphics library to dynamically manipulate images
 brew "gd"
-# Disk usage analyzer with console interface written in Go
-brew "gdu"
+# GitHub command-line tool
+brew "gh"
 # Distributed revision control system
 brew "git"
-# Enable transparent encryption/decryption of files in a git repo
-brew "git-crypt"
-# Small git utilities
-brew "git-extras"
-# See your latest local git branches, formatted real fancy
-brew "git-recent"
 # Render markdown on the CLI
 brew "glow"
-# GNU implementation of the famous stream editor
-brew "gnu-sed"
 # Validating, recursive, caching DNS resolver
 brew "unbound"
 # GNU Transport Layer Security (TLS) Library
 brew "gnutls"
 # GNU Pretty Good Privacy (PGP) package
 brew "gnupg"
-# Library access to GnuPG
-brew "gpgme"
-# Open source suite of directory software
-brew "openldap"
-# Manage your GnuPG keys with ease!
-brew "gpg-tui"
 # Image manipulation
 brew "netpbm"
 # C/C++ and Java libraries for Unicode and globalization
@@ -148,8 +107,6 @@ brew "pango"
 brew "librsvg"
 # Graph visualization software from AT&T and Bell Labs
 brew "graphviz"
-# GNU grep, egrep and fgrep
-brew "grep"
 # Popular GNU data compression program
 brew "gzip"
 # Improved top (interactive process viewer)
@@ -166,8 +123,8 @@ brew "irssi"
 brew "jq"
 # JSON parser for C
 brew "json-c"
-# Scanning your k8s clusters, diagnosing, and triaging issues in simple English
-brew "k8sgpt"
+# Network authentication protocol
+brew "krb5"
 # Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
 brew "legitify"
 # Secure hashing function
@@ -176,58 +133,32 @@ brew "libb2"
 brew "libpq"
 # Multi-platform support library with a focus on asynchronous I/O
 brew "libuv"
+# YAML Parser
+brew "libyaml"
 # Package manager for the Lua programming language
 brew "luarocks"
-# LZMA-based compression program similar to gzip or bzip2
-brew "lzip"
 # Swiss Army Knife for macOS
 brew "m-cli"
-# Collection of tools that nobody wrote when UNIX was young
-brew "moreutils"
-# Mongrel of mail user agents (part elm, pine, mush, mh, etc.)
-brew "mutt"
-# NCurses Disk Usage
-brew "ncdu"
 # HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server
 brew "nginx"
 # Port scanning utility for large networks
 brew "nmap"
-# ISO-C API and CLI for generating UUIDs
-brew "ossp-uuid"
-# Coreutils progress viewer
-brew "progress"
-# Python version management
-brew "pyenv"
-# Migrate pip packages from one Python version to another
-brew "pyenv-pip-migrate"
-# Pyenv plugin to manage virtualenv
-brew "pyenv-virtualenv"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.11"
-# Install various Ruby versions and implementations
-brew "ruby-build"
-# Ruby version manager
-brew "rbenv"
-# Static analysis and lint tool, for (ba)sh scripts
-brew "shellcheck"
-# Feature-rich console based todo list manager
-brew "task"
+# Open source suite of directory software
+brew "openldap"
+# General-purpose scripting language
+brew "php"
+# Manage compile and link flags for libraries
+brew "pkg-config"
 # Send macOS User Notifications from the command-line
 brew "terminal-notifier"
 # Tool which checks for the support of TLS/SSL ciphers and flaws
 brew "testssl"
-# Terraform version manager inspired by rbenv
-brew "tfenv"
-# Linter for Terraform files
-brew "tflint"
 # Static analysis security scanner for your terraform code
 brew "tfsec"
 # Terminal multiplexer
 brew "tmux"
 # Display directories as trees (with optional color/HTML output)
 brew "tree"
-# Tool for creating isolated virtual python environments
-brew "virtualenv"
 # Command-line interface to the WakaTime api
 brew "wakatime-cli"
 # Executes a program periodically, showing output fullscreen
@@ -238,12 +169,8 @@ brew "wget"
 brew "xdg-ninja", args: ["HEAD"]
 # Watcher for macOS 10.14+ light/dark mode changes
 brew "cormacrelf/tap/dark-notify"
-# Cleans up your $HOME from those pesky dotfiles
-brew "doron-cohen/tap/antidot"
-# lets you quickly switch between multiple git user profiles
-brew "gesquive/tap/git-user"
-# Automated code review tool integrated with any code analysis tools regardless of programming language.
-brew "reviewdog/tap/reviewdog"
+# Igbinary PHP extension
+brew "shivammathur/extensions/igbinary@8.3"
 # Imagick PHP extension
 brew "shivammathur/extensions/imagick@8.3"
 # Mcrypt PHP extension
@@ -259,13 +186,9 @@ brew "shivammathur/extensions/uuid@8.3"
 # Yaml PHP extension
 brew "shivammathur/extensions/yaml@8.3"
 # General-purpose scripting language
-brew "shivammathur/php/php"
-# General-purpose scripting language
 brew "shivammathur/php/php-debug"
-# Command-line interface for 1Password
-cask "1password-cli"
-# GPU-accelerated terminal emulator
-cask "alacritty"
+# Find & fix known vulnerabilities in open-source dependencies
+brew "snyk/tap/snyk"
 # Text editor
 cask "coda"
 # Universal database tool and SQL client
@@ -274,6 +197,15 @@ cask "dbeaver-community"
 cask "dbngin"
 # App to build and share containerised applications and microservices
 cask "docker"
+cask "font-jetbrains-mono"
+cask "font-jetbrains-mono-nerd-font"
+cask "font-lato"
+cask "font-open-sans"
+cask "font-roboto"
+cask "font-source-code-pro"
+cask "font-source-code-pro-for-powerline"
+cask "font-source-sans-pro"
+cask "font-source-serif-pro"
 # GIT client
 cask "fork"
 # HTTP and GraphQL Client
@@ -284,18 +216,12 @@ cask "jetbrains-toolbox"
 cask "keybase"
 # Kubernetes IDE
 cask "lens"
-# Keep all tasks from your todo apps on your menu bar
-cask "monofocus"
 # Reverse proxy, secure introspectable tunnels to localhost
 cask "ngrok"
 # Simple application that will prevent iTunes or Apple Music from launching
 cask "notunes"
 # Knowledge base that works on top of a local folder of plain text Markdown files
 cask "obsidian"
-# Scheduling application focusing on organisation
-cask "omnifocus"
-# Collaboration platform for API development
-cask "postman"
 # Display image info and preview unsupported formats in QuickLook
 cask "qlimagesize"
 # Quick Look generator for Markdown files
@@ -326,6 +252,8 @@ cask "suspicious-package"
 cask "syntax-highlight"
 # Python IDE for beginners
 cask "thonny"
+# To-do list
+cask "todoist"
 # Configuration application for the Ultimate Hacking Keyboard
 cask "uhk-agent"
 # Open-source code editor
@@ -334,6 +262,8 @@ cask "visual-studio-code"
 cask "vlc"
 # Spell-checking service for Finnish
 cask "voikkospellservice"
+# GPU-accelerated cross-platform terminal emulator and multiplexer
+cask "wezterm"
 # Application for generating TOTP and HOTP codes
 cask "yubico-authenticator"
 # Multiplayer code editor
--- a/config/htop/htoprc
+++ b/config/htop/htoprc
@@ -0,0 +1,53 @@
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+htop_version=3.3.0
+config_reader_min_version=3
+fields=0 48 17 18 38 39 2 46 47 49 1
+hide_kernel_threads=1
+hide_userland_threads=0
+hide_running_in_container=0
+shadow_other_users=0
+show_thread_names=0
+show_program_path=1
+highlight_base_name=0
+highlight_deleted_exe=1
+shadow_distribution_path_prefix=0
+highlight_megabytes=1
+highlight_threads=1
+highlight_changes=0
+highlight_changes_delay_secs=5
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=0
+header_margin=1
+screen_tabs=1
+detailed_cpu_time=0
+cpu_count_from_one=0
+show_cpu_usage=1
+show_cpu_frequency=0
+update_process_names=0
+account_guest_in_cpu_meter=0
+color_scheme=0
+enable_mouse=1
+delay=15
+hide_function_bar=0
+header_layout=two_50_50
+column_meters_0=LeftCPUs2 Memory Swap
+column_meter_modes_0=1 1 1
+column_meters_1=RightCPUs2 Tasks LoadAverage Uptime
+column_meter_modes_1=1 2 2 2
+tree_view=0
+sort_key=46
+tree_sort_key=0
+sort_direction=-1
+tree_sort_direction=1
+tree_view_always_by_pid=0
+all_branches_collapsed=0
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
+.sort_key=PERCENT_CPU
+.tree_sort_key=PID
+.tree_view_always_by_pid=0
+.tree_view=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0
--- a/config/ideavim/ideavimrc
+++ b/config/ideavim/ideavimrc
@@ -0,0 +1,73 @@
+"" Source your .vimrc
+"source ~/.vimrc
+
+"" -- Suggested options --
+" Show a few lines of context around the cursor. Note that this makes the
+" text scroll if you mouse-click near the start or end of the window.
+set scrolloff=5
+
+" Don't use Ex mode, use Q for formatting.
+map Q gq
+
+
+"" -- Map IDE actions to IdeaVim -- https://jb.gg/abva4t
+"" Map \r to the Reformat Code action
+"map \r <Action>(ReformatCode)
+
+"" Map <leader>d to start debug
+"map <leader>d <Action>(Debug)
+
+"" Map \b to toggle the breakpoint on the current line
+"map \b <Action>(ToggleLineBreakpoint)
+
+
+" Find more examples here: https://jb.gg/share-ideavimrc
+
+" https://github.com/ville6000/dotfiles/blob/main/vimrc
+set nocompatible                " disable compatibility mode with vi
+filetype off                    " disable filetype detection (but re-enable later, see below)
+
+set encoding=utf-8              " UTF-8
+set number                      " Show line numbers
+set laststatus=2                " Always show statusline (even with only single window)
+set showmatch                   " Highlight matching brace
+set visualbell                  " Use visual bell (no beeping)
+set hlsearch                    " Highlight all search results
+set smartcase                   " Enable smart-case search
+set ignorecase                  " Always case-insensitive
+set incsearch                   " Searches for strings incrementally
+set cindent                     " Use 'C' style program indenting
+set expandtab                   " Use spaces instead of tabs
+set shiftwidth=4                " Number of auto-indent spaces
+set smartindent                 " Enable smart-indent
+set smarttab                    " Enable smart-tabs
+set softtabstop=4               " Number of spaces per Tab
+set ruler                       " Show row and column ruler information
+set cursorline         		    " Highlight current line
+set undolevels=1000		        " Number of undo levels
+set backspace=indent,eol,start	" Backspace behaviour
+set so=5
+
+" move vertically by visual line (don't skip wrapped lines)
+nmap j gj
+nmap k gk
+
+syntax enable
+filetype plugin indent on
+
+call plug#begin('~/.vim/plugged')
+
+Plug 'ayu-theme/ayu-vim'
+Plug 'ctrlpvim/ctrlp.vim'
+
+call plug#end()
+
+set termguicolors
+set background=dark
+let ayucolor="dark"
+colorscheme ayu
+
+if has('gui_running')
+    set macligatures
+    set guifont=JetBrainsMono:h14
+endif
--- a/config/nvim-kickstart
+++ b/config/nvim-kickstart
--- a/config/nvim/.editorconfig
+++ b/config/nvim/.editorconfig
@@ -0,0 +1,11 @@
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 2
--- a/config/nvim/.gitignore
+++ b/config/nvim/.gitignore
@@ -1,8 +0,0 @@
-tt.*
-.tests
-doc/tags
-debug
-.repro
-foo.*
-*.log
-data
--- a/config/nvim/.luarc.json
+++ b/config/nvim/.luarc.json
@@ -1,3 +1,5 @@
 {
-  "diagnostics.globals": ["vim"]
-}
+    "diagnostics.globals": [
+        "vim"
+    ]
+}
--- a/config/nvim/.neoconf.json
+++ b/config/nvim/.neoconf.json
@@ -1,15 +0,0 @@
-{
-  "neodev": {
-    "library": {
-      "enabled": true,
-      "plugins": true
-    }
-  },
-  "neoconf": {
-    "plugins": {
-      "lua_ls": {
-        "enabled": true
-      }
-    }
-  }
-}
--- a/config/nvim/.stylua.toml
+++ b/config/nvim/.stylua.toml
@@ -0,0 +1,7 @@
+column_width = 160
+line_endings = "Unix"
+indent_type = "Spaces"
+indent_width = 2
+quote_style = "AutoPreferSingle"
+call_parentheses = "None"
+
--- a/config/nvim/README.md
+++ b/config/nvim/README.md
@@ -1,4 +0,0 @@
-# 💤 LazyVim
-
-A starter template for [LazyVim](https://github.com/LazyVim/LazyVim).
-Refer to the [documentation](https://lazyvim.github.io/installation) to get started.
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -1,2 +1,67 @@
-- bootstrap lazy.nvim, LazyVim and your plugins
-require("config.lazy")
+-- vim: ts=2 sts=2 sw=2 et
+
+-- Install lazylazy
+-- https://github.com/folke/lazy.nvim
+local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system {
+    'git',
+    'clone',
+    '--filter=blob:none',
+    'https://github.com/folke/lazy.nvim.git',
+    '--branch=stable', -- latest stable release
+    lazypath,
+  }
+end
+vim.opt.rtp:prepend(lazypath)
+
+require 'options'
+require 'keymaps'
+
+require('lazy').setup {
+  checker = {
+    -- Automatically check for updates
+    enabled = true,
+  },
+  spec = {
+    -- Useful plugin to show you pending keybinds.
+    -- https://github.com/folke/which-key.nvim
+    {
+      'folke/which-key.nvim',
+      event = 'VimEnter', -- Sets the loading event to 'VimEnter'
+      priority = 1001, -- Make sure to load this as soon as possible
+      config = function() -- This is the function that runs, AFTER loading
+        local wk = require 'which-key'
+        wk.setup()
+
+        wk.add {
+          { '<leader>b', group = '[b] Buffer' },
+          { '<leader>c', group = '[c] Code' },
+          { '<leader>d', group = '[d] Document' },
+          { '<leader>f', group = '[f] File' },
+          { '<leader>g', group = '[g] Git' },
+          { '<leader>l', group = '[l] LSP' },
+          { '<leader>o', group = '[o] Open' },
+          { '<leader>p', group = '[p] Project' },
+          { '<leader>q', group = '[q] Quit' },
+          { '<leader>s', group = '[s] Search' },
+          { '<leader>t', group = '[t] Toggle' },
+          { '<leader>w', group = '[w] Workspace' },
+          { '<leader>z', group = '[x] FZF' },
+          { '<leader>?', group = '[?] Help' },
+          {
+            '<leader>?w',
+            function()
+              wk.show { global = false }
+            end,
+            desc = 'Buffer Local Keymaps (which-key)',
+          },
+        }
+      end,
+    },
+    -- Import plugins from `lua/plugins` directory
+    { import = 'plugins' },
+  },
+}
+
+require 'config.misc'
--- a/config/nvim/lazyvim.json
+++ b/config/nvim/lazyvim.json
@@ -1,35 +0,0 @@
-{
-  "extras": [
-    "lazyvim.plugins.extras.coding.copilot",
-    "lazyvim.plugins.extras.coding.yanky",
-    "lazyvim.plugins.extras.editor.aerial",
-    "lazyvim.plugins.extras.editor.aerial",
-    "lazyvim.plugins.extras.editor.harpoon2",
-    "lazyvim.plugins.extras.editor.leap",
-    "lazyvim.plugins.extras.editor.outline",
-    "lazyvim.plugins.extras.editor.refactoring",
-    "lazyvim.plugins.extras.formatting.black",
-    "lazyvim.plugins.extras.formatting.prettier",
-    "lazyvim.plugins.extras.lang.ansible",
-    "lazyvim.plugins.extras.lang.docker",
-    "lazyvim.plugins.extras.lang.go",
-    "lazyvim.plugins.extras.lang.json",
-    "lazyvim.plugins.extras.lang.markdown",
-    "lazyvim.plugins.extras.lang.php",
-    "lazyvim.plugins.extras.lang.python",
-    "lazyvim.plugins.extras.lang.tailwind",
-    "lazyvim.plugins.extras.lang.terraform",
-    "lazyvim.plugins.extras.lang.typescript",
-    "lazyvim.plugins.extras.lang.vue",
-    "lazyvim.plugins.extras.lang.yaml",
-    "lazyvim.plugins.extras.linting.eslint",
-    "lazyvim.plugins.extras.ui.edgy",
-    "lazyvim.plugins.extras.ui.mini-animate",
-    "lazyvim.plugins.extras.util.dot",
-    "lazyvim.plugins.extras.util.mini-hipatterns"
-  ],
-  "news": {
-    "NEWS.md": "6520"
-  },
-  "version": 6
-}
--- a/config/nvim/lua/config/autocmds.lua
+++ b/config/nvim/lua/config/autocmds.lua
@@ -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
--- a/config/nvim/lua/config/keymaps.lua
+++ b/config/nvim/lua/config/keymaps.lua
@@ -1,16 +0,0 @@
-- 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
-local wk = require("which-key")
-
-- ╭──────────────────────────────────────────────────────────╮
-- │                       Comment box                        │
-- ╰──────────────────────────────────────────────────────────╯
-wk.add({
-  { "<Leader>bc", group = "□ Comment box" },
-  { "<Leader>bcb", "<Cmd>CBccbox<CR>", desc = "Box Title" },
-  { "<Leader>bcd", "<Cmd>CBd<CR>", desc = "Remove a box" },
-  { "<Leader>bcl", "<Cmd>CBline<CR>", desc = "Simple Line" },
-  { "<Leader>bcm", "<Cmd>CBllbox14<CR>", desc = "Marked" },
-  { "<Leader>bct", "<Cmd>CBllline<CR>", desc = "Titled Line" },
-})
--- a/config/nvim/lua/config/lazy.lua
+++ b/config/nvim/lua/config/lazy.lua
@@ -1,63 +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({
-  spec = {
-    -- add LazyVim and import its plugins
-    {
-      "LazyVim/LazyVim",
-      import = "lazyvim.plugins",
-      opts = {
-        colorscheme = "tokyonight",
-      },
-    },
-    {
-      "folke/tokyonight.nvim",
-      lazy = false,
-      priority = 1000,
-      opts = {
-        style = "night",
-        transparent = true,
-        sidebars = { "qf", "vista_kind", "terminal", "packer" },
-        styles = {
-          sidebars = "transparent",
-          floats = "transparent",
-        },
-        dim_inactive = true,
-        lualine_bold = true,
-      },
-    },
-    { 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",
-      },
-    },
-  },
-})
--- a/config/nvim/lua/config/misc.lua
+++ b/config/nvim/lua/config/misc.lua
@@ -0,0 +1,10 @@
+-- Go
+local format_sync_grp = vim.api.nvim_create_augroup('GoFormat', {})
+vim.api.nvim_create_autocmd('BufWritePre', {
+  pattern = '*.go',
+  callback = function()
+    require('go.format').goimport()
+  end,
+  group = format_sync_grp,
+})
+require('go').setup()
--- a/config/nvim/lua/config/options.lua
+++ b/config/nvim/lua/config/options.lua
@@ -1,13 +0,0 @@
-- 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
-
-local opt = vim.opt
-
-opt.number = true
-opt.relativenumber = true
-opt.modeline = true
-vim.g.root_spec = { "lsp", { ".git", "lua" }, "cwd" }
-
-- The line beneath this is called `modeline`. See `:help modeline`
-- vim: ts=2 sts=2 sw=2 et
--- a/config/nvim/lua/keymaps.lua
+++ b/config/nvim/lua/keymaps.lua
@@ -0,0 +1,78 @@
+vim.api.nvim_set_keymap('i', 'jj', '<Esc>', { noremap = false })
+
+-- twilight
+vim.api.nvim_set_keymap('n', 'tw', ':Twilight<enter>', { noremap = false })
+
+-- buffers
+vim.api.nvim_set_keymap('n', '<leader>bk', ':blast<enter>', { desc = 'Last', noremap = false })
+vim.api.nvim_set_keymap('n', '<leader>bj', ':bfirst<enter>', { desc = 'First', noremap = false })
+vim.api.nvim_set_keymap('n', '<leader>bh', ':bprev<enter>', { desc = 'Prev', noremap = false })
+vim.api.nvim_set_keymap('n', '<leader>bl', ':bnext<enter>', { desc = 'Next', noremap = false })
+vim.api.nvim_set_keymap('n', '<leader>bd', ':bdelete<enter>', { desc = 'Delete', noremap = false })
+vim.api.nvim_set_keymap('n', '<C-w>', ':bdelete<enter>', { desc = 'Delete buffer', noremap = false })
+
+-- files
+vim.api.nvim_set_keymap('n', 'QQ', ':q!<enter>', { desc = 'Quickly Quit', noremap = false })
+vim.api.nvim_set_keymap('n', 'WW', ':w!<enter>', { desc = 'Force write', noremap = false })
+vim.api.nvim_set_keymap('n', 'E', '$', { noremap = false })
+vim.api.nvim_set_keymap('n', 'B', '^', { noremap = false })
+vim.api.nvim_set_keymap('n', 'tT', ':TransparentToggle<CR>', { desc = 'Toggle Transparency', noremap = true })
+vim.api.nvim_set_keymap('n', 'ss', ':noh<CR>', { noremap = true })
+
+-- splits
+vim.api.nvim_set_keymap('n', '<C-W>,', ':vertical resize -10<CR>', { desc = 'V Resize -', noremap = true })
+vim.api.nvim_set_keymap('n', '<C-W>.', ':vertical resize +10<CR>', { desc = 'V Resize +', noremap = true })
+
+-- Quicker close split
+vim.keymap.set('n', '<leader>qf', ':q<CR>', { desc = 'Quicker close split', silent = true, noremap = true })
+
+-- Keymaps for better default experience
+-- See `:help vim.keymap.set()`
+vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
+
+-- Remap for dealing with word wrap
+vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+
+-- Noice
+vim.api.nvim_set_keymap('n', '<leader>nn', ':Noice dismiss<CR>', { desc = 'Noice dismiss', noremap = true })
+
+vim.keymap.set('n', '<leader>xe', '<cmd>GoIfErr<cr>', { desc = 'Go If Error', silent = true, noremap = true })
+
+-- TIP: Disable arrow keys in normal mode
+vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
+vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
+vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
+vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
+
+-- Keybinds to make split navigation easier.
+--  Use CTRL+<hjkl> to switch between windows
+--
+--  See `:help wincmd` for a list of all window commands
+vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
+vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
+vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
+vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
+
+-- Old habits
+vim.keymap.set('n', '<C-s>', '<cmd>w<CR>', { desc = 'Save file' })
+vim.keymap.set('n', '<leader>qq', '<cmd>wq!<CR>', { desc = '[qq] Quickly Quit' })
+
+-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
+-- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
+-- is not what someone will guess without a bit more experience.
+--
+-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping
+-- or just use <C-\><C-n> to exit terminal mode
+vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
+
+-- [[ Highlight on yank ]]
+-- See `:help vim.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 = '*',
+})
--- a/config/nvim/lua/options.lua
+++ b/config/nvim/lua/options.lua
@@ -0,0 +1,80 @@
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+
+-- Set to true if you have a Nerd Font installed and selected in the terminal
+vim.g.have_nerd_font = true
+
+-- Make sure editorconfig support is enabled
+vim.g.editorconfig = true
+
+-- [[ Setting options ]]
+-- See `:help vim.opt`
+-- For more options, you can see `:help option-list`
+
+vim.opt.number = true
+vim.opt.relativenumber = true
+
+-- Enable mouse mode, can be useful for resizing splits for example!
+vim.opt.mouse = 'a'
+
+-- Don't show the mode, since it's already in the status line
+vim.opt.showmode = false
+
+-- Sync clipboard between OS and Neovim.
+--  Schedule the setting after `UiEnter` because it can increase startup-time.
+--  Remove this option if you want your OS clipboard to remain independent.
+--  See `:help 'clipboard'`
+vim.schedule(function()
+  vim.opt.clipboard = 'unnamedplus'
+end)
+
+vim.opt.breakindent = true -- Enable break indent
+vim.opt.smartindent = true -- Insert indents automatically
+
+-- Save undo history
+vim.opt.undofile = true
+
+-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term
+vim.opt.ignorecase = true
+vim.opt.smartcase = true
+
+-- Keep signcolumn on by default
+vim.opt.signcolumn = 'yes'
+
+-- Decrease update time
+vim.opt.updatetime = 250
+vim.wo.signcolumn = 'yes'
+
+-- Decrease mapped sequence wait time
+-- Displays which-key popup sooner
+vim.opt.timeoutlen = 300
+
+-- Configure how new splits should be opened
+vim.opt.splitright = true
+vim.opt.splitbelow = true
+
+-- Sets how neovim will display certain whitespace characters in the editor.
+--  See `:help 'list'`
+--  and `:help 'listchars'`
+vim.opt.list = true
+vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
+
+-- Preview substitutions live, as you type!
+vim.opt.inccommand = 'split'
+
+-- Show which line your cursor is on
+vim.opt.cursorline = true
+
+-- Minimal number of screen lines to keep above and below the cursor.
+vim.opt.scrolloff = 10
+
+-- Enable break indent
+vim.o.breakindent = true
+
+-- Save undo history
+vim.o.undofile = true
+
+-- Set completeopt to have a better completion experience
+vim.o.completeopt = 'menuone,noselect'
+-- Fixes Notify opacity issues
+vim.o.termguicolors = true
--- a/config/nvim/lua/plugins/autoformat.lua
+++ b/config/nvim/lua/plugins/autoformat.lua
@@ -0,0 +1,38 @@
+-- Autoformat
+-- https://github.com/stevearc/conform.nvim
+return {
+  'stevearc/conform.nvim',
+  event = { 'BufWritePre' },
+  cmd = { 'ConformInfo' },
+  keys = {
+    {
+      '<leader>f',
+      function()
+        require('conform').format { async = true, lsp_fallback = true }
+      end,
+      mode = '',
+      desc = '[f] Format buffer',
+    },
+  },
+  opts = {
+    notify_on_error = false,
+    format_on_save = function(bufnr)
+      -- Disable "format_on_save lsp_fallback" for languages that don't
+      -- have a well standardized coding style. You can add additional
+      -- languages here or re-enable it for the disabled ones.
+      local disable_filetypes = { c = true, cpp = true }
+      return {
+        timeout_ms = 500,
+        lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
+      }
+    end,
+    formatters_by_ft = {
+      lua = { 'stylua' },
+      -- Conform can also run multiple formatters sequentially
+      -- python = { "isort", "black" },
+      --
+      -- You can use 'stop_after_first' to run the first available formatter from the list
+      javascript = { 'prettierd', 'prettier', stop_after_first = true },
+    },
+  },
+}
--- a/config/nvim/lua/plugins/cmp.lua
+++ b/config/nvim/lua/plugins/cmp.lua
@@ -0,0 +1,91 @@
+return {
+  -- Autocompletion
+  -- https://github.com/hrsh7th/nvim-cmp
+  {
+    'hrsh7th/nvim-cmp',
+    event = 'InsertEnter',
+    dependencies = {
+      'hrsh7th/cmp-nvim-lsp',
+      'L3MON4D3/LuaSnip',
+      'saadparwaiz1/cmp_luasnip',
+      -- Adds other completion capabilities.
+      --  nvim-cmp does not ship with all sources by default. They are split
+      --  into multiple repos for maintenance purposes.
+      'hrsh7th/cmp-nvim-lsp',
+      'hrsh7th/cmp-path',
+      'onsails/lspkind.nvim',
+      {
+        'zbirenbaum/copilot-cmp',
+        dependencies = {
+          'zbirenbaum/copilot.lua',
+        },
+        config = function()
+          require('copilot_cmp').setup()
+        end,
+      },
+    },
+    config = function()
+      -- nvim-cmp setup
+      local cmp = require 'cmp'
+      local luasnip = require 'luasnip'
+      local lspkind = require 'lspkind'
+      luasnip.config.setup {}
+
+      cmp.setup {
+        formatting = {
+          format = lspkind.cmp_format {
+            mode = 'symbol',
+            max_width = 50,
+            symbol_map = { Copilot = '' },
+          },
+        },
+        view = {
+          entries = 'native',
+        },
+        snippet = {
+          expand = function(args)
+            luasnip.lsp_expand(args.body)
+          end,
+        },
+        mapping = cmp.mapping.preset.insert {
+          ['<C-d>'] = cmp.mapping.scroll_docs(-4),
+          ['<C-f>'] = cmp.mapping.scroll_docs(4),
+          -- Manually trigger a completion from nvim-cmp.
+          --  Generally you don't need this, because nvim-cmp will display
+          --  completions whenever it has completion options available.
+          ['<C-Space>'] = cmp.mapping.complete(),
+          ['<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_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.jumpable(-1) then
+              luasnip.jump(-1)
+            else
+              fallback()
+            end
+          end, { 'i', 's' }),
+        },
+        sources = {
+          -- Copilot Source
+          { name = 'copilot', group_index = 2 },
+          -- Other Sources
+          { name = 'nvim_lsp', group_index = 2 },
+          { name = 'path', group_index = 2 },
+          { name = 'luasnip', group_index = 2 },
+        },
+      }
+    end,
+  },
+}
--- a/config/nvim/lua/plugins/coding.lua
+++ b/config/nvim/lua/plugins/coding.lua
@@ -1,126 +0,0 @@
-return {
-  -- A better annotation generator. Supports multiple languages and annotation conventions.
-  -- https://github.com/danymat/neogen
-  {
-    "danymat/neogen",
-    dependencies = "nvim-treesitter/nvim-treesitter",
-    version = "*",
-    cmd = "Neogen",
-    opts = {
-      snippet_engine = "luasnip",
-      languages = {
-        lua = { template = { annotation_convention = "ldoc" } },
-        typescript = { template = { annotation_convention = "tsdoc" } },
-        typescriptreact = { template = { annotation_convention = "tsdoc" } },
-      },
-    },
-    keys = {
-      {
-        "<leader>ba",
-        desc = "Annotations / Comments",
-      },
-      {
-        "<leader>baa",
-        function()
-          require("neogen").generate({ type = "current" })
-        end,
-        desc = "Current",
-      },
-      {
-        "<leader>bac",
-        function()
-          require("neogen").generate({ type = "class" })
-        end,
-        desc = "Class",
-      },
-      {
-        "<leader>baf",
-        function()
-          require("neogen").generate({ type = "func" })
-        end,
-        desc = "Function",
-      },
-      {
-        "<leader>bat",
-        function()
-          require("neogen").generate({ type = "type" })
-        end,
-        desc = "Type",
-      },
-      {
-        "<leader>baF",
-        function()
-          require("neogen").generate({ type = "file" })
-        end,
-        desc = "File",
-      },
-    },
-  },
-  {
-    "laytan/tailwind-sorter.nvim",
-    dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-lua/plenary.nvim" },
-    build = "cd formatter && npm i && npm run build",
-    config = true,
-    opts = {
-      on_save_enabled = true,
-    },
-  },
-  -- Describe the regexp under the cursor
-  -- https://github.com/bennypowers/nvim-regexplainer
-  {
-    "bennypowers/nvim-regexplainer",
-    dependencies = {
-      "nvim-treesitter/nvim-treesitter",
-      "MunifTanjim/nui.nvim",
-    },
-    opts = {
-      -- automatically show the explainer when the cursor enters a regexp
-      auto = true,
-    },
-  },
-  -- Clarify and beautify your comments using boxes and lines.
-  -- https://github.com/LudoPinelli/comment-box.nvim
-  { "LudoPinelli/comment-box.nvim", opts = {} },
-  -- Mason
-  -- https://github.com/williamboman/mason.nvim
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed, {
-        "actionlint",
-        "ansible-language-server",
-        "ansible-lint",
-        "bash-language-server",
-        "blade-formatter",
-        "cfn-lint",
-        "codeql",
-        "codespell",
-        "commitlint",
-        "diagnostic-languageserver",
-        "docker-compose-language-service",
-        "dockerfile-language-server",
-        "editorconfig-checker",
-        "fixjson",
-        "flake8",
-        "html-lsp",
-        "jq",
-        "jsonlint",
-        "luacheck",
-        "nginx-language-server",
-        "php-cs-fixer",
-        "phpcs",
-        "phpmd",
-        "semgrep",
-        "shellcheck",
-        "shfmt",
-        "sonarlint-language-server",
-        "stylelint",
-        "stylua",
-        "yamllint",
-      })
-    end,
-  },
-  -- Vim plugin for automatic time tracking and metrics generated from your programming activity.
-  -- https://github.com/wakatime/vim-wakatime
-  { "wakatime/vim-wakatime", lazy = false, enabled = true },
-}
--- a/config/nvim/lua/plugins/copilot.lua
+++ b/config/nvim/lua/plugins/copilot.lua
@@ -0,0 +1,17 @@
+-- CoPilot
+-- https://github.com/zbirenbaum/copilot.lua
+return {
+  'zbirenbaum/copilot.lua',
+  cmd = 'Copilot',
+  build = ':Copilot setup',
+  event = { 'InsertEnter', 'LspAttach' },
+  fix_pairs = true,
+  opts = {
+    suggestion = { enabled = false },
+    panel = { enabled = false },
+    filetypes = {
+      markdown = true,
+      help = true,
+    },
+  },
+}
--- a/config/nvim/lua/plugins/dap.lua
+++ b/config/nvim/lua/plugins/dap.lua
@@ -0,0 +1,29 @@
+return {
+
+  'ray-x/go.nvim',
+  'ray-x/guihua.lua',
+
+  {
+    'rcarriga/nvim-dap-ui',
+    dependencies = {
+      'mfussenegger/nvim-dap',
+      'nvim-neotest/nvim-nio',
+      'theHamsta/nvim-dap-virtual-text',
+      'leoluz/nvim-dap-go',
+    },
+    setup = function()
+      require('dapui').setup()
+      require('dap-go').setup()
+      require('nvim-dap-virtual-text').setup()
+
+      vim.fn.sign_define('DapBreakpoint', { text = '🔴', texthl = 'DapBreakpoint', linehl = 'DapBreakpoint', numhl = 'DapBreakpoint' })
+
+      -- Debugger
+      vim.api.nvim_set_keymap('n', '<leader>dt', ':DapUiToggle<CR>', { noremap = true })
+      vim.api.nvim_set_keymap('n', '<leader>db', ':DapToggleBreakpoint<CR>', { noremap = true })
+      vim.api.nvim_set_keymap('n', '<leader>dc', ':DapContinue<CR>', { noremap = true })
+      vim.api.nvim_set_keymap('n', '<leader>dr', ":lua require('dapui').open({reset = true})<CR>", { noremap = true })
+      vim.api.nvim_set_keymap('n', '<leader>ht', ":lua require('harpoon.ui').toggle_quick_menu()<CR>", { noremap = true })
+    end,
+  },
+}
--- a/config/nvim/lua/plugins/example.lua
+++ b/config/nvim/lua/plugins/example.lua
@@ -1,266 +0,0 @@
-- since this is just an example spec, don't actually load anything here and return an empty spec
-- stylua: ignore
-if true then return {} end
-
-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim
--
-- In your plugin files, you can:
-- * add extra plugins
-- * disable/enabled LazyVim plugins
-- * override the configuration of LazyVim plugins
-return {
-  -- add gruvbox
-  { "ellisonleao/gruvbox.nvim" },
-
-  -- Configure LazyVim to load gruvbox
-  {
-    "LazyVim/LazyVim",
-    opts = {
-      colorscheme = "gruvbox",
-    },
-  },
-
-  -- change trouble config
-  {
-    "folke/trouble.nvim",
-    -- opts will be merged with the parent spec
-    opts = { use_diagnostic_signs = true },
-  },
-
-  -- disable trouble
-  { "folke/trouble.nvim", enabled = false },
-
-  -- add symbols-outline
-  {
-    "simrat39/symbols-outline.nvim",
-    cmd = "SymbolsOutline",
-    keys = { { "<leader>cs", "<cmd>SymbolsOutline<cr>", desc = "Symbols Outline" } },
-    config = true,
-  },
-
-  -- override nvim-cmp and add cmp-emoji
-  {
-    "hrsh7th/nvim-cmp",
-    dependencies = { "hrsh7th/cmp-emoji" },
-    ---@param opts cmp.ConfigSchema
-    opts = function(_, opts)
-      local cmp = require("cmp")
-      opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } }))
-    end,
-  },
-
-  -- change some telescope options and a keymap to browse plugin files
-  {
-    "nvim-telescope/telescope.nvim",
-    keys = {
-      -- add a keymap to browse plugin files
-      -- stylua: ignore
-      {
-        "<leader>fp",
-        function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
-        desc = "Find Plugin File",
-      },
-    },
-    -- change some options
-    opts = {
-      defaults = {
-        layout_strategy = "horizontal",
-        layout_config = { prompt_position = "top" },
-        sorting_strategy = "ascending",
-        winblend = 0,
-      },
-    },
-  },
-
-  -- add telescope-fzf-native
-  {
-    "telescope.nvim",
-    dependencies = {
-      "nvim-telescope/telescope-fzf-native.nvim",
-      build = "make",
-      config = function()
-        require("telescope").load_extension("fzf")
-      end,
-    },
-  },
-
-  -- add pyright to lspconfig
-  {
-    "neovim/nvim-lspconfig",
-    ---@class PluginLspOpts
-    opts = {
-      ---@type lspconfig.options
-      servers = {
-        -- pyright will be automatically installed with mason and loaded with lspconfig
-        pyright = {},
-      },
-    },
-  },
-
-  -- add tsserver and setup with typescript.nvim instead of lspconfig
-  {
-    "neovim/nvim-lspconfig",
-    dependencies = {
-      "jose-elias-alvarez/typescript.nvim",
-      init = function()
-        require("lazyvim.util.lsp").on_attach(function(_, buffer)
-          -- stylua: ignore
-          vim.keymap.set("n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
-          vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
-        end)
-      end,
-    },
-    ---@class PluginLspOpts
-    opts = {
-      ---@type lspconfig.options
-      servers = {
-        -- tsserver will be automatically installed with mason and loaded with lspconfig
-        tsserver = {},
-      },
-      -- you can do any additional lsp server setup here
-      -- return true if you don't want this server to be setup with lspconfig
-      ---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
-      setup = {
-        -- example to setup with typescript.nvim
-        tsserver = function(_, opts)
-          require("typescript").setup({ server = opts })
-          return true
-        end,
-        -- Specify * to use this function as a fallback for any server
-        -- ["*"] = function(server, opts) end,
-      },
-    },
-  },
-
-  -- for typescript, LazyVim also includes extra specs to properly setup lspconfig,
-  -- treesitter, mason and typescript.nvim. So instead of the above, you can use:
-  { import = "lazyvim.plugins.extras.lang.typescript" },
-
-  -- add more treesitter parsers
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = {
-      ensure_installed = {
-        "bash",
-        "html",
-        "javascript",
-        "json",
-        "lua",
-        "markdown",
-        "markdown_inline",
-        "python",
-        "query",
-        "regex",
-        "tsx",
-        "typescript",
-        "vim",
-        "yaml",
-      },
-    },
-  },
-
-  -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above
-  -- would overwrite `ensure_installed` with the new value.
-  -- If you'd rather extend the default config, use the code below instead:
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      -- add tsx and treesitter
-      vim.list_extend(opts.ensure_installed, {
-        "tsx",
-        "typescript",
-      })
-    end,
-  },
-
-  -- the opts function can also be used to change the default opts:
-  {
-    "nvim-lualine/lualine.nvim",
-    event = "VeryLazy",
-    opts = function(_, opts)
-      table.insert(opts.sections.lualine_x, "😄")
-    end,
-  },
-
-  -- or you can return new options to override all the defaults
-  {
-    "nvim-lualine/lualine.nvim",
-    event = "VeryLazy",
-    opts = function()
-      return {
-        --[[add your custom lualine config here]]
-      }
-    end,
-  },
-
-  -- use mini.starter instead of alpha
-  { import = "lazyvim.plugins.extras.ui.mini-starter" },
-
-  -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc
-  { import = "lazyvim.plugins.extras.lang.json" },
-
-  -- add any tools you want to have installed below
-  {
-    "williamboman/mason.nvim",
-    opts = {
-      ensure_installed = {
-        "stylua",
-        "shellcheck",
-        "shfmt",
-        "flake8",
-      },
-    },
-  },
-
-  -- Use <tab> for completion and snippets (supertab)
-  -- first: disable default <tab> and <s-tab> behavior in LuaSnip
-  {
-    "L3MON4D3/LuaSnip",
-    keys = function()
-      return {}
-    end,
-  },
-  -- then: setup supertab in cmp
-  {
-    "hrsh7th/nvim-cmp",
-    dependencies = {
-      "hrsh7th/cmp-emoji",
-    },
-    ---@param opts cmp.ConfigSchema
-    opts = function(_, opts)
-      local has_words_before = function()
-        unpack = unpack or table.unpack
-        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-        return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-      end
-
-      local luasnip = require("luasnip")
-      local cmp = require("cmp")
-
-      opts.mapping = vim.tbl_extend("force", opts.mapping, {
-        ["<Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_next_item()
-            -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
-            -- this way you will only jump inside the snippet region
-          elseif luasnip.expand_or_jumpable() then
-            luasnip.expand_or_jump()
-          elseif has_words_before() then
-            cmp.complete()
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-        ["<S-Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_prev_item()
-          elseif luasnip.jumpable(-1) then
-            luasnip.jump(-1)
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-      })
-    end,
-  },
-}
--- a/config/nvim/lua/plugins/fzf.lua
+++ b/config/nvim/lua/plugins/fzf.lua
@@ -0,0 +1,32 @@
+return {
+  -- fzf <3 vim
+  -- https://github.com/junegunn/fzf.vim
+  'junegunn/fzf.vim',
+  dependencies = {
+    { 'junegunn/fzf', run = ':call fzf#install()' },
+  },
+  config = function()
+    -- Stolen from https://github.com/erikw/dotfiles/blob/d68d6274d67ac47afa20b9a0b9f3b0fa54bcdaf3/.config/nvim/lua/plugins.lua
+    -- Comment must be on line of its own...
+    -- Search for files in given path.
+    vim.keymap.set('n', '<Leader>zf', ':FZF<space>', { silent = true, desc = 'FZF: search for files in given path.' })
+    -- Sublime-like shortcut 'go to file' ctrl+p.
+    vim.keymap.set('n', '<C-p>', ':Files<CR>', { silent = true, desc = 'FZF: search for files starting at current directory.' })
+    vim.keymap.set('n', '<Leader>zc', ':Commands<CR>', { silent = true, desc = 'FZF: search commands.' })
+    vim.keymap.set('n', '<Leader>zt', ':Tags<CR>', { silent = true, desc = 'FZF: search in tags file' })
+    vim.keymap.set('n', '<Leader>zb', ':Buffers<CR>', { silent = true, desc = 'FZF: search open buffers.' })
+    -- Ref: https://medium.com/@paulodiovani/vim-buffers-windows-and-tabs-an-overview-8e2a57c57afa).
+    vim.keymap.set('n', '<Leader>zt', ':Windows<CR>', { silent = true, desc = 'FZF: search open tabs.' })
+    vim.keymap.set('n', '<Leader>zh', ':History<CR>', { silent = true, desc = 'FZF: search history of opened files' })
+    vim.keymap.set('n', '<Leader>zm', ':Maps<CR>', { silent = true, desc = 'FZF: search mappings.' })
+    vim.keymap.set('n', '<Leader>zg', ':Rg<CR>', { silent = true, desc = 'FZF: search with rg (aka live grep).' })
+
+    -- To ignore a certain path in a git project from both RG and FD used by FZF,
+    -- the eaiest way is to create ignore files and exclude the in local git clone.
+    -- Ref: https://stackoverflow.com/a/1753078/265508
+    -- $ cd git_proj/
+    -- $ echo "path/to/exclude" > .rgignore
+    -- $ echo "path/to/exclude" > .fdignore
+    -- $ printf ".rgignore\n.fdignore" >> .git/info/exclude
+  end,
+}
--- a/config/nvim/lua/plugins/git.lua
+++ b/config/nvim/lua/plugins/git.lua
@@ -0,0 +1,116 @@
+return {
+
+  -- fugitive.vim: A Git wrapper so awesome, it should be illegal
+  -- https://github.com/tpope/vim-fugitive
+  { 'tpope/vim-fugitive' },
+
+  -- Git integration for buffers
+  -- https://github.com/lewis6991/gitsigns.nvim
+  {
+    'lewis6991/gitsigns.nvim',
+    config = function()
+      require('gitsigns').setup {
+        signs = {
+          add = { text = '+' },
+          change = { text = '~' },
+          delete = { text = '_' },
+          topdelete = { text = '‾' },
+          changedelete = { text = '~' },
+        },
+        current_line_blame = false,
+        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', ']c', function()
+            if vim.wo.diff then
+              return ']c'
+            end
+            vim.schedule(function()
+              gs.next_hunk()
+            end)
+            return '<Ignore>'
+          end, { expr = true })
+
+          map('n', '[c', function()
+            if vim.wo.diff then
+              return '[c'
+            end
+            vim.schedule(function()
+              gs.prev_hunk()
+            end)
+            return '<Ignore>'
+          end, { expr = true })
+
+          -- Actions
+          map({ 'n', 'v' }, '<leader>hs', ':Gitsigns stage_hunk<CR>')
+          map({ 'n', 'v' }, '<leader>hr', ':Gitsigns reset_hunk<CR>')
+          map('n', '<leader>hS', gs.stage_buffer)
+          map('n', '<leader>ha', gs.stage_hunk)
+          map('n', '<leader>hu', gs.undo_stage_hunk)
+          map('n', '<leader>hR', gs.reset_buffer)
+          map('n', '<leader>hp', gs.preview_hunk)
+          map('n', '<leader>hb', function()
+            gs.blame_line { full = true }
+          end)
+          map('n', '<leader>tB', gs.toggle_current_line_blame)
+          map('n', '<leader>hd', gs.diffthis)
+          map('n', '<leader>hD', function()
+            gs.diffthis '~'
+          end)
+
+          -- Text object
+          map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+        end,
+      }
+    end,
+  },
+
+  -- git-worktree.nvim: Manage git worktrees
+  -- https://github.com/ThePrimeagen/git-worktree.nvim
+  {
+    'ThePrimeagen/git-worktree.nvim',
+    config = function()
+      require('git-worktree').setup()
+    end,
+  },
+
+  -- An interactive and powerful Git interface for Neovim, inspired by Magit
+  -- https://github.com/NeogitOrg/neogit
+  {
+    'NeogitOrg/neogit',
+    config = function()
+      -- This contains mainly Neogit but also a bunch of Git settings
+      -- like fetching branches with telescope or blaming with fugitive
+      local neogit = require 'neogit'
+
+      vim.keymap.set('n', '<leader>gs', neogit.open, { silent = true, noremap = true })
+      vim.keymap.set('n', '<leader>gc', ':Neogit commit<CR>', { silent = true, noremap = true })
+      vim.keymap.set('n', '<leader>gp', ':Neogit pull<CR>', { silent = true, noremap = true })
+      vim.keymap.set('n', '<leader>gP', ':Neogit push<CR>', { silent = true, noremap = true })
+      vim.keymap.set('n', '<leader>gb', ':Telescope git_branches<CR>', { silent = true, noremap = true })
+      vim.keymap.set('n', '<leader>gB', ':G blame<CR>', { silent = true, noremap = true })
+
+      neogit.setup {
+        disable_commit_confirmation = true,
+        disable_signs = false,
+        disable_context_highlighting = false,
+        disable_builtin_notifications = false,
+        signs = {
+          section = { '', '' },
+          item = { '', '' },
+          hunk = { '', '' },
+        },
+        integrations = {
+          diffview = true,
+        },
+      }
+    end,
+  },
+}
--- a/config/nvim/lua/plugins/goto-preview.lua
+++ b/config/nvim/lua/plugins/goto-preview.lua
@@ -0,0 +1,29 @@
+return {
+  -- A small Neovim plugin for previewing definitions using floating windows.
+  -- https://github.com/rmagatti/goto-preview
+  'rmagatti/goto-preview',
+  config = function()
+    require('goto-preview').setup {
+      width = 120, -- Width of the floating window
+      height = 15, -- Height of the floating window
+      border = { '↖', '─', '┐', '│', '┘', '─', '└', '│' }, -- Border characters of the floating window
+      default_mappings = true,
+      debug = false, -- Print debug information
+      opacity = nil, -- 0-100 opacity level of the floating window where 100 is fully transparent.
+      resizing_mappings = false, -- Binds arrow keys to resizing the floating window.
+      post_open_hook = nil, -- A function taking two arguments, a buffer and a window to be ran as a hook.
+      references = { -- Configure the telescope UI for slowing the references cycling window.
+        telescope = require('telescope.themes').get_dropdown {
+          hide_preview = false,
+        },
+      },
+      -- These two configs can also be passed down to the goto-preview definition and implementation calls for one off "peak" functionality.
+      focus_on_open = true, -- Focus the floating window when opening it.
+      dismiss_on_move = false, -- Dismiss the floating window when moving the cursor.
+      force_close = true, -- passed into vim.api.nvim_win_close's second argument. See :h nvim_win_close
+      bufhidden = 'wipe', -- the bufhidden option to set on the floating window. See :h bufhidden
+      stack_floating_preview_windows = true, -- Whether to nest floating windows
+      preview_window_title = { enable = true, position = 'left' },
+    }
+  end,
+}
--- a/config/nvim/lua/plugins/harpoon.lua
+++ b/config/nvim/lua/plugins/harpoon.lua
@@ -0,0 +1,103 @@
+return {
+  -- Getting you where you want with the fewest keystrokes.
+  -- https://github.com/ThePrimeagen/harpoon
+  {
+    'ThePrimeagen/harpoon',
+    branch = 'harpoon2',
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      'nvim-telescope/telescope.nvim',
+    },
+    config = function()
+      local harpoon = require 'harpoon'
+
+      harpoon:setup {}
+
+      vim.keymap.set('n', '<leader>ht', function()
+        harpoon.ui:toggle_quick_menu(harpoon:list())
+      end)
+
+      -- basic telescope configuration
+      local conf = require('telescope.config').values
+      local function toggle_telescope(harpoon_files)
+        local file_paths = {}
+        for _, item in ipairs(harpoon_files.items) do
+          table.insert(file_paths, item.value)
+        end
+
+        require('telescope.pickers')
+          .new({}, {
+            prompt_title = 'Harpoon',
+            finder = require('telescope.finders').new_table {
+              results = file_paths,
+            },
+            previewer = conf.file_previewer {},
+            sorter = conf.generic_sorter {},
+          })
+          :find()
+      end
+
+      vim.keymap.set('n', '<leader>xa', function()
+        toggle_telescope(harpoon:list())
+      end, { desc = 'Open harpoon window' })
+    end,
+    keys = {
+      {
+        '<leader>xa',
+        function()
+          require('harpoon'):list():add()
+        end,
+        desc = 'harpoon file',
+      },
+      {
+        '<leader>xN',
+        function()
+          require('harpoon'):list():prev()
+        end,
+        desc = 'harpoon to previous file',
+      },
+      {
+        '<leader>xn',
+        function()
+          require('harpoon'):list():next()
+        end,
+        desc = 'harpoon to next file',
+      },
+      {
+        '<leader>1',
+        function()
+          require('harpoon'):list():select(1)
+        end,
+        desc = 'harpoon to file 1',
+      },
+      {
+        '<leader>2',
+        function()
+          require('harpoon'):list():select(2)
+        end,
+        desc = 'harpoon to file 2',
+      },
+      {
+        '<leader>3',
+        function()
+          require('harpoon'):list():select(3)
+        end,
+        desc = 'harpoon to file 3',
+      },
+      {
+        '<leader>4',
+        function()
+          require('harpoon'):list():select(4)
+        end,
+        desc = 'harpoon to file 4',
+      },
+      {
+        '<leader>5',
+        function()
+          require('harpoon'):list():select(5)
+        end,
+        desc = 'harpoon to file 5',
+      },
+    },
+  },
+}
--- a/config/nvim/lua/plugins/lang-php.lua
+++ b/config/nvim/lua/plugins/lang-php.lua
@@ -1,48 +0,0 @@
-return {
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed, {
-        "php",
-      })
-    end,
-  },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed, {
-        "phpactor",
-        "intelephense",
-      })
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        phpactor = {},
-      },
-    },
-  },
-  {
-    "mfussenegger/nvim-dap",
-    optional = true,
-    dependencies = {
-      "williamboman/mason.nvim",
-      opts = function(_, opts)
-        if type(opts.ensure_installed) == "table" then
-          table.insert(opts.ensure_installed, "php-debug-adapter")
-        end
-      end,
-    },
-    opts = function()
-      local dap = require("dap")
-      local path = require("mason-registry").get_package("php-debug-adapter"):get_install_path()
-      dap.adapters.php = {
-        type = "executable",
-        command = "node",
-        args = { path .. "/extension/out/phpDebug.js" },
-      }
-    end,
-  },
-}
--- a/config/nvim/lua/plugins/lazy.lua
+++ b/config/nvim/lua/plugins/lazy.lua
@@ -0,0 +1,59 @@
+return {
+  -- vscode-like pictograms for neovim lsp completion items
+  -- https://github.com/onsails/lspkind-nvim
+  { 'onsails/lspkind.nvim' },
+
+  -- Rethinking Vim as a tool for writing
+  -- https://github.com/preservim/vim-pencil
+  { 'preservim/vim-pencil' },
+
+  -- obsession.vim: continuously updated session files
+  -- https://github.com/tpope/vim-obsession
+  { 'tpope/vim-obsession' },
+
+  -- surround.vim: Delete/change/add parentheses/quotes/XML-tags/much more with ease
+  -- https://github.com/tpope/vim-surround
+  { 'tpope/vim-surround' },
+
+  -- Highlight, list and search todo comments in your projects
+  -- https://github.com/folke/todo-comments.nvim
+  {
+    'folke/todo-comments.nvim',
+    dependencies = 'nvim-lua/plenary.nvim',
+    config = function()
+      require('todo-comments').setup {}
+    end,
+  },
+
+  -- LSP Configuration & Plugins
+  -- Meta type definitions for the Lua platform Luvit.
+  -- https://github.com/Bilal2453/luvit-meta
+  { 'Bilal2453/luvit-meta', lazy = true },
+
+  -- Indent guides for Neovim
+  -- https://github.com/lukas-reineke/indent-blankline.nvim
+  {
+    'lukas-reineke/indent-blankline.nvim',
+    main = 'ibl',
+    opts = {},
+  },
+
+  -- Commenting
+  -- https://github.com/numToStr/Comment.nvim
+  {
+    'numToStr/Comment.nvim', -- "gc" to comment visual regions/lines
+    event = { 'BufRead', 'BufNewFile' },
+    config = function()
+      require('Comment').setup()
+    end,
+  },
+
+  -- Detect tabstop and shiftwidth automatically
+  -- https://github.com/tpope/vim-sleuth
+  { 'tpope/vim-sleuth' },
+
+  -- Vim plugin for automatic time tracking and metrics
+  -- generated from your programming activity.
+  -- https://github.com/wakatime/vim-wakatime
+  { 'wakatime/vim-wakatime', lazy = false, enabled = true },
+}
--- a/config/nvim/lua/plugins/lint.lua
+++ b/config/nvim/lua/plugins/lint.lua
@@ -0,0 +1,55 @@
+return {
+
+  { -- Linting
+    'mfussenegger/nvim-lint',
+    event = { 'BufReadPre', 'BufNewFile' },
+    config = function()
+      local lint = require 'lint'
+      lint.linters_by_ft = {
+        markdown = { 'markdownlint' },
+      }
+
+      -- To allow other plugins to add linters to require('lint').linters_by_ft,
+      -- instead set linters_by_ft like this:
+      -- lint.linters_by_ft = lint.linters_by_ft or {}
+      -- lint.linters_by_ft['markdown'] = { 'markdownlint' }
+      --
+      -- However, note that this will enable a set of default linters,
+      -- which will cause errors unless these tools are available:
+      -- {
+      --   clojure = { "clj-kondo" },
+      --   dockerfile = { "hadolint" },
+      --   inko = { "inko" },
+      --   janet = { "janet" },
+      --   json = { "jsonlint" },
+      --   markdown = { "vale" },
+      --   rst = { "vale" },
+      --   ruby = { "ruby" },
+      --   terraform = { "tflint" },
+      --   text = { "vale" }
+      -- }
+      --
+      -- You can disable the default linters by setting their filetypes to nil:
+      -- lint.linters_by_ft['clojure'] = nil
+      -- lint.linters_by_ft['dockerfile'] = nil
+      -- lint.linters_by_ft['inko'] = nil
+      -- lint.linters_by_ft['janet'] = nil
+      -- lint.linters_by_ft['json'] = nil
+      -- lint.linters_by_ft['markdown'] = nil
+      -- lint.linters_by_ft['rst'] = nil
+      -- lint.linters_by_ft['ruby'] = nil
+      -- lint.linters_by_ft['terraform'] = nil
+      -- lint.linters_by_ft['text'] = nil
+
+      -- Create autocommand which carries out the actual linting
+      -- on the specified events.
+      local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
+      vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
+        group = lint_augroup,
+        callback = function()
+          lint.try_lint()
+        end,
+      })
+    end,
+  },
+}
--- a/config/nvim/lua/plugins/lsp.lua
+++ b/config/nvim/lua/plugins/lsp.lua
@@ -0,0 +1,254 @@
+-- Quickstart configs for Nvim LSP
+-- https://github.com/neovim/nvim-lspconfig
+return {
+  'neovim/nvim-lspconfig',
+  dependencies = {
+    -- Automatically install LSPs to stdpath for neovim
+    'williamboman/mason.nvim',
+    'williamboman/mason-lspconfig.nvim',
+    'WhoIsSethDaniel/mason-tool-installer.nvim',
+    -- Useful status updates for LSP
+    {
+      'j-hui/fidget.nvim',
+      opts = {
+        notification = {
+          window = {
+            winblend = 50,
+            align = 'top',
+          },
+        },
+      },
+    },
+    'b0o/schemastore.nvim',
+    {
+      -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
+      -- used for completion, annotations and signatures of Neovim apis
+      'folke/lazydev.nvim',
+      ft = 'lua',
+      opts = {
+        library = {
+          -- Load luvit types when the `vim.uv` word is found
+          { path = 'luvit-meta/library', words = { 'vim%.uv' } },
+        },
+      },
+    },
+  },
+  config = function()
+    -- Diagnostic keymaps
+    vim.keymap.set('n', 'dp', vim.diagnostic.goto_prev, { desc = 'Diagnostic: Goto Prev' })
+    vim.keymap.set('n', 'dn', vim.diagnostic.goto_next, { desc = 'Diagnostic: Goto Next' })
+    vim.keymap.set('n', '<leader>do', vim.diagnostic.open_float, { desc = 'Diagnostic: Open float' })
+    vim.keymap.set('n', '<leader>dq', vim.diagnostic.setloclist, { desc = 'Diagnostic: Set loc list' })
+
+    -- LSP settings.
+    --  This function gets run when an LSP connects to a particular buffer.
+    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', vim.lsp.buf.definition, '[G]oto [D]efinition')
+      nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
+      nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
+      nmap('<leader>D', vim.lsp.buf.type_definition, '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(_)
+        if vim.lsp.buf.format then
+          vim.lsp.buf.format()
+        elseif vim.lsp.buf.formatting then
+          vim.lsp.buf.formatting()
+        end
+      end, { desc = 'Format current buffer with LSP' })
+    end
+
+    -- Setup mason so it can manage external tooling
+    require('mason').setup()
+
+    -- Enable the following language servers
+    -- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
+    local servers = {
+      -- :help lspconfig-all for all pre-configured LSPs
+      ast_grep = {},
+
+      actionlint = {}, -- GitHub Actions
+      ansiblels = {}, -- Ansible
+      bashls = {}, -- Bash
+      css_variables = {}, -- CSS
+      cssls = {}, -- CSS
+      docker_compose_language_service = {}, -- Docker compose
+      dockerls = {}, -- Docker
+      eslint = {}, -- ESLint
+      gitlab_ci_ls = {}, -- GitLab CI
+      gopls = {}, -- Go
+      grammarly = {}, -- Grammar and better writing
+      html = {}, -- HTML
+      intelephense = {}, -- PHP
+      jinja_lsp = {}, -- Jinja templates
+      pest_ls = {}, -- Pest (PHP)
+      phpactor = {}, -- PHP
+      psalm = {}, -- PHP
+      pyright = {}, -- Python
+      semgrep = {}, -- Security
+      shellcheck = {}, -- Shell scripts
+      shfmt = {}, -- Shell scripts formatting
+      stylelint_lsp = {}, -- Stylelint for S/CSS
+      stylua = {}, -- Used to format Lua code
+      tailwindcss = {}, -- Tailwind CSS
+      terraformls = {}, -- Terraform
+      tflint = {}, -- Terraform
+      ts_ls = {}, -- TypeScript/JS
+      typos_lsp = {}, -- Better writing
+      volar = {}, -- Vue
+      yamlls = {}, -- YAML
+
+      lua_ls = {
+        -- cmd = {...},
+        -- filetypes = { ...},
+        -- capabilities = {},
+        settings = {
+          Lua = {
+            completion = {
+              callSnippet = 'Replace',
+            },
+            -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
+            diagnostics = { disable = { 'missing-fields' } },
+          },
+        },
+      },
+      jsonls = {
+        settings = {
+          json = {
+            schemas = require('schemastore').json.schemas(),
+            validate = { enable = true },
+          },
+          yaml = {
+            schemaStore = {
+              -- You must disable built-in schemaStore support if you want to use
+              -- this plugin and its advanced options like `ignore`.
+              enable = false,
+              -- Avoid TypeError: Cannot read properties of undefined (reading 'length')
+              url = '',
+            },
+            schemas = require('schemastore').yaml.schemas(),
+          },
+        },
+      },
+    }
+
+    local ensure_installed = vim.tbl_keys(servers or {})
+    vim.list_extend(ensure_installed, {
+      'actionlint',
+      'ansible-language-server',
+      'ansible-lint',
+      'bash-language-server',
+      'blade-formatter',
+      'codespell',
+      'commitlint',
+      'diagnostic-languageserver',
+      'docker-compose-language-service',
+      'dockerfile-language-server',
+      'editorconfig-checker',
+      'fixjson',
+      'flake8',
+      'html-lsp',
+      'jq',
+      'jsonlint',
+      'luacheck',
+      'php-cs-fixer',
+      'phpcs',
+      'phpmd',
+      'semgrep',
+      'shellcheck',
+      'shfmt',
+      'stylelint',
+      'stylua',
+      'yamllint',
+    })
+    require('mason-tool-installer').setup {
+      ensure_installed = ensure_installed,
+      auto_update = true,
+    }
+
+    -- Ensure the servers above are installed
+    require('mason-lspconfig').setup {
+      automatic_installation = true,
+      ensure_installed = servers,
+    }
+
+    -- nvim-cmp supports additional completion capabilities
+    local capabilities = vim.lsp.protocol.make_client_capabilities()
+    capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
+
+    for _, lsp in ipairs(servers) do
+      require('lspconfig')[lsp].setup {
+        on_attach = on_attach,
+        capabilities = capabilities,
+      }
+    end
+
+    -- Turn on lsp status information
+    require('fidget').setup()
+
+    -- Example custom configuration for lua
+    --
+    -- Make runtime files discoverable to the server
+    local runtime_path = vim.split(package.path, ';')
+    table.insert(runtime_path, 'lua/?.lua')
+    table.insert(runtime_path, 'lua/?/init.lua')
+
+    require('lspconfig').lua_ls.setup {
+      on_attach = on_attach,
+      capabilities = capabilities,
+      settings = {
+        Lua = {
+          runtime = {
+            -- Tell the language server which version of Lua you're using (most likely LuaJIT)
+            version = 'LuaJIT',
+            -- Setup your lua path
+            path = runtime_path,
+          },
+          diagnostics = {
+            globals = { 'vim' },
+          },
+          workspace = {
+            library = vim.api.nvim_get_runtime_file('', true),
+            checkThirdParty = false,
+          },
+          -- Do not send telemetry data containing a randomized but unique identifier
+          telemetry = { enable = false },
+        },
+      },
+    }
+
+    vim.api.nvim_create_autocmd('FileType', {
+      pattern = 'sh',
+      callback = function()
+        vim.lsp.start {
+          name = 'bash-language-server',
+          cmd = { 'bash-language-server', 'start' },
+        }
+      end,
+    })
+  end,
+}
--- a/config/nvim/lua/plugins/lualine.lua
+++ b/config/nvim/lua/plugins/lualine.lua
@@ -0,0 +1,33 @@
+-- Fancier statusline
+-- https://github.com/nvim-lualine/lualine.nvim
+return {
+  'nvim-lualine/lualine.nvim',
+  config = function()
+    require('lualine').setup {
+      options = {
+        icons_enabled = true,
+        component_separators = '|',
+        section_separators = '',
+      },
+      sections = {
+        lualine_x = {
+          {
+            require('noice').api.statusline.mode.get,
+            cond = require('noice').api.statusline.mode.has,
+            -- color = { fg = '#ff9e64' },
+          },
+          {
+            require('noice').api.status.command.get,
+            cond = require('noice').api.status.command.has,
+            -- color = { fg = '#ff9e64' },
+          },
+        },
+        lualine_a = {
+          {
+            'buffers',
+          },
+        },
+      },
+    }
+  end,
+}
--- a/config/nvim/lua/plugins/neotree.lua
+++ b/config/nvim/lua/plugins/neotree.lua
@@ -0,0 +1,95 @@
+-- Neo-tree is a Neovim plugin to browse the file system
+-- https://github.com/nvim-neo-tree/neo-tree.nvim
+
+return {
+  'nvim-neo-tree/neo-tree.nvim',
+  version = '*',
+  dependencies = {
+    'nvim-lua/plenary.nvim',
+    'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
+    'MunifTanjim/nui.nvim',
+    {
+      's1n7ax/nvim-window-picker',
+      version = '2.*',
+      config = function()
+        require('window-picker').setup {
+          filter_rules = {
+            include_current_win = false,
+            autoselect_one = true,
+            -- filter using buffer options
+            bo = {
+              -- if the file type is one of following, the window will be ignored
+              filetype = { 'neo-tree', 'neo-tree-popup', 'notify' },
+              -- if the buffer type is one of following, the window will be ignored
+              buftype = { 'terminal', 'quickfix' },
+            },
+          },
+        }
+      end,
+    },
+  },
+  cmd = 'Neotree',
+  keys = {
+    { '<leader>e', ':Neotree reveal<CR>', { desc = 'NeoTree reveal' } },
+  },
+  opts = {
+    close_if_last_window = true,
+    filesystem = {
+      window = {
+        mappings = {
+          ['<Esc>'] = 'close_window',
+        },
+      },
+      filtered_items = {
+        hide_dotfiles = true,
+        hide_gitignored = true,
+        hide_hidden = true, -- only works on Windows for hidden files/directories
+        hide_by_name = {
+          '.DS_Store',
+          'node_modules',
+        },
+        always_show = {
+          '.actrc',
+          '.browserslistrc',
+          '.commitlintrc.json',
+          '.editorconfig',
+          '.env',
+          '.env.example',
+          '.envrc',
+          '.eslintrc.json',
+          '.github',
+          '.gitignore',
+          '.gitkeep',
+          '.ignore',
+          '.markdownlint.json',
+          '.markdownlint.yaml',
+          '.markdownlintignore',
+          '.nvmrc',
+          '.prettierignore',
+          '.prettierrc.js',
+          '.prettierrc.json',
+          '.prettierrc.yaml',
+          '.python-version',
+          '.releaserc.json',
+          '.shellcheckrc',
+          '.simple-git-hooks.json',
+          '.stylelintrc.json',
+          '.stylua.toml',
+          '.yamlignore',
+          '.yamllint.yaml',
+        },
+        always_show_by_pattern = {
+          '.*.json',
+          '.*.toml',
+          '.*.yaml',
+          '.*.yml',
+          '.*rc',
+          '.*rc.*',
+          '.env*',
+          '.prettierrc*',
+          '.stylua.*',
+        },
+      },
+    },
+  },
+}
--- a/config/nvim/lua/plugins/noice.lua
+++ b/config/nvim/lua/plugins/noice.lua
@@ -0,0 +1,80 @@
+return {
+  -- Highly experimental plugin that completely replaces the UI
+  -- for messages, cmdline and the popupmenu.
+  -- https://github.com/folke/noice.nvim
+  {
+    'folke/noice.nvim',
+    dependencies = {
+      'MunifTanjim/nui.nvim',
+      -- A fancy, configurable, notification manager for NeoVim
+      -- https://github.com/rcarriga/nvim-notify
+      {
+        'rcarriga/nvim-notify',
+        config = function()
+          require('notify').setup {
+            background_colour = '#000000',
+            enabled = false,
+          }
+        end,
+      },
+    },
+    setup = function()
+      vim.g.noice_ignored_filetypes = { 'fugitiveblame', 'fugitive', 'gitcommit' }
+      require('noice').setup {
+        -- you can enable a preset for easier configuration
+        presets = {
+          bottom_search = true, -- use a classic bottom cmdline for search
+          command_palette = true, -- position the cmdline and popupmenu together
+          long_message_to_split = true, -- long messages will be sent to a split
+          inc_rename = false, -- enables an input dialog for inc-rename.nvim
+          lsp_doc_border = false, -- add a border to hover docs and signature help
+        },
+        views = {
+          cmdline_popup = {
+            position = {
+              row = 5,
+              col = '50%',
+            },
+            size = {
+              width = 60,
+              height = 'auto',
+            },
+          },
+          popupmenu = {
+            relative = 'editor',
+            position = {
+              row = 8,
+              col = '50%',
+            },
+            size = {
+              width = 60,
+              height = 10,
+            },
+            border = {
+              style = 'rounded',
+              padding = { 0, 1 },
+            },
+            win_options = {
+              winhighlight = { Normal = 'Normal', FloatBorder = 'DiagnosticInfo' },
+            },
+          },
+        },
+        routes = {
+          {
+            filter = {
+              event = 'msg_show',
+              any = {
+                { find = '%d+L, %d+B' },
+                { find = '; after #%d+' },
+                { find = '; before #%d+' },
+                { find = '%d fewer lines' },
+                { find = '%d more lines' },
+              },
+            },
+            opts = { skip = true },
+          },
+        },
+      }
+    end,
+  },
+}
--- a/config/nvim/lua/plugins/nvim-lspconfig.lua
+++ b/config/nvim/lua/plugins/nvim-lspconfig.lua
@@ -1,20 +0,0 @@
-return {
-  "neovim/nvim-lspconfig",
-  opts = {
-    servers = {
-      eslint = {},
-      tflint = {},
-    },
-    setup = {
-      eslint = function()
-        require("lazyvim.util.lsp").on_attach(function(client)
-          if client.name == "eslint" then
-            client.server_capabilities.documentFormattingProvider = true
-          elseif client.name == "tsserver" then
-            client.server_capabilities.documentFormattingProvider = false
-          end
-        end)
-      end,
-    },
-  },
-}
--- a/config/nvim/lua/plugins/obsidian.lua
+++ b/config/nvim/lua/plugins/obsidian.lua
@@ -0,0 +1,19 @@
+return {
+  'epwalsh/obsidian.nvim',
+  version = '*', -- recommended, use latest release instead of latest commit
+  lazy = true,
+  ft = 'markdown',
+  dependencies = {
+    'nvim-lua/plenary.nvim',
+  },
+  config = function()
+    require('obsidian').setup {
+      workspaces = {
+        {
+          name = 'Notes',
+          path = vim.fn.expand '$HOME/Code/ivuorinen/obsidian',
+        },
+      },
+    }
+  end,
+}
--- a/config/nvim/lua/plugins/supertab.lua
+++ b/config/nvim/lua/plugins/supertab.lua
@@ -1,53 +0,0 @@
-return {
-  -- Use <tab> for completion and snippets (supertab)
-  -- first: disable default <tab> and <s-tab> behavior in LuaSnip
-  {
-    "L3MON4D3/LuaSnip",
-    keys = function()
-      return {}
-    end,
-  },
-  -- then: setup supertab in cmp
-  {
-    "hrsh7th/nvim-cmp",
-    dependencies = {
-      "hrsh7th/cmp-emoji",
-    },
-    ---@param opts cmp.ConfigSchema
-    opts = function(_, opts)
-      local has_words_before = function()
-        unpack = unpack or table.unpack
-        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-        return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-      end
-
-      local luasnip = require("luasnip")
-      local cmp = require("cmp")
-
-      opts.mapping = vim.tbl_extend("force", opts.mapping, {
-        ["<Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_next_item()
-            -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
-            -- this way you will only jump inside the snippet region
-          elseif luasnip.expand_or_jumpable() then
-            luasnip.expand_or_jump()
-          elseif has_words_before() then
-            cmp.complete()
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-        ["<S-Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_prev_item()
-          elseif luasnip.jumpable(-1) then
-            luasnip.jump(-1)
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-      })
-    end,
-  },
-}
--- a/config/nvim/lua/plugins/telescope.lua
+++ b/config/nvim/lua/plugins/telescope.lua
@@ -0,0 +1,85 @@
+return {
+  -- Fuzzy Finder (files, lsp, etc)
+  -- https://github.com/nvim-telescope/telescope.nvim
+  {
+    'nvim-telescope/telescope.nvim',
+    version = '*',
+    dependencies = {
+      { 'nvim-lua/plenary.nvim' },
+      { 'nvim-telescope/telescope-symbols.nvim' },
+
+      -- Fuzzy Finder Algorithm which requires local dependencies to be built.
+      -- Only load if `make` is available
+      {
+        'nvim-telescope/telescope-fzf-native.nvim',
+        build = 'make',
+        cond = vim.fn.executable 'make' == 1,
+      },
+    },
+    setup = function()
+      local t = require 'telescope'
+      local a = require 'telescope.actions'
+      local b = require 'telescope.builtin'
+      local themes = require 'telescope.themes'
+      require('telescope').load_extension 'harpoon'
+      t.load_extension 'git_worktree'
+
+      -- [[ Configure Telescope ]]
+      -- See `:help telescope` and `:help telescope.setup()`
+      t.setup {
+        defaults = {
+          layout_strategy = 'horizontal',
+          layout_config = {
+            preview_width = 0.65,
+            horizontal = {
+              size = {
+                width = '95%',
+                height = '95%',
+              },
+            },
+          },
+          pickers = {
+            find_files = {
+              theme = 'dropdown',
+            },
+          },
+          mappings = {
+            i = {
+              ['<C-u>'] = false,
+              ['<C-j>'] = a.move_selection_next,
+              ['<C-k>'] = a.move_selection_previous,
+              ['<C-d>'] = a.move_selection_previous,
+            },
+          },
+        },
+      }
+
+      -- Enable telescope fzf native, if installed
+      pcall(t.load_extension, 'fzf')
+
+      -- See `:help telescope.builtin`
+      vim.keymap.set('n', '<leader>so', b.oldfiles, { desc = '[?] Find recently opened files' })
+      vim.keymap.set('n', '<leader>/', function()
+        -- You can pass additional configuration to telescope to change theme, layout, etc.
+        b.current_buffer_fuzzy_find(themes.get_dropdown {
+          winblend = 10,
+          previewer = true,
+        })
+      end, { desc = '[/] Fuzzily search in current buffer]' })
+
+      vim.keymap.set('n', '<leader>sf', b.find_files, { desc = '[S]earch [F]iles' })
+      vim.keymap.set('n', '<leader>sw', b.grep_string, { desc = '[S]earch current [W]ord' })
+      vim.keymap.set('n', '<leader>sg', b.live_grep, { desc = '[S]earch by [G]rep' })
+      vim.keymap.set('n', '<leader>sd', b.diagnostics, { desc = '[S]earch [D]iagnostics' })
+      vim.keymap.set('n', '<leader>sb', b.buffers, { desc = '[ ] Find existing buffers' })
+      vim.keymap.set('n', '<leader>sS', b.git_status, { desc = '' })
+      vim.keymap.set('n', '<leader>sm', ':Telescope harpoon marks<CR>', { desc = 'Harpoon [M]arks' })
+      vim.keymap.set('n', '<Leader>sr', "<CMD>lua require('telescope').extensions.git_worktree.git_worktrees()<CR>")
+      vim.keymap.set('n', '<Leader>sR', "<CMD>lua require('telescope').extensions.git_worktree.create_git_worktree()<CR>")
+      vim.keymap.set('n', '<Leader>sn', "<CMD>lua require('telescope').extensions.notify.notify()<CR>")
+
+      vim.api.nvim_set_keymap('n', 'st', ':TodoTelescope<CR>', { noremap = true })
+      vim.api.nvim_set_keymap('n', '<Leader><tab>', "<Cmd>lua require('telescope.builtin').commands()<CR>", { noremap = false })
+    end,
+  },
+}
--- a/config/nvim/lua/plugins/treesitter.lua
+++ b/config/nvim/lua/plugins/treesitter.lua
@@ -1,23 +1,107 @@
 return {
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed, {
-        "bash",
-        "html",
-        "javascript",
-        "json",
-        "lua",
-        "markdown",
-        "markdown_inline",
-        "python",
-        "query",
-        "regex",
-        "tsx",
-        "typescript",
-        "vim",
-        "yaml",
-      })
-    end,
+  -- Highlight, edit, and navigate code
+  -- https://github.com/nvim-treesitter/nvim-treesitter
+  'nvim-treesitter/nvim-treesitter',
+  build = function()
+    pcall(require('nvim-treesitter.install').update { with_sync = true })
+  end,
+  dependencies = {
+    'nvim-treesitter/nvim-treesitter-textobjects',
  },
+  config = function()
+    require('nvim-treesitter.configs').setup {
+
+      -- Add languages to be installed here that you want installed for treesitter
+      ensure_installed = {
+        'bash',
+        'c',
+        'css',
+        'diff',
+        'go',
+        'html',
+        'javascript',
+        'jsdoc',
+        'json',
+        'jsonc',
+        'lua',
+        'luadoc',
+        'markdown',
+        'markdown_inline',
+        'python',
+        'query',
+        'regex',
+        'rust',
+        'sql',
+        'terraform',
+        'toml',
+        'tsx',
+        'typescript',
+        'vim',
+        'vimdoc',
+        'xml',
+        'yaml',
+      },
+
+      highlight = { enable = true },
+      indent = { enable = true },
+      incremental_selection = {
+        enable = true,
+        keymaps = {
+          init_selection = '<c-space>',
+          node_incremental = '<c-space>',
+          scope_incremental = '<c-s>',
+          node_decremental = '<c-backspace>',
+        },
+      },
+      textobjects = {
+        select = {
+          enable = true,
+          lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
+          keymaps = {
+            -- You can use the capture groups defined in textobjects.scm
+            ['aa'] = '@parameter.outer',
+            ['ia'] = '@parameter.inner',
+            ['af'] = '@function.outer',
+            ['if'] = '@function.inner',
+            ['ac'] = '@class.outer',
+            ['ic'] = '@class.inner',
+            ['ii'] = '@conditional.inner',
+            ['ai'] = '@conditional.outer',
+            ['il'] = '@loop.inner',
+            ['al'] = '@loop.outer',
+            ['at'] = '@comment.outer',
+          },
+        },
+        move = {
+          enable = true,
+          set_jumps = true, -- whether to set jumps in the jumplist
+          goto_next_start = {
+            [']f'] = '@function.outer',
+            [']]'] = '@class.outer',
+          },
+          goto_next_end = {
+            [']F'] = '@function.outer',
+            [']['] = '@class.outer',
+          },
+          goto_previous_start = {
+            ['[f'] = '@function.outer',
+            ['[['] = '@class.outer',
+          },
+          goto_previous_end = {
+            ['[F'] = '@function.outer',
+            ['[]'] = '@class.outer',
+          },
+        },
+        swap = {
+          enable = true,
+          swap_next = {
+            ['<leader>a'] = '@parameter.inner',
+          },
+          swap_previous = {
+            ['<leader>A'] = '@parameter.inner',
+          },
+        },
+      },
+    }
+  end,
 }
--- a/config/nvim/lua/plugins/trouble.lua
+++ b/config/nvim/lua/plugins/trouble.lua
@@ -0,0 +1,32 @@
+return {
+  'folke/trouble.nvim',
+  lazy = false,
+  dependencies = 'nvim-tree/nvim-web-devicons',
+  config = function()
+    require('trouble').setup {
+      auto_preview = false,
+      auto_fold = true,
+      auto_close = true,
+      use_lsp_diagnostic_signs = true,
+    }
+    vim.keymap.set('n', '<leader>xx', '<cmd>TroubleToggle<cr>', { silent = true, noremap = true })
+    vim.keymap.set('n', '<leader>xw', '<cmd>TroubleToggle workspace_diagnostics<cr>', { silent = true, noremap = true })
+    vim.keymap.set('n', '<leader>xd', '<cmd>TroubleToggle document_diagnostics<cr>', { silent = true, noremap = true })
+    vim.keymap.set('n', '<leader>xl', '<cmd>TroubleToggle loclist<cr>', { silent = true, noremap = true })
+    vim.keymap.set('n', '<leader>xq', '<cmd>TroubleToggle quickfix<cr>', { silent = true, noremap = true })
+    vim.keymap.set('n', 'gR', '<cmd>TroubleToggle lsp_references<cr>', { silent = true, noremap = true })
+
+    -- Diagnostic signs
+    -- https://github.com/folke/trouble.nvim/issues/52
+    local signs = {
+      Error = ' ',
+      Warning = ' ',
+      Hint = ' ',
+      Information = ' ',
+    }
+    for type, icon in pairs(signs) do
+      local hl = 'DiagnosticSign' .. type
+      vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+    end
+  end,
+}
--- a/config/nvim/lua/plugins/ufo.lua
+++ b/config/nvim/lua/plugins/ufo.lua
@@ -0,0 +1,84 @@
+local handler = function(virtText, lnum, endLnum, width, truncate)
+  local newVirtText = {}
+  local suffix = (' 󰁂 %d '):format(endLnum - lnum)
+  local sufWidth = vim.fn.strdisplaywidth(suffix)
+  local targetWidth = width - sufWidth
+  local curWidth = 0
+  for _, chunk in ipairs(virtText) do
+    local chunkText = chunk[1]
+    local chunkWidth = vim.fn.strdisplaywidth(chunkText)
+    if targetWidth > curWidth + chunkWidth then
+      table.insert(newVirtText, chunk)
+    else
+      chunkText = truncate(chunkText, targetWidth - curWidth)
+      local hlGroup = chunk[2]
+      table.insert(newVirtText, { chunkText, hlGroup })
+      chunkWidth = vim.fn.strdisplaywidth(chunkText)
+      -- str width returned from truncate() may less than 2nd argument, need padding
+      if curWidth + chunkWidth < targetWidth then
+        suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth)
+      end
+      break
+    end
+    curWidth = curWidth + chunkWidth
+  end
+  table.insert(newVirtText, { suffix, 'MoreMsg' })
+  return newVirtText
+end
+
+return {
+  -- Not UFO in the sky, but an ultra fold in Neovim.
+  -- https://github.com/kevinhwang91/nvim-ufo/
+  {
+    'kevinhwang91/nvim-ufo',
+    lazy = false,
+    enabled = true,
+    version = '*',
+    dependencies = {
+      'kevinhwang91/promise-async',
+      { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' },
+      {
+        'luukvbaal/statuscol.nvim',
+        config = function()
+          local builtin = require 'statuscol.builtin'
+          require('statuscol').setup {
+            relculright = true,
+            segments = {
+              { text = { builtin.foldfunc }, click = 'v:lua.ScFa' },
+              { text = { '%s' }, click = 'v:lua.ScSa' },
+              { text = { builtin.lnumfunc, ' ' }, click = 'v:lua.ScLa' },
+            },
+          }
+        end,
+      },
+    },
+    init = function()
+      vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
+      vim.o.foldcolumn = '1' -- '0' is not bad
+      vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
+      vim.o.foldlevelstart = 99
+      vim.o.foldenable = true
+    end,
+    opts = {
+      open_fold_hl_timeout = 150,
+      close_fold_kinds_for_ft = { 'imports', 'comment' },
+      preview = {
+        win_config = {
+          border = { '', '─', '', '', '', '─', '', '' },
+          winhighlight = 'Normal:Folded',
+          winblend = 0,
+        },
+        mappings = {
+          scrollU = '<C-u>',
+          scrollD = '<C-d>',
+          jumpTop = '[',
+          jumpBot = ']',
+        },
+      },
+      provider_selector = function(_, _, _) -- bufnr, filetype, buftype
+        return { 'treesitter', 'indent' }
+      end,
+      fold_virt_text_handler = handler,
+    },
+  },
+}
--- a/config/nvim/lua/plugins/ui.lua
+++ b/config/nvim/lua/plugins/ui.lua
@@ -1,135 +1,154 @@
-- luacheck: globals vim
 return {
-  -- Neotree configuration
+  -- Theme of choice, tokyonight
+  -- https://github.com/folke/tokyonight.nvim
  {
-    "nvim-neo-tree/neo-tree.nvim",
+    'folke/tokyonight.nvim',
+    priority = 1000, -- Make sure to load this before all the other start plugins.
+    init = function()
+      vim.cmd.colorscheme 'tokyonight'
+    end,
    opts = {
-      filesystem = {
-        filtered_items = {
-          always_show = {
-            ".github",
-            ".gitignore",
-            ".editorconfig",
-            ".python-version",
-            ".nvmrc",
-            ".env",
-            ".env.example",
-          },
-        },
-      },
+      transparent = true,
+    },
+  },
+
+  -- Automatic dark mode
+  -- https://github.com/f-person/auto-dark-mode.nvim
+  {
+    'f-person/auto-dark-mode.nvim',
+    opts = {
+      update_interval = 1000,
+      set_dark_mode = function()
+        vim.api.nvim_set_option_value('background', 'dark', {})
+        vim.cmd 'colorscheme tokyonight-storm'
+      end,
+      set_light_mode = function()
+        vim.api.nvim_set_option_value('background', 'light', {})
+        vim.cmd 'colorscheme tokyonight-day'
+      end,
+    },
+  },
+
+  -- Remove all background colors to make nvim transparent
+  -- https://github.com/xiyaowong/nvim-transparent
+  { 'xiyaowong/nvim-transparent' },
+
+  -- Twilight is a Lua plugin for Neovim 0.5 that dims inactive
+  -- portions of the code you're editing using TreeSitter.
+  -- https://github.com/folke/twilight.nvim
+  {
+    'folke/twilight.nvim',
+    ft = 'markdown', -- Highlight markdown files
+  },
+
+  -- Seamless navigation between tmux panes and vim splits
+  -- https://github.com/christoomey/vim-tmux-navigator
+  {
+    'christoomey/vim-tmux-navigator',
+    lazy = false,
+    enabled = true,
+    cmd = {
+      'TmuxNavigateLeft',
+      'TmuxNavigateDown',
+      'TmuxNavigateUp',
+      'TmuxNavigateRight',
+      'TmuxNavigatePrevious',
+    },
+    keys = {
+      { '<c-h>', '<cmd><C-U>TmuxNavigateLeft<cr>' },
+      { '<c-j>', '<cmd><C-U>TmuxNavigateDown<cr>' },
+      { '<c-k>', '<cmd><C-U>TmuxNavigateUp<cr>' },
+      { '<c-l>', '<cmd><C-U>TmuxNavigateRight<cr>' },
+      { '<c-\\>', '<cmd><C-U>TmuxNavigatePrevious<cr>' },
    },
  },
  -- Cloak allows you to overlay *'s over defined patterns in defined files.
  -- https://github.com/laytan/cloak.nvim
-  { "laytan/cloak.nvim" },
-  -- Not UFO in the sky, but an ultra fold in Neovim.
-  -- https://github.com/kevinhwang91/nvim-ufo/
  {
-    "kevinhwang91/nvim-ufo",
+    'laytan/cloak.nvim',
+    enabled = true,
+    lazy = false,
+    version = '*',
+    config = function()
+      require('cloak').setup {
+        enabled = true,
+        cloak_character = '*',
+        -- The applied highlight group (colors) on the cloaking, see `:h highlight`.
+        highlight_group = 'Comment',
+        patterns = {
+          {
+            -- Match any file starting with ".env".
+            -- This can be a table to match multiple file patterns.
+            file_pattern = {
+              '.env*',
+              'wrangler.toml',
+              '.dev.vars',
+            },
+            -- Match an equals sign and any character after it.
+            -- This can also be a table of patterns to cloak,
+            -- example: cloak_pattern = { ":.+", "-.+" } for yaml files.
+            cloak_pattern = '=.+',
+          },
+        },
+      }
+    end,
+    keys = {
+      { '<leader>tc', '<cmd>CloakToggle<cr>', desc = '[tc] Toggle Cloak' },
+    },
+  },
+  -- Close buffer without messing up with the window.
+  -- https://github.com/famiu/bufdelete.nvim
+  { 'famiu/bufdelete.nvim' },
+  -- Neovim plugin for locking a buffer to a window
+  -- https://github.com/stevearc/stickybuf.nvim
+  { 'stevearc/stickybuf.nvim', opts = {} },
+  -- Describe the regexp under the cursor
+  -- https://github.com/bennypowers/nvim-regexplainer
+  {
+    'bennypowers/nvim-regexplainer',
    lazy = false,
    enabled = true,
    dependencies = {
-      "kevinhwang91/promise-async",
-      { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" },
-      {
-        "luukvbaal/statuscol.nvim",
-        config = function()
-          local builtin = require("statuscol.builtin")
-          require("statuscol").setup({
-            relculright = true,
-            segments = {
-              { text = { builtin.foldfunc }, click = "v:lua.ScFa" },
-              { text = { "%s" }, click = "v:lua.ScSa" },
-              { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
-            },
-          })
-        end,
-      },
+      'nvim-treesitter/nvim-treesitter',
+      'MunifTanjim/nui.nvim',
    },
-    init = function()
-      vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
-      vim.o.foldcolumn = "1" -- '0' is not bad
-      vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
-      vim.o.foldlevelstart = 99
-      vim.o.foldenable = true
-    end,
    opts = {
-      open_fold_hl_timeout = 150,
-      close_fold_kinds_for_ft = { "imports", "comment" },
-      preview = {
-        win_config = {
-          border = { "", "─", "", "", "", "─", "", "" },
-          winhighlight = "Normal:Folded",
-          winblend = 0,
-        },
-        mappings = {
-          scrollU = "<C-u>",
-          scrollD = "<C-d>",
-          jumpTop = "[",
-          jumpBot = "]",
-        },
-      },
-      provider_selector = function(_, _, _) -- bufnr, filetype, buftype
-        return { "treesitter", "indent" }
-      end,
-      fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
-        local newVirtText = {}
-        local suffix = (" 󰁂 %d "):format(endLnum - lnum)
-        local sufWidth = vim.fn.strdisplaywidth(suffix)
-        local targetWidth = width - sufWidth
-        local curWidth = 0
-        for _, chunk in ipairs(virtText) do
-          local chunkText = chunk[1]
-          local chunkWidth = vim.fn.strdisplaywidth(chunkText)
-          if targetWidth > curWidth + chunkWidth then
-            table.insert(newVirtText, chunk)
-          else
-            chunkText = truncate(chunkText, targetWidth - curWidth)
-            local hlGroup = chunk[2]
-            table.insert(newVirtText, { chunkText, hlGroup })
-            chunkWidth = vim.fn.strdisplaywidth(chunkText)
-            -- str width returned from truncate() may less than 2nd argument, need padding
-            if curWidth + chunkWidth < targetWidth then
-              suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
-            end
-            break
-          end
-          curWidth = curWidth + chunkWidth
-        end
-        table.insert(newVirtText, { suffix, "MoreMsg" })
-        return newVirtText
-      end,
+      -- automatically show the explainer when the cursor enters a regexp
+      auto = true,
    },
  },
-  -- Indent guides for Neovim
-  -- https://github.com/lukas-reineke/indent-blankline.nvim
-  { "lukas-reineke/indent-blankline.nvim" },
-  -- Git integration for buffers
-  -- https://github.com/lewis6991/gitsigns.nvim
-  { "lewis6991/gitsigns.nvim" },
-  -- Close buffer without messing up with the window.
-  -- https://github.com/famiu/bufdelete.nvim
-  { "famiu/bufdelete.nvim" },
-  -- Neovim plugin for locking a buffer to a window
-  -- https://github.com/stevearc/stickybuf.nvim
-  { "stevearc/stickybuf.nvim", opts = {} },
-  -- A pretty window for previewing, navigating and editing your LSP locations
-  -- https://github.com/DNLHC/glance.nvim
-  { "dnlhc/glance.nvim" },
+  -- Clarify and beautify your comments using boxes and lines.
+  -- https://github.com/LudoPinelli/comment-box.nvim
+  {
+    'LudoPinelli/comment-box.nvim',
+    opts = {},
+    init = function()
+      local wk = require 'which-key'
+
+      wk.add {
+        { '<leader>cb', group = 'CommentBox' },
+        { '<Leader>cbt', '<Cmd>CBccbox<CR>', desc = 'CommentBox: Box Title' },
+        { '<Leader>cbd', '<Cmd>CBd<CR>', desc = 'Remove a box' },
+        { '<Leader>cbl', '<Cmd>CBline<CR>', desc = 'CommentBox: Simple Line' },
+        { '<Leader>cbm', '<Cmd>CBllbox14<CR>', desc = 'CommentBox: Marked' },
+        { '<Leader>cbt', '<Cmd>CBllline<CR>', desc = 'CommentBox: Titled Line' },
+      }
+    end,
+  },
  -- Automatically expand width of the current window.
  -- Maximizes and restore it. And all this with nice animations!
  -- https://github.com/anuvyklack/windows.nvim
  {
-    "anuvyklack/windows.nvim",
+    'anuvyklack/windows.nvim',
    dependencies = {
-      "anuvyklack/middleclass",
-      "anuvyklack/animation.nvim",
+      'anuvyklack/middleclass',
+      'anuvyklack/animation.nvim',
    },
    config = function()
      vim.o.winwidth = 15
      vim.o.winminwidth = 10
      vim.o.equalalways = false
-      require("windows").setup()
+      require('windows').setup()
    end,
  },
 }
--- a/config/nvim/lua/spell/en.utf-8.add
+++ b/config/nvim/lua/spell/en.utf-8.add
@@ -0,0 +1,13 @@
+#'ve
+i/!
+i've/!
+I've
+I
+good
+#rd
+#rd/!
+#rd
+#rd
+#rd/!
+#rd
+wrd/!
--- a/config/nvim/spell/en.utf-8.add
+++ b/config/nvim/spell/en.utf-8.add
@@ -1,3 +0,0 @@
-Plugins
-lua
-plugins
--- a/config/nvim/stylua.toml
+++ b/config/nvim/stylua.toml
@@ -1,3 +0,0 @@
-indent_type = "Spaces"
-indent_width = 2
-column_width = 120
--- a/config/yamlfmt/.yamlfmt
+++ b/config/yamlfmt/.yamlfmt
@@ -0,0 +1,8 @@
+formatter:
+  type: basic
+  indent: 2
+  retain_line_breaks: false
+  disallow_anchors: false
+  max_line_length: 0
+  scan_folded_as_literal: false
+  indentless_arrays: false
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -35,10 +35,6 @@
      relink: true
      path: config/*
      exclude: [config/nvm]
-    ~/.config/nvm/default-packages:
-      create: true
-      relink: true
-      path: config/nvm/default-packages
    ~/.local/bin:
      glob: true
      path: local/bin/*
@@ -53,7 +49,7 @@
      mode: 0600
      path: ssh/*
 - shell:
-    - bash add-submodules.sh
+    - bash add-submodules.sh || true
    - git submodule update --init --recursive --force
    - bash local/bin/dfm install all
 - pipx:
--- a/local/bin/dfm
+++ b/local/bin/dfm
@@ -44,6 +44,23 @@ if ! declare -f msg_done > /dev/null; then
  }
 fi

+if ! declare -f array_diff > /dev/null; then
+  # Function to compare two arrays and return the difference
+  # Example: array_diff DIFFERENCE ARRAY1 ARRAY2
+  # $1 - variable to store the difference
+  # $2 - first array
+  # $3 - second array
+  # Output to $1 the difference between $2 and $3
+  # Source: https://stackoverflow.com/a/42399479/594940
+  array_diff()
+  {
+    eval local ARR1=\(\"\${$2[@]}\"\)
+    eval local ARR2=\(\"\${$3[@]}\"\)
+    local IFS=$'\n'
+    mapfile -t "$1" < <(comm -23 <(echo "${ARR1[*]}" | sort) <(echo "${ARR2[*]}" | sort))
+  }
+fi
+
 VERSION_NVM="v0.39.5"

 # Loads configs for better installation experience
@@ -293,6 +310,7 @@ section_brew()
    "autoupdate:Setups brew auto-update and runs it immediately"
    "leaves:List brew leaves (installed on request)"
    "clean:Clean up brew packages"
+    "untracked:List untracked brew packages"
  )

  x-have brew && {
@@ -309,11 +327,55 @@ section_brew()
        brew bundle dump \
          --force \
          --file="$BREWFILE" \
+          --cleanup \
+          --tap \
+          --formula \
+          --cask \
          --describe && msg_yay "Done!"
        ;;
      leaves)
        brew leaves --installed-on-request
        ;;
+      untracked)
+        declare -a BREW_LIST_ALL
+        while IFS= read -r line; do
+          BREW_LIST_ALL+=("$line")
+        done < <(brew list --formula --installed-on-request -1 --full-name)
+        while IFS= read -r c; do
+          BREW_LIST_ALL+=("$c")
+        done < <(brew list --cask -1 --full-name)
+
+        # Remove entries that are installed as dependencies
+        declare -a BREW_LIST_DEPENDENCIES
+        while IFS= read -r l; do
+          BREW_LIST_DEPENDENCIES+=("$l")
+        done < <(brew list -1 --installed-as-dependency)
+
+        declare -a BREW_LIST_BUNDLED
+        while IFS= read -r b; do
+          BREW_LIST_BUNDLED+=("$b")
+        done < <(brew bundle list --all --file="$BREWFILE")
+
+        declare -a BREW_LIST_TRACKED_WITHOUT_DEPS
+        for f in "${BREW_LIST_ALL[@]}"; do
+          if [[ ! " ${BREW_LIST_DEPENDENCIES[@]} " =~ " ${f} " ]]; then
+            BREW_LIST_TRACKED_WITHOUT_DEPS+=("$f")
+          fi
+        done
+
+        array_diff BREW_LIST_UNTRACKED BREW_LIST_TRACKED_WITHOUT_DEPS BREW_LIST_BUNDLED
+
+        # If there are no untracked packages, exit
+        if [ ${#BREW_LIST_UNTRACKED[@]} -eq 0 ]; then
+          msg_yay "No untracked packages found!"
+          exit 0
+        fi
+
+        echo "Untracked:"
+        for f in "${BREW_LIST_UNTRACKED[@]}"; do
+          echo "  $f"
+        done
+        ;;
      clean)
        brew bundle cleanup --file="$BREWFILE" && msg_yay "Done!"
        ;;
@@ -417,7 +479,9 @@ section_dotfiles()
      ! x-have shfmt && msg_err "shfmt not found, install with asdf"
      # Format shell scripts according to following rules.
      fd --full-path "$DOTFILES" -tx \
+        --hidden \
        -E '*.pl' -E '*.php' -E '*.py' -E '*.zsh' -E 'plugins' -E 'fzf' -E 'dotbot' \
+        -E 'test' -E '**/bin/asdf/**' -E '**/tldr/*' \
        -x shfmt \
        --language-dialect bash \
        --func-next-line --list --write \
--- a/local/bin/x-term-colors
+++ b/local/bin/x-term-colors
@@ -9,12 +9,12 @@

 setBackgroundColor()
 {
-    echo -en "\x1b[48;2;$1;$2;$3""m"
+  echo -en "\x1b[48;2;$1;$2;$3""m"
 }

 resetOutput()
 {
-    echo -en "\x1b[0m\n"
+  echo -en "\x1b[0m\n"
 }

 # Gives a color $1/255 % along HSV
@@ -24,76 +24,69 @@ resetOutput()
 # ranging between 0 and 255 inclusive
 rainbowColor()
 {
-    let h=$1/43
-    let f=$1-43*$h
-    let t=$f*255/43
-    let q=255-t
+  let h=$1/43
+  let f=$1-43*$h
+  let t=$f*255/43
+  let q=255-t

-    if [ $h -eq 0 ]
-    then
-        echo "255 $t 0"
-    elif [ $h -eq 1 ]
-    then
-        echo "$q 255 0"
-    elif [ $h -eq 2 ]
-    then
-        echo "0 255 $t"
-    elif [ $h -eq 3 ]
-    then
-        echo "0 $q 255"
-    elif [ $h -eq 4 ]
-    then
-        echo "$t 0 255"
-    elif [ $h -eq 5 ]
-    then
-        echo "255 0 $q"
-    else
-        # execution should never reach here
-        echo "0 0 0"
-    fi
+  if [ $h -eq 0 ]; then
+    echo "255 $t 0"
+  elif [ $h -eq 1 ]; then
+    echo "$q 255 0"
+  elif [ $h -eq 2 ]; then
+    echo "0 255 $t"
+  elif [ $h -eq 3 ]; then
+    echo "0 $q 255"
+  elif [ $h -eq 4 ]; then
+    echo "$t 0 255"
+  elif [ $h -eq 5 ]; then
+    echo "255 0 $q"
+  else
+    # execution should never reach here
+    echo "0 0 0"
+  fi
 }

 for i in $(seq 0 127); do
-    setBackgroundColor "$i" 0 0
-    echo -en " "
+  setBackgroundColor "$i" 0 0
+  echo -en " "
 done
 resetOutput
 for i in $(seq 255 128); do
-    setBackgroundColor "$i" 0 0
-    echo -en " "
+  setBackgroundColor "$i" 0 0
+  echo -en " "
 done
 resetOutput

 for i in $(seq 0 127); do
-    setBackgroundColor 0 "$i" 0
-    echo -n " "
+  setBackgroundColor 0 "$i" 0
+  echo -n " "
 done
 resetOutput
 for i in $(seq 255 128); do
-    setBackgroundColor 0 "$i" 0
-    echo -n " "
+  setBackgroundColor 0 "$i" 0
+  echo -n " "
 done
 resetOutput

 for i in $(seq 0 127); do
-    setBackgroundColor 0 0 "$i"
-    echo -n " "
+  setBackgroundColor 0 0 "$i"
+  echo -n " "
 done
 resetOutput
 for i in $(seq 255 128); do
-    setBackgroundColor 0 0 "$i"
-    echo -n " "
+  setBackgroundColor 0 0 "$i"
+  echo -n " "
 done
 resetOutput

 for i in $(seq 0 127); do
-    setBackgroundColor $(rainbowColor "$i")
-    echo -n " "
+  setBackgroundColor $(rainbowColor "$i")
+  echo -n " "
 done
 resetOutput
 for i in $(seq 255 128); do
-    setBackgroundColor $(rainbowColor "$i")
-    echo -n " "
+  setBackgroundColor $(rainbowColor "$i")
+  echo -n " "
 done
 resetOutput
-
--- a/secrets/.gitkeep
+++ b/secrets/.gitkeep
Author	SHA1	Message	Date
Ismo Vuorinen	093f58f129	feat: removed nvim-lazy, nvim-kickstart	2024-09-22 04:31:44 +03:00
Ismo Vuorinen	9b6e39b4af	feat(nvim): plugins, cleanup, ign lazy-lock.json	2024-09-22 04:26:02 +03:00
Ismo Vuorinen	6f1e1a0416	feat(nvim): new nvim config (#28 ) * feat(nvim): clean config, work in progress * feat: refactored plugins and configs * feat: stylua config, ufo, lsp refactor, cleanup * feat: renamed nvim to nvim-lazy, added alias * feat: renamed nvim-clean to be nvim, updated alias	2024-09-22 03:52:02 +03:00
Ismo Vuorinen	36e0f36e06	chore: move to .tool-versions	2024-09-19 17:02:14 +03:00
Ismo Vuorinen	e2c37d29e8	chore: more cleanup, linting and fixes	2024-09-19 12:40:16 +03:00
Ismo Vuorinen	78716fa8ce	feat(config): few handy date aliases	2024-09-19 09:49:59 +03:00
Ismo Vuorinen	81e9b20eb6	chore(config): cleanup and removal of duplicates	2024-09-19 09:49:35 +03:00