chore(nvim): tweaks and fixes

* feat(nvim): reworked cmp, lsp and bunch of stuff

* chore: del disabled plugins, do coderabbit fixes

* chore: tweak settings, remove duplication

* chore: next round of refactoring

* feat: replaced lualine w/ mini.statusline, tweaks

* chore: cleanup, options and keymap stuff

.editorconfig

@@ -8,6 +8,9 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.md]
+max_line_length = 100
+
 [*.php]
 indent_size = 4
 

.github/README.md

@@ -6,10 +6,10 @@ aware of yet. As I find more interesting tools, configs and other stuff,
 this repository will live accordingly.
 
 Please for the love of everything good do not use these 1:1 as your own dotfiles,
-fork or download the repo as a zip and go from there with your own configs.
+fork or download the repository as a zip and go from there with your own configs.
 
 It would be nice if you'd add an issue linking to your fork or repo so I can
-see what interesing stuff you've done with it. Sharing is caring.
+see what interesting stuff you've done with it. Sharing is caring.
 
 ## Setup
 
@@ -28,9 +28,9 @@ see what interesing stuff you've done with it. Sharing is caring.
 
 ![screenshot of the oh-my-posh shell](./screenshots/oh-my-posh.png)
 
-![screenshot of light version of tmux with nvim editing this repo](./screenshots/tmux-nvim-kickstart-light.png)
+![screenshot of light version of tmux with nvim editing this repository](./screenshots/tmux-nvim-kickstart-light.png)
 
-![screenshot of dark version of tmux with nvim editing this repo](./screenshots/tmux-nvim-kickstart-dark.png)
+![screenshot of dark version of tmux with nvim editing this repository](./screenshots/tmux-nvim-kickstart-dark.png)
 
 ## Interesting files and locations
 
@@ -52,7 +52,7 @@ see what interesing stuff you've done with it. Sharing is caring.
 | `local/`  | `.local/`   | XDG Base folder: `bin`, `share` and `state` |
 | `ssh/`    | `.ssh/`     | SSH Configurations.                         |
 
-### dfm - the dotfiles manager
+### `dfm` - the dotfiles manager
 
 [`.local/bin/dfm`][dfm] is a shell script that has some tools that help with dotfiles management.
 

.github/workflows/pre-commit-autoupdate.yml

@@ -12,7 +12,7 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5.2.0
+      - uses: actions/setup-python@v5.3.0
       - run: pip install pre-commit && pre-commit autoupdate
       - uses: peter-evans/create-pull-request@v7
         with:

.gitignore

@@ -28,4 +28,5 @@ config/gnupg/s
 config/gnupg/private-keys-v1.d
 config/nvim/spell/*
 !config/nvim/spell/.gitkeep
+antidote_plugins.zsh
 

.gitmodules

@@ -23,10 +23,6 @@
 	path = config/tmux/plugins/tmux-continuum
 	url = https://github.com/tmux-plugins/tmux-continuum
 	ignore = dirty
-[submodule "tmux/tmux-resurrect"]
-	path = config/tmux/plugins/tmux-resurrect
-	url = https://github.com/tmux-plugins/tmux-resurrect
-	ignore = dirty
 [submodule "tmux/tmux-sensible"]
 	path = config/tmux/plugins/tmux-sensible
 	url = https://github.com/tmux-plugins/tmux-sensible.git
@@ -64,3 +60,7 @@
 [submodule "asdf"]
 	path = local/bin/asdf
 	url = https://github.com/asdf-vm/asdf.git
+[submodule "antidote"]
+	path = tools/antidote
+	url = https://github.com/mattmc3/antidote.git
+	shallow = true

.ignore

@@ -1,6 +1,7 @@
 .git/**
 config/cheat/cheatsheets/community/**
-tools/dotbot/**
+node_modules
+tools/antidote/**
 tools/dotbot-brew/**
 tools/dotbot-include/**
-node_modules
+tools/dotbot/**

.nvmrc

@@ -0,0 +1 @@
+22.12.0

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
@@ -19,7 +19,7 @@ repos:
         args: [--autofix, --no-sort-keys]
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.43.0
     hooks:
       - id: markdownlint
         args: [-c, .markdownlint.yaml, --fix]
@@ -40,11 +40,11 @@ repos:
       - id: shellcheck
 
   - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.9.0-1
+    rev: v3.10.0-2
     hooks:
       - id: shfmt
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.3
+    rev: v1.7.4
     hooks:
       - id: actionlint

.python-version

@@ -0,0 +1 @@
+3.13.1

.tool-versions

@@ -1,2 +0,0 @@
-python 3.12.7
-nodejs 22.9.0

add-submodules.sh

@@ -17,14 +17,16 @@ git submodule add --name cheat-tldr \
   -f https://github.com/ivuorinen/cheatsheet-tldr.git config/cheat/cheatsheets/tldr
 git submodule add --name asdf \
   -f https://github.com/asdf-vm/asdf.git local/bin/asdf
+git submodule add --name antidote \
+  --depth 1 \
+  -f https://github.com/mattmc3/antidote.git tools/antidote \
+
 
 # tmux plugin manager and plugins
 git submodule add --name tmux/tmux-continuum \
   -f https://github.com/tmux-plugins/tmux-continuum config/tmux/plugins/tmux-continuum
 git submodule add --name tmux/tmux-mode-indicator \
   -f https://github.com/MunifTanjim/tmux-mode-indicator.git config/tmux/plugins/tmux-mode-indicator
-git submodule add --name tmux/tmux-resurrect \
-  -f https://github.com/tmux-plugins/tmux-resurrect config/tmux/plugins/tmux-resurrect
 git submodule add --name tmux/tmux-sensible \
   -f https://github.com/tmux-plugins/tmux-sensible.git config/tmux/plugins/tmux-sensible
 git submodule add --name tmux/tmux-sessionist \
@@ -45,10 +47,14 @@ for MODULE in $(git config --file .gitmodules --get-regexp path | awk '{ print $
   git config "submodule.${MODULE}.ignore" all
 done
 
+# Mark certain repositories shallow
+git config -f .gitmodules submodule.antidote.shallow true
+
 # remove old submodules
 [ -d "config/tmux/plugins/tpm" ] && rm -rf config/tmux/plugins/tpm
 [ -d "config/tmux/plugins/tmux" ] && rm -rf config/tmux/plugins/tmux
 [ -d "config/tmux/plugins/tmux-menus" ] && rm -rf config/tmux/plugins/tmux-menus
+[ -d "config/tmux/plugins/tmux-resurrect" ] && rm -rf config/tmux/plugins/tmux-resurrect
 [ -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

base/bashrc

@@ -14,10 +14,10 @@ source "$DOTFILES/config/shared.sh"
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null
 
-x-have oh-my-posh && {
-  eval "$(oh-my-posh init bash --config "$DOTFILES/config/omp/own.toml")"
-}
-
 x-have antidot && {
   eval "$(antidot init)"
 }
+
+PROMPT_DIRTRIM=3
+PROMPT_COMMAND='PS1_CMD1=$(git branch --show-current 2>/dev/null)'
+PS1='\[\e[95m\]\u\[\e[0m\]@\[\e[38;5;22;2m\]\h\[\e[0m\] \[\e[38;5;33m\]\w\[\e[0m\] \[\e[92;2m\]${PS1_CMD1}\n\[\e[39m\]➜\[\e[0m\] '

base/envrc

@@ -1 +1,2 @@
+use node
 use asdf

base/nvmrc

@@ -0,0 +1 @@
+lts/*

base/tool-versions

@@ -1,30 +1,27 @@
 asdf-plugin-manager 1.4.0
-nodejs 22.9.0
-golang 1.23.2
-python 3.12.7
+golang 1.23.3
 ruby 3.3.4
-rust 1.81.0
-direnv 2.34.0
+rust 1.82.0
+direnv 2.35.0
 fd 10.2.0
-1password-cli 2.30.0
+1password-cli 2.30.3
 age 1.2.0
 bottom 0.10.2
 dotenv-linter 3.3.0
 editorconfig-checker 2.8.0
-github-cli 2.58.0
+github-cli 2.61.0
 hadolint 2.12.0
-kubectl 1.31.1
-pipx 1.7.1
-pre-commit 3.8.0
+kubectl 1.31.2
+pre-commit 4.0.1
 ripgrep 14.1.1
 shellcheck 0.10.0
-shfmt 3.9.0
-terragrunt 0.67.15
-tf-summarize 0.3.11
+shfmt 3.10.0
+terragrunt 0.68.8
+tf-summarize 0.3.13
 yamllint 1.35.1
 yq 4.44.3
 bats 1.11.0
 gitleaks 8.18.4
 delta 0.18.1
-sops 3.9.0
-eza system
+eza 0.20.8
+sops 3.9.1

base/zshrc

@@ -1,8 +1,10 @@
 # this is my zsh config. there are many like it, but this one is mine.
+# https://zsh.sourceforge.io/Intro/intro_3.html
 # shellcheck shell=bash
 
 # export VERBOSE=1
 # export DEBUG=1
+autoload -U promptinit; promptinit
 
 export DOTFILES="$HOME/.dotfiles"
 LOCAL_SHARE="$HOME/.local/share"
@@ -10,56 +12,12 @@ export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$LOCAL_SHARE/nvim/mason/bin:$L
 export SHARED_SCRIPTS_SOURCED=0
 
 source "$DOTFILES/config/shared.sh"
+source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc"
 
-eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
+ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 
-# Function to load antigen if available
-load_antigen()
-{
-  local antigen_zsh_path="$XDG_BIN_HOME/antigen.zsh"
-  # shellcheck source=../../.local/bin/antigen.zsh
-  if [[ -f "$antigen_zsh_path" ]]; then
-    source "$antigen_zsh_path"
-
-    antigen use oh-my-zsh
-
-    # Disable ls colors to avoid issues with eza
-    export DISABLE_LS_COLORS=true
-
-    export ZSH_TMUX_AUTOSTART=false
-    export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
-    export ZSH_TMUX_UNICODE=true
-    export ZSH_TMUX_AUTOQUIT=false
-    export ZSH_TMUX_DEFAULT_SESSION_NAME=main
-
-    zstyle ':omz:plugins:eza' 'dirs-first' yes
-    zstyle ':omz:plugins:eza' 'git-status' yes
-    zstyle ':omz:plugins:eza' 'icons' yes
-    zstyle ':omz:plugins:eza' 'ls' yes
-    zstyle ':omz:plugins:eza' 'prompt' yes
-
-    if [[ "$OSTYPE" == darwin* ]]; then
-      zstyle :omz:plugins:ssh-agent keychain yes
-    fi
-    zstyle :omz:plugins:ssh-agent lazy yes
-    zstyle :omz:plugins:ssh-agent quiet yes
-
-    # z, the zsh version
-    export ZSHZ_DATA="$XDG_STATE_HOME/z"
-    antigen bundle z
-
-    # these should be always available
-    antigen bundle jreese/zsh-titles
-    antigen bundle brew
-    antigen bundle colored-man-pages
-    antigen bundle zsh-users/zsh-completions
-    antigen bundle eza
-
-    # this needs to be the last item
-    antigen bundle zsh-users/zsh-syntax-highlighting
-    antigen apply
-  fi
-}
+source "$DOTFILES/config/zsh/antidote.zsh"
+# source "$DOTFILES/config/zsh/prompt.zsh"
 
 # Function to source FZF configuration
 source_fzf_config()
@@ -75,7 +33,7 @@ source_fzf_config()
 setup_tmux_window_name_plugin()
 {
   if [[ -n "$TMUX" ]]; then
-    local tmux_window_name_plugin="$DOTFILES/config/tmux/plugins/tmux-window-name/scripts/rename_session_windows.py"
+    local tmux_window_name_plugin="$TMUX_PLUGINS/tmux-window-name/scripts/rename_session_windows.py"
     if [[ -f "$tmux_window_name_plugin" ]]; then
       tmux_window_name()
       {
@@ -87,15 +45,10 @@ setup_tmux_window_name_plugin()
   fi
 }
 
-main()
-{
-  load_antigen
-  source_fzf_config
-  setup_tmux_window_name_plugin
-  if x-have antidot; then
-    eval "$(antidot init)"
-  fi
-  source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc"
-}
+source_fzf_config
+setup_tmux_window_name_plugin
+x-have antidot && eval "$(antidot init)"
 
-main "$@"
+autoload -Uz compinit bashcompinit
+compinit -d $ZSH_COMPDUMP
+bashcompinit

config/asdf/cargo-packages

@@ -21,3 +21,5 @@ bob-nvim
 bottom
 // A modern alternative to ls
 eza
+// Tmux Sessionizer: A tool for opening git repositories as tmux sessions
+tmux-sessionizer

config/asdf/plugin-versions

@@ -1,28 +1,27 @@
 1password-cli         https://github.com/NeoHsu/asdf-1password-cli.git            f5d5aab
 age                   https://github.com/threkk/asdf-age.git                      396bdf6
-asdf-plugin-manager   https://github.com/asdf-community/asdf-plugin-manager.git   0ef4f9e
+asdf-plugin-manager   https://github.com/asdf-community/asdf-plugin-manager.git   b5862c1
 bats                  https://github.com/timgluz/asdf-bats.git                    299551f
 bottom                https://github.com/carbonteq/asdf-btm.git                   fd8a55a
 delta                 https://github.com/andweeb/asdf-delta.git                   501318b
 direnv                https://github.com/asdf-community/asdf-direnv.git           6ff3dbe
 dotenv-linter         https://github.com/wesleimp/asdf-dotenv-linter.git          1369f53
 editorconfig-checker  https://github.com/gabitchov/asdf-editorconfig-checker.git  585c1d5
+eza                   https://github.com/lwiechec/asdf-eza.git                    11f578d
 fd                    https://gitlab.com/wt0f/asdf-fd.git                         17d56e0
 github-cli            https://github.com/bartlomiejdanek/asdf-github-cli.git      e0605b7
 gitleaks              https://github.com/jmcvetta/asdf-gitleaks.git               0cc0d7e
-golang                https://github.com/asdf-community/asdf-golang.git           d4f1d65
+golang                https://github.com/asdf-community/asdf-golang.git           e2527a3
 hadolint              https://github.com/devlincashman/asdf-hadolint.git          335e230
 kubectl               https://github.com/asdf-community/asdf-kubectl.git          2fb3b57
-nodejs                https://github.com/asdf-vm/asdf-nodejs.git                  c36e6f0
-pipx                  https://github.com/yozachar/asdf-pipx.git                   31db618
 pre-commit            https://github.com/jonathanmorley/asdf-pre-commit.git       26bfc42
-python                https://github.com/asdf-community/asdf-python               a3a0185
 ripgrep               https://gitlab.com/wt0f/asdf-ripgrep.git                    e836665
-ruby                  https://github.com/asdf-vm/asdf-ruby.git                    96334db
+ruby                  https://github.com/asdf-vm/asdf-ruby.git                    194fe45
 rust                  https://github.com/code-lever/asdf-rust.git                 95acf4f
 shellcheck            https://github.com/luizm/asdf-shellcheck.git                66200ff
 shfmt                 https://github.com/luizm/asdf-shfmt.git                     a42c5ff
+sops                  https://github.com/feniix/asdf-sops.git                     5c7a2fb
 terragrunt            https://github.com/ohmer/asdf-terragrunt.git                4a6651a
 tf-summarize          https://github.com/adamcrews/asdf-tf-summarize.git          880ad26
-yamllint              https://github.com/ericcornelissen/asdf-yamllint.git        38e3870
+yamllint              https://github.com/ericcornelissen/asdf-yamllint.git        bc2813e
 yq                    https://github.com/sudermanjr/asdf-yq.git                   772992f

config/asdf/python-packages

@@ -1,4 +1,4 @@
 ansible
 pipenv
-semgrep
 neovim
+libtmux

config/direnv/direnv.toml

@@ -1,11 +1,11 @@
 [global]
-disable_stdin = true
+disable_stdin = false
 load_dotenv = true
-hide_env_diff = true
+hide_env_diff = false
 
 [whitelist]
 prefix = [
-  "~/Code/ivuorinen/"
+  "~/Code/"
 ]
 exact = [
   "~/.dotfiles/.envrc"

config/exports

@@ -14,30 +14,20 @@
 # if DOTFILES is not set, set it to the default location
 [ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles"
 
+# zsh completions directory
+[ -z "$ZSH_COMPLETIONS" ] && export ZSH_COMPLETIONS="$XDG_CONFIG_HOME/zsh/completion"
+
 export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
 
-# Load bash completions if available for zsh
-if [[ -n "$ZSH_VERSION" ]]; then
-  autoload bashcompinit
-  bashcompinit
-fi
-
-# Load asdf
-export ASDF_DIR="$XDG_BIN_HOME/asdf"
-if [[ -d $ASDF_DIR ]]; then
-  [[ -d $ASDF_DIR/bin ]] && x-path-prepend "$ASDF_DIR/bin"
-  [[ -d $ASDF_DIR/shims ]] && x-path-prepend "$ASDF_DIR/shims"
-  [[ -d $ASDF_DIR/completions ]] && fpath=("$ASDF_DIR/completions" $fpath)
-  [[ -d $ASDF_DIR/plugins ]] && fpath=("$ASDF_DIR/plugins" $fpath)
-  source "$ASDF_DIR/asdf.sh"
-fi
+# Add zsh completions to FPATH, compinit will be called later
+FPATH="$ZSH_COMPLETIONS:$FPATH"
 
 if ! command -v msg &> /dev/null; then
   # Function to print messages if VERBOSE is enabled
   # $1 - message (string)
   msg()
   {
-    [[ "$VERBOSE" -eq 1 ]] && echo "-> $1"
+    [[ $VERBOSE -eq 1 ]] && msgr msg "-> $1"
     return 0
   }
 fi
@@ -53,7 +43,7 @@ else
   # Optionally write a msg to stderr suggesting users install bkt.
   bkt()
   {
-    while [[ "$1" == --* ]]; do shift; done
+    while [[ $1 == --* ]]; do shift; done
     "$@"
   }
 fi
@@ -125,7 +115,7 @@ preexec()
 dfu()
 {
   (
-    cd "$DOTFILES" && git pull --ff-only && ./install
+    cd "$DOTFILES" && git rebase --ff --autostash && ./install
   )
 }
 
@@ -192,6 +182,7 @@ nonascii()
 # Usage: strip_nonascii "string"
 strip_nonascii()
 {
+  # shellcheck disable=SC2001
   echo "$1" | LC_ALL=C sed 's/[^[:print:][:space:]]//g'
 }
 
@@ -199,7 +190,7 @@ strip_nonascii()
 # Usage: slugify "string"
 slugify()
 {
-  echo "$1" | iconv -t ascii//TRANSLIT | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | tr A-Z a-z
+  echo "$1" | iconv -t ascii//TRANSLIT | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | tr '[:upper:]' '[:lower:]'
 }
 
 # https://stackoverflow.com/a/85932
@@ -233,33 +224,33 @@ replacable()
   FILE1="$1"
   FILE2="$2"
 
-  [[ ! -r "$FILE1" ]] && {
-    [[ $VERBOSE -eq 1 ]] && msg_err "File 1 ($FILE1) does not exist"
+  [[ ! -r $FILE1 ]] && {
+    [[ $VERBOSE -eq 1 ]] && msgr err "File 1 ($FILE1) does not exist"
     return 0
   }
-  [[ ! -r "$FILE2" ]] && {
-    [[ $VERBOSE -eq 1 ]] && msg_err "File 2 ($FILE2) does not exist, replaceable"
+  [[ ! -r $FILE2 ]] && {
+    [[ $VERBOSE -eq 1 ]] && msgr err "File 2 ($FILE2) does not exist, replaceable"
     return 1
   }
 
   FILE1_HASH=$(get_sha256sum "$FILE1")
   FILE2_HASH=$(get_sha256sum "$FILE2")
 
-  [[ $FILE1_HASH = "" ]] && {
-    [[ $VERBOSE -eq 1 ]] && msg_err "Could not get hash for file 1 ($FILE1)"
+  [[ $FILE1_HASH == "" ]] && {
+    [[ $VERBOSE -eq 1 ]] && msgr err "Could not get hash for file 1 ($FILE1)"
     return 0
   }
-  [[ $FILE2_HASH = "" ]] && {
-    [[ $VERBOSE -eq 1 ]] && msg_err "Could not get hash for file 2 ($FILE2), replaceable"
+  [[ $FILE2_HASH == "" ]] && {
+    [[ $VERBOSE -eq 1 ]] && msgr err "Could not get hash for file 2 ($FILE2), replaceable"
     return 1
   }
 
-  [[ "$FILE1_HASH" == "$FILE2_HASH" ]] && {
-    [[ $VERBOSE -eq 1 ]] && msg_ok "Files match, not replaceable: $FILE1"
+  [[ $FILE1_HASH == "$FILE2_HASH" ]] && {
+    [[ $VERBOSE -eq 1 ]] && msgr ok "Files match, not replaceable: $FILE1"
     return 0
   }
 
-  [[ $VERBOSE -eq 1 ]] && msg_warn "Files do not match ($FILE1_HASH != $FILE2_HASH), replaceable"
+  [[ $VERBOSE -eq 1 ]] && msgr warn "Files do not match ($FILE1_HASH != $FILE2_HASH), replaceable"
 
   return 1
 }
@@ -303,8 +294,45 @@ export GREP_OPTIONS="--color=auto"
 # update the values of LINES and COLUMNS.
 hash shopt 2> /dev/null && shopt -s checkwinsize
 
+# shellcheck disable=SC2155
 export SHORT_HOST=$(hostname -s)
 
+# asdf
+# https://github.com/asdf-vm/asdf
+msg "Setting up asdf configuration"
+export ASDF_DIR="${XDG_BIN_HOME}/asdf"
+if [[ -d $ASDF_DIR ]]; then
+  [[ -d $ASDF_DIR/completions ]] && FPATH="$ASDF_DIR/completions:$FPATH"
+  [[ -d $ASDF_DIR/plugins ]] && FPATH="$ASDF_DIR/plugins:$FPATH"
+
+  export ASDF_CONFIG_FILE="${XDG_CONFIG_HOME}/asdf/asdfrc"
+  export ASDF_DATA_DIR="${ASDF_DIR}"
+  export ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME="${XDG_CONFIG_HOME}/asdf/plugin-versions"
+  export ASDF_LOG_FILE="${XDG_CACHE_HOME}/asdf/asdf.log"
+  export ASDF_FORCE_PREPEND=yes
+  ## Default package files
+  export ASDF_CRATE_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/cargo-packages"
+  export ASDF_GEM_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/gem-packages"
+  export ASDF_GOLANG_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/golang-packages"
+  export ASDF_NPM_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/npm-packages"
+  export ASDF_PYTHON_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/python-packages"
+  ## Plugin configuration
+  export ASDF_DIRENV_IGNORE_MISSING_PLUGINS=1
+  export ASDF_GOLANG_MOD_VERSION_ENABLED=true
+  export ASDF_NODEJS_LEGACY_FILE_DYNAMIC_STRATEGY="latest_available"
+  ## Add asdf to path
+  export PATH="${ASDF_DIR}/bin:${PATH}"
+
+  source "$ASDF_DIR/asdf.sh"
+fi
+
+# Antidote configuration
+# https://getantidote.github.io/
+msg "Setting up Antidote configuration"
+export ANTIDOTE_DIR="$DOTFILES/tools/antidote"
+export ANTIDOTE_HOME="$XDG_CACHE_HOME/antidote"
+export ANTIDOTE_PLUGINS="$XDG_CONFIG_HOME/zsh/antidote_plugins"
+
 # Antigen configuration
 # https://github.com/zsh-users/antigen/wiki/Configuration
 msg "Setting up Antigen configuration"
@@ -322,28 +350,6 @@ export ANSIBLE_GALAXY_CACHE_DIR="$XDG_CACHE_HOME/ansible/galaxy_cache"
 x-dc "$ANSIBLE_HOME"
 x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
 
-# asdf
-# https://github.com/asdf-vm/asdf
-msg "Setting up asdf configuration"
-export ASDF_DIR="${XDG_BIN_HOME}/asdf"
-export ASDF_CONFIG_FILE="${XDG_CONFIG_HOME}/asdf/asdfrc"
-export ASDF_DATA_DIR="${ASDF_DIR}"
-export ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME="${XDG_CONFIG_HOME}/asdf/plugin-versions"
-export ASDF_LOG_FILE="${XDG_CACHE_HOME}/asdf/asdf.log"
-export ASDF_FORCE_PREPEND=yes
-## Default package files
-export ASDF_CRATE_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/cargo-packages"
-export ASDF_GEM_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/gem-packages"
-export ASDF_GOLANG_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/golang-packages"
-export ASDF_NPM_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/npm-packages"
-export ASDF_PYTHON_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/python-packages"
-## Plugin configuration
-export ASDF_DIRENV_IGNORE_MISSING_PLUGINS=1
-export ASDF_GOLANG_MOD_VERSION_ENABLED=true
-export ASDF_NODEJS_LEGACY_FILE_DYNAMIC_STRATEGY="latest_available"
-## Add asdf to path
-export PATH="${ASDF_DIR}/bin:${PATH}"
-
 # aws
 # https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html
 # https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html
@@ -400,6 +406,10 @@ x-dc "$DOCKER_CONFIG"
 # Docker: Disable snyk ad
 export DOCKER_SCAN_SUGGEST=false
 
+# fzf
+export FZF_BASE="${XDG_CONFIG_HOME}/fzf"
+export FZF_DEFAULT_OPTS='--height 40% --tmux bottom,40% --layout reverse --border top'
+
 # GnuPG
 # https://gnupg.org/documentation/manuals/gnupg/Invoking-GPG.html
 msg "Setting up GnuPG configuration"
@@ -411,6 +421,9 @@ msg "Setting up Go configuration"
 export GOPATH="$XDG_DATA_HOME/go"
 export GOBIN="$XDG_BIN_HOME"
 
+# Lando
+export PATH="$HOME/.lando/bin${PATH+:$PATH}" #landopath
+
 # NPM: Add npm packages to path
 msg "Setting up NPM configuration"
 x-have node && {
@@ -435,6 +448,8 @@ 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"
+[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+x-have pyenv && eval "$(pyenv init -)"
 
 # Rust / cargo
 msg "Setting up Rust/Cargo configuration"
@@ -461,7 +476,17 @@ export TF_PLUGIN_CACHE_DIR="$XDG_CACHE_HOME/terraform/plugin-cache"
 # tmux
 # https://tmux.github.io/
 msg "Setting up tmux configuration"
+export TMUX_PLUGINS="$XDG_CONFIG_HOME/tmux/plugins"
 export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
+## These settings are for zsh-tmux
+export ZSH_TMUX_AUTOSTART=false
+export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
+export ZSH_TMUX_UNICODE=true
+export ZSH_TMUX_AUTOQUIT=false
+export ZSH_TMUX_DEFAULT_SESSION_NAME=main
+
+# tms, https://github.com/jrmoulton/tmux-sessionizer
+export TMS_CONFIG_FILE="${XDG_CONFIG_HOME}/tms/config.toml"
 
 # wakatime, https://github.com/wakatime/wakatime-cli
 msg "Setting up Wakatime configuration"
@@ -470,6 +495,7 @@ x-dc "$WAKATIME_HOME"
 
 # Misc
 msg "Setting up miscellaneous configuration"
+export ZSHZ_DATA="$XDG_STATE_HOME/z"
 export CHEAT_USE_FZF=true
 export SQLITE_HISTORY="${XDG_CACHE_HOME}/sqlite_history"
 
@@ -479,6 +505,7 @@ X_EXPORTS_FILES=(
   "$HOME/.config/exports-$(hostname)-secret"
 )
 for exportFile in "${X_EXPORTS_FILES[@]}"; do
+  # shellcheck source=$HOME/.config/exports-secret
   [ -f "$exportFile" ] && source "$exportFile" && msg "Sourced $exportFile"
 done
 unset X_EXPORTS_FILES

config/git/gitignore

@@ -20,3 +20,4 @@ auth.json
 dfm.sh
 .scannerwork
 .phpactor.json
+.zsh_history

config/homebrew/Brewfile

@@ -53,6 +53,10 @@ brew "aspell"
 brew "autoconf"
 # Collection of over 500 reusable autoconf macros
 brew "autoconf-archive"
+# Cryptographic recipes and primitives for Python
+brew "cryptography"
+# Official Amazon AWS command-line interface
+brew "awscli"
 # Bourne-Again SHell, a UNIX command interpreter
 brew "bash"
 # GNU multiple precision arithmetic library
@@ -71,8 +75,6 @@ brew "gettext"
 brew "glib"
 # 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
@@ -85,6 +87,12 @@ brew "freetds"
 brew "gd"
 # GitHub command-line tool
 brew "gh"
+# OpenType text shaping engine
+brew "harfbuzz"
+# Secure hashing function
+brew "libb2"
+# Framework for layout and rendering of i18n text
+brew "pango"
 # Distributed revision control system
 brew "git"
 # Render markdown on the CLI
@@ -97,12 +105,6 @@ brew "gnutls"
 brew "gnupg"
 # Image manipulation
 brew "netpbm"
-# C/C++ and Java libraries for Unicode and globalization
-brew "icu4c"
-# OpenType text shaping engine
-brew "harfbuzz"
-# Framework for layout and rendering of i18n text
-brew "pango"
 # Library to render SVG files using Cairo
 brew "librsvg"
 # Graph visualization software from AT&T and Bell Labs
@@ -127,8 +129,6 @@ brew "json-c"
 brew "krb5"
 # Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
 brew "legitify"
-# Secure hashing function
-brew "libb2"
 # Postgres C API library
 brew "libpq"
 # Multi-platform support library with a focus on asynchronous I/O
@@ -143,10 +143,14 @@ brew "m-cli"
 brew "nginx"
 # Port scanning utility for large networks
 brew "nmap"
+# Libraries for security-enabled client and server applications
+brew "nss"
 # Open source suite of directory software
 brew "openldap"
 # General-purpose scripting language
 brew "php"
+# General-purpose scripting language
+brew "php@8.2"
 # Manage compile and link flags for libraries
 brew "pkg-config"
 # Send macOS User Notifications from the command-line
@@ -204,6 +208,8 @@ 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

config/nvim/.editorconfig

@@ -15,3 +15,6 @@ trim_trailing_whitespace = true
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
+
+[*.json]
+max_line_length = off

config/nvim/init.lua

@@ -5,7 +5,7 @@
 -- ── Install lazylazy ────────────────────────────────────────────────
 -- https://github.com/folke/lazy.nvim
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
+if not vim.loop.fs_stat(lazypath) then
   local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
   local out = vim.fn.system {
     'git',
@@ -58,4 +58,6 @@ require('lazy').setup(
   }
 )
 
+require 'keymaps'
+
 -- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/autogroups.lua

@@ -5,7 +5,7 @@
 local augroup = vim.api.nvim_create_augroup -- Create/get autocommand group
 local autocmd = vim.api.nvim_create_autocmd -- Create autocommand
 
--- ── Highlight on yank ───────────────────────────────────────────────
+-- Highlight on yank
 -- See `:help vim.highlight.on_yank()`
 autocmd('TextYankPost', {
   callback = function() vim.highlight.on_yank() end,
@@ -13,7 +13,21 @@ autocmd('TextYankPost', {
   pattern = '*',
 })
 
--- ── Windows to close with "q" ───────────────────────────────────────
+-- Set the numberwidth to the maximum line number.
+--
+-- This fixes the issue where the line numbers jump
+-- around when moving between lines relative line numbers enabled.
+autocmd({ "BufEnter", "BufWinEnter", "TabEnter" }, {
+  callback = function()
+    local max_line_count = vim.fn.line("$")
+    -- Only adjust if the file is large enough to matter
+    if max_line_count > 99 then
+      vim.opt.numberwidth = #tostring(max_line_count) + 1
+    end
+  end,
+})
+
+-- Windows to close with "q"
 autocmd('FileType', {
   group = augroup('close_with_q', { clear = true }),
   pattern = {
@@ -44,11 +58,46 @@ autocmd('FileType', {
   end,
 })
 
--- ── make it easier to close man-files when opened inline ────────────
+-- make it easier to close man-files when opened inline
 autocmd('FileType', {
   group = augroup('man_unlisted', { clear = true }),
   pattern = { 'man' },
   callback = function(event) vim.bo[event.buf].buflisted = false end,
 })
 
+-- wrap and check for spell in text filetypes
+autocmd('FileType', {
+  group = augroup('wrap_spell', { clear = true }),
+  pattern = { 'text', 'plaintex', 'typst', 'gitcommit', 'markdown', 'asciidoc', 'rst', 'tex' },
+  callback = function()
+    vim.opt_local.wrap = true
+    vim.opt_local.spell = true
+  end,
+})
+
+-- Fix conceallevel for json files
+autocmd({ 'FileType' }, {
+  group = augroup('json_conceal', { clear = true }),
+  pattern = { 'json', 'jsonc', 'json5' },
+  callback = function() vim.opt_local.conceallevel = 0 end,
+})
+
+-- Set filetype for SSH config directory
+autocmd({ 'BufRead', 'BufNewFile' }, {
+  desc = 'Set filetype for SSH config directory',
+  pattern = { '*/?.ssh/{config|shared}.d/*', '*/?.ssh/config.local', '*/?.ssh/config.work' },
+  command = 'set filetype=sshconfig',
+})
+
+-- Format on save, unless disabled
+autocmd('BufWritePre', {
+  group = augroup('Format', { clear = true }),
+  pattern = '*', -- All files
+  callback = function()
+    if not vim.g.disable_autoformat then
+      vim.lsp.buf.format({ async = false })
+    end
+  end,
+})
+
 -- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/keymaps.lua

@@ -0,0 +1,218 @@
+-- ╭─────────────────────────────────────────────────────────╮
+-- │            Function shortcuts for keymap set            │
+-- ╰─────────────────────────────────────────────────────────╯
+-- vim: set ft=lua ts=2 sw=2 tw=0 et cc=80 :
+
+-- Keymap set shortcut
+--@type vim.keymap.set
+local s = vim.keymap.set
+
+-- Handle description
+---@param desc string|table? Optional description. Can be a string or a table.
+---@return table -- The description as a table.
+local function handleDesc(desc)
+  if type(desc) == "string" then
+    -- Convert string to table with `desc` as a key
+    -- If the string is empty, just return as an empty description
+    return { desc = desc }
+  elseif type(desc) == "table" then
+    -- If desc doesn't have 'desc' key, combine it with
+    -- others with empty description
+    if not desc.desc then
+      desc.desc = ''
+      return desc
+    end
+    -- Use the table as is
+    return desc
+  else
+    -- Default to an empty table if `desc` is nil or an unsupported type
+    return { desc = '' }
+  end
+end
+
+-- Normal mode keymaps
+---@param key string rhs, required
+---@param cmd string|function lhs, required
+---@param opts table? Options, optional
+local n = function(key, cmd, opts) s('n', key, cmd, opts) end
+
+-- Leader keymap shortcut function
+-- It prepends '<leader>' to the key
+---@param key string rhs, required, but will be prepended with '<leader>'
+---@param cmd string|function lhs, required
+---@param opts table|string? Options (or just description), optional
+local nl = function(key, cmd, opts)
+  opts = handleDesc(opts)
+  n('<leader>' .. key, cmd, opts)
+end
+
+-- Local leader keymap shortcut function
+-- It prepends '<leader>' to the key and uses desc from opts
+---@param key string rhs, required, but will be prepended with '<leader>'
+---@param cmd string|function lhs, required
+---@param opts table|string description, required
+local nld = function(key, cmd, opts)
+  opts = handleDesc(opts)
+  nl(key, cmd, opts)
+end
+
+-- Keymap shortcut function with mode defined, good for sorting by rhs
+---@param key string rhs, required
+---@param mode string|string[] one of n, v, x, or table of modes { 'n', 'v' }
+---@param cmd string|function lhs, required
+---@param opts string|table description, required
+local d = function(key, mode, cmd, opts)
+  opts = handleDesc(opts)
+  s(mode, key, cmd, opts)
+end
+
+-- Leader based keymap shortcut function with mode defined
+---@param key string rhs, required, but will be prepended with '<leader>'
+---@param mode string|string[] one of n, v, x, or table of modes { 'n', 'v' }
+---@param cmd string|function lhs, required
+---@param opts string|table description (or opts), required
+local ld = function(key, mode, cmd, opts)
+  opts = handleDesc(opts)
+  s(mode, '<leader>' .. key, cmd, opts)
+end
+
+-- ╭─────────────────────────────────────────────────────────╮
+-- │                         Keymaps                         │
+-- ╰─────────────────────────────────────────────────────────╯
+
+-- Disable arrow keys in normal mode
+n('<left>', ':echo "Use h to move!!"<CR>')
+n('<right>', ':echo "Use l to move!!"<CR>')
+n('<up>', ':echo "Use k to move!!"<CR>')
+n('<down>', ':echo "Use j to move!!"<CR>')
+
+n('<C-s>', ':w!<cr>', { desc = 'Save', noremap = true })
+n('<esc><esc>', ':nohlsearch<cr>', { desc = 'Clear Search Highlighting' })
+
+-- Buffer operations
+-- Mappings for buffer management operations like switching, deleting, etc.
+-- Convention: All mappings start with 'b' followed by the operation
+nld('bd', ':lua MiniBufremove.delete()<CR>', 'Delete')
+nld('bh', ':bprev<cr>', 'Prev')
+nld('bj', ':bfirst<cr>', 'First')
+nld('bk', ':blast<cr>', 'Last')
+nld('bl', ':bnext<cr>', 'Next')
+nld('bw', ':lua MiniBufremove.wipeout()<CR>', 'Wipeout')
+
+-- Code
+nld('cg', ':lua require("neogen").generate()<CR>', 'Generate annotations')
+
+-- LSP
+n('<C-l>', ':lua vim.lsp.buf.signature_help()<CR>', { desc = 'Signature' })
+n('K', ':Lspsaga hover_doc<cr>', { desc = 'Hover Documentation' })
+ld('ca', 'n', ':Lspsaga code_action<cr>', 'Code Action')
+ld('cci', 'n', ':Lspsaga incoming_calls<cr>', 'Incoming Calls')
+ld('cco', 'n', ':Lspsaga outgoing_calls<cr>', 'Outgoing Calls')
+ld('cd', 'n', ':Lspsaga show_line_diagnostics<cr>', 'Line Diagnostics')
+ld('cf', { 'n', 'x' }, ':lua vim.lsp.buf.format()<CR>', 'Format')
+ld('ci', 'n', ':Lspsaga implement<cr>', 'Implementations')
+ld('cl', 'n', ':Lspsaga show_cursor_diagnostics<cr>', 'Cursor Diagnostics')
+ld('cp', 'n', ':Lspsaga peek_definition<cr>', 'Peek Definition')
+ld('cr', 'n', ':Lspsaga rename<cr>', 'Rename')
+ld('cR', 'n', ':Lspsaga rename ++project<cr>', 'Rename Project wide')
+ld('cs', 'n', ':Telescope lsp_document_symbols<CR>', 'LSP Document Symbols')
+ld('ct', 'n', ':Lspsaga peek_type_definition<cr>', 'Peek Type Definition')
+ld('cT', 'n', ':Telescope lsp_type_definitions<CR>', 'LSP Type Definitions')
+ld('cu', 'n', ':Lspsaga preview_definition<cr>', 'Preview Definition')
+ld('cv', 'n', ':Lspsaga diagnostic_jump_prev<cr>', 'Diagnostic Jump Prev')
+ld('cw', 'n', ':Lspsaga diagnostic_jump_next<cr>', 'Diagnostic Jump Next')
+
+-- CommentBox operations
+-- Mappings for creating and managing comment boxes
+-- Convention: All mappings start with 'cb' followed by the box type
+nld('cbb', '<Cmd>CBccbox<CR>', 'CB: Box Title')
+nld('cbd', '<Cmd>CBd<CR>', 'CB: Remove a box')
+nld('cbl', '<Cmd>CBline<CR>', 'CB: Simple Line')
+nld('cbm', '<Cmd>CBllbox14<CR>', 'CB: Marked')
+nld('cbt', '<Cmd>CBllline<CR>', 'CB: Titled Line')
+
+
+-- Telescope
+nld('f', ':Telescope find_files<cr>', 'Find Files')
+nld(',', ':Telescope buffers<cr>', 'Find existing buffers')
+nld('/', function()
+  require('telescope.builtin').current_buffer_fuzzy_find(
+    require('telescope.themes').get_dropdown {
+      winblend = 20,
+      previewer = true,
+    }
+  )
+end, 'Fuzzily search in current buffer')
+
+nld('sc', ':Telescope commands<cr>', 'Commands')
+nld('sd', ':Telescope diagnostics<cr>', 'Search Diagnostics')
+nld('sg', ':Telescope live_grep<cr>', 'Search by Grep')
+nld('sh', ':Telescope highlights<cr>', 'List Highlights')
+nld('sk', ':Telescope keymaps<cr>', 'Search Keymaps')
+nld('sl', ':Telescope luasnip<CR>', 'Search LuaSnip')
+nld('so', ':Telescope oldfiles<CR>', 'Old Files')
+nld('sp',
+  ':lua require("telescope").extensions.lazy_plugins.lazy_plugins()<cr>',
+  'Lazy Plugins')
+nld('sq', ':Telescope quickfix<cr>', 'Quickfix')
+nld('ss', ':Telescope treesitter<cr>', 'Treesitter')
+nld('st', ':TodoTelescope<cr>', 'Search Todos')
+nld('sw', ':Telescope grep_string<cr>', 'Grep String')
+nld('sx', ':Telescope import<cr>', 'Telescope: Import')
+
+-- Trouble
+nld('xd',
+  ':Trouble document_diagnostics<cr>', 'Trouble: Document Diagnostics')
+nld('xl', ':Trouble loclist<cr>', 'Trouble: Location List')
+nld('xq', ':Trouble quickfix<cr>', 'Trouble: Quickfix')
+nld('xw',
+  ':Trouble workspace_diagnostics<cr>', 'Trouble: Workspace Diagnostics')
+nld('xx', ':Trouble diagnostics<cr>', 'Trouble: Diagnostic')
+
+-- Text manipulation
+d('<', { 'n', 'v' }, '<gv', 'Indent Left')
+d('>', { 'n', 'v' }, '>gv', 'Indent Right')
+d('<C-k>', { 'n', 'v' }, ":m '<-2<CR>gv=gv", 'Move Block Up')
+d('<C-j>', { 'n', 'v' }, ":m '>+1<CR>gv=gv", 'Move Block Down')
+
+-- Other functionality
+nld('o', function() require('snacks').gitbrowse() end, 'Open repo in browser')
+
+-- Toggle settings
+local function toggle_background()
+  vim.o.bg = vim.o.bg == "light" and "dark" or "light"
+end
+
+nld('tc', ':CloakToggle<cr>', 'Cloak: Toggle')
+nld('te', ':Neotree toggle<cr>', 'Toggle Neotree')
+nld('tl', toggle_background, 'Toggle Light/Dark Mode')
+nld('tn', ':Noice dismiss<cr>', 'Noice: Dismiss Notification')
+
+-- Splits
+n('<C-w>,', ':vertical resize -10<CR>', { desc = 'V Resize -' })
+n('<C-w>.', ':vertical resize +10<CR>', { desc = 'V Resize +' })
+n('<C-w>-', ':resize -5<CR>', { desc = 'H Resize -' })
+n('<C-w>+', ':resize +5<CR>', { desc = 'H Resize +' })
+n('<C-w>=', '<C-w>=', { desc = 'Equal Size Splits' })
+
+-- Deal with word wrap
+n('k',
+  "v:count == 0 ? 'gk' : 'k'",
+  { desc = 'Move up', noremap = true, expr = true })
+n('j',
+  "v:count == 0 ? 'gj' : 'j'",
+  { desc = 'Move down', noremap = true, expr = true })
+
+-- Quit
+nld('qf', ':q<CR>', 'Quicker close split')
+nld('qq', function()
+  if vim.fn.confirm("Force save and quit?", "&Yes\n&No", 2) == 1 then
+    vim.cmd('wq!')
+  end
+end, 'Quit with force saving')
+nld('qw', ':wq<CR>', 'Write and quit')
+nld('qQ', function()
+  if vim.fn.confirm("Force quit without saving?", "&Yes\n&No", 2) == 1 then
+    vim.cmd('q!')
+  end
+end, 'Force quit without saving')

config/nvim/lua/options.lua

@@ -2,32 +2,54 @@
 -- │              neovim configuration options               │
 -- ╰─────────────────────────────────────────────────────────╯
 -- See `:help vim.opt`
+--     `:help vim.g`
 -- For more options, you can see `:help option-list`
 
--- Enables the experimental nvim 0.5 features
-vim.loader.enable()
+local g = vim.g     -- A table to store global variables
+local o = vim.opt   -- A table to store global options
 
--- Map leader and local leader
-vim.g.mapleader = ' '
-vim.g.maplocalleader = ' '
+vim.loader.enable() -- Enable the plugin loader
 
--- Set the colorscheme and variants
-vim.g.colors_theme = 'tokyonight'
-vim.g.colors_variant_light = 'tokyonight-day'
-vim.g.colors_variant_dark = 'tokyonight-storm'
+-- vim.global
+g.mapleader = ' '                          -- Space as the leader key
+g.maplocalleader = ' '                     -- Space as the local leader key
+g.colors_theme = 'tokyonight'              -- Set the colorscheme
+g.colors_variant_light = 'tokyonight-day'  -- Set the light variant
+g.colors_variant_dark = 'tokyonight-storm' -- Set the dark variant
+g.editorconfig = true                      -- Make sure editorconfig support is enabled
+g.loaded_perl_provider = 0                 -- Disable perl provider
+g.loaded_ruby_provider = 0                 -- Disable ruby provider
 
--- Make sure editorconfig support is enabled
-vim.g.editorconfig = true
+-- vim.options
+o.breakindent = true               -- Enable break indent
+o.completeopt = 'menuone,noselect' -- Popup menu when typing
+o.cursorline = true                -- Show which line your cursor is on
+o.inccommand = 'split'             -- Preview substitutions live, as you type!
+o.mouse = 'a'                      -- Enable mouse support
+o.number = true                    -- Show line numbers
+o.numberwidth = 3                  -- Set the width of the number column
+o.relativenumber = true            -- Show relative line numbers
+o.scrolloff = 15                   -- Show context around cursor
+o.showmode = false                 -- Don't show mode
+o.signcolumn = 'yes:2'             -- Keep signcolumn on by default
+o.smartindent = true               -- Insert indents automatically
+o.spell = true                     -- Enable spell checking
+o.spelllang = 'en_us'              -- Set the spell checking language
+o.splitbelow = true                -- split to the bottom
+o.splitright = true                -- vsplit to the right
+o.termguicolors = true             -- Fixes Notify opacity issues
+o.timeoutlen = 250                 -- Decrease mapped sequence wait time
+o.undofile = true                  -- Save undo history
+o.updatetime = 250                 -- 250 ms = 2,5 seconds
+o.ignorecase = true                -- Ignore case in search patterns
+o.smartcase = true                 -- Override 'ignorecase' if pattern contains upper case chars
 
--- Enable line numbers and relative line numbers
-vim.opt.number = true
-vim.opt.relativenumber = true
 
--- Enable mouse mode, can be useful for resizing splits for example!
-vim.opt.mouse = 'a'
+o.list = true -- Show some invisible characters
+o.listchars = { tab = '» ', trail = '·', nbsp = '␣' } -- Which invisible chars to show
 
--- Don't show the mode, since it's already in the status line
-vim.opt.showmode = false
+-- Enable the colorcolumn
+vim.api.nvim_set_option_value('colorcolumn', '+1', { scope = 'global' })
 
 -- Sync clipboard between OS and Neovim.
 --  Schedule the setting after `UiEnter` because it can increase startup-time.
@@ -37,95 +59,4 @@ vim.schedule(function()
   vim.opt.clipboard = c
 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 = 250
-
--- 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 = 15
-
--- Set completeopt to have a better completion experience
-vim.o.completeopt = 'menuone,noselect'
-
--- Fixes Notify opacity issues
-vim.o.termguicolors = true
-
--- Set spell checking
-vim.o.spell = true
-vim.o.spelllang = 'en_us'
-
--- Tree-sitter settings
-vim.g.loaded_perl_provider = 0
-vim.g.loaded_ruby_provider = 0
-
--- kevinhwang91/nvim-ufo settings
-vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
-vim.o.foldcolumn = '1' -- '0' is not bad
--- Using ufo provider need a large value, feel free to decrease the value
-vim.o.foldlevel = 99
-vim.o.foldlevelstart = 99
-vim.o.foldenable = true
-
--- anuvyklack/windows.nvim settings
-vim.o.winwidth = 15
-vim.o.winminwidth = 10
-vim.o.equalalways = false
-
--- folke/noice.nvim settings
-vim.g.noice_ignored_filetypes = {
-  'fugitiveblame',
-  'fugitive',
-  'gitcommit',
-  'noice',
-}
-
--- ── Deal with word wrap ───────────────────────────────────────────────────────
-local m = vim.api.nvim_set_keymap
-m(
-  'n',
-  'k',
-  "v:count == 0 ? 'gk' : 'k'",
-  { desc = 'Move up', noremap = true, expr = true }
-)
-m(
-  'n',
-  'j',
-  "v:count == 0 ? 'gj' : 'j'",
-  { desc = 'Move down', noremap = true, expr = true }
-)
-
 -- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/plugins/blink.lua

@@ -0,0 +1,117 @@
+return {
+  -- Performant, batteries-included completion plugin for Neovim
+  -- https:/github.com/saghen/blink.cmp
+  {
+    'saghen/blink.cmp',
+    version = '*',
+    lazy = false, -- lazy loading handled internally
+    dependencies = {
+      -- Compatibility layer for using nvim-cmp sources on blink.cmp
+      -- https://github.com/Saghen/blink.compat
+      {
+        'saghen/blink.compat',
+        version = '*',
+        -- lazy.nvim will automatically load the plugin when it's required by blink.cmp
+        lazy = true,
+        opts = {
+          -- make sure to set opts so that lazy.nvim calls blink.compat's setup
+          impersonate_nvim_cmp = true,
+        },
+      },
+      -- Set of preconfigured snippets for different languages.
+      -- https://github.com/rafamadriz/friendly-snippets
+      { 'rafamadriz/friendly-snippets' },
+      -- Lua plugin to turn github copilot into a cmp source
+      -- https://github.com/giuxtaposition/blink-cmp-copilot
+      {
+        "giuxtaposition/blink-cmp-copilot",
+        dependencies = {
+          -- Fully featured & enhanced replacement for copilot.vim complete
+          -- with API for interacting with Github Copilot
+          -- https://github.com/zbirenbaum/copilot.lua
+          {
+            'zbirenbaum/copilot.lua',
+            cmd = 'Copilot',
+            build = ':Copilot setup',
+            event = { 'InsertEnter', 'LspAttach' },
+            opts = {
+              fix_pairs = true,
+              suggestion = { enabled = false },
+              panel = { enabled = false },
+              filetypes = {
+                markdown = true,
+              },
+            },
+          },
+        },
+      },
+    },
+    ---@module 'blink.cmp'
+    ---@type blink.cmp.Config
+    opts = {
+      -- 'default' for mappings similar to built-in completion
+      -- 'super-tab' for mappings similar to vscode (tab to accept, arrow keys to navigate)
+      -- 'enter' for mappings similar to 'super-tab' but with 'enter' to accept
+      -- see the "default configuration" section below for full documentation on how to define
+      -- your own keymap.
+      keymap = {
+        preset = 'super-tab',
+        -- Use Ctrl-x to trigger auto completion
+        ['<C-x>'] = { 'show', 'show_documentation', 'hide_documentation' },
+      },
+
+      appearance = {
+        -- Sets the fallback highlight groups to nvim-cmp's highlight groups
+        -- Useful for when your theme doesn't support blink.cmp
+        -- will be removed in a future release
+        use_nvim_cmp_as_default = true,
+        -- Set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
+        -- Adjusts spacing to ensure icons are aligned
+        nerd_font_variant = vim.g.nerd_font_variant or 'mono',
+      },
+
+      completion = {
+        menu = {
+          draw = {
+            columns = { { "label", "label_description", gap = 1 }, { "kind_icon", "kind", gap = 1 } },
+          },
+        },
+        documentation = {
+          auto_show = true
+        },
+        ghost_text = {
+          enabled = false,
+        },
+      },
+
+      -- default list of enabled providers defined so that you can extend it
+      -- elsewhere in your config, without redefining it, via `opts_extend`
+      sources = {
+        providers = {
+          copilot = {
+            name = 'copilot',
+            module = 'blink-cmp-copilot'
+          },
+        },
+        completion = {
+          enabled_providers = {
+            'lsp',
+            'copilot',
+            'path',
+            'snippets',
+            'buffer',
+          },
+        },
+      },
+
+      -- experimental auto-brackets support
+      -- completion = { accept = { auto_brackets = { enabled = true } } }
+
+      -- experimental signature help support
+      signature = { enabled = true }
+    },
+    -- allows extending the enabled_providers array elsewhere in your config
+    -- without having to redefine it
+    opts_extend = { "sources.completion.enabled_providers" },
+  },
+}

config/nvim/lua/plugins/cmp.lua

@@ -1,231 +0,0 @@
--- Auto completion
--- https://github.com/hrsh7th/nvim-cmp
-return {
-  {
-    'hrsh7th/nvim-cmp',
-    lazy = false,
-    version = false, -- Use the latest version of the plugin
-    event = 'InsertEnter',
-    dependencies = {
-      'hrsh7th/cmp-nvim-lsp',
-
-      -- ── LuaSnip Dependencies ────────────────────────────────────────────
-      -- Snippet Engine for Neovim written in Lua.
-      -- https://github.com/L3MON4D3/LuaSnip
-      {
-        'L3MON4D3/LuaSnip',
-        build = 'make install_jsregexp',
-        dependencies = {
-          -- luasnip completion source for nvim-cmp
-          -- https://github.com/saadparwaiz1/cmp_luasnip
-          'saadparwaiz1/cmp_luasnip',
-          'rafamadriz/friendly-snippets',
-        },
-      },
-      { '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-buffer' },
-      { 'hrsh7th/cmp-path' },
-      { 'hrsh7th/cmp-nvim-lsp-signature-help' },
-      { 'hrsh7th/cmp-emoji' },
-      { 'hrsh7th/cmp-cmdline' },
-      -- cmp import and use all environment variables from .env.* and system
-      -- https://github.com/SergioRibera/cmp-dotenv
-      { 'SergioRibera/cmp-dotenv' },
-      -- A dictionary completion source for nvim-cmp
-      -- https://github.com/uga-rosa/cmp-dictionary
-      { 'uga-rosa/cmp-dictionary' },
-      -- An additional source for nvim-cmp to autocomplete packages and its versions
-      -- https://github.com/David-Kunz/cmp-npm
-      {
-        'David-Kunz/cmp-npm',
-        dependencies = { 'nvim-lua/plenary.nvim' },
-        ft = 'json',
-        opts = {},
-      },
-      -- https://github.com/chrisgrieser/cmp-nerdfont
-      { 'chrisgrieser/cmp-nerdfont' },
-
-      -- ── Other deps ──────────────────────────────────────────────────────
-      -- vscode-like pictograms for neovim lsp completion items
-      -- https://github.com/onsails/lspkind.nvim
-      { 'onsails/lspkind.nvim' },
-      -- Lua plugin to turn github copilot into a cmp source
-      -- https://github.com/zbirenbaum/copilot-cmp
-      {
-        'zbirenbaum/copilot-cmp',
-        dependencies = {
-          -- Fully featured & enhanced replacement for copilot.vim complete
-          -- with API for interacting with Github Copilot
-          -- https://github.com/zbirenbaum/copilot.lua
-          {
-            'zbirenbaum/copilot.lua',
-            cmd = 'Copilot',
-            build = ':Copilot setup',
-            event = { 'InsertEnter', 'LspAttach' },
-            opts = {
-              fix_pairs = true,
-              suggestion = { enabled = false },
-              panel = { enabled = false },
-              filetypes = {
-                markdown = true,
-                help = true,
-              },
-            },
-          },
-        },
-        config = function() require('copilot_cmp').setup() end,
-      },
-    },
-    config = function()
-      local cmp = require 'cmp'
-      local luasnip = require 'luasnip'
-      local lspkind = require 'lspkind'
-      luasnip.config.setup {}
-      require('luasnip.loaders.from_vscode').lazy_load()
-      require('copilot_cmp').setup()
-
-      require('cmp_dictionary').setup {
-        paths = { '/usr/share/dict/words' },
-        exact_length = 2,
-      }
-
-      local has_words_before = function()
-        if vim.api.nvim_get_option_value('buftype', {}) == 'prompt' then
-          return false
-        end
-        local line, col = table.unpack(vim.api.nvim_win_get_cursor(0))
-        return col ~= 0
-          and vim.api
-              .nvim_buf_get_text(0, line - 1, 0, line - 1, col, {})[1]
-              :match '^%s*$'
-            == nil
-      end
-
-      cmp.setup {
-        formatting = {
-          format = lspkind.cmp_format {
-            mode = 'symbol',
-            max_width = function() return math.floor(0.45 * vim.o.columns) end,
-            show_labelDetails = true,
-            symbol_map = {
-              Copilot = '',
-              Text = '',
-              Constructor = '',
-            },
-          },
-        },
-        window = {
-          completion = cmp.config.window.bordered(),
-          documentation = cmp.config.window.bordered(),
-        },
-        view = {
-          width = function(_, _) return math.min(80, vim.o.columns) end,
-          -- entries = {
-          --   name = 'custom',
-          --   selection_order = 'near_cursor',
-          -- },
-        },
-        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-c>'] = cmp.mapping.complete(),
-          ['<CR>'] = cmp.mapping.confirm {
-            behavior = cmp.ConfirmBehavior.Replace,
-            select = true,
-          },
-          ['<Tab>'] = cmp.mapping(function(fallback)
-            if cmp.visible() and has_words_before() then
-              cmp.select_next_item { behavior = cmp.SelectBehavior.Select }
-            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 = {
-          -- function arg popups while typing
-          { name = 'nvim_lsp_signature_help', group_index = 2 },
-
-          -- Copilot Source
-          { name = 'copilot', group_index = 2 },
-          -- Other Sources
-          { name = 'dictionary', keyword_length = 2, group_index = 2 },
-          { name = 'npm', keyword_length = 4, group_index = 2 },
-          { name = 'nvim_lsp', group_index = 2 },
-          { name = 'luasnip', group_index = 2 },
-          { name = 'dotenv', group_index = 2 },
-          { name = 'path', group_index = 2 },
-          { name = 'emoji', group_index = 2 },
-          { name = 'nerdfont', group_index = 2 },
-        },
-        sorting = {
-          priority_weight = 2,
-          comparators = {
-            require('copilot_cmp.comparators').prioritize,
-
-            -- Below is the default comparator list and order for nvim-cmp
-            cmp.config.compare.offset,
-            cmp.config.compare.scopes, --this is commented in nvim-cmp too
-            cmp.config.compare.exact,
-            cmp.config.compare.score,
-            cmp.config.compare.recently_used,
-            cmp.config.compare.locality,
-            cmp.config.compare.kind,
-            cmp.config.compare.sort_text,
-            cmp.config.compare.length,
-            cmp.config.compare.order,
-          },
-        },
-      }
-
-      cmp.setup.cmdline({ '/', '?' }, {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = {
-          { name = 'buffer' },
-        },
-      })
-
-      -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-      cmp.setup.cmdline(':', {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = cmp.config.sources({
-          { name = 'path' },
-        }, {
-          { name = 'cmdline' },
-        }),
-        matching = { disallow_symbol_nonprefix_matching = false },
-      })
-    end,
-  },
-  -- Luasnip choice node completion source for nvim-cmp
-  -- https://github.com/doxnit/cmp-luasnip-choice
-  {
-    'doxnit/cmp-luasnip-choice',
-    config = function()
-      require('cmp_luasnip_choice').setup {
-        auto_open = true, -- Automatically open nvim-cmp on choice node (default: true)
-      }
-    end,
-  },
-}

config/nvim/lua/plugins/comment.lua

@@ -1,9 +0,0 @@
--- Commenting
--- "gc" to comment visual regions/lines
--- https://github.com/numToStr/Comment.nvim
-return {
-  'numToStr/Comment.nvim',
-  version = '*',
-  event = { 'BufRead', 'BufNewFile' },
-  opts = {},
-}

config/nvim/lua/plugins/conform.lua

@@ -1,84 +0,0 @@
--- ── Formatting ──────────────────────────────────────────────────────
--- Lightweight yet powerful formatter plugin for Neovim
--- https://github.com/stevearc/conform.nvim
-return {
-  'stevearc/conform.nvim',
-  event = { 'BufWritePre' },
-  cmd = { 'ConformInfo' },
-  config = function()
-    -- Select first conform formatter that is available
-    ---@param bufnr integer
-    ---@param ... string
-    ---@return string
-    local function first(bufnr, ...)
-      local conform = require 'conform'
-      for i = 1, select('#', ...) do
-        local formatter = select(i, ...)
-        if conform.get_formatter_info(formatter, bufnr).available then
-          return formatter
-        end
-      end
-      return select(1, ...)
-    end
-
-    require('conform').setup {
-      -- Enable or disable logging
-      notify_on_error = true,
-      -- Set the default formatter for all filetypes
-      default_formatter = 'injected',
-      -- Set the default formatter for all filetypes
-      default_formatter_opts = {
-        lsp_format = 'fallback',
-        -- Set the default formatter for all filetypes
-        -- formatter = 'injected',
-        -- Set the default formatter for all filetypes
-        -- formatter_opts = {},
-      },
-      formatters_by_ft = {
-        markdown = function(bufnr)
-          return { first(bufnr, 'prettierd', 'prettier'), 'injected' }
-        end,
-        javascript = function(bufnr)
-          return { first(bufnr, 'prettier', 'eslint'), 'injected' }
-        end,
-        lua = { 'stylua' },
-        -- Conform will run multiple formatters sequentially
-        -- python = { 'isort', 'black', lsp_format = 'fallback' },
-        -- You can customize some of the format options for the filetype (:help conform.format)
-        -- rust = { 'rustfmt', lsp_format = 'fallback' },
-      },
-      format_on_save = function(bufnr)
-        -- Disable autoformat on certain filetypes
-        local ignore_filetypes = {
-          'c',
-          'cpp',
-          'sql',
-          'java',
-        }
-        if vim.tbl_contains(ignore_filetypes, vim.bo[bufnr].filetype) then
-          return
-        end
-        -- Disable with a global or buffer-local variable
-        if
-            vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat
-        then
-          return
-        end
-        -- Disable autoformat for files in a certain path
-        local bufname = vim.api.nvim_buf_get_name(bufnr)
-        if bufname:match '/node_modules/' then return end
-        if bufname:match '/vendor/' then return end
-        if bufname:match '/dist/' then return end
-        if bufname:match '/build/' then return end
-
-        return { timeout_ms = 500, lsp_format = 'fallback' }
-      end,
-    }
-  end,
-  init = function()
-    -- If you want the formatexpr, here is the place to set it
-    vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
-  end,
-
-
-}

config/nvim/lua/plugins/dap.lua

@@ -1,25 +0,0 @@
-return {
-  {
-    'rcarriga/nvim-dap-ui',
-    dependencies = {
-      'mfussenegger/nvim-dap',
-      'nvim-neotest/nvim-nio',
-      'theHamsta/nvim-dap-virtual-text',
-      'ray-x/go.nvim',
-      'ray-x/guihua.lua',
-      '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',
-      })
-    end,
-  },
-}

config/nvim/lua/plugins/flash.lua

@@ -1,39 +0,0 @@
-return {
-  'folke/flash.nvim',
-  event = 'VeryLazy',
-  opts = {},
-  keys = {
-    {
-      'zk',
-      mode = { 'n', 'x', 'o' },
-      function() require('flash').jump() end,
-      desc = 'Flash',
-    },
-    {
-      'Zk',
-      mode = { 'n', 'x', 'o' },
-      function() require('flash').treesitter() end,
-      desc = 'Flash Treesitter',
-    },
-    {
-      'r',
-      mode = 'o',
-      function() require('flash').remote() end,
-      desc = 'Remote Flash',
-    },
-    {
-      'R',
-      mode = { 'o', 'x' },
-      function() require('flash').treesitter_search() end,
-      desc = 'Treesitter Search',
-    },
-    {
-      '<m-s>',
-      mode = { 'c' },
-      function() require('flash').toggle() end,
-      desc = 'Toggle Flash Search',
-    },
-  },
-}
-
--- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/plugins/folke.lua

@@ -0,0 +1,69 @@
+return {
+  -- A collection of small QoL plugins for Neovim
+  -- https://github.com/folke/snacks.nvim
+  {
+    "folke/snacks.nvim",
+    priority = 1000,
+    lazy = false,
+    ---@type snacks.Config
+    opts = {
+      bigfile = { enabled = true },
+      gitbrowse = { enabled = true },
+      notify = { enabled = true },
+      notifier = { enabled = true },
+      quickfile = { enabled = true },
+      statuscolumn = { enabled = true },
+      words = { enabled = true },
+      styles = {
+        notification = {
+          wo = { wrap = true } -- Wrap notifications
+        }
+      }
+    },
+  },
+  -- A pretty diagnostics, references, telescope results,
+  -- quickfix and location list to help you solve all the
+  -- trouble your code is causing.
+  -- https://github.com/folke/trouble.nvim
+  {
+    'folke/trouble.nvim',
+    lazy = false,
+    dependencies = { 'nvim-tree/nvim-web-devicons' },
+    ---@type trouble.Config
+    opts = {
+      auto_preview = true,
+      auto_fold = true,
+      auto_close = true,
+      use_lsp_diagnostic_signs = true,
+    },
+  },
+  -- Navigate your code with search labels, enhanced
+  -- character motions and Treesitter integration
+  -- https://github.com/folke/flash.nvim
+  {
+    'folke/flash.nvim',
+    event = 'VeryLazy',
+    ---@type Flash.Config
+    opts = {},
+    keys = {
+      {
+        'zk',
+        mode = { 'n', 'x', 'o' },
+        function() require('flash').jump() end,
+        desc = 'Flash',
+      },
+      {
+        'Zk',
+        mode = { 'n', 'x', 'o' },
+        function() require('flash').treesitter() end,
+        desc = 'Flash Treesitter',
+      },
+      {
+        '<m-s>',
+        mode = { 'c' },
+        function() require('flash').toggle() end,
+        desc = 'Toggle Flash Search',
+      },
+    },
+  },
+}

config/nvim/lua/plugins/goto-preview.lua

@@ -1,30 +0,0 @@
--- A small Neovim plugin for previewing definitions using floating windows.
--- https://github.com/rmagatti/goto-preview
-return {
-  'rmagatti/goto-preview',
-  dependencies = {
-    { 'nvim-telescope/telescope.nvim' },
-  },
-  opts = {
-    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' },
-  },
-}

config/nvim/lua/plugins/harpoon.lua

@@ -1,47 +0,0 @@
--- Getting you where you want with the fewest keystrokes.
--- https://github.com/ThePrimeagen/harpoon
-return {
-  'ThePrimeagen/harpoon',
-  branch = 'harpoon2',
-  dependencies = {
-    'nvim-lua/plenary.nvim',
-    'nvim-telescope/telescope.nvim',
-  },
-  config = function()
-    local harpoon = require 'harpoon'
-    harpoon:setup {}
-
-    -- 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>hw',
-      function() toggle_telescope(harpoon:list()) end,
-      { desc = 'Open harpoon window with telescope' }
-    )
-    vim.keymap.set(
-      'n',
-      '<leader>ht',
-      function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
-      { desc = 'Open Harpoon Quick menu' }
-    )
-  end,
-}

config/nvim/lua/plugins/lsp-saga.lua

@@ -1,21 +0,0 @@
--- improve neovim lsp experience
--- https://github.com/nvimdev/lspsaga.nvim
--- https://nvimdev.github.io/lspsaga/
-return {
-  'nvimdev/lspsaga.nvim',
-  event = 'LspAttach',
-  dependencies = {
-    'nvim-treesitter/nvim-treesitter', -- optional
-    'nvim-tree/nvim-web-devicons', -- optional
-  },
-  opts = {
-    code_action = {
-      show_server_name = true,
-    },
-    diagnostic = {
-      keys = {
-        quit = { 'q', '<ESC>' },
-      },
-    },
-  },
-}

config/nvim/lua/plugins/lsp.lua

@@ -1,216 +1,194 @@
--- ── Mason and LSPConfig integration ────────────────────────────────────
-
--- ── LSP settings. ───────────────────────────────────────────────
---  This function gets run when an LSP connects to a particular buffer.
-
--- 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')
-
--- nvim-cmp supports additional completion capabilities
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
--- Tell the server the capability of foldingRange,
--- Neovim hasn't added foldingRange to default capabilities, users must add it manually
-capabilities.textDocument.foldingRange = {
-  dynamicRegistration = true,
-  lineFoldingOnly = true,
-}
-
 return {
-  -- Portable package manager for Neovim that runs everywhere Neovim runs.
-  -- Easily install and manage LSP servers, DAP servers, linters, and formatters.
-  -- https://github.com/williamboman/mason.nvim
+  -- improve neovim lsp experience
+  -- https://github.com/nvimdev/lspsaga.nvim
+  -- https://nvimdev.github.io/lspsaga/
   {
-    'williamboman/mason.nvim',
-    cmd = 'Mason',
-    run = ':MasonUpdate',
+    'nvimdev/lspsaga.nvim',
+    event = 'LspAttach',
+    dependencies = {
+      'nvim-treesitter/nvim-treesitter',
+      'nvim-tree/nvim-web-devicons',
+    },
+    ---@type LspsagaConfig
     opts = {
-      PATH = 'prepend',
-      -- Mason servers to install
-      -- See: https://mason-registry.dev/registry/list
-      ensure_installed = {
-        'bash-language-server',
-        'clang-format',
-        'codespell',
-        'commitlint',
-        'diagnostic-languageserver',
-        'editorconfig-checker',
-        'fixjson',
-        'jsonlint',
-        'lua-language-server',
-        'luacheck',
-        'phpcbf',
-        'phpcs',
-        'phpmd',
-        'prettier',
-        'shellcheck',
-        'shfmt',
-        'stylua',
-        'vim-language-server',
-        'vue-language-server',
-        'yamllint',
+      code_action = {
+        show_server_name = true,
+        keys = {
+          quit = { 'q', '<ESC>' },
+        },
+      },
+      diagnostic = {
+        keys = {
+          quit = { 'q', '<ESC>' },
+        },
       },
     },
   },
-  -- Extension to mason.nvim that makes it easier to use lspconfig with mason.nvim.
-  -- https://github.com/williamboman/mason-lspconfig.nvim
+  -- A simple wrapper for nvim-lspconfig and mason-lspconfig
+  -- to easily setup LSP servers.
+  -- https://github.com/junnplus/lsp-setup.nvim
   {
-    'williamboman/mason-lspconfig.nvim',
-    opts = {
-      -- ── Enable the following language servers ───────────────────────────
-      -- :help lspconfig-all for all pre-configured LSPs
-      ensure_installed = {
-        'bashls',
-        -- 'csharp_ls',
-        'gopls',
-        'html',
-        'intelephense',
-        'tailwindcss',
-        'ts_ls',
-        'lua_ls',
-        'jsonls',
+    'junnplus/lsp-setup.nvim',
+    dependencies = {
+      { 'neovim/nvim-lspconfig' },
+      {
+        'williamboman/mason.nvim',
+        cmd = 'Mason',
+        run = ':MasonUpdate'
       },
-      automatic_installation = true,
-      handlers = {
-        -- The first entry (without a key) will be the default handler
-        -- and will be called for each installed server that doesn't have
-        -- a dedicated handler.
-        function(server_name) -- default handler (optional)
-          require('lspconfig')[server_name].setup {
-            on_attach = function(_, bufnr)
-              -- Create a command `:Format` local to the LSP buffer
-              vim.api.nvim_buf_create_user_command(
-                bufnr,
-                'Format',
-                function(_)
-                  require('conform').format {
-                    formatters = { 'injected' },
-                    async = true,
-                    lsp_fallback = true,
-                  }
-                end,
-                { desc = 'Format current buffer with LSP' }
-              )
-            end,
-            capabilities = capabilities,
-          }
-        end,
-        -- Next, you can provide targeted overrides for specific servers.
-        ['lua_ls'] = function()
-          require('lspconfig')['lua_ls'].setup {
-            on_attach = function(_, bufnr)
-              -- Create a command `:Format` local to the LSP buffer
-              vim.api.nvim_buf_create_user_command(
-                bufnr,
-                'Format',
-                function(_)
-                  require('conform').format {
-                    formatters = { 'injected' },
-                    async = true,
-                    lsp_fallback = true,
-                  }
-                end,
-                { desc = 'Format current buffer with LSP' }
-              )
-            end,
-            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,
+      { 'williamboman/mason-lspconfig.nvim' },
+      { 'folke/neodev.nvim' },
+      { 'b0o/schemastore.nvim' },
+      { 'saghen/blink.cmp' },
+    },
+    opts = {
+      default_mappings = false,
+      mappings = {
+        gd = 'lua require"telescope.builtin".lsp_definitions()',
+        gi = 'lua require"telescope.builtin".lsp_implementations()',
+        gr = 'lua require"telescope.builtin".lsp_references()',
+      },
+      inlay_hints = {
+        enabled = true,
+      },
+      servers = {
+        bashls = {},
+        -- csharp_ls = {},
+        diagnosticls = {},
+        gopls = {
+          settings = {
+            gopls = {
+              hints = {
+                rangeVariableTypes = true,
+                parameterNames = true,
+                constantValues = true,
+                assignVariableTypes = true,
+                compositeLiteralFields = true,
+                compositeLiteralTypes = true,
+                functionTypeParameters = true,
+              },
+            },
+          },
+        },
+        html = {},
+        intelephense = {},
+        jsonls = {},
+        lua_ls = {
+          settings = {
+            Lua = {
+              diagnostics = {
+                globals = { 'vim' },
+                disable = {
+                  -- Ignore lua_ls noisy `missing-fields` warnings
+                  'missing-fields',
                 },
-                diagnostics = {
-                  globals = { 'vim' },
-                  disable = {
-                    -- Ignore lua_ls noisy `missing-fields` warnings
-                    'missing-fields',
-                  },
+              },
+              hint = {
+                enable = false,
+                arrayIndex = 'Auto',
+                await = true,
+                paramName = 'All',
+                paramType = true,
+                semicolon = 'SameLine',
+                setType = false,
+              },
+            },
+          },
+        },
+        tailwindcss = {},
+        ts_ls = {
+          settings = {
+            typescript = {
+              inlayHints = {
+                includeInlayParameterNameHints = 'all',
+                includeInlayParameterNameHintsWhenArgumentMatchesName = false,
+                includeInlayFunctionParameterTypeHints = true,
+                includeInlayVariableTypeHints = true,
+                includeInlayVariableTypeHintsWhenTypeMatchesName = false,
+                includeInlayPropertyDeclarationTypeHints = true,
+                includeInlayFunctionLikeReturnTypeHints = true,
+                includeInlayEnumMemberValueHints = true,
+              },
+            },
+          },
+        },
+        vimls = {},
+        volar = {
+          settings = {
+            typescript = {
+              inlayHints = {
+                enumMemberValues = {
+                  enabled = true,
                 },
-                workspace = {
-                  library = vim.api.nvim_get_runtime_file('', true),
-                  checkThirdParty = false,
+                functionLikeReturnTypes = {
+                  enabled = true,
                 },
-                -- Do not send telemetry data containing a randomized
-                -- but unique identifier
-                telemetry = { enable = false },
-
-                completion = {
-                  callSnippet = 'Replace',
+                propertyDeclarationTypes = {
+                  enabled = true,
+                },
+                parameterTypes = {
+                  enabled = true,
+                  suppressWhenArgumentMatchesName = true,
+                },
+                variableTypes = {
+                  enabled = true,
                 },
               },
             },
-          }
-        end,
-        ['jsonls'] = function()
-          require('lspconfig')['jsonls'].setup {
-            on_attach = function(_, bufnr)
-              -- Create a command `:Format` local to the LSP buffer
-              vim.api.nvim_buf_create_user_command(
-                bufnr,
-                'Format',
-                function(_)
-                  require('conform').format {
-                    formatters = { 'injected' },
-                    async = true,
-                    lsp_fallback = true,
-                  }
-                end,
-                { desc = 'Format current buffer with LSP' }
-              )
-            end,
-            capabilities = capabilities,
-            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(),
-                validate = { enable = true },
-              },
-            },
-          }
-        end,
+          },
+        },
       },
     },
-  },
+    config = function(_, opts)
+      require('neodev').setup()
+      require('lsp-setup').setup(opts)
+      local lspconfig = require('lspconfig')
+      for server, config in pairs(opts.servers) do
+        -- passing config.capabilities to blink.cmp merges with the capabilities in your
+        -- `opts[server].capabilities, if you've defined it
+        config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
+        lspconfig[server].setup(config)
+      end
 
-  -- Automatically install formatters registered with conform.nvim via mason.nvim
-  -- https://github.com/zapling/mason-conform.nvim
-  -- { 'zapling/mason-conform.nvim', opts = {} },
-
-  -- ── Misc ───────────────────────────────────────────────────
-  -- vscode-like pictograms for neovim lsp completion items
-  -- https://github.com/onsails/lspkind-nvim
-  { 'onsails/lspkind.nvim', opts = {} },
-  -- JSON schemas for Neovim
-  -- https://github.com/b0o/SchemaStore.nvim
-  { 'b0o/schemastore.nvim' },
-
-  -- ── LSP ────────────────────────────────────────────────────
-  -- Quick start configs for Nvim LSP
-  -- https://github.com/neovim/nvim-lspconfig
-  { 'neovim/nvim-lspconfig' },
-
-  -- Garbage collector that stops inactive LSP clients to free RAM
-  -- https://github.com/Zeioth/garbage-day.nvim
-  {
-    'zeioth/garbage-day.nvim',
-    dependencies = 'neovim/nvim-lspconfig',
-    event = 'VeryLazy',
-    opts = {},
+      lspconfig.lua_ls.on_init = function(client)
+        if client.workspace_folders then
+          local path = client.workspace_folders[1].name
+          if vim.loop.fs_stat(path .. '/.luarc.json') or vim.loop.fs_stat(path .. '/.luarc.jsonc') then
+            return
+          end
+        end
+        client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, {
+          runtime = {
+            -- Tell the language server which version of Lua you're using
+            -- (most likely LuaJIT in the case of Neovim)
+            version = 'LuaJIT'
+          },
+          -- Make the server aware of Neovim runtime files
+          workspace = {
+            checkThirdParty = false,
+            library = {
+              vim.env.VIMRUNTIME
+            }
+          }
+        })
+      end
+      lspconfig.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(),
+          validate = { enable = true },
+        },
+      }
+    end,
   },
 }

config/nvim/lua/plugins/lualine.lua

@@ -1,72 +0,0 @@
--- Fancier statusline
--- https://github.com/nvim-lualine/lualine.nvim
-return {
-  'nvim-lualine/lualine.nvim',
-  dependencies = {
-    'kyazdani42/nvim-web-devicons',
-    'folke/noice.nvim',
-  },
-  config = function()
-    local function diff_source()
-      local gitsigns = vim.b.gitsigns_status_dict
-      if gitsigns then
-        return {
-          added = gitsigns.added,
-          modified = gitsigns.changed,
-          removed = gitsigns.removed,
-        }
-      end
-    end
-
-    require('lualine').setup {
-      options = {
-        icons_enabled = true,
-        component_separators = '|',
-        section_separators = '',
-      },
-      -- Sections
-      -- +-------------------------------------------------+
-      -- | A | B | C                             X | Y | Z |
-      -- +-------------------------------------------------+
-      sections = {
-        lualine_a = {
-          'mode',
-        },
-        lualine_b = {
-          { 'b:gitsigns_head', icon = '' },
-          { 'diff', source = diff_source },
-          'diagnostics',
-        },
-        lualine_c = {
-          'buffers',
-          -- 'filename',
-        },
-        lualine_x = {
-          -- 'fileformat',
-          'filetype',
-        },
-        lualine_y = {
-          -- 'progress'
-        },
-        lualine_z = {
-          {
-            require('noice').api.statusline.mode.get,
-            cond = require('noice').api.statusline.mode.has,
-          },
-          {
-            require('noice').api.status.command.get,
-            cond = require('noice').api.status.command.has,
-          },
-        },
-      },
-      inactive_sections = {
-        lualine_a = {},
-        lualine_b = {},
-        lualine_c = { 'filename' },
-        lualine_x = { 'location' },
-        lualine_y = {},
-        lualine_z = {},
-      },
-    }
-  end,
-}

config/nvim/lua/plugins/mini.lua

@@ -0,0 +1,223 @@
+-- https://github.com/echasnovski/mini.nvim
+-- https://github.com/echasnovski/mini.nvim/tree/main?tab=readme-ov-file#modules
+return {
+  -- Presets for common options and mappings
+  { 'echasnovski/mini.basics',    version = '*' },
+
+  -- Animate common Neovim actions
+  -- Replaced anuvyklack/windows.nvim
+  { 'echasnovski/mini.animate',   version = '*', opts = {} },
+
+  -- Buffer removing (unshow, delete, wipeout), which saves window layout
+  -- Replaced famiu/bufdelete.nvim
+  { 'echasnovski/mini.bufremove', version = '*', opts = {} },
+
+  -- Show next key clues
+  -- Replaced folke/which-key.nvim
+  {
+    'echasnovski/mini.clue',
+    version = '*',
+    config = function()
+      local miniclue = require 'mini.clue'
+
+      miniclue.setup {
+        triggers = {
+          -- Leader triggers
+          { mode = 'n', keys = '<Leader>' },
+          { mode = 'x', keys = '<Leader>' },
+
+          -- Built-in completion
+          { mode = 'i', keys = '<C-x>' },
+
+          -- `g` key
+          { mode = 'n', keys = 'g' },
+          { mode = 'x', keys = 'g' },
+
+          -- Marks
+          { mode = 'n', keys = "'" },
+          { mode = 'n', keys = '`' },
+          { mode = 'x', keys = "'" },
+          { mode = 'x', keys = '`' },
+
+          -- Registers
+          { mode = 'n', keys = '"' },
+          { mode = 'x', keys = '"' },
+          { mode = 'i', keys = '<C-r>' },
+          { mode = 'c', keys = '<C-r>' },
+
+          -- Window commands
+          { mode = 'n', keys = '<C-w>' },
+
+          -- `z` key
+          { mode = 'n', keys = 'z' },
+          { mode = 'x', keys = 'z' },
+        },
+
+        clues = {
+          -- Enhance this by adding descriptions for <Leader> mapping groups
+          miniclue.gen_clues.builtin_completion(),
+          miniclue.gen_clues.g(),
+          miniclue.gen_clues.marks(),
+          miniclue.gen_clues.registers(),
+          miniclue.gen_clues.windows(),
+          miniclue.gen_clues.z(),
+          { mode = 'n', keys = '<Leader>b',  desc = '+Buffers' },
+          { mode = 'n', keys = '<Leader>c',  desc = '+Code' },
+          { mode = 'n', keys = '<Leader>cb', desc = '+CommentBox' },
+          { mode = 'n', keys = '<Leader>q',  desc = '+Quit' },
+          { mode = 'n', keys = '<Leader>s',  desc = '+Telescope' },
+          { mode = 'n', keys = '<Leader>t',  desc = '+Toggle' },
+          { mode = 'n', keys = '<Leader>x',  desc = '+Trouble' },
+          { mode = 'n', keys = '<leader>z',  desc = '+TreeSitter' },
+          { mode = 'n', keys = '<leader>zg', desc = '+Goto' },
+          { mode = 'n', keys = '<Leader>?',  desc = '+Help' },
+          { mode = 'n', keys = 'd',          desc = '+Diagnostics' },
+          { mode = 'n', keys = 'y',          desc = '+Yank' },
+        },
+      }
+    end,
+  },
+
+  -- Comment lines
+  -- Replaced numToStr/Comment.nvim
+  { 'echasnovski/mini.comment',    version = '*', opts = {} },
+
+  -- Highlight cursor word and its matches
+  { 'echasnovski/mini.cursorword', version = '*' },
+
+  -- Work with diff hunks
+  -- Replaced lewis6991/gitsigns.nvim
+  { 'echasnovski/mini.diff',       version = '*', opts = {} },
+
+  -- Git integration
+  { 'echasnovski/mini-git',        version = '*', opts = {}, main = 'mini.git' },
+
+  -- Highlight patterns in text
+  -- Replaced folke/todo-comments.nvim
+  {
+    'echasnovski/mini.hipatterns',
+    version = '*',
+    opts = {
+      highlighters = {
+        -- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE'
+        fixme = {
+          pattern = '%f[%w]()FIXME:?%s*()%f[%W]',
+          group = 'MiniHipatternsFixme',
+        },
+        hack = {
+          pattern = '%f[%w]()HACK:?%s*()%f[%W]',
+          group = 'MiniHipatternsHack',
+        },
+        todo = {
+          pattern = '%f[%w]()NOTE:?%s*()%f[%W]',
+          group = 'MiniHipatternsTodo',
+        },
+        note = {
+          pattern = '%f[%w]()NOTE()%f[%W]',
+          group = 'MiniHipatternsNote',
+        },
+        bug = {
+          pattern = '%f[%w]()BUG:?%s*()%f[%W]',
+          group = 'MiniHipatternsBug',
+        },
+        perf = {
+          pattern = '%f[%w]()PERF:?%s*()%f[%W]',
+          group = 'MiniHipatternsPerf',
+        },
+      },
+    },
+    config = function(opts)
+      local hp = require 'mini.hipatterns'
+      hp.setup {
+        highlighters = opts.highlighters,
+
+        -- Highlight hex color strings (`#rrggbb`) using that color
+        hex_color = hp.gen_highlighter.hex_color(),
+      }
+    end,
+  },
+
+  -- Icons
+  {
+    'echasnovski/mini.icons',
+    opts = {
+      file = {
+        ['.keep'] = { glyph = '󰊢', hl = 'MiniIconsGrey' },
+        ['devcontainer.json'] = { glyph = '', hl = 'MiniIconsAzure' },
+      },
+      filetype = {
+        dotenv = { glyph = '', hl = 'MiniIconsYellow' },
+      },
+    },
+  },
+
+  -- Visualize and work with indent scope
+  -- Replaced lukas-reineke/indent-blankline.nvim
+  { 'echasnovski/mini.indentscope', version = '*', opts = {} },
+
+  -- Jump to next/previous single character
+  {
+    'echasnovski/mini.jump',
+    version = '*',
+    opts = {
+      mappings = {
+        forward = 'f',
+        backward = 'F',
+        forward_till = 't',
+        backward_till = 'T',
+        repeat_jump = ';',
+      },
+    },
+  },
+
+  -- Move lines and blocks of text
+  { 'echasnovski/mini.move',        version = '*', opts = {} },
+
+  -- Text edit operators
+  { 'echasnovski/mini.operators',   version = '*', opts = {} },
+
+  -- Split and join arguments, lists, and other sequences
+  -- Replaced Wansmer/treesj
+  { 'echasnovski/mini.splitjoin',   version = '*', opts = {} },
+
+  -- Fast and flexible start screen
+  -- Replaced glepnir/dashboard-nvim
+  { 'echasnovski/mini.starter',     version = '*', opts = {} },
+
+  -- Minimal and fast statusline module with opinionated default look
+  -- Replaced nvim-lualine/lualine.nvim
+  {
+    'echasnovski/mini.statusline',
+    version = '*',
+    opts = {
+      use_icons = true,
+      set_vim_settings = true,
+      content = {
+        active = function()
+          local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 })
+          local git = MiniStatusline.section_git({ trunc_width = 75 })
+          local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 })
+          local filename = MiniStatusline.section_filename({ trunc_width = 140 })
+          local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 })
+          local location = MiniStatusline.section_location({ trunc_width = 75 })
+          return MiniStatusline.combine_groups({
+            { hl = mode_hl,                 strings = { mode } },
+            { hl = 'MiniStatuslineDevinfo', strings = { git, diagnostics } },
+            '%<', -- Mark general truncate point
+            { hl = 'MiniStatuslineFilename', strings = { filename } },
+            '%=', -- End left alignment
+            { hl = 'MiniStatuslineFileinfo', strings = { fileinfo } },
+            { hl = mode_hl,                  strings = { location } },
+          })
+        end,
+      },
+    }
+  },
+
+  -- Fast and feature-rich surround actions
+  -- Replaced kylechui/nvim-surround
+  { 'echasnovski/mini.surround',   version = '*', opts = {} },
+
+  -- Work with trailing whitespace
+  { 'echasnovski/mini.trailspace', version = '*', opts = {} },
+}

config/nvim/lua/plugins/neotree.lua

@@ -35,6 +35,7 @@ return {
       window = {
         mappings = {
           ['<Esc>'] = 'close_window',
+          ['q'] = 'close_window',
         },
       },
       filtered_items = {

config/nvim/lua/plugins/noice.lua

@@ -1,85 +0,0 @@
--- Highly experimental plugin that completely replaces the UI
--- for messages, cmdline and the popupmenu.
--- https://github.com/folke/noice.nvim
-return {
-  'folke/noice.nvim',
-  lazy = false,
-  enabled = true,
-  dependencies = {
-    'MunifTanjim/nui.nvim',
-    -- A fancy, configurable, notification manager for NeoVim
-    -- https://github.com/rcarriga/nvim-notify
-    'rcarriga/nvim-notify',
-    'hrsh7th/nvim-cmp',
-  },
-  opts = {
-    lsp = {
-      -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
-      override = {
-        ['vim.lsp.util.convert_input_to_markdown_lines'] = true,
-        ['vim.lsp.util.stylize_markdown'] = true,
-        ['cmp.entry.get_documentation'] = true, -- requires hrsh7th/nvim-cmp
-      },
-    },
-    -- you can enable a preset for easier configuration
-    presets = {
-      bottom_search = false, -- 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
-    },
-    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 },
-      },
-      {
-        filter = {
-          event = 'notify',
-          find = 'No information available',
-        },
-        opts = { skip = true },
-      },
-    },
-    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' },
-        },
-      },
-    },
-  },
-}

config/nvim/lua/plugins/refactoring.lua

@@ -1,8 +0,0 @@
--- The Refactoring library based off the Refactoring book by Martin Fowler
--- https://github.com/ThePrimeagen/refactoring.nvim
-return {
-  'ThePrimeagen/refactoring.nvim',
-  version = '*',
-  dependencies = { 'nvim-lua/plenary.nvim', 'nvim-treesitter/nvim-treesitter' },
-  opts = {},
-}

config/nvim/lua/plugins/surround.lua

@@ -1,8 +0,0 @@
--- Add/change/delete surrounding delimiter pairs with ease.
--- https://github.com/kylechui/nvim-surround
-return {
-  'kylechui/nvim-surround',
-  version = '*',
-  event = 'VeryLazy',
-  opts = {},
-}

config/nvim/lua/plugins/telescope.lua

@@ -7,13 +7,16 @@ return {
   dependencies = {
     { 'nvim-lua/plenary.nvim' },
     { 'nvim-telescope/telescope-symbols.nvim' },
-    { 'folke/which-key.nvim' },
 
     -- A Telescope picker to quickly access configurations
     -- of plugins managed by lazy.nvim.
     -- https://github.com/polirritmico/telescope-lazy-plugins.nvim
     { 'polirritmico/telescope-lazy-plugins.nvim' },
 
+    -- Neovim plugin. Telescope.nvim extension that adds LuaSnip integration.
+    -- https://github.com/benfowler/telescope-luasnip.nvim
+    { 'benfowler/telescope-luasnip.nvim' },
+
     -- Fuzzy Finder Algorithm which requires local dependencies to be built.
     -- Only load if `make` is available
     {
@@ -21,11 +24,14 @@ return {
       build = 'make',
       cond = vim.fn.executable 'make' == 1,
     },
+
+    -- Import modules with ease
+    -- https://github.com/piersolenski/telescope-import.nvim
+    { 'piersolenski/telescope-import.nvim' },
   },
   config = function()
     local t = require 'telescope'
     local a = require 'telescope.actions'
-    local themes = require 'telescope.themes'
 
     -- [[ Configure Telescope ]]
     -- See `:help telescope` and `:help telescope.setup()`
@@ -51,13 +57,31 @@ return {
           -- Must be a valid path to the file containing the lazy spec and setup() call.
           lazy_config = vim.fn.stdpath 'config' .. '/init.lua',
         },
+        import = {
+          -- Imports can be added at a specified line whilst keeping the cursor in place
+          insert_at_top = true,
+          -- Optionally support additional languages or modify existing languages...
+          custom_languages = {
+            {
+              -- The filetypes that ripgrep supports (find these via `rg --type-list`)
+              extensions = { 'js', 'ts' },
+              -- The Vim filetypes
+              filetypes = { 'vue' },
+              -- Optionally set a line other than 1
+              insert_at_line = 2, ---@type function|number
+              -- The regex pattern for the import statement
+              regex = [[^(?:import(?:[\"'\s]*([\w*{}\n, ]+)from\s*)?[\"'\s](.*?)[\"'\s].*)]],
+            },
+          },
+        },
       },
     }
 
     -- Load extensions
-    pcall(t.load_extension, 'harpoon')
     pcall(t.load_extension, 'git_worktree')
     pcall(t.load_extension, 'lazy_plugins')
+    pcall(t.load_extension, 'luasnip')
+    pcall(t.load_extension, 'import')
 
     -- Enable telescope fzf native, if installed
     pcall(t.load_extension, 'fzf')
@@ -65,12 +89,5 @@ return {
     -- [[ Telescope Keymaps ]]
     -- See `:help telescope.builtin`
     -- See `:help telescope.keymap`
-    vim.keymap.set('n', '<leader>/', function()
-      -- You can pass additional configuration to telescope to change theme, layout, etc.
-      require('telescope.builtin').current_buffer_fuzzy_find(themes.get_dropdown {
-        winblend = 10,
-        previewer = true,
-      })
-    end, { desc = '[/] Fuzzily search in current buffer]' })
   end,
 }

config/nvim/lua/plugins/todo-comments.lua

@@ -1,8 +0,0 @@
--- Highlight, list and search todo comments in your projects
--- https://github.com/folke/todo-comments.nvim
-return {
-  'folke/todo-comments.nvim',
-  version = '*',
-  dependencies = { 'nvim-lua/plenary.nvim' },
-  opts = {},
-}

config/nvim/lua/plugins/treesitter.lua

@@ -8,105 +8,61 @@ return {
   end,
   dependencies = {
     'nvim-treesitter/nvim-treesitter-textobjects',
+    'nvim-treesitter/nvim-treesitter-refactor',
+    'nvim-treesitter/nvim-treesitter-context',
+    'JoosepAlviste/nvim-ts-context-commentstring',
   },
-  config = function()
-    require('nvim-treesitter.configs').setup {
-      auto_install = true,
-      ignore_install = {},
-      sync_install = true,
-      modules = {},
+  ---@type TSConfig
+  opts = {
+    auto_install = true,  -- Auto install the parser generators
+    sync_install = false, -- Sync install the parser generators, install async
 
-      -- 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',
-      },
+    -- Add languages to be installed here that you want installed for treesitter
+    ensure_installed = {
+      'bash',
+      'json',
+      'jsonc',
+      'lua',
+      'luadoc',
+      'markdown',
+      'markdown_inline',
+      'query',
+      'regex',
+      'vim',
+      'vimdoc',
+      'yaml',
+    },
 
-      highlight = { enable = true },
-      indent = { enable = true },
-      incremental_selection = {
+    highlight = { enable = true },
+    indent = { enable = true },
+    textobjects = {
+      select = {
         enable = true,
-        keymaps = {
-          init_selection = '<a-space>',
-          node_incremental = '<a-space>',
-          scope_incremental = '<c-s>',
-          node_decremental = '<c-backspace>',
-        },
+        lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
       },
-      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>cn'] = '@parameter.inner',
-          },
-          swap_previous = {
-            ['<leader>cP'] = '@parameter.inner',
-          },
-        },
+      move = {
+        enable = true,
+        set_jumps = true, -- whether to set jumps in the jumplist
       },
-    }
+    },
+  },
+  config = function(_, opts)
+    require('nvim-treesitter.configs').setup(opts)
+
+    vim.api.nvim_create_autocmd({ "FileType" }, {
+      callback = function()
+        -- Set foldmethod to treesitter if available
+        if require("nvim-treesitter.parsers").has_parser() then
+          vim.opt.foldmethod = "expr"
+          vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+        else
+          -- Otherwise, set foldmethod to syntax
+          vim.opt.foldmethod = "syntax"
+        end
+
+        vim.opt.foldlevel = 9    -- Open all folds by default
+        vim.opt.foldnestmax = 99 -- Maximum fold nesting
+      end,
+    })
   end,
 }

config/nvim/lua/plugins/treesj.lua

@@ -1,9 +0,0 @@
--- Neovim plugin for splitting/joining blocks of code
--- https://github.com/Wansmer/treesj
-return {
-  'Wansmer/treesj',
-  dependencies = { 'nvim-treesitter/nvim-treesitter' },
-  opts = {
-    use_default_keymaps = false,
-  },
-}

config/nvim/lua/plugins/trouble.lua

@@ -1,15 +0,0 @@
--- A pretty diagnostics, references, telescope results,
--- quickfix and location list to help you solve all the
--- trouble your code is causing.
--- https://github.com/folke/trouble.nvim
-return {
-  'folke/trouble.nvim',
-  lazy = false,
-  dependencies = { 'nvim-tree/nvim-web-devicons' },
-  opts = {
-    auto_preview = true,
-    auto_fold = true,
-    auto_close = true,
-    use_lsp_diagnostic_signs = true,
-  },
-}

config/nvim/lua/plugins/ufo.lua

@@ -1,116 +0,0 @@
--- Not UFO in the sky, but an ultra fold in Neovim.
--- https://github.com/kevinhwang91/nvim-ufo/
-return {
-  'kevinhwang91/nvim-ufo',
-  version = '*',
-  dependencies = {
-    { 'neovim/nvim-lspconfig' },
-    { 'kevinhwang91/promise-async' },
-    { 'nvim-treesitter/nvim-treesitter' },
-    {
-      -- Status column plugin that provides a configurable
-      -- 'statuscolumn' and click handlers.
-      -- https://github.com/luukvbaal/statuscol.nvim
-      'luukvbaal/statuscol.nvim',
-      config = function()
-        local builtin = require 'statuscol.builtin'
-        require('statuscol').setup {
-          relculright = true,
-          segments = {
-            {
-              text = { builtin.foldfunc },
-              click = 'v:lua.ScFa',
-            },
-            {
-              sign = {
-                namespace = { 'diagnostic/signs' },
-                maxwidth = 2,
-                -- auto = true,
-              },
-              click = 'v:lua.ScSa',
-            },
-            {
-              text = { builtin.lnumfunc, ' ' },
-              click = 'v:lua.ScLa',
-            },
-          },
-        }
-      end,
-    },
-  },
-  config = function()
-    local capabilities = vim.lsp.protocol.make_client_capabilities()
-    capabilities.textDocument.foldingRange = {
-      dynamicRegistration = false,
-      lineFoldingOnly = true,
-    }
-    local language_servers = require('lspconfig').util.available_servers() -- or list servers manually like {'gopls', 'clangd'}
-    for _, ls in ipairs(language_servers) do
-      require('lspconfig')[ls].setup {
-        capabilities = capabilities,
-        -- you can add other fields for setting up lsp server in this table
-      }
-    end
-
-    require('ufo').setup {
-      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
-      --
-      -- This handler is called when the fold text is too long to fit in the window.
-      -- It is expected to truncate the text and return a new list of virtual text.
-      --
-      ---@param virtText table The current virtual text list.
-      ---@param lnum number The line number of the first line in the fold.
-      ---@param endLnum number The line number of the last line in the fold.
-      ---@param width number The width of the window.
-      ---@param truncate function Truncate function
-      ---@return table
-      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,
-    }
-  end,
-}

config/nvim/lua/plugins/ui.lua

@@ -27,147 +27,17 @@ return {
     },
   },
 
-  -- Extensible Neovim Scrollbar
-  -- https://github.com/petertriho/nvim-scrollbar
-  { 'petertriho/nvim-scrollbar', opts = {} },
-
-  -- vim dashboard
-  -- https://github.com/nvimdev/dashboard-nvim
-  {
-    'nvimdev/dashboard-nvim',
-    event = 'VimEnter',
-    config = function()
-      require('dashboard').setup {
-        theme = 'doom',
-        config = {
-          disable_move = true,
-          week_header = {
-            enable = true,
-          },
-          shortcut = {},
-          center = {
-            {
-              icon = ' ',
-              icon_hl = '@variable',
-              desc = 'Files',
-              group = 'Label',
-              action = 'Telescope find_files',
-              key = 'f',
-            },
-            {
-              icon = ' ',
-              desc = 'Marks',
-              group = 'DiagnosticHint',
-              action = 'Telescope harpoon marks',
-              key = 'a',
-            },
-            {
-              icon = '⚑ ',
-              desc = 'TODO',
-              group = 'DiagnosticOptions',
-              action = 'TodoTelescope',
-              key = 't',
-            },
-            {
-              icon = ' ',
-              desc = 'Search',
-              group = 'Number',
-              action = 'Telescope live_grep',
-              key = 's',
-            },
-            {
-              icon = '󰊳 ',
-              desc = 'Lazy Update',
-              group = '@property',
-              action = 'Lazy update',
-              key = 'u',
-            },
-          },
-        },
-      }
-    end,
-    dependencies = { { 'nvim-tree/nvim-web-devicons' } },
-  },
+  -- A neovim plugin that shows colorcolumn dynamically
+  -- https://github.com/Bekaboo/deadcolumn.nvim
+  { 'Bekaboo/deadcolumn.nvim' },
 
   -- Remove all background colors to make nvim transparent
   -- https://github.com/xiyaowong/nvim-transparent
-  { 'xiyaowong/nvim-transparent', opts = {} },
+  { 'xiyaowong/nvim-transparent',     opts = {} },
 
-  -- 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', opts = {} },
-
-  -- Indent guides for Neovim
-  -- https://github.com/lukas-reineke/indent-blankline.nvim
-  {
-    'lukas-reineke/indent-blankline.nvim',
-    main = 'ibl',
-    config = function()
-      require('ibl').setup {
-        indent = {
-          char = '│',
-        },
-        exclude = {
-          filetypes = { 'terminal', 'dashboard' },
-          buftypes = { 'dashboard' },
-        },
-      }
-    end,
-  },
-
-  -- Git integration for buffers
-  -- https://github.com/lewis6991/gitsigns.nvim
-  {
-    'lewis6991/gitsigns.nvim',
-    version = false,
-    lazy = false,
-    opts = {
-      signs = {
-        add = { text = '+' },
-        change = { text = '~' },
-        delete = { text = '_' },
-        topdelete = { text = '‾' },
-        changedelete = { text = '~' },
-      },
-      current_line_blame = false,
-      on_attach = function(bufnr)
-        local gs = require 'gitsigns'
-
-        local function map(mode, l, r, opts)
-          opts = opts or {}
-          opts.buffer = bufnr
-          vim.keymap.set(mode, l, r, opts)
-        end
-
-        -- Navigation
-        map('n', 'gn', function()
-          if vim.wo.diff then return ']c' end
-          vim.schedule(function() gs.next_hunk() end)
-          return '<Ignore>'
-        end, { expr = true })
-
-        map('n', 'gp', function()
-          if vim.wo.diff then return '[c' end
-          vim.schedule(function() gs.prev_hunk() end)
-          return '<Ignore>'
-        end, { expr = true })
-      end,
-    },
-  },
-
-  -- Seamless navigation between tmux panes and vim splits
-  -- https://github.com/christoomey/vim-tmux-navigator
-  {
-    'christoomey/vim-tmux-navigator',
-    cmd = {
-      'TmuxNavigateLeft',
-      'TmuxNavigateDown',
-      'TmuxNavigateUp',
-      'TmuxNavigateRight',
-      'TmuxNavigatePrevious',
-    },
-  },
+  -- Display a character as the colorcolumn
+  -- https://github.com/lukas-reineke/virt-column.nvim
+  { 'lukas-reineke/virt-column.nvim', opts = {} },
 
   -- Cloak allows you to overlay *'s over defined patterns in defined files.
   -- https://github.com/laytan/cloak.nvim
@@ -196,9 +66,6 @@ return {
       },
     },
   },
-  -- 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
@@ -221,24 +88,17 @@ return {
 
   -- Clarify and beautify your comments using boxes and lines.
   -- https://github.com/LudoPinelli/comment-box.nvim
-  { 'LudoPinelli/comment-box.nvim', opts = {} },
-
-  -- 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',
-    dependencies = {
-      'anuvyklack/middleclass',
-      'anuvyklack/animation.nvim',
-    },
-    opts = {},
+    'LudoPinelli/comment-box.nvim',
+    event = 'BufEnter',
+    opts = {}
   },
 
   -- Plugin to improve viewing Markdown files in Neovim
   -- https://github.com/MeanderingProgrammer/render-markdown.nvim
   {
     'MeanderingProgrammer/render-markdown.nvim',
+    event = 'BufEnter',
     dependencies = {
       'nvim-treesitter/nvim-treesitter',
       'nvim-tree/nvim-web-devicons',

config/nvim/lua/plugins/vim-sleuth.lua

@@ -1,3 +0,0 @@
--- Detect tabstop and shiftwidth automatically
--- https://github.com/tpope/vim-sleuth
-return { 'tpope/vim-sleuth' }

config/nvim/lua/plugins/which-key.lua

@@ -1,545 +0,0 @@
--- Useful plugin to show you pending keybinds.
--- https://github.com/folke/which-key.nvim
-return {
-  'folke/which-key.nvim',
-  lazy = false,
-  version = '*',
-  priority = 1001, -- Make sure to load this as soon as possible
-  dependencies = {
-    'nvim-lua/plenary.nvim',
-    'echasnovski/mini.icons',
-  },
-  config = function()
-    local wk = require 'which-key'
-    wk.setup()
-
-    wk.add {
-      -- ╭─────────────────────────────────────────────────────────╮
-      -- │                       With leader                       │
-      -- ╰─────────────────────────────────────────────────────────╯
-
-      -- ── Buffer ──────────────────────────────────────────────────────────
-      {
-        '<leader>b',
-        group = '[b] Buffer',
-        -- Add the current buffers to the menu
-        expand = function() return require('which-key.extras').expand.buf() end,
-      },
-      {
-        { '<leader>bk', '<cmd>blast<cr>', desc = 'Buffer: Last' },
-        { '<leader>bj', '<cmd>bfirst<cr>', desc = 'Buffer: First' },
-        { '<leader>bh', '<cmd>bprev<cr>', desc = 'Buffer: Prev' },
-        { '<leader>bl', '<cmd>bnext<cr>', desc = 'Buffer: Next' },
-        { '<leader>bd', '<cmd>Bdelete<cr>', desc = 'Buffer: Delete' },
-        { '<leader>bw', '<cmd>Bwipeout<cr>', desc = 'Buffer: Wipeout' },
-      },
-
-      -- ── Code ────────────────────────────────────────────────────────────
-      { '<leader>c', group = '[c] Code' },
-      { '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', desc = 'LSP: Code Action' },
-      { '<leader>cg', '<cmd>lua require("neogen").generate()<CR>', desc = 'Generate annotations' },
-
-      -- Code: treesj
-      { '<leader>cc', group = 'Code Split/Join' },
-      -- see: lua/plugins/treesj.lua
-      { '<leader>cct', '<cmd>TSJToggle<CR>', desc = 'Split/Join: Toggle' },
-      { '<leader>ccs', '<cmd>TSJSplit<CR>', desc = 'Split/Join: Split' },
-      { '<leader>ccj', '<cmd>TSJJoin<CR>', desc = 'Split/Join: Join' },
-
-      -- ── Code: CommentBox ────────────────────────────────────────────────
-      { '<leader>cb', group = 'CommentBox' },
-      { '<leader>cbb', '<Cmd>CBccbox<CR>', desc = 'CommentBox: Box Title' },
-      { '<leader>cbd', '<Cmd>CBd<CR>', desc = 'CommentBox: 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' },
-
-      -- ── Code: Refactoring ───────────────────────────────────────────────
-      { '<leader>cx', group = '[x] Refactoring' },
-      {
-        mode = { 'x' },
-        -- Extract function supports only visual mode
-        {
-          '<leader>cxe',
-          "<cmd>lua require('refactoring').refactor('Extract Function')<cr>",
-          desc = 'Extract Function',
-        },
-        {
-          '<leader>cxf',
-          "<cmd>lua require('refactoring').refactor('Extract Function To File')<cr>",
-          desc = 'Extract Function to File',
-        },
-        -- Extract variable supports only visual mode
-        {
-          '<leader>cxv',
-          "<cmd>lua require('refactoring').refactor('Extract Variable')<cr>",
-          desc = 'Extract Variable',
-        },
-      },
-      -- Inline func supports only normal
-      {
-        '<leader>cxif',
-        "<cmd>lua require('refactoring').refactor('Inline Function')<cr>",
-        desc = 'Inline Function',
-      },
-      -- Extract block supports only normal mode
-      {
-        '<leader>cxb',
-        "<cmd>lua require('refactoring').refactor('Extract Block')<cr>",
-        desc = 'Extract Block',
-      },
-      {
-        '<leader>cxbf',
-        "<cmd>lua require('refactoring').refactor('Extract Block To File')<cr>",
-        desc = 'Extract Block to File',
-      },
-      {
-        mode = { 'n', 'x' },
-        -- Inline var supports both normal and visual mode
-        {
-          '<leader>cxiv',
-          "<cmd>lua require('refactoring').refactor('Inline Variable')<cr>",
-          desc = 'Inline Variable',
-        },
-      },
-
-      -- ── Code: LSPSaga ───────────────────────────────────────────────────
-      -- See: lua/plugins/lsp.lua
-      {
-        '<C-a>',
-        '<cmd>Lspsaga term_toggle<cr>',
-        desc = 'LSPSaga: Open Floaterm',
-      },
-      {
-        '<leader>ca',
-        '<cmd>Lspsaga code_action<cr>',
-        desc = 'LSPSaga: Code Actions',
-      },
-      {
-        '<leader>cci',
-        '<cmd>Lspsaga incoming_calls<cr>',
-        desc = 'LSPSaga: Incoming Calls',
-      },
-      {
-        '<leader>cco',
-        '<cmd>Lspsaga outgoing_calls<cr>',
-        desc = 'LSPSaga: Outgoing Calls',
-      },
-      {
-        '<leader>cd',
-        '<cmd>Lspsaga show_line_diagnostics<cr>',
-        desc = 'LSPSaga: Show Line Diagnostics',
-      },
-      {
-        '<leader>cf',
-        '<cmd>lua require("conform").format({ async = true, lsp_fallback = true })<cr>',
-        mode = { 'n', 'v' },
-        desc = 'Format buffer',
-      },
-      {
-        '<leader>ci',
-        '<cmd>Lspsaga implement<cr>',
-        desc = 'LSPSaga: Implementations',
-      },
-      {
-        '<leader>cl',
-        '<cmd>Lspsaga show_cursor_diagnostics<cr>',
-        desc = 'LSPSaga: Show Cursor Diagnostics',
-      },
-      {
-        '<leader>cp',
-        '<cmd>Lspsaga peek_definition<cr>',
-        desc = 'LSPSaga: Peek Definition',
-      },
-      { '<leader>cr', '<cmd>Lspsaga rename<cr>', desc = 'LSPSaga: Rename' },
-      {
-        '<leader>cR',
-        '<cmd>Lspsaga rename ++project<cr>',
-        desc = 'LSPSaga: Rename Project wide',
-      },
-      {
-        '<leader>cs',
-        '<cmd>Lspsaga signature_help<cr>',
-        desc = 'LSPSaga: Signature Documentation',
-      },
-      {
-        '<leader>ct',
-        '<cmd>Lspsaga peek_type_definition<cr>',
-        desc = 'LSPSaga: Peek Type Definition',
-      },
-      {
-        '<leader>cu',
-        '<cmd>Lspsaga preview_definition<cr>',
-        desc = 'LSPSaga: Preview Definition',
-      },
-      {
-        '<leader>cv',
-        '<cmd>Lspsaga diagnostic_jump_prev<cr>',
-        desc = 'LSPSaga: Diagnostic Jump Prev',
-      },
-      {
-        '<leader>cw',
-        '<cmd>Lspsaga diagnostic_jump_next<cr>',
-        desc = 'LSPSaga: Diagnostic Jump Next',
-      },
-
-      -- ── DAP ─────────────────────────────────────────────────────────────
-      { '<leader>d', group = '[d] DAP' },
-      {
-        {
-          '<leader>db',
-          '<cmd>DapToggleBreakpoint',
-          desc = 'DAP: Toggle Breakpoint',
-        },
-        { '<leader>dc', '<cmd>DapContinue', desc = 'DAP: Continue' },
-        {
-          '<leader>do',
-          '<cmd>lua vim.diagnostic.open_float()<CR>',
-          desc = 'Diagnostic: Open float',
-        },
-        {
-          '<leader>dq',
-          '<cmd>lua vim.diagnostic.setloclist()<CR>',
-          desc = 'Diagnostic: Set loc list',
-        },
-        {
-          '<leader>dr',
-          "<cmd>lua require('dapui').open({reset = true})<CR>",
-          desc = 'DAP: Reset',
-        },
-        {
-          '<leader>ds',
-          '<cmd>lua require("telescope.builtin").lsp_document_symbols()<CR>',
-          desc = 'LSP: Document Symbols',
-        },
-        { '<leader>dt', '<cmd>DapUiToggle', desc = 'DAP: Toggle UI' },
-      },
-
-      -- ── Harpoon ─────────────────────────────────────────────────────────
-      -- See: lua/plugins/telescope.lua
-      { '<leader>h', group = '[h] Harpoon' },
-      {
-        {
-          '<leader>ha',
-          '<cmd>lua require("harpoon"):list():add()<cr>',
-          desc = 'harpoon file',
-        },
-        {
-          '<leader>hn',
-          '<cmd>lua require("harpoon"):list():next()<cr>',
-          desc = 'harpoon to next file',
-        },
-        {
-          '<leader>hp',
-          '<cmd>lua require("harpoon"):list():prev()<cr>',
-          desc = 'harpoon to previous file',
-        },
-        {
-          '<leader>ht',
-          "<cmd>lua require('harpoon.ui').toggle_quick_menu()<CR>",
-          desc = 'DAP: Harpoon UI',
-        },
-      },
-
-      -- ── LSP ─────────────────────────────────────────────────────────────
-      { '<leader>l', group = '[l] LSP' },
-      -- See: lua/plugins/lsp.lua
-
-      -- ── Quit ────────────────────────────────────────────────────────────
-      { '<leader>q', group = '[q] Quit' },
-      {
-        { '<leader>qf', '<cmd>q<CR>', desc = 'Quicker close split' },
-        { '<leader>qq', '<cmd>wq!<CR>', desc = 'Quit with force saving' },
-        { '<leader>qw', '<cmd>wq<CR>', desc = 'Write and quit' },
-      },
-
-      -- ── Search ──────────────────────────────────────────────────────────
-      { '<leader>s', group = '[s] Search' },
-      -- See: lua/plugins/telescope.lua
-      {
-        '<leader><space>',
-        "<cmd>lua require('telescope.builtin').buffers()<cr>",
-        desc = 'Find existing buffers',
-      },
-      {
-        '<leader><tab>',
-        "<cmd>lua require('telescope.builtin').commands()<CR>",
-        desc = 'Telescope: Commands',
-      },
-      {
-        '<leader>sd',
-        "<cmd>lua require('telescope.builtin').diagnostics()<cr>",
-        desc = 'Search Diagnostics',
-      },
-      {
-        '<leader>sg',
-        "<cmd>lua require('telescope.builtin').live_grep()<cr>",
-        desc = 'Search by Grep',
-      },
-      {
-        '<leader>sm',
-        '<cmd>Telescope harpoon marks<CR>',
-        desc = 'Harpoon Marks',
-      },
-      {
-        '<leader>sn',
-        "<cmd>lua require('telescope').extensions.notify.notify()<CR>",
-        desc = 'Show Notifications',
-      },
-      {
-        '<leader>so',
-        "<cmd>lua require('telescope.builtin').oldfiles()<cr>",
-        desc = 'Find recently Opened files',
-      },
-      {
-        '<leader>sp',
-        "<cmd>lua require('telescope').extensions.lazy_plugins.lazy_plugins()<cr>",
-        desc = 'Find neovim/lazy configs',
-      },
-      { '<leader>st', '<cmd>TodoTelescope<CR>', desc = 'Telescope: Show Todo' },
-      {
-        '<leader>sw',
-        "<cmd>lua require('telescope.builtin').grep_string()<cr>",
-        desc = 'Search current Word',
-      },
-
-      -- ── Toggle ──────────────────────────────────────────────────────────
-      { '<leader>t', group = '[t] Toggle' },
-      {
-        { '<leader>tc', '<cmd>CloakToggle<cr>', desc = 'Toggle Cloak' },
-        { '<leader>tn', '<cmd>Noice dismiss<CR>', desc = 'Noice dismiss' },
-        { '<leader>ts', '<cmd>noh<CR>', desc = 'Toggle Search Highlighting' },
-        {
-          '<leader>tt',
-          '<cmd>TransparentToggle<CR>',
-          desc = 'Toggle Transparency',
-        },
-        { '<leader>tw', '<cmd>Twilight<cr>', desc = 'Toggle Twilight' },
-      },
-
-      -- ── Workspace ───────────────────────────────────────────────────────
-      { '<leader>w', group = '[w] Workspace' },
-      {
-        {
-          '<leader>wa',
-          '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>',
-          desc = 'LSP: Workspace Add Folder',
-        },
-        {
-          '<leader>wl',
-          '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>',
-          desc = 'LSP: Workspace List Folders',
-        },
-        {
-          '<leader>wr',
-          '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>',
-          desc = 'LSP: Workspace Remove Folder',
-        },
-        {
-          '<leader>ws',
-          '<cmd>lua require("telescope.builtin").lsp_dynamic_workspace_symbols()<CR>',
-          desc = 'LSP: Workspace Symbols',
-        },
-      },
-
-      -- ── Trouble ─────────────────────────────────────────────────────────
-      { '<leader>x', group = '[x] Trouble' },
-      {
-        {
-          '<leader>xx',
-          '<cmd>Trouble diagnostics<cr>',
-          desc = 'Toggle Trouble Diagnostics',
-        },
-        {
-          '<leader>xw',
-          '<cmd>Trouble workspace_diagnostics<cr>',
-          desc = 'Toggle Workspace Diagnostics',
-        },
-        {
-          '<leader>xd',
-          '<cmd>Trouble document_diagnostics<cr>',
-          desc = 'Toggle Document Diagnostics',
-        },
-        { '<leader>xl', '<cmd>Trouble loclist<cr>', desc = 'Toggle Loclist' },
-        { '<leader>xq', '<cmd>Trouble quickfix<cr>', desc = 'Toggle Quickfix' },
-      },
-
-      -- ── Help ────────────────────────────────────────────────────────────
-      { '<leader>?', group = '[?] Help & Cheat sheets' },
-      {
-        {
-          '<leader>?w',
-          '<cmd>lua require("which-key").show({global = false})<cr>',
-          desc = 'Buffer Local Keymaps (which-key)',
-        },
-      },
-
-      -- ── Misc ────────────────────────────────────────────────────────────
-      { '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', desc = 'LSP: Type Definition' },
-      { '<leader>e', '<cmd>Neotree reveal<CR>', desc = 'NeoTree reveal' },
-
-      -- ╭─────────────────────────────────────────────────────────╮
-      -- │                     Without leader                      │
-      -- ╰─────────────────────────────────────────────────────────╯
-      { 'y', group = 'Yank & Surround' },
-
-      { 'gp', group = 'Goto Preview' },
-      {
-        {
-          'gpd',
-          '<cmd>lua require("goto-preview").goto_preview_definition()<CR>',
-          desc = 'Goto: Preview Definition',
-        },
-        {
-          'gpi',
-          '<cmd>lua require("goto-preview").goto_preview_implementation()<CR>',
-          desc = 'Goto: Preview Implementation',
-        },
-        {
-          'gpP',
-          '<cmd>lua require("goto-preview").close_all_windows()<CR>',
-          desc = 'Goto: Close All Preview Windows',
-        },
-      },
-
-      -- ── tmux navigation ─────────────────────────────────────────────────
-      {
-        {
-          '<c-h>',
-          '<cmd><C-U>TmuxNavigateLeft<cr>',
-          desc = 'tmux: Navigate Left',
-        },
-        {
-          '<c-j>',
-          '<cmd><C-U>TmuxNavigateDown<cr>',
-          desc = 'tmux: Navigate Down',
-        },
-        { '<c-k>', '<cmd><C-U>TmuxNavigateUp<cr>', desc = 'tmux: Navigate Up' },
-        {
-          '<c-l>',
-          '<cmd><C-U>TmuxNavigateRight<cr>',
-          desc = 'tmux: Navigate Right',
-        },
-        {
-          '<c-\\>',
-          '<cmd><C-U>TmuxNavigatePrevious<cr>',
-          desc = 'tmux: Navigate Previous',
-        },
-      },
-
-      -- ── Old habits ──────────────────────────────────────────────────────
-      { '<C-s>', '<cmd>w<CR>', desc = 'Save file' },
-
-      -- ── Text manipulation in visual mode ────────────────────────────────
-      {
-        mode = 'v',
-        { '>', '>gv', desc = 'Indent Right' },
-        { '<', '<gv', desc = 'Indent Left' },
-        { 'J', "<cmd>m '>+1<CR>gv=gv", desc = 'Move Block Down' },
-        { 'K', "<cmd>m '<-2<CR>gv=gv", desc = 'Move Block Up' },
-      },
-
-      -- ── LSP ─────────────────────────────────────────────────────────────
-      {
-        '<C-k>',
-        '<cmd>lua vim.lsp.buf.signature_help()<CR>',
-        desc = 'LSP: Signature Documentation',
-      },
-      {
-        'K',
-        '<cmd>Lspsaga hover_doc<cr>',
-        desc = 'LSPSaga: Hover Documentation',
-      },
-
-      { 'd', group = 'Diagnostics' },
-      {
-        {
-          'dn',
-          '<cmd>lua vim.diagnostic.goto_next()<CR>',
-          desc = 'Diagnostic: Goto Next',
-        },
-        {
-          'dp',
-          '<cmd>lua vim.diagnostic.goto_prev()<CR>',
-          desc = 'Diagnostic: Goto Prev',
-        },
-      },
-      {
-        { 'g', group = 'Goto' },
-        {
-          'gD',
-          '<cmd>lua vim.lsp.buf.declaration()<CR>',
-          desc = 'LSP: Goto Declaration',
-        },
-        {
-          'gI',
-          '<cmd>lua vim.lsp.buf.implementation()<CR>',
-          desc = 'LSP: Goto Implementation',
-        },
-        {
-          'gR',
-          '<cmd>Trouble lsp_references<cr>',
-          desc = 'Toggle LSP References',
-        },
-        {
-          'gd',
-          '<cmd>lua vim.lsp.buf.definition()<CR>',
-          desc = 'LSP: Goto Definition',
-        },
-        {
-          'gr',
-          '<cmd>lua require("telescope.builtin").lsp_references()<CR>',
-          desc = 'LSP: Goto References',
-        },
-      },
-
-      -- ── Misc keybinds ───────────────────────────────────────────────────
-      -- Sublime-like shortcut 'go to file' ctrl+p.
-      {
-        '<C-p>',
-        '<cmd>Telescope find_files<CR>',
-        desc = 'Search for files starting at current directory.',
-      },
-      { 'QQ', '<cmd>q!<CR>', desc = 'Quit without saving' },
-      { 'WW', '<cmd>w!<CR>', desc = 'Force write to file' },
-      { 'ss', '<cmd>noh<CR>', desc = 'Clear Search Highlighting' },
-      {
-        'jj',
-        '<Esc>',
-        desc = 'Esc without touching esc in insert mode',
-        mode = 'i',
-      },
-
-      -- ── Splits ──────────────────────────────────────────────────────────
-      --  Use CTRL+<hjkl> to switch between windows in normal mode
-      --  See `:help wincmd` for a list of all window commands
-      { '<C-h>', '<C-w><C-h>', desc = 'Move focus to the left window' },
-      { '<C-l>', '<C-w><C-l>', desc = 'Move focus to the right window' },
-      { '<C-j>', '<C-w><C-j>', desc = 'Move focus to the lower window' },
-      { '<C-k>', '<C-w><C-k>', desc = 'Move focus to the upper window' },
-      --  Split resizing
-      { '<C-w>,', '<cmd>vertical resize -10<CR>', desc = 'V Resize -' },
-      { '<C-w>.', '<cmd>vertical resize +10<CR>', desc = 'V Resize +' },
-
-      -- ── Disable arrow keys in normal mode ───────────────────────────────
-      { '<left>', '<cmd>echo "Use h to move!!"<CR>' },
-      { '<right>', '<cmd>echo "Use l to move!!"<CR>' },
-      { '<up>', '<cmd>echo "Use k to move!!"<CR>' },
-      { '<down>', '<cmd>echo "Use j to move!!"<CR>' },
-
-      -- ── Terminal ────────────────────────────────────────────────────────
-      -- 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.
-      { '<Esc><Esc>', '<C-\\><C-n>', desc = 'Exit terminal mode', mode = 't' },
-
-      -- ── Search ──────────────────────────────────────────────────────────
-      -- :noh if you have search highlights
-      { '<Esc><Esc>', '<cmd>noh<CR>', desc = 'Clear search highlights' },
-    }
-  end,
-}

config/nvm/default-packages

@@ -0,0 +1,5 @@
+# $NVM_DIR/default-packages
+
+yarn
+neovim
+corepack

config/omp/own.toml

@@ -1,122 +1,117 @@
 "$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"
+console_title_template = '{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}'
+version = 3
+auto_upgrade = false
 final_space = true
-console_title_template = "{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}"
-version = 2
-auto_upgrade = true
-
-[[blocks]]
-alignment = "left"
-type = "prompt"
-
-  [[blocks.segments]]
-  foreground = "cyan"
-  style = "powerline"
-  template = "{{ .Icon }}"
-  type = "os"
-
-  [[blocks.segments]]
-  type = "session"
-  style = "plain"
-  template = " {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}"
-
-  [[blocks.segments]]
-  foreground = "cyan"
-  style = "plain"
-  template = " {{ .Path }} "
-  type = "path"
-
-    [blocks.segments.properties]
-    style = "mixed"
-
-    [blocks.segments.mapped_locations]
-    "~/Code/*" = ""
-    "~/Code/ivuorinen/" = ""
-
-  [[blocks.segments]]
-  type = "git"
-  style = "plain"
-  foreground = "lightGreen"
-  # template = "{{ .UpstreamIcon }}{{ .HEAD }} {{ if or (.Staging.Changed) (.Working.Changed) }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uF046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}){{ end }}"
-  template = "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }}"
-
-    [blocks.segments.properties]
-    fetch_status = true
-    fetch_upstream_icon = true
-
-      [blocks.segments.properties.untracked_modes]
-      "~/Code/oh-my-posh/" = "no"
-
-  [[blocks.segments]]
-  type = "terraform"
-  style = "plain"
-  foreground = "#000000"
-  background = "#ebcc34"
-  template = "{{.WorkspaceName}}"
-
-[[blocks]]
-alignment = "left"
-type = "prompt"
-
-  [[blocks.segments]]
-  foreground = "#68a063"
-  style = "plain"
-  template = " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}"
-  type = "node"
-
-    [blocks.segments.properties]
-    display_mode = "files"
-    fetch_package_manager = true
-    fetch_version = true
-
-  [[blocks.segments]]
-  foreground = "#4063D8"
-  style = "plain"
-  template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
-  type = "crystal"
-
-    [blocks.segments.properties]
-    display_mode = "files"
-    fetch_version = true
-
-  [[blocks.segments]]
-  foreground = "#DE3F24"
-  style = "plain"
-  template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
-  type = "ruby"
-
-    [blocks.segments.properties]
-    display_mode = "files"
-    fetch_version = true
-
-  [[blocks.segments]]
-  foreground = "#FED142"
-  style = "plain"
-  template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
-  type = "python"
-
-    [blocks.segments.properties]
-    display_mode = "context"
-    fetch_virtual_env = false
-
-[[blocks]]
-  alignment = "left"
-  newline = true
-  type = "prompt"
-
-  [[blocks.segments]]
-  background = "transparent"
-  foreground = "lightGreen"
-  foreground_templates = [ "{{ if gt .Code 0 }}red{{ end }}" ]
-  style = "plain"
-  template = "➜"
-  type = "status"
-
-    [blocks.segments.properties]
-    always_enabled = true
 
 [transient_prompt]
-background = "transparent"
-foreground = "lightGreen"
-foreground_templates = [ "{{ if gt .Code 0 }}red{{ end }}" ]
-template = "➜ "
+  template = '➜ '
+  foreground = 'lightGreen'
+  background = 'transparent'
+  foreground_templates = ['{{ if gt .Code 0 }}red{{ end }}']
 
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+
+  [[blocks.segments]]
+    style = 'powerline'
+    template = '{{ .Icon }}'
+    foreground = 'cyan'
+    type = 'os'
+
+  [[blocks.segments]]
+    style = 'plain'
+    template = ' {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}'
+    type = 'session'
+
+  [[blocks.segments]]
+    style = 'plain'
+    template = ' {{ .Path }} '
+    foreground = 'cyan'
+    type = 'path'
+
+    [blocks.segments.properties]
+      style = 'mixed'
+
+  [[blocks.segments]]
+    style = 'plain'
+    template = '{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }}'
+    foreground = 'lightGreen'
+    type = 'git'
+
+    [blocks.segments.properties]
+      fetch_status = true
+      fetch_upstream_icon = true
+
+      [blocks.segments.properties.untracked_modes]
+        '~/Code/oh-my-posh/' = 'no'
+
+  [[blocks.segments]]
+    style = 'plain'
+    template = '{{.WorkspaceName}}'
+    foreground = '#000000'
+    background = '#ebcc34'
+    type = 'terraform'
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+
+  [[blocks.segments]]
+    style = 'plain'
+    template = ' {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}'
+    foreground = '#68a063'
+    type = 'node'
+
+    [blocks.segments.properties]
+      display_mode = 'files'
+      fetch_package_manager = true
+      fetch_version = true
+
+  [[blocks.segments]]
+    style = 'plain'
+    template = ' {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}'
+    foreground = '#4063D8'
+    type = 'crystal'
+
+    [blocks.segments.properties]
+      display_mode = 'files'
+      fetch_version = true
+
+  [[blocks.segments]]
+    style = 'plain'
+    template = ' {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}'
+    foreground = '#DE3F24'
+    type = 'ruby'
+
+    [blocks.segments.properties]
+      display_mode = 'files'
+      fetch_version = true
+
+  [[blocks.segments]]
+    style = 'plain'
+    template = ' {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}'
+    foreground = '#FED142'
+    type = 'python'
+
+    [blocks.segments.properties]
+      display_mode = 'context'
+      fetch_version = true
+      fetch_virtual_env = true
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    style = 'plain'
+    template = '➜'
+    foreground = 'lightGreen'
+    background = 'transparent'
+    type = 'status'
+    foreground_templates = ['{{ if gt .Code 0 }}red{{ end }}']
+
+    [blocks.segments.properties]
+      always_enabled = true

config/tms/config.toml

@@ -0,0 +1,5 @@
+default_session = "main"
+
+[[search_dirs]]
+path = "~/Code"
+depth = 10

config/tmux/tmux.conf

@@ -28,6 +28,15 @@ bind -n M-Down  select-pane -D
 # Reload tmux config with <prefix> + r
 bind r source-file ~/.dotfiles/config/tmux/tmux.conf \; display "tmux cfg reloaded!"
 
+# Switch to next client with <prefix>( and previous with <prefix>)
+bind -r '(' switch-client -p\; refresh-client -S
+bind -r ')' switch-client -n\; refresh-client -S
+
+# tms, https://github.com/jrmoulton/tmux-sessionizer
+bind C-h display-popup -E "tms"
+bind C-j display-popup -E "tms switch"
+bind C-k display-popup -E "tms windows"
+
 # Open a new window with <prefix> + N
 bind N new-window
 
@@ -112,7 +121,7 @@ set-option -g status-left ''
 set-option -g window-status-format ' #I:#W '
 set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag, ◈ ,} '
 
-set-option -g status-right "#{hostname_short}/#S #{tmux_mode_indicator}"
+set-option -g status-right "#{hostname_short}/#(tms sessions) #{tmux_mode_indicator}"
 
 set -g pane-border-style "fg=#3b4261"
 set -g pane-active-border-style "fg=#7aa2f7"
@@ -138,15 +147,11 @@ set -g @tmux_window_name_max_name_len "20"
 set -g @tmux_window_name_use_tilde "True"
 set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh', 'oh-my-posh']"
 set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
-set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases', 'oh-my-posh', 'antidot']" # Default is []
-set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local')]"
+set -g @tmux_window_name_ignored_programs "['sqlite3', 'oh-my-posh', 'antidot', 'antidote', 'direnv']" # Default is []
+set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local'), ('.+asdf', 'asdf')]"
 
 ## https://github.com/tmux-plugins/tmux-continuum
-set -g @continuum-restore 'on'
-
-## https://github.com/tmux-plugins/tmux-resurrect
-set -g @resurrect-strategy-nvim 'session'
-set -g @resurrect-dir '~/.local/state/tmux/tmux-resurrect'
+# set -g @continuum-restore 'on'
 
 ## https://github.com/MunifTanjim/tmux-mode-indicator
 set -g @mode_indicator_prefix_mode_style 'bg=default,fg=#7aa2f7'
@@ -160,9 +165,8 @@ set -g @mode_indicator_sync_mode_style 'bg=default,fg=red'
 
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-sensible/sensible.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-window-name/tmux_window_name.tmux
-run-shell ~/.dotfiles/config/tmux/plugins/tmux-resurrect/resurrect.tmux
-run-shell ~/.dotfiles/config/tmux/plugins/tmux-continuum/continuum.tmux
-run-shell ~/.dotfiles/config/tmux/plugins/tmux-sessionist/sessionist.tmux
+# run-shell ~/.dotfiles/config/tmux/plugins/tmux-continuum/continuum.tmux
+# run-shell ~/.dotfiles/config/tmux/plugins/tmux-sessionist/sessionist.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-mode-indicator/mode_indicator.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-suspend/suspend.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-yank/yank.tmux

config/wezterm/wezterm.lua

@@ -1,9 +1,14 @@
-local wezterm = require("wezterm")
+local wezterm = require 'wezterm'
 local config = wezterm.config_builder()
 
 -- Font and font size
 config.font_size = 14.0
-config.font = wezterm.font("JetBrainsMonoNL Nerd Font Mono")
+config.font = wezterm.font_with_fallback {
+  'JetBrainsMonoNL Nerd Font Mono',
+  'JetBrains Mono',
+  'Noto Color Emoji',
+  'Symbols Nerd Font Mono',
+}
 
 -- Make the window a bit transparent
 config.window_background_opacity = 0.97
@@ -15,16 +20,16 @@ config.send_composed_key_when_left_alt_is_pressed = true
 
 -- Function to detect the theme based on appearance
 function Scheme_for_appearance(appearance)
-  if appearance:find("Dark") then
-    return "Tokyo Night Storm"
+  if appearance:find 'Dark' then
+    return 'Tokyo Night Storm'
   else
-    return "Tokyo Night Day"
+    return 'Tokyo Night Day'
   end
 end
 
 -- Set the color scheme based on appearance
 ---@diagnostic disable-next-line: unused-local
-wezterm.on("window-config-reloaded", function(window, pane)
+wezterm.on('window-config-reloaded', function(window, pane)
   local overrides = window:get_config_overrides() or {}
   local appearance = window:get_appearance()
   local scheme = Scheme_for_appearance(appearance)

config/zsh/antidote.zsh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+# Setup antidote for Oh My Zsh
+# vim: ft=zsh et sw=2 ts=2
+
+[[ -z "$DOTFILES" ]] && DOTFILES="$HOME/.dotfiles"
+[[ -z "$ANTIDOTE_DIR" ]] && ANTIDOTE_DIR="$DOTFILES/tools/antidote"
+[[ -z "$ANTIDOTE_HOME" ]] && ANTIDOTE_HOME="$XDG_CACHE_HOME/antidote"
+[[ -z "$ANTIDOTE_PLUGINS" ]] && ANTIDOTE_PLUGINS="$XDG_CONFIG_HOME/zsh/antidote_plugins"
+
+[[ ! -d "$ANTIDOTE_DIR" ]] && {
+  git submodule add \
+    --name antidote \
+    --depth=1 \
+    -f https://github.com/mattmc3/antidote.git "${ANTIDOTE_DIR}"
+  git config -f .gitmodules submodule.antidote.shallow true
+}
+
+# Plugin configurations
+zstyle ':antidote:bundle' use-friendly-names 'yes'
+zstyle ':omz:update' mode reminder
+zstyle ':omz:plugins:nvm' autoload yes
+
+# Pure prompt settings
+export PURE_PROMPT_SYMBOL='➜'
+export PURE_GIT_UNTRACKED_DIRTY=0
+export PURE_CMD_MAX_EXEC_TIME=86400 # 24 hours
+zstyle ':prompt:pure:git:stash' show yes
+zstyle ':prompt:pure:execution_time' show no
+zstyle ':prompt:pure:user' color magenta
+zstyle ':prompt:pure:user:root' color red
+zstyle ':prompt:pure:host' color green
+zstyle ':prompt:pure:path' color white
+zstyle ':prompt:pure:prompt:success' color green
+zstyle ':prompt:pure:prompt:error' color red
+
+# Disable ls colors to avoid issues with eza
+export DISABLE_LS_COLORS=true
+zstyle ':omz:plugins:eza' 'dirs-first' yes
+zstyle ':omz:plugins:eza' 'git-status' yes
+zstyle ':omz:plugins:eza' 'icons' yes
+zstyle ':omz:plugins:eza' 'ls' yes
+zstyle ':omz:plugins:eza' 'prompt' yes
+
+[[ -f "${ANTIDOTE_PLUGINS}.txt" ]] || touch "${ANTIDOTE_PLUGINS}.txt"
+FPATH="$ANTIDOTE_DIR/functions:$FPATH"
+autoload -Uz antidote
+if [[ ! "${ANTIDOTE_PLUGINS}.zsh" -nt "${ANTIDOTE_PLUGINS}.txt" ]]; then
+  antidote bundle <"${ANTIDOTE_PLUGINS}.txt" >|"${ANTIDOTE_PLUGINS}.zsh"
+fi
+
+# Source your static plugins file.
+# shellcheck source=$HOME/.dotfiles/config/zsh/antidote_plugins.zsh
+source "${ANTIDOTE_PLUGINS}.zsh"

config/zsh/antidote_plugins.txt

@@ -0,0 +1,41 @@
+# This file is for Antidote plugins
+# https://getantidote.github.io/usage
+# vim: ft=ini
+
+# set up Zsh completions with plugins
+mattmc3/ez-compinit
+zsh-users/zsh-completions kind:fpath path:src
+
+# frameworks like oh-my-zsh are supported
+getantidote/use-omz        # handle OMZ dependencies
+ohmyzsh/ohmyzsh path:lib   # load OMZ's library
+
+# Use pure prompt
+mafredri/zsh-async
+sindresorhus/pure
+
+ohmyzsh/ohmyzsh path:plugins/colored-man-pages
+ohmyzsh/ohmyzsh path:plugins/brew
+ohmyzsh/ohmyzsh path:plugins/extract
+ohmyzsh/ohmyzsh path:plugins/eza
+ohmyzsh/ohmyzsh path:plugins/fzf
+ohmyzsh/ohmyzsh path:plugins/git
+ohmyzsh/ohmyzsh path:plugins/golang
+ohmyzsh/ohmyzsh path:plugins/gpg-agent
+ohmyzsh/ohmyzsh path:plugins/nvm
+ohmyzsh/ohmyzsh path:plugins/python
+ohmyzsh/ohmyzsh path:plugins/tmux
+ohmyzsh/ohmyzsh path:plugins/z
+
+# Automatically activate nvm if .nvmrc file is present
+ivuorinen/nvm-auto-use
+
+# Add core plugins that make Zsh a bit more like Fish
+zdharma-continuum/fast-syntax-highlighting
+
+# Add some plugins that are not in OMZ
+jreese/zsh-titles
+yuki-ycino/tms
+
+# This needs to be last bundle
+# zsh-users/zsh-syntax-highlighting

config/zsh/completion/_oh-my-posh

@@ -0,0 +1,212 @@
+#compdef oh-my-posh
+compdef _oh-my-posh oh-my-posh
+
+# zsh completion for oh-my-posh                           -*- shell-script -*-
+
+__oh-my-posh_debug()
+{
+    local file="$BASH_COMP_DEBUG_FILE"
+    if [[ -n ${file} ]]; then
+        echo "$*" >> "${file}"
+    fi
+}
+
+_oh-my-posh()
+{
+    local shellCompDirectiveError=1
+    local shellCompDirectiveNoSpace=2
+    local shellCompDirectiveNoFileComp=4
+    local shellCompDirectiveFilterFileExt=8
+    local shellCompDirectiveFilterDirs=16
+    local shellCompDirectiveKeepOrder=32
+
+    local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace keepOrder
+    local -a completions
+
+    __oh-my-posh_debug "\n========= starting completion logic =========="
+    __oh-my-posh_debug "CURRENT: ${CURRENT}, words[*]: ${words[*]}"
+
+    # The user could have moved the cursor backwards on the command-line.
+    # We need to trigger completion from the $CURRENT location, so we need
+    # to truncate the command-line ($words) up to the $CURRENT location.
+    # (We cannot use $CURSOR as its value does not work when a command is an alias.)
+    words=("${=words[1,CURRENT]}")
+    __oh-my-posh_debug "Truncated words[*]: ${words[*]},"
+
+    lastParam=${words[-1]}
+    lastChar=${lastParam[-1]}
+    __oh-my-posh_debug "lastParam: ${lastParam}, lastChar: ${lastChar}"
+
+    # For zsh, when completing a flag with an = (e.g., oh-my-posh -n=<TAB>)
+    # completions must be prefixed with the flag
+    setopt local_options BASH_REMATCH
+    if [[ "${lastParam}" =~ '-.*=' ]]; then
+        # We are dealing with a flag with an =
+        flagPrefix="-P ${BASH_REMATCH}"
+    fi
+
+    # Prepare the command to obtain completions
+    requestComp="${words[1]} __complete ${words[2,-1]}"
+    if [ "${lastChar}" = "" ]; then
+        # If the last parameter is complete (there is a space following it)
+        # We add an extra empty parameter so we can indicate this to the go completion code.
+        __oh-my-posh_debug "Adding extra empty parameter"
+        requestComp="${requestComp} \"\""
+    fi
+
+    __oh-my-posh_debug "About to call: eval ${requestComp}"
+
+    # Use eval to handle any environment variables and such
+    out=$(eval ${requestComp} 2>/dev/null)
+    __oh-my-posh_debug "completion output: ${out}"
+
+    # Extract the directive integer following a : from the last line
+    local lastLine
+    while IFS='\n' read -r line; do
+        lastLine=${line}
+    done < <(printf "%s\n" "${out[@]}")
+    __oh-my-posh_debug "last line: ${lastLine}"
+
+    if [ "${lastLine[1]}" = : ]; then
+        directive=${lastLine[2,-1]}
+        # Remove the directive including the : and the newline
+        local suffix
+        (( suffix=${#lastLine}+2))
+        out=${out[1,-$suffix]}
+    else
+        # There is no directive specified.  Leave $out as is.
+        __oh-my-posh_debug "No directive found.  Setting do default"
+        directive=0
+    fi
+
+    __oh-my-posh_debug "directive: ${directive}"
+    __oh-my-posh_debug "completions: ${out}"
+    __oh-my-posh_debug "flagPrefix: ${flagPrefix}"
+
+    if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then
+        __oh-my-posh_debug "Completion received error. Ignoring completions."
+        return
+    fi
+
+    local activeHelpMarker="_activeHelp_ "
+    local endIndex=${#activeHelpMarker}
+    local startIndex=$((${#activeHelpMarker}+1))
+    local hasActiveHelp=0
+    while IFS='\n' read -r comp; do
+        # Check if this is an activeHelp statement (i.e., prefixed with $activeHelpMarker)
+        if [ "${comp[1,$endIndex]}" = "$activeHelpMarker" ];then
+            __oh-my-posh_debug "ActiveHelp found: $comp"
+            comp="${comp[$startIndex,-1]}"
+            if [ -n "$comp" ]; then
+                compadd -x "${comp}"
+                __oh-my-posh_debug "ActiveHelp will need delimiter"
+                hasActiveHelp=1
+            fi
+
+            continue
+        fi
+
+        if [ -n "$comp" ]; then
+            # If requested, completions are returned with a description.
+            # The description is preceded by a TAB character.
+            # For zsh's _describe, we need to use a : instead of a TAB.
+            # We first need to escape any : as part of the completion itself.
+            comp=${comp//:/\\:}
+
+            local tab="$(printf '\t')"
+            comp=${comp//$tab/:}
+
+            __oh-my-posh_debug "Adding completion: ${comp}"
+            completions+=${comp}
+            lastComp=$comp
+        fi
+    done < <(printf "%s\n" "${out[@]}")
+
+    # Add a delimiter after the activeHelp statements, but only if:
+    # - there are completions following the activeHelp statements, or
+    # - file completion will be performed (so there will be choices after the activeHelp)
+    if [ $hasActiveHelp -eq 1 ]; then
+        if [ ${#completions} -ne 0 ] || [ $((directive & shellCompDirectiveNoFileComp)) -eq 0 ]; then
+            __oh-my-posh_debug "Adding activeHelp delimiter"
+            compadd -x "--"
+            hasActiveHelp=0
+        fi
+    fi
+
+    if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then
+        __oh-my-posh_debug "Activating nospace."
+        noSpace="-S ''"
+    fi
+
+    if [ $((directive & shellCompDirectiveKeepOrder)) -ne 0 ]; then
+        __oh-my-posh_debug "Activating keep order."
+        keepOrder="-V"
+    fi
+
+    if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then
+        # File extension filtering
+        local filteringCmd
+        filteringCmd='_files'
+        for filter in ${completions[@]}; do
+            if [ ${filter[1]} != '*' ]; then
+                # zsh requires a glob pattern to do file filtering
+                filter="\*.$filter"
+            fi
+            filteringCmd+=" -g $filter"
+        done
+        filteringCmd+=" ${flagPrefix}"
+
+        __oh-my-posh_debug "File filtering command: $filteringCmd"
+        _arguments '*:filename:'"$filteringCmd"
+    elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then
+        # File completion for directories only
+        local subdir
+        subdir="${completions[1]}"
+        if [ -n "$subdir" ]; then
+            __oh-my-posh_debug "Listing directories in $subdir"
+            pushd "${subdir}" >/dev/null 2>&1
+        else
+            __oh-my-posh_debug "Listing directories in ."
+        fi
+
+        local result
+        _arguments '*:dirname:_files -/'" ${flagPrefix}"
+        result=$?
+        if [ -n "$subdir" ]; then
+            popd >/dev/null 2>&1
+        fi
+        return $result
+    else
+        __oh-my-posh_debug "Calling _describe"
+        if eval _describe $keepOrder "completions" completions $flagPrefix $noSpace; then
+            __oh-my-posh_debug "_describe found some completions"
+
+            # Return the success of having called _describe
+            return 0
+        else
+            __oh-my-posh_debug "_describe did not find completions."
+            __oh-my-posh_debug "Checking if we should do file completion."
+            if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then
+                __oh-my-posh_debug "deactivating file completion"
+
+                # We must return an error code here to let zsh know that there were no
+                # completions found by _describe; this is what will trigger other
+                # matching algorithms to attempt to find completions.
+                # For example zsh can match letters in the middle of words.
+                return 1
+            else
+                # Perform file completion
+                __oh-my-posh_debug "Activating file completion"
+
+                # We must return the result of this command, so it must be the
+                # last command, or else we must store its result to return it.
+                _arguments '*:filename:_files'" ${flagPrefix}"
+            fi
+        fi
+    fi
+}
+
+# don't run the completion function when being source-ed or eval-ed
+if [ "$funcstack[1]" = "_oh-my-posh" ]; then
+    _oh-my-posh
+fi

config/zsh/prompt.zsh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+# Setup prompt
+# vim: ft=zsh:
+
+setopt PROMPT_SUBST
+
+# Setup vcs_info
+autoload -Uz vcs_info
+zstyle ':vcs_info:*' enable git
+zstyle ':vcs_info:*' max-exports 2
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:*' check-for-staged-changes true
+zstyle ':vcs_info:*' use-simple true
+zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unstaged changes
+zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
+
+zstyle ':vcs_info:*' formats '%F{5}%F{2}%b%c%u%F{5}%f '
+zstyle ':vcs_info:*' actionformats '%F{5}%F{2}%b%F{3}|%F{1}%a%c%u%F{5}%f '
+
+theme_precmd () {
+  vcs_info
+}
+
+export NL=$'\n'
+
+# Set defaults for display.
+# We want the host always, but only the user if we are in an SSH session or root.
+P_HOST="%F{green}%m%f"
+P_USER=''
+
+# If we are in an SSH session, we want to show the username
+[[ "$SSH_CONNECTION" != '' ]] && P_USER="%{${fg}[magenta]%}%n%f"
+
+# If we are root, color the user name differently
+[[ $UID -eq 0 ]] && P_USER="%{${fg}[red]%}%n%f"
+
+# If P_USER is set, suffix user with @ giving us user@host
+[[ -n "$P_USER" ]] && P_USER="$P_USER@"
+
+# Combine the prompt parts. Could be just the host, or user@host.
+P_PREFIX="$P_USER$P_HOST"
+
+# Set the color of the current directory
+P_DIR="%F{blue}%~%f"
+
+# Change the color of the prompt if the last command failed
+P_SHELL="%(?.%F{green}.%F{red})➜%f"
+
+# Any extras we want to display
+P_EXTRA=""
+
+# Set the prompt
+# user@host /path/to/current/dir (branch) ➜
+export PROMPT="${P_PREFIX} ${P_DIR} %{$reset_color%}${vcs_info_msg_0_}%{$reset_color%}%{${P_EXTRA}%}${NL}${P_SHELL} "
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd theme_precmd

docs/nvim-keybindings.md

@@ -2,171 +2,399 @@
 
 ```txt
 
-n  <Space>/    * <Lua 380: ~/.config/nvim/lua/plugins/telescope.lua:82>
-                 [/] Fuzzily search in current buffer]
-n  <Space>hw   * <Lua 42: ~/.config/nvim/lua/plugins/harpoon.lua:40>
-                 Open harpoon window with telescope
-n  <Space>1    * <Lua 40: ~/.config/nvim/lua/plugins/harpoon.lua:68>
-                 harpoon to file 1
-n  <Space>hn   * <Lua 39: ~/.config/nvim/lua/plugins/harpoon.lua:61>
-                 harpoon to next file
-n  <Space>hp   * <Lua 38: ~/.config/nvim/lua/plugins/harpoon.lua:54>
-                 harpoon to previous file
-n  <Space>ha   * <Lua 37: ~/.config/nvim/lua/plugins/harpoon.lua:47>
-                 harpoon file
-n  <Space>5    * <Lua 36: ~/.config/nvim/lua/plugins/harpoon.lua:96>
-                 harpoon to file 5
-n  <Space>4    * <Lua 35: ~/.config/nvim/lua/plugins/harpoon.lua:89>
-                 harpoon to file 4
-n  <Space>3    * <Lua 34: ~/.config/nvim/lua/plugins/harpoon.lua:82>
-                 harpoon to file 3
-n  <Space>2    * <Lua 33: ~/.config/nvim/lua/plugins/harpoon.lua:75>
-                 harpoon to file 2
-n  <Space>tc   * <Cmd>CloakToggle<CR>
-                 [tc] Toggle Cloak
-n  <Space>xx   * <Cmd>Trouble<CR>
-                 Toggle Trouble
-n  <Space>xq   * <Cmd>Trouble quickfix<CR>
-                 Toggle Quickfix
-n  <Space>xl   * <Cmd>Trouble loclist<CR>
-                 Toggle Loclist
-n  <Space>xd   * <Cmd>Trouble document_diagnostics<CR>
-                 Toggle Document Diagnostics
-n  <Space>xw   * <Cmd>Trouble workspace_diagnostics<CR>
-                 Toggle Workspace Diagnostics
-n  <Space>?s   * <Cmd>Neoconf show<CR>
-                 Neoconf: Show merged config
-n  <Space>?m   * <Cmd>Neoconf lsp<CR>
-                 Neoconf: Show merged LSP config
-n  <Space>?l   * <Cmd>Neoconf local<CR>
-                 Neoconf: Local
-n  <Space>?g   * <Cmd>Neoconf global<CR>
-                 Neoconf: Global
-n  <Space>?c   * <Cmd>Neoconf<CR>
-                 Neoconf: Open
-n  <Space>wl   * <Cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>
-                 LSP: Workspace List Folders
-n  <Space>wr   * <Cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>
-                 LSP: Workspace Remove Folder
-n  <Space>wa   * <Cmd>lua vim.lsp.buf.add_workspace_folder()<CR>
-                 LSP: Workspace Add Folder
-n  <Space>ws   * <Cmd>lua require("telescope.builtin").lsp_dynamic_workspace_symbols()<CR>
-                 LSP: Workspace Symbols
-n  <Space>ds   * <Cmd>lua require("telescope.builtin").lsp_document_symbols()<CR>
-                 LSP: Document Symbols
-n  <Space>D    * <Cmd>lua vim.lsp.buf.type_definition()<CR>
-                 LSP: Type Definition
-n  <Space>ca   * <Cmd>lua vim.lsp.buf.code_action()<CR>
-                 LSP: Code Action
-n  <Space>cr   * <Cmd>lua vim.lsp.buf.rename()<CR>
-                 LSP: Rename
-n  <Space>dq   * <Cmd>lua vim.diagnostic.setloclist()<CR>
-                 Diagnostic: Set loc list
-n  <Space>do   * <Cmd>lua vim.diagnostic.open_float()<CR>
-                 Diagnostic: Open float
-   <Space>cf   * <Lua 107: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 [f] Format buffer
-n  <Space>e    * <Lua 81: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 NeoTree reveal
-n  <Space>cg   * <Lua 50: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+x  <Space>     *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "<Space>"
+n  <Space>     *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "<Space>"
+x  "           *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after """
+n  "           *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after """
+x  '           *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "'"
+n  '           *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "'"
+x  `           *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "`"
+n  `           *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "`"
+x  g           *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "g"
+n  g           *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "g"
+x  z           *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "z"
+n  z           *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "z"
+n  <C-W>       *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Query keys after "<C-W>"
+n  <Esc><Esc>  * :nohlsearch<CR>
+                 Clear Search Highlighting
+n  <Space>qQ   * :q!<CR>
+                 Force quit without saving
+n  <Space>qw   * :wq<CR>
+                 Write and quit
+n  <Space>qq   * :wq!<CR>
+                 Quit with force saving
+n  <Space>qf   * :q<CR>
+                 Quicker close split
+n  <Space>tn   * :Noice dismiss<CR>
+                 Noice: Dismiss Notification
+n  <Space>tl   * :lua vim.o.bg = vim.o.bg:get() == "light" and "dark" or "light"<CR>
+                 Toggle Light/Dark Mode
+n  <Space>te   * :Neotree toggle<CR>
+                 Toggle Neotree
+n  <Space>tc   * :CloakToggle<CR>
+                 Cloak: Toggle
+n  <Space>o    * ~/.config/nvim/lua/keymaps.lua
+                 Open repo in browser
+n  <Space>xx   * :Trouble diagnostics<CR>
+                 Trouble: Diagnostic
+n  <Space>xw   * :Trouble workspace_diagnostics<CR>
+                 Trouble: Workspace Diagnostics
+n  <Space>xq   * :Trouble quickfix<CR>
+                 Trouble: Quickfix
+n  <Space>xl   * :Trouble loclist<CR>
+                 Trouble: Location List
+n  <Space>xd   * :Trouble document_diagnostics<CR>
+                 Trouble: Document Diagnostics
+n  <Space>sx   * :Telescope import<CR>
+                 Telescope: Import
+n  <Space>sw   * :Telescope grep_string<CR>
+                 Grep String
+n  <Space>st   * :TodoTelescope<CR>
+                 Search Todos
+n  <Space>ss   * :Telescope treesitter<CR>
+                 Treesitter
+n  <Space>sq   * :Telescope quickfix<CR>
+                 Quickfix
+n  <Space>sp   * :lua require("telescope").extensions.lazy_plugins.lazy_plugins()<CR>
+                 Lazy Plugins
+n  <Space>so   * :Telescope oldfiles<CR>
+                 Old Files
+n  <Space>sl   * :Telescope luasnip<CR>
+                 Search LuaSnip
+n  <Space>sk   * :Telescope keymaps<CR>
+                 Search Keymaps
+n  <Space>sh   * :Telescope highlights<CR>
+                 List Highlights
+n  <Space>sg   * :Telescope live_grep<CR>
+                 Search by Grep
+n  <Space>sd   * :Telescope diagnostics<CR>
+                 Search Diagnostics
+n  <Space>sc   * :Telescope commands<CR>
+                 Commands
+n  <Space>/    * ~/.config/nvim/lua/keymaps.lua
+                 Fuzzily search in current buffer
+n  <Space>,    * :Telescope buffers<CR>
+                 Find existing buffers
+n  <Space>f    * :Telescope find_files<CR>
+                 Find Files
+n  <Space>cbt  * <Cmd>CBllline<CR>
+                 CB: Titled Line
+n  <Space>cbm  * <Cmd>CBllbox14<CR>
+                 CB: Marked
+n  <Space>cbl  * <Cmd>CBline<CR>
+                 CB: Simple Line
+n  <Space>cbd  * <Cmd>CBd<CR>
+                 CB: Remove a box
+n  <Space>cbb  * <Cmd>CBccbox<CR>
+                 CB: Box Title
+n  <Space>cw   * :Lspsaga diagnostic_jump_next<CR>
+                 Diagnostic Jump Next
+n  <Space>cv   * :Lspsaga diagnostic_jump_prev<CR>
+                 Diagnostic Jump Prev
+n  <Space>cu   * :Lspsaga preview_definition<CR>
+                 Preview Definition
+n  <Space>cT   * :Telescope lsp_type_definitions<CR>
+                 LSP Type Definitions
+n  <Space>ct   * :Lspsaga peek_type_definition<CR>
+                 Peek Type Definition
+n  <Space>cs   * :Telescope lsp_document_symbols<CR>
+                 LSP Document Symbols
+n  <Space>cR   * :Lspsaga rename ++project<CR>
+                 Rename Project wide
+n  <Space>cr   * :Lspsaga rename<CR>
+                 Rename
+n  <Space>cp   * :Lspsaga peek_definition<CR>
+                 Peek Definition
+n  <Space>cl   * :Lspsaga show_cursor_diagnostics<CR>
+                 Cursor Diagnostics
+n  <Space>ci   * :Lspsaga implement<CR>
+                 Implementations
+x  <Space>cf   * :lua vim.lsp.buf.format()<CR>
+                 Format
+n  <Space>cf   * :lua vim.lsp.buf.format()<CR>
+                 Format
+n  <Space>cd   * :Lspsaga show_line_diagnostics<CR>
+                 Line Diagnostics
+n  <Space>cco  * :Lspsaga outgoing_calls<CR>
+                 Outgoing Calls
+n  <Space>cci  * :Lspsaga incoming_calls<CR>
+                 Incoming Calls
+n  <Space>ca   * :Lspsaga code_action<CR>
+                 Code Action
+n  <Space>cg   * :lua require("neogen").generate()<CR>
                  Generate annotations
-n  <Space>zm   * <Lua 49: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search mappings.
-n  <Space>zh   * <Lua 48: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search history of opened files
-n  <Space>zb   * <Lua 47: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search open buffers.
-n  <Space>zt   * <Lua 46: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search open tabs.
-n  <Space>zc   * <Lua 32: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search commands.
-n  <Space>zf   * <Lua 31: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search for files in given path.
-n  <Space>zg   * <Lua 25: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search with rg (aka live grep).
-n  <Space>dc   * <Lua 45: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 DAP: Continue
-n  <Space>db   * <Lua 44: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 DAP: Toggle Breakpoint
-n  <Space>dt   * <Lua 43: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 DAP: Toggle UI
-n  <Space>ht   * <Lua 369: ~/.config/nvim/lua/plugins/harpoon.lua:16>
-                 Open Harpoon Quick menu
-n  <Space>dr   * <Lua 41: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 DAP: Reset
-x  #           * <Lua 7: vim/_defaults.lua:0>
+n  <Space>bw   * :lua MiniBufremove.wipeout()<CR>
+                 Wipeout
+n  <Space>bl   * :bnext<CR>
+                 Next
+n  <Space>bk   * :blast<CR>
+                 Last
+n  <Space>bj   * :bfirst<CR>
+                 First
+n  <Space>bh   * :bprev<CR>
+                 Prev
+n  <Space>bd   * :lua MiniBufremove.delete()<CR>
+                 Delete
+x  #           * vim/_defaults.lua
                  :help v_#-default
 o  %             <Plug>(MatchitOperationForward)
 x  %             <Plug>(MatchitVisualForward)
 n  %             <Plug>(MatchitNormalForward)
 n  &           * :&&<CR>
                  :help &-default
-x  *           * <Lua 3: vim/_defaults.lua:0>
+x  *           * vim/_defaults.lua
                  :help v_star-default
+o  ;           * ~/.local/share/nvim/lazy/mini.jump/lua/mini/jump.lua
+                 Repeat jump
+x  ;           * <Cmd>lua MiniJump.jump()<CR>
+                 Repeat jump
+n  ;           * <Cmd>lua MiniJump.jump()<CR>
+                 Repeat jump
+v  <           * <gv
+                 Indent Left
+n  <           * <gv
+                 Indent Left
+v  >           * >gv
+                 Indent Right
+n  >           * >gv
+                 Indent Right
+n  @           * ~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Execute macro without 'mini.clue' triggers
 x  @           * mode() == 'V' ? ':normal! @'.getcharstr().'<CR>' : '@'
                  :help v_@-default
-n  K           * <Cmd>lua vim.lsp.buf.hover()<CR>
-                 LSP: Hover Documentation
+o  F           * ~/.local/share/nvim/lazy/mini.jump/lua/mini/jump.lua
+                 Jump backward
+x  F           * <Cmd>lua MiniJump.smart_jump(true, false)<CR>
+                 Jump backward
+n  F           * <Cmd>lua MiniJump.smart_jump(true, false)<CR>
+                 Jump backward
+n  K           * :Lspsaga hover_doc<CR>
+                 Hover Documentation
+n  Q           * ~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua
+                 Execute macro without 'mini.clue' triggers
 x  Q           * mode() == 'V' ? ':normal! @<C-R>=reg_recorded()<CR><CR>' : 'Q'
                  :help v_Q-default
-x  S             <Plug>VSurround
+o  T           * ~/.local/share/nvim/lazy/mini.jump/lua/mini/jump.lua
+                 Jump backward till
+x  T           * <Cmd>lua MiniJump.smart_jump(true, true)<CR>
+                 Jump backward till
+n  T           * <Cmd>lua MiniJump.smart_jump(true, true)<CR>
+                 Jump backward till
 n  Y           * y$
                  :help Y-default
+n  Zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+                 Flash Treesitter
+x  Zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+                 Flash Treesitter
+o  Zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+                 Flash Treesitter
 o  [%            <Plug>(MatchitOperationMultiBackward)
 x  [%            <Plug>(MatchitVisualMultiBackward)
 n  [%            <Plug>(MatchitNormalMultiBackward)
-n  [d          * <Lua 15: vim/_defaults.lua:0>
+o  [i          * <Cmd>lua MiniIndentscope.operator('top')<CR>
+                 Go to indent scope top
+x  [i          * <Cmd>lua MiniIndentscope.operator('top')<CR>
+                 Go to indent scope top
+n  [i          * <Cmd>lua MiniIndentscope.operator('top', true)<CR>
+                 Go to indent scope top
+o  [h          * V<Cmd>lua MiniDiff.goto_hunk('prev')<CR>
+                 Previous hunk
+x  [h          * <Cmd>lua MiniDiff.goto_hunk('prev')<CR>
+                 Previous hunk
+n  [h          * <Cmd>lua MiniDiff.goto_hunk('prev')<CR>
+                 Previous hunk
+o  [H          * V<Cmd>lua MiniDiff.goto_hunk('first')<CR>
+                 First hunk
+x  [H          * <Cmd>lua MiniDiff.goto_hunk('first')<CR>
+                 First hunk
+n  [H          * <Cmd>lua MiniDiff.goto_hunk('first')<CR>
+                 First hunk
+n  [d          * vim/_defaults.lua
                  Jump to the previous diagnostic
 o  ]%            <Plug>(MatchitOperationMultiForward)
 x  ]%            <Plug>(MatchitVisualMultiForward)
 n  ]%            <Plug>(MatchitNormalMultiForward)
-n  ]d          * <Lua 14: vim/_defaults.lua:0>
+o  ]i          * <Cmd>lua MiniIndentscope.operator('bottom')<CR>
+                 Go to indent scope bottom
+x  ]i          * <Cmd>lua MiniIndentscope.operator('bottom')<CR>
+                 Go to indent scope bottom
+n  ]i          * <Cmd>lua MiniIndentscope.operator('bottom', true)<CR>
+                 Go to indent scope bottom
+o  ]H          * V<Cmd>lua MiniDiff.goto_hunk('last')<CR>
+                 Last hunk
+x  ]H          * <Cmd>lua MiniDiff.goto_hunk('last')<CR>
+                 Last hunk
+n  ]H          * <Cmd>lua MiniDiff.goto_hunk('last')<CR>
+                 Last hunk
+o  ]h          * V<Cmd>lua MiniDiff.goto_hunk('next')<CR>
+                 Next hunk
+x  ]h          * <Cmd>lua MiniDiff.goto_hunk('next')<CR>
+                 Next hunk
+n  ]h          * <Cmd>lua MiniDiff.goto_hunk('next')<CR>
+                 Next hunk
+n  ]d          * vim/_defaults.lua
                  Jump to the next diagnostic
 x  a%            <Plug>(MatchitVisualTextObject)
-n  cS            <Plug>CSurround
-n  cs            <Plug>Csurround
-n  ds            <Plug>Dsurround
-n  dp          * <Cmd>lua vim.diagnostic.goto_prev()<CR>
-                 Diagnostic: Goto Prev
-n  dn          * <Cmd>lua vim.diagnostic.goto_next()<CR>
-                 Diagnostic: Goto Next
+o  ai          * <Cmd>lua MiniIndentscope.textobject(true)<CR>
+                 Object scope with border
+x  ai          * <Cmd>lua MiniIndentscope.textobject(true)<CR>
+                 Object scope with border
+o  f           * ~/.local/share/nvim/lazy/mini.jump/lua/mini/jump.lua
+                 Jump forward
+x  f           * <Cmd>lua MiniJump.smart_jump(false, false)<CR>
+                 Jump forward
+n  f           * <Cmd>lua MiniJump.smart_jump(false, false)<CR>
+                 Jump forward
+n  gR          * :RegexplainerToggle<CR>
+                 Toggle Regexplainer
 o  g%            <Plug>(MatchitOperationBackward)
 x  g%            <Plug>(MatchitVisualBackward)
 n  g%            <Plug>(MatchitNormalBackward)
-x  gS            <Plug>VgSurround
-n  gR          * :RegexplainerToggle<CR>
-                 Toggle Regexplainer
-n  gD          * <Cmd>lua vim.lsp.buf.declaration()<CR>
-                 LSP: Goto Declaration
-n  gd          * <Cmd>lua vim.lsp.buf.definition()<CR>
-                 LSP: Goto Definition
-n  gr          * <Cmd>lua require("telescope.builtin").lsp_references()<CR>
-                 LSP: Goto References
-n  gI          * <Cmd>lua vim.lsp.buf.implementation()<CR>
-                 LSP: Goto Implementation
-o  gc          * <Lua 13: vim/_defaults.lua:0>
+o  gh          * <Cmd>lua MiniDiff.textobject()<CR>
+                 Hunk range textobject
+x  gH          * ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua
+                 Reset hunks
+n  gH          * ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua
+                 Reset hunks
+x  gh          * ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua
+                 Apply hunks
+n  gh          * ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua
+                 Apply hunks
+x  gs          * <Cmd>lua MiniOperators.sort('visual')<CR>
+                 Sort selection
+n  gss           ^gsg_
+                 Sort line
+n  gs          * v:lua.MiniOperators.sort()
+                 Sort operator
+x  gr          * <Cmd>lua MiniOperators.replace('visual')<CR>
+                 Replace selection
+n  grr           gr_
+                 Replace line
+n  gr          * v:lua.MiniOperators.replace()
+                 Replace operator
+x  gm          * <Cmd>lua MiniOperators.multiply('visual')<CR>
+                 Multiply selection
+n  gmm           gm_
+                 Multiply line
+n  gm          * v:lua.MiniOperators.multiply()
+                 Multiply operator
+n  gxx           gx_
+                 Exchange line
+x  g=          * <Cmd>lua MiniOperators.evaluate('visual')<CR>
+                 Evaluate selection
+n  g==           g=_
+                 Evaluate line
+n  g=          * v:lua.MiniOperators.evaluate()
+                 Evaluate operator
+x  gS          * :<C-U>lua MiniSplitjoin.toggle({ region = MiniSplitjoin.get_visual_region() })<CR>
+                 Toggle arguments
+n  gS          * v:lua.MiniSplitjoin.operator("toggle") . " "
+                 Toggle arguments
+o  gc          * <Cmd>lua MiniComment.textobject()<CR>
                  Comment textobject
-n  gcc         * <Lua 12: vim/_defaults.lua:0>
-                 Toggle comment line
-x  gc          * <Lua 11: vim/_defaults.lua:0>
-                 Toggle comment
-n  gc          * <Lua 10: vim/_defaults.lua:0>
-                 Toggle comment
-x  gx          * <Lua 9: vim/_defaults.lua:0>
-                 Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)
-n  gx          * <Lua 8: vim/_defaults.lua:0>
-                 Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)
+n  gcc         * ~/.local/share/nvim/lazy/mini.comment/lua/mini/comment.lua
+                 Comment line
+x  gc          * ~/.local/share/nvim/lazy/mini.comment/lua/mini/comment.lua
+                 Comment selection
+n  gc          * ~/.local/share/nvim/lazy/mini.comment/lua/mini/comment.lua
+                 Comment
+x  gx          * <Cmd>lua MiniOperators.exchange('visual')<CR>
+                 Exchange selection
+n  gx          * v:lua.MiniOperators.exchange()
+                 Exchange operator
+o  ii          * <Cmd>lua MiniIndentscope.textobject(false)<CR>
+                 Object scope
+x  ii          * <Cmd>lua MiniIndentscope.textobject(false)<CR>
+                 Object scope
 n  j           * v:count == 0 ? 'gj' : 'j'
                  Move down
 n  k           * v:count == 0 ? 'gk' : 'k'
                  Move up
-n  n           * <Lua 51: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Twilight
-n  ySS           <Plug>YSsurround
-n  ySs           <Plug>YSsurround
-n  yss           <Plug>Yssurround
-n  yS            <Plug>YSurround
-n  ys            <Plug>Ysurround
+n  shn         * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Highlight next surrounding
+n  sFn         * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Find next left surrounding
+n  sfn         * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Find next right surrounding
+n  srn         * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Replace next surrounding
+n  sdn         * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Delete next surrounding
+n  shl         * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Highlight previous surrounding
+n  sFl         * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Find previous left surrounding
+n  sfl         * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Find previous right surrounding
+n  srl         * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Replace previous surrounding
+n  sdl         * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Delete previous surrounding
+x  sa          * :<C-U>lua MiniSurround.add('visual')<CR>
+                 Add surrounding to selection
+n  sn          * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Update `MiniSurround.config.n_lines`
+n  sh          * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Highlight surrounding
+n  sF          * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Find left surrounding
+n  sf          * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Find right surrounding
+n  sr          * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Replace surrounding
+n  sd          * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Delete surrounding
+n  sa          * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua
+                 Add surrounding
+o  t           * ~/.local/share/nvim/lazy/mini.jump/lua/mini/jump.lua
+                 Jump forward till
+x  t           * <Cmd>lua MiniJump.smart_jump(false, true)<CR>
+                 Jump forward till
+n  t           * <Cmd>lua MiniJump.smart_jump(false, true)<CR>
+                 Jump forward till
+x  zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+                 Flash
+n  zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+                 Flash
+o  zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+                 Flash
+n  <C-W>=      * <C-W>=
+                 Equal Size Splits
+n  <C-W>+      * :resize +5<CR>
+                 H Resize +
+n  <C-W>-      * :resize -5<CR>
+                 H Resize -
+n  <C-W>.      * :vertical resize +10<CR>
+                 V Resize +
+n  <C-W>,      * :vertical resize -10<CR>
+                 V Resize -
+v  <C-J>       * :m '>+1<CR>gv=gv
+                 Move Block Down
+n  <C-J>       * :m '>+1<CR>gv=gv
+                 Move Block Down
+v  <C-K>       * :m '<-2<CR>gv=gv
+                 Move Block Up
+n  <C-K>       * :m '<-2<CR>gv=gv
+                 Move Block Up
+n  <C-S>       * :w!<CR>
+                 Save
+n  <Down>      * :echo "Use j to move!!"<CR>
+n  <Up>        * :echo "Use k to move!!"<CR>
+n  <Right>     * :echo "Use l to move!!"<CR>
+n  <Left>      * :echo "Use h to move!!"<CR>
 x  <Plug>(MatchitVisualTextObject)   <Plug>(MatchitVisualMultiBackward)o<Plug>(MatchitVisualMultiForward)
 o  <Plug>(MatchitOperationMultiForward) * :<C-U>call matchit#MultiMatch("W",  "o")<CR>
 o  <Plug>(MatchitOperationMultiBackward) * :<C-U>call matchit#MultiMatch("bW", "o")<CR>
@@ -180,44 +408,29 @@ x  <Plug>(MatchitVisualBackward) * :<C-U>call matchit#Match_wrapper('',0,'v')<CR
 x  <Plug>(MatchitVisualForward) * :<C-U>call matchit#Match_wrapper('',1,'v')<CR>:if col("''") != col("$") | exe ":normal! m'" | endif<CR>gv``
 n  <Plug>(MatchitNormalBackward) * :<C-U>call matchit#Match_wrapper('',0,'n')<CR>
 n  <Plug>(MatchitNormalForward) * :<C-U>call matchit#Match_wrapper('',1,'n')<CR>
-v  <Plug>VgSurround * :<C-U>call <SNR>27_opfunc(visualmode(),visualmode() ==# 'V' ? 0 : 1)<CR>
-v  <Plug>VSurround * :<C-U>call <SNR>27_opfunc(visualmode(),visualmode() ==# 'V' ? 1 : 0)<CR>
-n  <Plug>YSurround * <SNR>27_opfunc2('setup')
-n  <Plug>Ysurround * <SNR>27_opfunc('setup')
-n  <Plug>YSsurround * <SNR>27_opfunc2('setup').'_'
-n  <Plug>Yssurround * '^'.v:count1.<SNR>27_opfunc('setup').'g_'
-n  <Plug>CSurround * :<C-U>call <SNR>27_changesurround(1)<CR>
-n  <Plug>Csurround * :<C-U>call <SNR>27_changesurround()<CR>
-n  <Plug>Dsurround * :<C-U>call <SNR>27_dosurround(<SNR>27_inputtarget())<CR>
-n  <Plug>SurroundRepeat * .
-n  <C-L>       * :<C-U>TmuxNavigateRight<CR>
-n  <C-Bslash>  * :<C-U>TmuxNavigatePrevious<CR>
-n  <C-J>       * :<C-U>TmuxNavigateDown<CR>
-n  <C-H>       * :<C-U>TmuxNavigateLeft<CR>
-n  <C-K>       * :<C-U>TmuxNavigateUp<CR>
-s  <Plug>luasnip-jump-prev * <Lua 283: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:57>
-                 LuaSnip: Jump to the previous node
-s  <Plug>luasnip-jump-next * <Lua 282: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:54>
-                 LuaSnip: Jump to the next node
-s  <Plug>luasnip-prev-choice * <Lua 281: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:51>
-                 LuaSnip: Change to the previous choice from the choiceNode
-s  <Plug>luasnip-next-choice * <Lua 280: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:48>
-                 LuaSnip: Change to the next choice from the choiceNode
-s  <Plug>luasnip-expand-snippet * <Lua 279: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:45>
-                 LuaSnip: Expand the current snippet
-s  <Plug>luasnip-expand-or-jump * <Lua 278: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:42>
-                 LuaSnip: Expand or jump in the current snippet
-   <Plug>luasnip-expand-repeat * <Lua 276: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:35>
-                 LuaSnip: Repeat last node expansion
-n  <Plug>luasnip-delete-check * <Lua 274: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:28>
-                 LuaSnip: Removes current snippet from jumplist
+n  <M-k>       * <Cmd>lua MiniMove.move_line('up')<CR>
+                 Move line up
+n  <M-j>       * <Cmd>lua MiniMove.move_line('down')<CR>
+                 Move line down
+n  <M-l>       * <Cmd>lua MiniMove.move_line('right')<CR>
+                 Move line right
+n  <M-h>       * <Cmd>lua MiniMove.move_line('left')<CR>
+                 Move line left
+x  <M-k>       * <Cmd>lua MiniMove.move_selection('up')<CR>
+                 Move up
+x  <M-j>       * <Cmd>lua MiniMove.move_selection('down')<CR>
+                 Move down
+x  <M-l>       * <Cmd>lua MiniMove.move_selection('right')<CR>
+                 Move right
+x  <M-h>       * <Cmd>lua MiniMove.move_selection('left')<CR>
+                 Move left
 n  <Plug>PlenaryTestFile * :lua require('plenary.test_harness').test_file(vim.fn.expand("%:p"))<CR>
-n  <C-P>       * <Lua 26: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search for files starting at current directory.
 n  <C-W><C-D>    <C-W>d
                  Show diagnostics under the cursor
-n  <C-W>d      * <Lua 16: vim/_defaults.lua:0>
+n  <C-W>d      * vim/_defaults.lua
                  Show diagnostics under the cursor
+n  <C-L>       * :lua vim.lsp.buf.signature_help()<CR>
+                 Signature
 ```
 
-- Generated on Wed 25 Sep 2024 14:52:25 EEST
+- Generated on Mon 9 Dec 2024 10:05:25 EET

install.conf.yaml

@@ -19,6 +19,7 @@
     ~/.local/share/gnupg:
       mode: 0700
     ~/.local/state:
+    ~/.local/state/zsh:
     ~/.ssh:
       mode: 0700
     ~/.ssh/local.d:

local/bin/dfm

@@ -122,7 +122,6 @@ section_install()
 
   MENU=(
     "all:Installs everything in the correct order"
-    "antigen:Updates the antigen.zsh file"
     "cargo:Install rust/cargo packages"
     "cheat-databases:Install cheat external cheatsheet databases"
     "composer:Install composer"
@@ -148,34 +147,22 @@ section_install()
       msgr msg "Starting to install all and reloading configurations..."
       $0 install macos
       $0 install fonts
-      $0 install antigen
       $0 brew install
       $0 install ohmyposh
       $0 install asdf
-      # $0 install ohmybash
-      # $0 install pip
-      # $0 install cargo
       $0 install composer
-      # $0 install dotenv
       $0 install fzf
-      # $0 install gh
-      # $0 install go
+      $0 install go
       $0 install cheat-databases
       $0 install imagick
-      # $0 install neofetch
-      # $0 install nvm
-      # $0 install npm
-      $0 install ntfy
+      $0 install nvm
+      $0 install npm
+      # $0 install ntfy
       $0 install z
       msgr msg "Reloading configurations again..."
       source "$DOTFILES/config/shared.sh"
       msgr yay "All done!"
       ;;
-    antigen)
-      msg "Installing antigen..."
-      curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
-        && msg_yay "New antigen installed!"
-      ;;
     asdf)
       msg "Installing asdf..."
       bash "$DOTFILES/scripts/install-asdf.sh both" \
@@ -198,13 +185,6 @@ section_install()
       bash "$DOTFILES/scripts/install-composer.sh" \
         && msg_yay "composer installed!"
       ;;
-    dotenv)
-      msg "Installing dotenv-linter..."
-      curl -sSfL \
-        https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh \
-        | sh -s -- -b "$XDG_BIN_HOME" \
-        && msg_yay "dotenv-linter installed!"
-      ;;
     fonts)
       msg "Installing fonts..."
       bash "$DOTFILES/scripts/install-fonts.sh" \
@@ -231,13 +211,6 @@ section_install()
         && chmod +x "$XDG_BIN_HOME/magick" \
         && msg_yay "imagick installed!"
       ;;
-    starship)
-      msg "Installing starship.rs..."
-      curl -sS https://starship.rs/install.sh | sh -s -- \
-        --bin-dir ~/.local/bin \
-        --yes \
-        && msg_yay "starship installed!"
-      ;;
     macos)
       msg "Setting up macOS defaults..."
       bash "$DOTFILES/scripts/set-macos-defaults.sh" \
@@ -250,9 +223,11 @@ section_install()
       ;;
     nvm)
       msg "Installing nvm..."
-      curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash
-      git checkout "$DOTFILES/base/zshrc"
-      git checkout "$DOTFILES/base/bashrc"
+      NVM_VERSION=$(x-gh-get-latest-version nvm-sh/nvm)
+      msg "Latest nvm version: $NVM_VERSION"
+      NVM_INSTALL="https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh"
+      NVM_CURL="curl -o- \"$NVM_INSTALL\" | bash"
+      PROFILE=/dev/null bash -c "$NVM_CURL"
       $0 install nvm-latest
       msg_yay "nvm installed!"
       ;;
@@ -276,11 +251,6 @@ section_install()
       bash "$DOTFILES/scripts/install-ntfy.sh" \
         && msg_yay "ntfy installed!"
       ;;
-    ohmybash)
-      msg "oh-my-bash install started..."
-      bash "$DOTFILES/scripts/install-ohmybash.sh" \
-        && msg_yay "oh-my-bash installed!"
-      ;;
     ohmyposh)
       msg "oh-my-posh install started..."
       bash "$DOTFILES/scripts/install-ohmyposh.sh" \
@@ -392,18 +362,106 @@ section_brew()
   ! x-have brew && menu_section "$USAGE_PREFIX" "brew not available on this system"
 }
 
+section_asdf()
+{
+  USAGE_PREFIX="$SCRIPT asdf <command>"
+  MENU=(
+    "install:Install asdf"
+    "current:Show asdf current versions"
+    "global:Show asdf global versions"
+    "installed:Show asdf installed versions"
+    "local:Show asdf local versions"
+    "versions:Show asdf versions"
+    "where:Show asdf where"
+    "which:Show asdf which"
+  )
+
+  case "$1" in
+    install)
+      msg "Installing asdf..."
+      bash "$DOTFILES/scripts/install-asdf.sh both" \
+        && msg_yay "asdf installed!"
+      ;;
+    current)
+      asdf current
+      ;;
+    global)
+      asdf global
+      ;;
+    installed)
+      asdf list
+      ;;
+    local)
+      asdf local
+      ;;
+    versions)
+      asdf list all
+      ;;
+    where)
+      asdf where
+      ;;
+    which)
+      asdf which
+      ;;
+    *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
+  esac
+}
+
 section_helpers()
 {
   USAGE_PREFIX="$SCRIPT helpers <command>"
   MENU=(
-    "path:Show \$PATH dir by dir"
+    "aliases:<shell> (bash, zsh) Show aliases for bash or zsh"
+    "colors:Show colors"
+    "env:Show environment variables"
+    "functions:Show functions"
+    "nvim:Show nvim keybindings"
+    'path:Show $PATH dir by dir'
+    "tmux:Show tmux keybindings"
+    "wezterm:Show wezterm keybindings"
   )
 
-  case "$1" in
+  CMD="$1"
+  shift
+  SECTION="$1"
+  shift
+
+  case "$CMD" in
     path)
       # shellcheck disable=2001
       for i in $(echo "$PATH" | sed 's/:/ /g'); do echo "$i"; done
       ;;
+    aliases)
+      case "$SECTION" in
+        "zsh")
+          zsh -ixc : 2>&1 | grep -E '> alias' | sed "s|$HOME|~|" | grep -v "(eval)"
+          ;;
+        "bash")
+          bash -ixc : 2>&1 | grep -E '> alias' | sed "s|$HOME|~|" | grep -v "(eval)"
+          ;;
+        *)
+          echo "$SCRIPT helpers aliases <shell> (bash, zsh)"
+          ;;
+      esac
+      ;;
+    "colors")
+      for i in {0..255}; do echo -en "\e[38;5;${i}m${i} "; done
+      ;;
+    "env")
+      env | sort
+      ;;
+    "functions")
+      declare -F
+      ;;
+    "nvim")
+      cat "$DOTFILES/docs/nvim-keybindings.md"
+      ;;
+    "tmux")
+      cat "$DOTFILES/docs/tmux-keybindings.md"
+      ;;
+    "wezterm")
+      cat "$DOTFILES/docs/wezterm-keybindings.md"
+      ;;
     *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
   esac
 }
@@ -506,12 +564,12 @@ section_check()
 
   case "$1" in
     a | arch)
-      [[ "$2" = "" ]] && echo "$X_ARCH" && exit 0
-      [[ $X_ARCH = "$2" ]] && exit 0 || exit 1
+      [[ $2 == "" ]] && echo "$X_ARCH" && exit 0
+      [[ $X_ARCH == "$2" ]] && exit 0 || exit 1
       ;;
     h | host | hostname)
-      [[ "$2" = "" ]] && echo "$X_HOSTNAME" && exit 0
-      [[ $X_HOSTNAME = "$2" ]] && exit 0 || exit 1
+      [[ $2 == "" ]] && echo "$X_HOSTNAME" && exit 0
+      [[ $X_HOSTNAME == "$2" ]] && exit 0 || exit 1
       ;;
     *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
   esac
@@ -524,9 +582,16 @@ section_tests()
 
   MENU=(
     "msg:List all log functions from shared.sh"
+    "params:List all parameters"
   )
 
   case "$1" in
+    params)
+      echo "All parameters:"
+      for i in "$@"; do
+        echo "  $i"
+      done
+      ;;
     msg)
       msg "msg"
       msg_done "msg_done"
@@ -555,6 +620,8 @@ usage()
   echo ""
   section_install
   echo ""
+  section_asdf
+  echo ""
   section_brew
   echo ""
   section_check
@@ -566,14 +633,22 @@ usage()
   section_helpers
 }
 
-# The main loop. first keyword after $0 triggers section, or help.
-case "$1" in
-  install) section_install "$2" ;;
-  brew) section_brew "$2" ;;
-  check) section_check "$2" ;;
-  dotfiles) section_dotfiles "$2" ;;
-  helpers) section_helpers "$2" ;;
-  docs) section_docs "$2" ;;
-  tests) section_tests "$2" ;;
-  *) usage && exit 0 ;;
-esac
+main()
+{
+  SECTION="$1"
+  shift
+  # The main loop. The first keyword after $0 triggers section, or help.
+  case "$SECTION" in
+    install) section_install "$@" ;;
+    asdf) section_asdf "$@" ;;
+    brew) section_brew "$@" ;;
+    check) section_check "$@" ;;
+    dotfiles) section_dotfiles "$@" ;;
+    helpers) section_helpers "$@" ;;
+    docs) section_docs "$@" ;;
+    tests) section_tests "$@" ;;
+    *) usage && exit 0 ;;
+  esac
+}
+
+main "$@"

scripts/create-nvim-keymaps.sh

@@ -19,8 +19,12 @@ main()
 
   printf "\n\`\`\`\n\n- Generated on %s\n" "$(date)" >> "$DEST"
 
-  # Remove lines with "Last set from" from the file
-  sed -e '/^	Last set from/d' "$DEST" > "${DEST}.tmp" && mv "${DEST}.tmp" "$DEST"
+  # Remove unnecessary information from the output and the last line
+  sed -E \
+    -e 's/<Lua [^:]+: ([^:>]+):[0-9]+>/\1/' \
+    -e '/^	Last set from/d' "$DEST" \
+    > "${DEST}.tmp" \
+    && mv "${DEST}.tmp" "$DEST"
 
   msg "Neovim keybindings documentation generated at $DEST"
 }

scripts/install-asdf.sh

@@ -4,7 +4,7 @@
 #
 # It also updates asdf and the plugins, and then reshim asdf.
 #
-# Usage: ./install-asdf.sh [both|install|add_plugins]
+# Usage: ./install-asdf.sh [both|install|update|add_plugins]
 # Author: Ismo Vuorinen <https://github.com/ivuorinen>
 # License: MIT
 #
@@ -13,9 +13,37 @@ source "${DOTFILES}/config/shared.sh"
 export ASDF_DIR="${XDG_BIN_HOME}/asdf"
 export PATH="${ASDF_DIR}/bin:$PATH"
 
+# If ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME is not set, set it
+if [ -z "${ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME}" ]; then
+  export ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME="${XDG_CONFIG_HOME}/asdf/plugin-versions"
+fi
+
 msg "Sourcing asdf in your shell"
 . "$ASDF_DIR/asdf.sh"
 
+ASDF_INSTALLABLES=(
+  "1password-cli:github.com/NeoHsu/asdf-1password-cli.git"
+  "age:github.com/threkk/asdf-age.git"
+  "bottom:github.com/carbonteq/asdf-btm.git"
+  "direnv:github.com/asdf-community/asdf-direnv.git"
+  "dotenv-linter:github.com/wesleimp/asdf-dotenv-linter.git"
+  "editorconfig-checker:github.com/gabitchov/asdf-editorconfig-checker.git"
+  "fd:gitlab.com/wt0f/asdf-fd.git"
+  "github-cli:github.com/bartlomiejdanek/asdf-github-cli.git"
+  "golang:github.com/asdf-community/asdf-golang.git"
+  "hadolint:github.com/devlincashman/asdf-hadolint.git"
+  "kubectl:github.com/asdf-community/asdf-kubectl.git"
+  "pre-commit:github.com/jonathanmorley/asdf-pre-commit.git"
+  "ripgrep:gitlab.com/wt0f/asdf-ripgrep.git"
+  "rust:github.com/code-lever/asdf-rust.git"
+  "shellcheck:github.com/luizm/asdf-shellcheck.git"
+  "shfmt:github.com/luizm/asdf-shfmt.git"
+  "terragrunt:github.com/ohmer/asdf-terragrunt.git"
+  "tf-summarize:github.com/adamcrews/asdf-tf-summarize.git"
+  "yamllint:github.com/ericcornelissen/asdf-yamllint.git"
+  "yq:github.com/sudermanjr/asdf-yq.git"
+)
+
 # Function to update asdf and plugins
 update_asdf()
 {
@@ -24,53 +52,33 @@ update_asdf()
   asdf global asdf-plugin-manager "$(asdf latest asdf-plugin-manager)"
   asdf-plugin-manager version
   asdf-plugin-manager add-all
+  asdf-plugin-manager export > "${ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME}"
 
   asdf install
 
   return 0
 }
 
+update_asdf_commands()
+{
+  msg "Updating asdf commands using asdf-plugin-manager"
+  asdf-plugin-manager update-all
+  return 0
+}
+
 # Function to install asdf plugins
 install_asdf_plugins()
 {
-  ASDF_INSTALLABLES=(
-    "1password-cli:github.com/NeoHsu/asdf-1password-cli.git"
-    "age:github.com/threkk/asdf-age.git"
-    "bottom:github.com/carbonteq/asdf-btm.git"
-    "direnv:github.com/asdf-community/asdf-direnv.git"
-    "dotenv-linter:github.com/wesleimp/asdf-dotenv-linter.git"
-    "editorconfig-checker:github.com/gabitchov/asdf-editorconfig-checker.git"
-    "fd:gitlab.com/wt0f/asdf-fd.git"
-    "github-cli:github.com/bartlomiejdanek/asdf-github-cli.git"
-    "golang:github.com/asdf-community/asdf-golang.git"
-    "hadolint:github.com/devlincashman/asdf-hadolint.git"
-    "kubectl:github.com/asdf-community/asdf-kubectl.git"
-    "nodejs:github.com/asdf-vm/asdf-nodejs.git"
-    "pipx:github.com/yozachar/asdf-pipx.git"
-    "pre-commit:github.com/jonathanmorley/asdf-pre-commit.git"
-    "python:github.com/asdf-community/asdf-python.git"
-    "ripgrep:gitlab.com/wt0f/asdf-ripgrep.git"
-    "rust:github.com/code-lever/asdf-rust.git"
-    "shellcheck:github.com/luizm/asdf-shellcheck.git"
-    "shfmt:github.com/luizm/asdf-shfmt.git"
-    "terragrunt:github.com/ohmer/asdf-terragrunt.git"
-    "tf-summarize:github.com/adamcrews/asdf-tf-summarize.git"
-    "yamllint:github.com/ericcornelissen/asdf-yamllint.git"
-    "yq:github.com/sudermanjr/asdf-yq.git"
-  )
-
   msg "Installing asdf plugins"
   for item in "${ASDF_INSTALLABLES[@]}"; do
     CMD=$(echo "${item}" | awk -F ":" '{print $1}')
     URL=$(echo "${item}" | awk -F ":" '{print $2}')
 
     asdf plugin add "${CMD}" "https://${URL}"
-    asdf install "${CMD}" latest
-    asdf global "${CMD}" "$(asdf latest "${CMD}")"
   done
 
   msg "Exporting asdf plugin versions"
-  asdf-plugin-manager export > "${XDG_CONFIG_HOME}/asdf/plugin-versions"
+  asdf-plugin-manager export > "${ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME}"
 
   return 0
 }
@@ -85,7 +93,7 @@ reshim()
 # create usage function
 usage()
 {
-  echo "Usage: $0 [both|install|add_plugins]"
+  echo "Usage: $0 [both|install|add_plugins|update]"
   exit 1
 }
 
@@ -97,6 +105,10 @@ main()
       update_asdf
       reshim
       ;;
+    "update")
+      update_asdf_commands
+      reshim
+      ;;
     "install")
       update_asdf
       reshim

scripts/install-npm-packages.sh

@@ -3,18 +3,15 @@
 #
 # shellcheck source=shared.sh
 
-echo "This file ($0) has been deprecated in favor of asdf. Please use asdf instead."
-exit 0
-
 eval "$DOTFILES/config/shared.sh"
 
 # Enable verbosity with VERBOSE=1
 VERBOSE="${VERBOSE:-0}"
 
-msg "Starting to install npm packages"
+msgr msg "Starting to install npm packages"
 
 if ! command -v npm &> /dev/null; then
-  msg_err "npm could not be found."
+  msgr err "npm could not be found."
   exit 0
 fi
 
@@ -38,9 +35,9 @@ install_packages()
     if [[ ${pkg:0:1} == "#" ]]; then continue; fi
 
     if npm ls -g -p "$pkg" &> /dev/null; then
-      msg_run_done "$pkg" "already installed"
+      msgr run_done "$pkg" "already installed"
     else
-      msg_run "Installing npm package:" "$pkg"
+      msgr run "Installing npm package:" "$pkg"
       npm install -g --no-fund --no-progress --no-timing "$pkg"
     fi
     echo ""
@@ -50,7 +47,7 @@ install_packages()
 # Function to upgrade all global npm packages
 upgrade_global_packages()
 {
-  msg_run "Upgrading all global packages"
+  msgr run "Upgrading all global packages"
   npm -g --no-progress --no-timing --no-fund outdated
   npm -g --no-timing --no-fund upgrade
 }
@@ -58,7 +55,7 @@ upgrade_global_packages()
 # Function to clean npm cache
 clean_npm_cache()
 {
-  msg_run "Cleaning up npm cache"
+  msgr run "Cleaning up npm cache"
   npm cache verify
   npm cache clean --force
   npm cache verify
@@ -69,7 +66,7 @@ main()
   install_packages
   upgrade_global_packages
   clean_npm_cache
-  msg_yay "npm package installations complete"
+  msgr yay "npm package installations complete"
 }
 
 main "$@"

scripts/install-pip-packages.sh

@@ -3,9 +3,6 @@
 #
 # shellcheck source=shared.sh
 
-echo "This file ($0) has been deprecated in favor of asdf. Please use asdf instead."
-exit 0
-
 source "${DOTFILES}/config/shared.sh"
 
 # Enable verbosity with VERBOSE=1

scripts/set-macos-defaults.sh

@@ -131,7 +131,7 @@ systemsetup -settimezone "Europe/Helsinki" > /dev/null
 defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false
 
 # Stop iTunes from responding to the keyboard media keys
-#launchctl unload -w /System/Library/LaunchAgents/com.apple.rcd.plist 2> /dev/null
+launchctl unload -w /System/Library/LaunchAgents/com.apple.rcd.plist 2> /dev/null
 
 ###############################################################################
 # Screen                                                                      #

scripts/shared.sh

@@ -11,7 +11,7 @@
 [ -z "$SHARED_SCRIPTS_SOURCED" ] && {
 
   source "${DOTFILES}/config/shared.sh"
-  msgr done "(!) shared.sh not sourced"
+  msgr warn "(!) shared.sh not sourced"
 
   # Set variable that checks if the shared.sh script has been sourced only once
   # shellcheck disable=SC2034

ssh/shared.d/demons

@@ -1,3 +1,6 @@
+# demons
+# vim: ft=sshconfig
+
 Host vine
   User ubuntu
   HostName vine.antiprocess.net
@@ -13,3 +16,7 @@ Host paimon
   HostName paimon.antiprocess.net
   IdentityFile ~/.ssh/id_rsa
 
+Host baal
+  User ivuorinen
+  HostName baal.antiprocess.net
+  IdentityFile ~/.ssh/id_rsa