feat(tmux): removal of tmux-resurrect

Co-authored-by: ivuorinen <11024+ivuorinen@users.noreply.github.com>

.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,9 +12,9 @@ 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@v5
+      - uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-hooks

.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

.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]
@@ -40,11 +40,11 @@ repos:
       - id: shellcheck
 
   - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.9.0-1
+    rev: v3.10.0-1
     hooks:
       - id: shfmt
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.3
+    rev: v1.7.4
     hooks:
       - id: actionlint

.tool-versions

@@ -1,2 +1,2 @@
-python 3.12.7
-nodejs 22.9.0
+python 3.13.0
+nodejs 22.11.0

add-submodules.sh

@@ -23,8 +23,6 @@ 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 \
@@ -49,6 +47,7 @@ done
 [ -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,45 @@ 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)"
 }
+
+# If not running interactively, don't do anything
+case $- in
+*i*) ;;
+*) return ;;
+esac
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+  debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+  # We have color support; assume it's compliant with Ecma-48
+  # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+  # a case would tend to support setf rather than setaf.)
+  color_prompt=yes
+else
+  color_prompt=
+fi
+
+if [ "$color_prompt" = yes ]; then
+  PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\u\[\033[01;33m\]@\[\033[01;36m\]\h \[\033[01;33m\]\w \[\033[01;35m\]\$ \[\033[00m\]'
+else
+  PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm* | rxvt*)
+  PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+  ;;
+*) ;;
+esac
+
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init bash --config "$DOTFILES/config/omp/own.toml")"
+}

base/tool-versions

@@ -1,30 +1,28 @@
 asdf-plugin-manager 1.4.0
-nodejs 22.9.0
-golang 1.23.1
-python 3.12.6
+nodejs 23.1.0
+golang 1.23.3
+python 3.12.7
 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.57.0
+github-cli 2.61.0
 hadolint 2.12.0
-kubectl 1.31.1
+kubectl 1.31.2
 pipx 1.7.1
-pre-commit 3.8.0
+pre-commit 4.0.1
 ripgrep 14.1.1
 shellcheck 0.10.0
-shfmt 3.9.0
-terragrunt 0.67.10
-tf-summarize 0.3.10
+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

base/zshenv

@@ -1,4 +1,5 @@
 # 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
@@ -10,6 +11,16 @@ 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"
+
+export ZDOTDIR="$DOTFILES/zsh"
+ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
+
+# If not running interactively, don't do anything
+case $- in
+  *i*) ;;
+    *) return;;
+esac
 
 eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
 
@@ -53,9 +64,10 @@ load_antigen()
     antigen bundle brew
     antigen bundle colored-man-pages
     antigen bundle zsh-users/zsh-completions
-    antigen bundle eza
+    x-have eza && antigen bundle eza
+    x-have tms && antigen bundle yuki-ycino/tms
 
-    # this needs to be the last item
+    # this needs to be the last bundle
     antigen bundle zsh-users/zsh-syntax-highlighting
     antigen apply
   fi
@@ -87,15 +99,16 @@ 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"
-}
+load_antigen
+source_fzf_config
+setup_tmux_window_name_plugin
+if x-have antidot; then
+  eval "$(antidot init)"
+fi
 
-main "$@"
+# Lando
+export PATH="$HOME/.lando/bin${PATH+:$PATH}"; #landopath
+
+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,26 +1,29 @@
-1password-cli         https://github.com/NeoHsu/asdf-1password-cli.git                     f5d5aab
-age                   https://github.com/threkk/asdf-age.git                               4df80a0
-asdf-plugin-manager   https://github.com/asdf-community/asdf-plugin-manager.git            ecd1642
-bottom                https://github.com/carbonteq/asdf-btm.git                            fd8a55a
-direnv                https://github.com/asdf-community/asdf-direnv.git                    a2219c2
-dotenv-linter         https://github.com/wesleimp/asdf-dotenv-linter.git                   1369f53
-editorconfig-checker  https://github.com/gabitchov/asdf-editorconfig-checker.git           585c1d5
-fd                    https://gitlab.com/wt0f/asdf-fd.git                                  17d56e0
-github-cli            https://github.com/bartlomiejdanek/asdf-github-cli.git               e0605b7
-golang                https://github.com/asdf-community/asdf-golang.git                    0e86b1d
-hadolint              https://github.com/devlincashman/asdf-hadolint.git                   335e230
-kubectl               https://github.com/asdf-community/asdf-kubectl.git                   cbe6df4
-lazygit               https://github.com/nklmilojevic/asdf-lazygit.git                     78e04f1
-nodejs                https://github.com/asdf-vm/asdf-nodejs.git                           c5b7c40
-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                        7b0af87
-ripgrep               https://gitlab.com/wt0f/asdf-ripgrep.git                             e836665
-ruby                  https://github.com/asdf-vm/asdf-ruby.git                             27f78c9
-rust                  https://github.com/code-lever/asdf-rust.git                          95acf4f
-shellcheck            https://github.com/luizm/asdf-shellcheck.git                         780d78d
-shfmt                 https://github.com/luizm/asdf-shfmt.git                              a42c5ff
-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                 2f4fd4c
-yq                    https://github.com/sudermanjr/asdf-yq.git                            772992f
+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   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
+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           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                    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        bc2813e
+yq                    https://github.com/sudermanjr/asdf-yq.git                   772992f

config/asdf/python-packages

@@ -2,3 +2,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,21 +14,19 @@
 # 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
+# Add zsh completions to FPATH, compinit will be called later
+FPATH="$ZSH_COMPLETIONS:$FPATH"
 
 # 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)
+  [[ -d $ASDF_DIR/completions ]] && FPATH="$ASDF_DIR/completions:$FPATH"
+  [[ -d $ASDF_DIR/plugins ]] && FPATH="$ASDF_DIR/plugins:$FPATH"
   source "$ASDF_DIR/asdf.sh"
 fi
 
@@ -125,7 +123,7 @@ preexec()
 dfu()
 {
   (
-    cd "$DOTFILES" && git pull --ff-only && ./install
+    cd "$DOTFILES" && git rebase --ff --autostash && ./install
   )
 }
 
@@ -400,6 +398,9 @@ x-dc "$DOCKER_CONFIG"
 # Docker: Disable snyk ad
 export DOCKER_SCAN_SUGGEST=false
 
+# 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"
@@ -463,6 +464,9 @@ export TF_PLUGIN_CACHE_DIR="$XDG_CACHE_HOME/terraform/plugin-cache"
 msg "Setting up tmux configuration"
 export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
 
+# 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"
 export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"

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/lua/autogroups.lua

@@ -51,4 +51,21 @@ autocmd('FileType', {
   callback = function(event) vim.bo[event.buf].buflisted = false end,
 })
 
+-- ── wrap and check for spell in text filetypes ──────────────────────
+vim.api.nvim_create_autocmd('FileType', {
+  group = augroup('wrap_spell', { clear = true }),
+  pattern = { 'text', 'plaintex', 'typst', 'gitcommit', 'markdown' },
+  callback = function()
+    vim.opt_local.wrap = true
+    vim.opt_local.spell = true
+  end,
+})
+
+-- ── Fix conceallevel for json files ─────────────────────────────────
+vim.api.nvim_create_autocmd({ 'FileType' }, {
+  group = augroup('json_conceal', { clear = true }),
+  pattern = { 'json', 'jsonc', 'json5' },
+  callback = function() vim.opt_local.conceallevel = 0 end,
+})
+
 -- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/options.lua

@@ -19,6 +19,9 @@ vim.g.colors_variant_dark = 'tokyonight-storm'
 -- Make sure editorconfig support is enabled
 vim.g.editorconfig = true
 
+-- Enable the colorcolumn
+vim.api.nvim_set_option_value('colorcolumn', '+1', { scope = 'global' })
+
 -- Enable line numbers and relative line numbers
 vim.opt.number = true
 vim.opt.relativenumber = true

config/nvim/lua/plugins/cmp.lua

@@ -12,10 +12,19 @@ return {
       -- ── LuaSnip Dependencies ────────────────────────────────────────────
       -- Snippet Engine for Neovim written in Lua.
       -- https://github.com/L3MON4D3/LuaSnip
-      { 'L3MON4D3/LuaSnip', build = 'make install_jsregexp' },
-      -- luasnip completion source for nvim-cmp
-      -- https://github.com/saadparwaiz1/cmp_luasnip
-      { 'saadparwaiz1/cmp_luasnip' },
+      {
+        'L3MON4D3/LuaSnip',
+        version = '*',
+        event = 'BufReadPre',
+        build = 'make install_jsregexp',
+        dependencies = {
+          -- luasnip completion source for nvim-cmp
+          -- https://github.com/saadparwaiz1/cmp_luasnip
+          'saadparwaiz1/cmp_luasnip',
+          'rafamadriz/friendly-snippets',
+          'molleweide/LuaSnip-snippets.nvim',
+        },
+      },
 
       -- ── Adds other completion capabilities. ─────────────────────────────
       -- ── nvim-cmp does not ship with all sources by default.
@@ -23,9 +32,25 @@ return {
       { '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
@@ -63,8 +88,16 @@ return {
       local luasnip = require 'luasnip'
       local lspkind = require 'lspkind'
       luasnip.config.setup {}
+      luasnip.snippets = require('luasnip_snippets').load_snippets()
+      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
@@ -90,12 +123,16 @@ return {
             },
           },
         },
+        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',
-          },
+          -- entries = {
+          --   name = 'custom',
+          --   selection_order = 'near_cursor',
+          -- },
         },
         snippet = {
           expand = function(args) luasnip.lsp_expand(args.body) end,
@@ -131,14 +168,20 @@ return {
           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 = 'path', group_index = 2 },
           { name = 'luasnip', group_index = 2 },
-          { name = 'buffer', 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,
@@ -147,7 +190,7 @@ return {
 
             -- 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.scopes, --this is commented in nvim-cmp too
             cmp.config.compare.exact,
             cmp.config.compare.score,
             cmp.config.compare.recently_used,
@@ -159,6 +202,34 @@ return {
           },
         },
       }
+
+      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

@@ -0,0 +1,9 @@
+-- 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

@@ -0,0 +1,86 @@
+-- ── Formatting ──────────────────────────────────────────────────────
+-- Lightweight yet powerful formatter plugin for Neovim
+-- https://github.com/stevearc/conform.nvim
+
+return {
+  {
+    'stevearc/conform.nvim',
+    event = { 'BufWritePre' },
+    cmd = { 'ConformInfo' },
+    opts = {
+      -- Enable or disable logging
+      notify_on_error = false,
+      -- 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 = {},
+      },
+      -- The options you set here will be merged with the builtin formatters.
+      -- You can also define any custom formatters here.
+      formatters = {
+        injected = { options = { ignore_errors = true } },
+        -- # Example of using dprint only when a dprint.json file is present
+        -- dprint = {
+        --   condition = function(ctx)
+        --     return vim.fs.find({ "dprint.json" }, { path = ctx.filename, upward = true })[1]
+        --   end,
+        -- },
+        --
+        -- # Example of using shfmt with extra args
+        -- shfmt = {
+        --   prepend_args = { "-i", "2", "-ci" },
+        -- },
+      },
+      formatters_by_ft = {
+        lua = { 'stylua' },
+        -- Conform will run multiple formatters sequentially
+        go = { 'goimports', 'gofmt' },
+        -- 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,
+    },
+    init = function()
+      -- If you want the formatexpr, here is the place to set it
+      vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
+    end,
+  },
+  -- Automatically install formatters registered with conform.nvim via mason.nvim
+  -- https://github.com/zapling/mason-conform.nvim
+  {
+    'zapling/mason-conform.nvim',
+    depends = {
+      'stevearc/conform.nvim',
+      'williamboman/mason.nvim',
+    },
+    opts = {},
+  },
+}

config/nvim/lua/plugins/flash.lua

@@ -0,0 +1,39 @@
+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/goto-preview.lua

@@ -19,7 +19,8 @@ return {
         hide_preview = false,
       },
     },
-    -- These two configs can also be passed down to the goto-preview definition and implementation calls for one off "peak" functionality.
+    -- 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

config/nvim/lua/plugins/harpoon.lua

@@ -0,0 +1,47 @@
+-- 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/lazy.lua

@@ -1,66 +0,0 @@
-return {
-
-  -- A better annotation generator.
-  -- Supports multiple languages and annotation conventions.
-  -- https://github.com/danymat/neogen
-  {
-    'danymat/neogen',
-    version = '*',
-    opts = { enabled = true, snippet_engine = 'luasnip' },
-  },
-
-  -- The Refactoring library based off the Refactoring book by Martin Fowler
-  -- https://github.com/ThePrimeagen/refactoring.nvim
-  {
-    'ThePrimeagen/refactoring.nvim',
-    version = '*',
-    dependencies = { 'nvim-lua/plenary.nvim', 'nvim-treesitter/nvim-treesitter' },
-    opts = {},
-  },
-
-  -- All the npm/yarn/pnpm commands I don't want to type
-  -- https://github.com/vuki656/package-info.nvim
-  {
-    'vuki656/package-info.nvim',
-    version = '*',
-    dependencies = { 'MunifTanjim/nui.nvim' },
-    opts = {},
-  },
-
-  -- Add/change/delete surrounding delimiter pairs with ease. Written with ❤️ in Lua.
-  -- https://github.com/kylechui/nvim-surround
-  {
-    'kylechui/nvim-surround',
-    version = '*',
-    event = 'VeryLazy',
-    opts = {},
-  },
-
-  -- Highlight, list and search todo comments in your projects
-  -- https://github.com/folke/todo-comments.nvim
-  {
-    'folke/todo-comments.nvim',
-    version = '*',
-    dependencies = { 'nvim-lua/plenary.nvim' },
-    opts = {},
-  },
-
-  -- Commenting
-  -- "gc" to comment visual regions/lines
-  -- https://github.com/numToStr/Comment.nvim
-  {
-    'numToStr/Comment.nvim',
-    version = '*',
-    event = { 'BufRead', 'BufNewFile' },
-    opts = {},
-  },
-
-  -- Detect tabstop and shiftwidth automatically
-  -- https://github.com/tpope/vim-sleuth
-  { 'tpope/vim-sleuth' },
-
-  -- Vim plugin for automatic time tracking and metrics
-  -- generated from your programming activity.
-  -- https://github.com/wakatime/vim-wakatime
-  { 'wakatime/vim-wakatime', lazy = false, enabled = true },
-}

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

@@ -0,0 +1,21 @@
+-- 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,228 +1,47 @@
--- Quick start configs for Nvim LSP
--- https://github.com/neovim/nvim-lspconfig
+-- ── 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 {
   {
-    'neovim/nvim-lspconfig',
-    lazy = false,
-    dependencies = {
-      -- ── Mason and LSPConfig integration ─────────────────────────────────
-      -- Automatically install LSPs to stdpath for neovim
-
-      -- 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
-      {
-        'williamboman/mason.nvim',
-        cmd = 'Mason',
-        run = ':MasonUpdate',
-      },
-      -- Extension to mason.nvim that makes it easier to use lspconfig with mason.nvim.
-      -- https://github.com/williamboman/mason-lspconfig.nvim
-      { 'williamboman/mason-lspconfig.nvim' },
-
-      -- ── Formatting ──────────────────────────────────────────────────────
-      -- Lightweight yet powerful formatter plugin for Neovim
-      -- https://github.com/stevearc/conform.nvim
-      {
-        '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,
-      },
-
-      -- ── Misc ────────────────────────────────────────────────────────────
-      -- vscode-like pictograms for neovim lsp completion items
-      -- https://github.com/onsails/lspkind-nvim
-      { 'onsails/lspkind.nvim' },
-      -- JSON schemas for Neovim
-      -- https://github.com/b0o/SchemaStore.nvim
-      { 'b0o/schemastore.nvim' },
-    },
-    config = function()
-      -- ── 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')
-
-      -- Generate a command `:Format` local to the LSP buffer
-      --
-      ---@param _     nil    Skipped
-      ---@param bufnr number Buffer number
-      ---@output nil
-      local on_attach = function(_, bufnr)
-        -- Create a command `:Format` local to the LSP buffer
-        vim.api.nvim_create_user_command('Format', function(args)
-          local range = nil
-          if args.count ~= -1 then
-            local end_line = vim.api.nvim_buf_get_lines(
-              bufnr,
-              args.line2 - 1,
-              args.line2,
-              true
-            )[1]
-            range = {
-              start = { args.line1, 0 },
-              ['end'] = { args.line2, end_line:len() },
-            }
-          end
-          require('conform').format {
-            async = true,
-            lsp_format = 'fallback',
-            range = range,
-          }
-        end, { range = true, desc = 'Format current buffer with LSP' })
-      end
-
-      -- ── Enable the following language servers ───────────────────────────
-      -- :help lspconfig-all for all pre-configured LSPs
-      local servers = {
-        bashls = {}, -- Bash
-        -- csharp_ls = {}, -- C#, requires dotnet executable
-        gopls = {}, -- Go
-        html = {}, -- HTML
-        intelephense = {}, -- PHP
-        tailwindcss = {}, -- Tailwind CSS
-        ts_ls = {}, -- TypeScript
-        volar = {}, -- Vue
-
-        lua_ls = {
-          settings = {
-            Lua = {
-              runtime = {
-                -- Tell the language server which version of Lua you're using (most likely LuaJIT)
-                version = 'LuaJIT',
-                -- Setup your lua path
-                path = runtime_path,
-              },
-              diagnostics = {
-                globals = { 'vim' },
-                disable = {
-                  -- Ignore Lua_LS's noisy `missing-fields` warnings
-                  'missing-fields',
-                },
-              },
-              workspace = {
-                library = vim.api.nvim_get_runtime_file('', true),
-                checkThirdParty = false,
-              },
-              -- Do not send telemetry data containing a randomized but unique identifier
-              telemetry = { enable = false },
-
-              completion = {
-                callSnippet = 'Replace',
-              },
-            },
-          },
-        },
-        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 },
-            },
-          },
-        },
-      }
-
-      -- Mason servers should be it's own variable for mason-nvim-lint
+    'folke/neoconf.nvim',
+    cmd = 'Neoconf',
+    opts = {},
+  },
+  -- 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
+  {
+    'williamboman/mason.nvim',
+    cmd = 'Mason',
+    run = ':MasonUpdate',
+    opts = {
+      PATH = 'prepend',
+      -- Mason servers to install
       -- See: https://mason-registry.dev/registry/list
-      local mason_servers = {
-        'bash-language-server',
+      ensure_installed = {
         'clang-format',
         'codespell',
         'commitlint',
-        'diagnostic-languageserver',
         'editorconfig-checker',
         'fixjson',
         'jsonlint',
-        'lua-language-server',
         'luacheck',
         'phpcbf',
         'phpcs',
@@ -231,65 +50,184 @@ return {
         'shellcheck',
         'shfmt',
         'stylua',
-        'vim-language-server',
-        'vue-language-server',
         'yamllint',
-      }
-      local ensure_installed = vim.tbl_keys(servers or {})
-      vim.list_extend(ensure_installed, mason_servers)
-
-      -- ── Setup mason so it can manage external tooling ───────────────────
-      require('mason').setup {
-        ensure_installed = ensure_installed,
-        automatic_installation = true,
-      }
-
-      -- 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,
-      }
-
-      capabilities.textDocument.completion.completionItem.snippetSupport = true
-      capabilities.textDocument.completion.completionItem.resolveSupport = {
-        properties = {
-          'documentation',
-          'detail',
-          'additionalTextEdits',
-        },
-      }
-
-      local lspconfig_handlers = {
+      },
+    },
+  },
+  -- Extension to mason.nvim that makes it easier to use lspconfig with mason.nvim.
+  -- https://github.com/williamboman/mason-lspconfig.nvim
+  {
+    'williamboman/mason-lspconfig.nvim',
+    opts = {
+      -- ── Enable the following language servers ───────────────────────────
+      -- :help lspconfig-all for all pre-configured LSPs
+      ensure_installed = {
+        'bashls',
+        -- 'csharp_ls',
+        'diagnosticls',
+        'gopls',
+        'html',
+        'intelephense',
+        'jsonls',
+        'lua_ls',
+        'tailwindcss',
+        'ts_ls',
+        'vimls',
+        'volar',
+      },
+      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 = on_attach,
+            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 { settings = servers.lua_ls }
+          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,
+                },
+                diagnostics = {
+                  globals = { 'vim' },
+                  disable = {
+                    -- Ignore lua_ls noisy `missing-fields` warnings
+                    'missing-fields',
+                  },
+                },
+                workspace = {
+                  library = vim.api.nvim_get_runtime_file('', true),
+                  checkThirdParty = false,
+                },
+                -- Do not send telemetry data containing a randomized
+                -- but unique identifier
+                telemetry = { enable = false },
+
+                completion = {
+                  callSnippet = 'Replace',
+                },
+              },
+            },
+          }
         end,
         ['jsonls'] = function()
-          require('lspconfig')['jsonls'].setup { settings = servers.jsonls }
+          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,
-      }
-
-      require('mason-lspconfig').setup {
-        ensure_installed = vim.tbl_keys(servers or {}),
-        automatic_installation = true,
-        handlers = lspconfig_handlers,
-      }
-    end,
+        ['ts_ls'] = function()
+          local mason_registry = require 'mason-registry'
+          local ts_plugin_location = mason_registry
+            .get_package('vue-language-server')
+            :get_install_path() .. '/node_modules/@vue/typescript-plugin'
+          require('lspconfig')['volar'].setup {
+            init_options = {
+              plugins = {
+                {
+                  name = '@vue/typescript-plugin',
+                  location = ts_plugin_location,
+                  languages = { 'javascript', 'typescript', 'vue' },
+                },
+              },
+            },
+            filetypes = {
+              'typescript',
+              'javascript',
+              'javascriptreact',
+              'typescriptreact',
+              'vue',
+            },
+          }
+        end,
+      },
+    },
   },
 
+  -- ── 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', dependencies = { 'folke/neoconf.nvim' } },
+
   -- Garbage collector that stops inactive LSP clients to free RAM
   -- https://github.com/Zeioth/garbage-day.nvim
   {
@@ -298,134 +236,4 @@ return {
     event = 'VeryLazy',
     opts = {},
   },
-
-  -- improve neovim lsp experience
-  -- https://github.com/nvimdev/lspsaga.nvim
-  -- https://nvimdev.github.io/lspsaga/
-  {
-    '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>' },
-        },
-      },
-    },
-  },
-
-  -- Not UFO in the sky, but an ultra fold in Neovim.
-  -- https://github.com/kevinhwang91/nvim-ufo/
-  {
-    'kevinhwang91/nvim-ufo',
-    version = '*',
-    dependencies = {
-      { 'neovim/nvim-lspconfig' },
-      { 'kevinhwang91/promise-async' },
-      { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' },
-      {
-        -- 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,
-      },
-    },
-    opts = {
-      open_fold_hl_timeout = 150,
-      close_fold_kinds_for_ft = { 'imports', 'comment' },
-      preview = {
-        win_config = {
-          border = { '', '─', '', '', '', '─', '', '' },
-          winhighlight = 'Normal:Folded',
-          winblend = 0,
-        },
-        mappings = {
-          scrollU = '<C-u>',
-          scrollD = '<C-d>',
-          jumpTop = '[',
-          jumpBot = ']',
-        },
-      },
-
-      provider_selector = function(_, _, _) -- bufnr, filetype, buftype
-        return { 'treesitter', 'indent' }
-      end,
-
-      -- fold_virt_text_handler
-      --
-      -- 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,
-    },
-  },
 }

config/nvim/lua/plugins/neogen.lua

@@ -0,0 +1,8 @@
+-- A better annotation generator.
+-- Supports multiple languages and annotation conventions.
+-- https://github.com/danymat/neogen
+return {
+  'danymat/neogen',
+  version = '*',
+  opts = { enabled = true, snippet_engine = 'luasnip' },
+}

config/nvim/lua/plugins/noice.lua

@@ -1,7 +1,6 @@
 -- 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,
@@ -44,6 +43,13 @@ return {
         },
         opts = { skip = true },
       },
+      {
+        filter = {
+          event = 'notify',
+          find = 'No information available',
+        },
+        opts = { skip = true },
+      },
     },
     views = {
       cmdline_popup = {

config/nvim/lua/plugins/refactoring.lua

@@ -0,0 +1,8 @@
+-- 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

@@ -0,0 +1,8 @@
+-- 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

@@ -8,58 +8,16 @@ return {
     { 'nvim-lua/plenary.nvim' },
     { 'nvim-telescope/telescope-symbols.nvim' },
     { 'folke/which-key.nvim' },
-    -- Getting you where you want with the fewest keystrokes.
-    -- https://github.com/ThePrimeagen/harpoon
-    {
-      'ThePrimeagen/harpoon',
-      branch = 'harpoon2',
-      dependencies = {
-        'nvim-lua/plenary.nvim',
-        'nvim-telescope/telescope.nvim',
-      },
-      config = function()
-        local harpoon = require 'harpoon'
-        harpoon:setup {}
 
-        -- 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,
-    },
     -- 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
     {
@@ -67,6 +25,10 @@ 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'
@@ -97,6 +59,23 @@ 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].*)]],
+            },
+          },
+        },
       },
     }
 
@@ -104,6 +83,8 @@ return {
     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')
@@ -113,10 +94,12 @@ return {
     -- 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,
-      })
+      require('telescope.builtin').current_buffer_fuzzy_find(
+        themes.get_dropdown {
+          winblend = 20,
+          previewer = true,
+        }
+      )
     end, { desc = '[/] Fuzzily search in current buffer]' })
   end,
 }

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

@@ -0,0 +1,8 @@
+-- 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,6 +8,9 @@ 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 {
@@ -47,13 +50,39 @@ return {
         'yaml',
       },
 
+      refactor = {
+        navigation = {
+          enable = true,
+          -- Assign keymaps to false to disable them, e.g. `goto_definition = false`.
+          keymaps = {
+            goto_definition = '<leader>gnd',
+            list_definitions = '<leader>gnD',
+            list_definitions_toc = '<leader>gO',
+            goto_next_usage = '<a-*>',
+            goto_previous_usage = '<a-#>',
+          },
+        },
+        smart_rename = {
+          enable = true,
+          -- Assign keymaps to false to disable them, e.g. `smart_rename = false`.
+          keymaps = {
+            smart_rename = 'grr',
+          },
+        },
+        highlight_definitions = {
+          enable = true,
+          -- Set to false if you have an `updatetime` of ~100.
+          clear_on_cursor_move = true,
+        },
+        highlight_current_scope = { enable = false },
+      },
       highlight = { enable = true },
       indent = { enable = true },
       incremental_selection = {
         enable = true,
         keymaps = {
-          init_selection = '<c-space>',
-          node_incremental = '<c-space>',
+          init_selection = '<a-space>',
+          node_incremental = '<a-space>',
           scope_incremental = '<c-s>',
           node_decremental = '<c-backspace>',
         },

config/nvim/lua/plugins/treesj.lua

@@ -0,0 +1,9 @@
+-- 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

@@ -7,7 +7,7 @@ return {
   lazy = false,
   dependencies = { 'nvim-tree/nvim-web-devicons' },
   opts = {
-    auto_preview = false,
+    auto_preview = true,
     auto_fold = true,
     auto_close = true,
     use_lsp_diagnostic_signs = true,

config/nvim/lua/plugins/ufo.lua

@@ -0,0 +1,144 @@
+-- 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,
+          ft_ignore = {
+            'dashboard',
+            'NvimTree',
+            'help',
+            'vim',
+            'alpha',
+            'dashboard',
+            'neo-tree',
+            'Trouble',
+            'lazy',
+            'toggleterm',
+          },
+          bt_ignore = {
+            'help',
+            'vim',
+            'alpha',
+            'dashboard',
+            'neo-tree',
+            'Trouble',
+            'lazy',
+            'toggleterm',
+          },
+          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 = true,
+      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,6 +27,10 @@ return {
     },
   },
 
+  -- A neovim plugin that shows colorcolumn dynamically
+  -- https://github.com/Bekaboo/deadcolumn.nvim
+  { 'Bekaboo/deadcolumn.nvim' },
+
   -- vim dashboard
   -- https://github.com/nvimdev/dashboard-nvim
   {
@@ -78,6 +82,13 @@ return {
               action = 'Lazy update',
               key = 'u',
             },
+            {
+              icon = '☉ ',
+              desc = 'Quit',
+              group = 'DiagnosticError',
+              action = 'q',
+              key = 'q',
+            },
           },
         },
       }
@@ -99,25 +110,64 @@ return {
   {
     'lukas-reineke/indent-blankline.nvim',
     main = 'ibl',
-    config = function()
-      require('ibl').setup {
-        indent = {
-          char = '│',
+    opts = {
+      scope = { show_start = false, show_end = false },
+      indent = {
+        char = '│',
+        tab_char = '│',
+      },
+      exclude = {
+        filetypes = {
+          'Trouble',
+          'alpha',
+          'dashboard',
+          'help',
+          'lazy',
+          'lazyterm',
+          'mason',
+          'neo-tree',
+          'notify',
+          'terminal',
+          'toggleterm',
+          'trouble',
         },
-        exclude = {
-          filetypes = { 'terminal', 'dashboard' },
-          buftypes = { 'dashboard' },
-        },
-      }
+        buftypes = { 'dashboard' },
+      },
+    },
+  },
+
+  -- Display a character as the colorcolumn
+  -- https://github.com/lukas-reineke/virt-column.nvim
+  { 'lukas-reineke/virt-column.nvim', opts = {} },
+
+  -- icons
+  {
+    'echasnovski/mini.icons',
+    opts = {
+      file = {
+        ['.keep'] = { glyph = '󰊢', hl = 'MiniIconsGrey' },
+        ['devcontainer.json'] = { glyph = '', hl = 'MiniIconsAzure' },
+      },
+      filetype = {
+        dotenv = { glyph = '', hl = 'MiniIconsYellow' },
+      },
+    },
+    init = function()
+      package.preload['nvim-web-devicons'] = function()
+        require('mini.icons').mock_nvim_web_devicons()
+        return package.loaded['nvim-web-devicons']
+      end
     end,
   },
 
+  -- ui components
+  { 'MunifTanjim/nui.nvim', lazy = true },
+
   -- Git integration for buffers
   -- https://github.com/lewis6991/gitsigns.nvim
   {
     'lewis6991/gitsigns.nvim',
     version = false,
-    lazy = false,
     opts = {
       signs = {
         add = { text = '+' },
@@ -163,6 +213,7 @@ return {
       'TmuxNavigateRight',
       'TmuxNavigatePrevious',
     },
+    opts = {},
   },
 
   -- Cloak allows you to overlay *'s over defined patterns in defined files.

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

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

config/nvim/lua/plugins/wakatime.lua

@@ -0,0 +1,4 @@
+-- Vim plugin for automatic time tracking and metrics
+-- generated from your programming activity.
+-- https://github.com/wakatime/vim-wakatime
+return { 'wakatime/vim-wakatime', lazy = false, enabled = true }

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

@@ -22,10 +22,8 @@ return {
       {
         '<leader>b',
         group = '[b] Buffer',
-        expand = function()
-          -- Add the current buffers to the menu
-          return require('which-key.extras').expand.buf()
-        end,
+        -- 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' },
@@ -39,55 +37,30 @@ return {
       -- ── 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',
-        },
+        '<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: package.json control ──────────────────────────────────────
-      -- See: lua/plugins/lazy.lua
-      { '<leader>cn', group = 'package.json control' },
-      {
-        {
-          '<leader>cnd',
-          '<cmd>lua require("package-info").delete()<cr>',
-          desc = 'Delete package',
-        },
-        {
-          '<leader>cni',
-          '<cmd>lua require("package-info").install()<cr>',
-          desc = 'Install package',
-        },
-        {
-          '<leader>cns',
-          '<cmd>lua require("package-info").show({ force = true })<cr>',
-          desc = 'Show package info',
-        },
-        {
-          '<leader>cnu',
-          '<cmd>lua require("package-info").change_version()<cr>',
-          desc = 'Change version',
-        },
-      },
+      { '<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' },
@@ -168,8 +141,8 @@ return {
       {
         '<leader>cf',
         '<cmd>lua require("conform").format({ async = true, lsp_fallback = true })<cr>',
-        mode = { 'n', 'v' },
-        desc = 'Format buffer',
+        mode = {},
+        desc = 'Format buffer with Conform',
       },
       {
         '<leader>ci',
@@ -217,6 +190,11 @@ return {
         '<cmd>Lspsaga diagnostic_jump_next<cr>',
         desc = 'LSPSaga: Diagnostic Jump Next',
       },
+      {
+        '<leader>cx',
+        '<cmd>Telescope import<cr>',
+        desc = 'Telescope import',
+      },
 
       -- ── DAP ─────────────────────────────────────────────────────────────
       { '<leader>d', group = '[d] DAP' },
@@ -293,24 +271,34 @@ return {
       -- See: lua/plugins/telescope.lua
       {
         '<leader><space>',
-        "<cmd>lua require('telescope.builtin').buffers()<cr>",
+        '<cmd>Telescope buffers<cr>',
         desc = 'Find existing buffers',
       },
       {
-        '<leader><tab>',
-        "<cmd>lua require('telescope.builtin').commands()<CR>",
+        '<leader>sc',
+        '<cmd>Telescope commands<CR>',
         desc = 'Telescope: Commands',
       },
       {
         '<leader>sd',
-        "<cmd>lua require('telescope.builtin').diagnostics()<cr>",
+        '<cmd>Telescope diagnostics<cr>',
         desc = 'Search Diagnostics',
       },
       {
         '<leader>sg',
-        "<cmd>lua require('telescope.builtin').live_grep()<cr>",
+        '<cmd>Telescope live_grep<cr>',
         desc = 'Search by Grep',
       },
+      {
+        '<leader>sh',
+        '<cmd>Telescope highlights<cr>',
+        desc = 'List highlights',
+      },
+      {
+        '<leader>sl',
+        '<cmd>Telescope luasnip<CR>',
+        desc = 'Search LuaSnip',
+      },
       {
         '<leader>sm',
         '<cmd>Telescope harpoon marks<CR>',
@@ -323,7 +311,7 @@ return {
       },
       {
         '<leader>so',
-        "<cmd>lua require('telescope.builtin').oldfiles()<cr>",
+        '<cmd>Telescope oldfiles<cr>',
         desc = 'Find recently Opened files',
       },
       {
@@ -331,10 +319,54 @@ return {
         "<cmd>lua require('telescope').extensions.lazy_plugins.lazy_plugins()<cr>",
         desc = 'Find neovim/lazy configs',
       },
+      {
+        '<leader>sq',
+        '<cmd>Telescope quickfix<cr>',
+        desc = 'Quickfix list',
+      },
+      {
+        '<leader>sr',
+        group = 'References',
+        {
+          '<leader>srd',
+          '<cmd>Telescope lsp_definitions<CR>',
+          desc = 'Definitions',
+        },
+        {
+          '<leader>sri',
+          '<cmd>Telescope lsp_implementations<CR>',
+          desc = 'Implementations',
+        },
+        {
+          '<leader>srp',
+          '<cmd>Telescope lsp_document_symbols<CR>',
+          desc = 'Document Symbols',
+        },
+        {
+          '<leader>srr',
+          '<cmd>Telescope lsp_references<CR>',
+          desc = 'LSP References',
+        },
+        {
+          '<leader>srt',
+          '<cmd>Telescope lsp_type_definitions<CR>',
+          desc = 'Type Definitions',
+        },
+        {
+          '<leader>srw',
+          '<cmd>Telescope lsp_workspace_symbols<CR>',
+          desc = 'Workspace Symbols',
+        },
+      },
+      {
+        '<leader>ss',
+        '<cmd>Telescope treesitter',
+        desc = 'Treesitter symbols',
+      },
       { '<leader>st', '<cmd>TodoTelescope<CR>', desc = 'Telescope: Show Todo' },
       {
         '<leader>sw',
-        "<cmd>lua require('telescope.builtin').grep_string()<cr>",
+        '<cmd>Telescope grep_string<cr>',
         desc = 'Search current Word',
       },
 
@@ -402,39 +434,24 @@ return {
       -- ── Help ────────────────────────────────────────────────────────────
       { '<leader>?', group = '[?] Help & Cheat sheets' },
       {
+        {
+          '<leader>?h',
+          '<cmd>Telescope help_tags<cr>',
+          desc = 'Help tags',
+        },
+        {
+          '<leader>?m',
+          '<cmd>Telescope man_pages<cr>',
+          desc = 'Man pages',
+        },
         {
           '<leader>?w',
-          '<cmd>lua require("which-key").show({global = false})<cr>',
+          '<cmd>lua require("which-key").show({global = true})<cr>',
           desc = 'Buffer Local Keymaps (which-key)',
         },
       },
 
       -- ── Misc ────────────────────────────────────────────────────────────
-      {
-        '<leader>1',
-        '<cmd>lua require("harpoon"):list():select(1)<cr>',
-        desc = 'harpoon to file 1',
-      },
-      {
-        '<leader>2',
-        '<cmd>lua require("harpoon"):list():select(2)<cr>',
-        desc = 'harpoon to file 2',
-      },
-      {
-        '<leader>3',
-        '<cmd>lua require("harpoon"):list():select(3)<cr>',
-        desc = 'harpoon to file 3',
-      },
-      {
-        '<leader>4',
-        '<cmd>lua require("harpoon"):list():select(4)<cr>',
-        desc = 'harpoon to file 4',
-      },
-      {
-        '<leader>5',
-        '<cmd>lua require("harpoon"):list():select(5)<cr>',
-        desc = 'harpoon to file 5',
-      },
       {
         '<leader>D',
         '<cmd>lua vim.lsp.buf.type_definition()<CR>',
@@ -492,7 +509,7 @@ return {
       },
 
       -- ── Old habits ──────────────────────────────────────────────────────
-      { '<C-s>', '<cmd>w<CR>', desc = 'Save file' },
+      { '<C-s>', '<cmd>w!<CR>', desc = 'Save file' },
 
       -- ── Text manipulation in visual mode ────────────────────────────────
       {

config/nvim/snippets/javascript.json

@@ -0,0 +1,462 @@
+{
+  "While ..": {
+    "body": [
+      "while (${1:condition}) {",
+      "\t$0",
+      "}"
+    ],
+    "prefix": "while .."
+  },
+  "argv (node)": {
+    "body": "const argv = process.argv.slice(2);",
+    "description": "Arguments from the command line. [0] is the node executable path, [1] the path of the file being executed, making [2] the first positional argument.",
+    "prefix": "argv (node)"
+  },
+  "cast (JSDoc)": {
+    "body": "/** @type {${1:string}} */ (${2:bracketedVar})",
+    "prefix": "cast (JSDoc)"
+  },
+  "class (JSDoc) + typedef (JSDoc)": {
+    "body": [
+      "/** @typedef {Object} ${1:name}",
+      " * @property {${2:string}} ${3:prop1}",
+      " */"
+    ],
+    "description": "https://www.typescriptlang.org/docs/handbook/jsdoc-supported-types.html#typedef-callback-and-param",
+    "prefix": [
+      "class (JSDoc)",
+      "typedef (JSDoc)"
+    ]
+  },
+  "do .. while ..": {
+    "body": [
+      "do {",
+      "\t$0",
+      "} while (${1:condition});"
+    ],
+    "prefix": [
+      "do .. while",
+      "repeat until"
+    ]
+  },
+  "ec (export const)": {
+    "body": "export const ${1:CONSTANT}",
+    "prefix": "ec (export const)"
+  },
+  "ef (export function)": {
+    "body": [
+      "export function ${1:name}($2) {",
+      "\t$0",
+      "}"
+    ],
+    "prefix": "ef (export function)"
+  },
+  "filter ( => )": {
+    "body": "filter(${1:item} => ${1:item}$0)",
+    "prefix": "filter ( => )"
+  },
+  "for (i++)": {
+    "body": [
+      "for (let i = 0; i < ${1:array}.length; i++) {",
+      "\tconst ${2:element} = ${1:array}[i];",
+      "\t$0",
+      "}"
+    ],
+    "prefix": "for (i++)"
+  },
+  "for (i--)": {
+    "body": [
+      "for (let i = ${1:array}.length - 1; i >= 0; i--) {",
+      "\tconst ${2:element} = ${1:array}[i];",
+      "\t$0",
+      "}"
+    ],
+    "prefix": "for (i--)"
+  },
+  "for (key, value)": {
+    "body": [
+      "for (const [key, value] of Object.entries(${1:dict})) {",
+      "\t$0",
+      "}"
+    ],
+    "prefix": "for (key, value)"
+  },
+  "for .. in (key)": {
+    "body": [
+      "for (const ${1:key} in ${2:object}) {",
+      "\t$0",
+      "}"
+    ],
+    "prefix": "for .. in (key)"
+  },
+  "for .. of (array)": {
+    "body": [
+      "for (const ${1:iterator} of ${2:array}) {",
+      "\t$0",
+      "}"
+    ],
+    "prefix": "for .. of (array)"
+  },
+  "forEach": {
+    "body": [
+      "forEach(${1:item} => {",
+      "\t$0",
+      "});"
+    ],
+    "prefix": "forEach =>"
+  },
+  "function_trad": {
+    "body": [
+      "function ${1:name}() {",
+      "\t$0",
+      "}"
+    ],
+    "prefix": "function"
+  },
+  "if ..": {
+    "body": [
+      "if (${1:condition}) {",
+      "\t$0",
+      "}"
+    ],
+    "prefix": "if"
+  },
+  "if .. else": {
+    "body": [
+      "if (${1:condition}) {",
+      "\t$0",
+      "} else {",
+      "\t",
+      "}"
+    ],
+    "prefix": "if .. else"
+  },
+  "ignore (biome formatter)": {
+    "body": "// biome-ignore format: ${1:explanation}",
+    "description": "Ignores the next block of code.",
+    "prefix": "ignore (biome formatter)"
+  },
+  "ignore file (TypeScript) + nocheck (TypeScript)": {
+    "body": "// @ts-nocheck",
+    "prefix": [
+      "ignore file (TypeScript)",
+      "nocheck (TypeScript)"
+    ]
+  },
+  "map ( () => {} )": {
+    "body": [
+      "map(${1:item} => {",
+      "\t$0",
+      "\treturn;",
+      "})"
+    ],
+    "prefix": "map ( () => {} )"
+  },
+  "map ( => )": {
+    "body": "map(${1:item} => ${1:item}$0)",
+    "prefix": "map ( => )"
+  },
+  "reduce()": {
+    "body": [
+      ".reduce((acc, ${1:item}) => {",
+      "\t$0",
+      "\treturn acc;",
+      "}, ${2:initialValue})"
+    ],
+    "prefix": "reduce()"
+  },
+  "relative date": {
+    "body": [
+      "/**",
+      " * @param {string} absoluteDate string to be converted to a date",
+      " * @return {string} relative date",
+      " */",
+      "function relativeDate(absoluteDate) {",
+      "\tconst deltaSecs = (+new Date() - +new Date(absoluteDate)) / 1000;",
+      "\t/** @type {\"year\"|\"month\"|\"week\"|\"day\"|\"hour\"|\"minute\"|\"second\"} */",
+      "\tlet unit;",
+      "\tlet delta;",
+      "\tif (deltaSecs < 60) {",
+      "\t\tunit = \"second\";",
+      "\t\tdelta = deltaSecs;",
+      "\t} else if (deltaSecs < 60 * 60) {",
+      "\t\tunit = \"minute\";",
+      "\t\tdelta = Math.ceil(deltaSecs / 60);",
+      "\t} else if (deltaSecs < 60 * 60 * 24) {",
+      "\t\tunit = \"hour\";",
+      "\t\tdelta = Math.ceil(deltaSecs / 60 / 60);",
+      "\t} else if (deltaSecs < 60 * 60 * 24 * 7) {",
+      "\t\tunit = \"day\";",
+      "\t\tdelta = Math.ceil(deltaSecs / 60 / 60 / 24);",
+      "\t} else if (deltaSecs < 60 * 60 * 24 * 7 * 4) {",
+      "\t\tunit = \"week\";",
+      "\t\tdelta = Math.ceil(deltaSecs / 60 / 60 / 24 / 7);",
+      "\t} else if (deltaSecs < 60 * 60 * 24 * 7 * 4 * 12) {",
+      "\t\tunit = \"month\";",
+      "\t\tdelta = Math.ceil(deltaSecs / 60 / 60 / 24 / 7 / 4);",
+      "\t} else {",
+      "\t\tunit = \"year\";",
+      "\t\tdelta = Math.ceil(deltaSecs / 60 / 60 / 24 / 7 / 4 / 12);",
+      "\t}",
+      "\tconst formatter = new Intl.RelativeTimeFormat(\"en\", { style: \"long\", numeric: \"auto\" });",
+      "\treturn formatter.format(-delta, unit);",
+      "}"
+    ],
+    "prefix": "relative date"
+  },
+  "replace": {
+    "body": "replace(/${1:regexp}/, \"$2\")",
+    "prefix": "replace"
+  },
+  "sort ( () => {} )": {
+    "body": [
+      "sort((a, b) => {",
+      "\treturn ${1:b - a};",
+      "})"
+    ],
+    "description": "Sort Array with basic a-b-comparator function",
+    "prefix": "sort ( () => {} )"
+  },
+  "split by \\n": {
+    "body": ".split(\"\\n\")",
+    "prefix": ".split by \\n"
+  },
+  "split by \\r": {
+    "body": ".split(\"\\r\")",
+    "description": "required for output from app.doShellScript()",
+    "prefix": ".split by \\r"
+  },
+  "switch .. case": {
+    "body": [
+      "switch (${1:key}) {",
+      "\tcase ${2:value}:",
+      "\t\t$0",
+      "\t\tbreak;",
+      "\tdefault:",
+      "}"
+    ],
+    "prefix": "switch .. case"
+  },
+  "ternary": {
+    "body": "${1:condition} ? ${2:value1} : ${3:value2}",
+    "prefix": "ternary"
+  },
+  "thousand separator": {
+    "body": ".toLocaleString(\"de-DE\")",
+    "description": "insert thousand separator into a digit string",
+    "prefix": "thousand separator"
+  },
+  "timeout + delay": {
+    "body": [
+      "setTimeout(() => {",
+      "\t$0",
+      "}, ${1:timeoutMs});"
+    ],
+    "prefix": [
+      "timeout",
+      "delay"
+    ]
+  },
+  "today as ISO 8601 string": {
+    "body": "new Date().toISOString().slice(0, 10);",
+    "prefix": "ISO date"
+  },
+  "today's date": {
+    "body": "const today = new Date();",
+    "prefix": [
+      "today",
+      "date"
+    ]
+  },
+  "tomorrow's date": {
+    "body": [
+      "const tomorrow = new Date();",
+      "tomorrow.setDate(tomorrow.getDate() + 1);"
+    ],
+    "prefix": [
+      "tomorrow",
+      "date"
+    ]
+  },
+  "try .. catch": {
+    "body": [
+      "try {",
+      "\t$0",
+      "} catch (_error) {",
+      "\t",
+      "}"
+    ],
+    "description": "leading underscore so the variable is ignored by biome when not used.",
+    "prefix": "try .. catch"
+  },
+  "type (JSDoc)": {
+    "body": "/** @type {${1:string}} */",
+    "prefix": "type (JSDoc)"
+  },
+  "type: Record (JSDoc)": {
+    "body": "/** @type {Record<string, string>} */",
+    "prefix": "type: Record (JSDoc)"
+  },
+  "unique items": {
+    "body": "${1:arr} = [...new Set(${2:arr})];",
+    "prefix": "unique items"
+  },
+  "Class": {
+    "prefix": [
+      "clax"
+    ],
+    "body": [
+      "export class $1 ${2:extends ${3:Parent} }{",
+      "\tconstructor(${4:props}) {",
+      "\t\tthis.$4 = $4;",
+      "\t}",
+      "",
+      "\t$0",
+      "}"
+    ],
+    "description": "Class definition template."
+  },
+  "test": {
+    "prefix": [
+      "it"
+    ],
+    "body": [
+      "it('${1:should ${2}}', async () => {",
+      "\t$0",
+      "});"
+    ],
+    "description": "Test template"
+  },
+  "method": {
+    "prefix": [
+      "mtd"
+    ],
+    "body": [
+      "${1:async ${2:method}}(${3:params}) {",
+      "\t$0",
+      "}"
+    ],
+    "description": "method"
+  },
+  "function": {
+    "prefix": [
+      "fun"
+    ],
+    "body": [
+      "${1:async }${2:(${3:params})} => {$0}"
+    ],
+    "description": "function"
+  },
+  "const": {
+    "prefix": [
+      "const"
+    ],
+    "body": [
+      "const $1 = $0;"
+    ],
+    "description": "const"
+  },
+  "let": {
+    "prefix": [
+      "let"
+    ],
+    "body": [
+      "let $1 = $0;"
+    ],
+    "description": "let"
+  },
+  "Console log": {
+    "prefix": [
+      "cl"
+    ],
+    "body": [
+      "console.log($0);"
+    ],
+    "description": "Console log"
+  },
+  "Console debug": {
+    "prefix": [
+      "cd"
+    ],
+    "body": [
+      "console.debug($0);"
+    ],
+    "description": "Console debug"
+  },
+  "Console log all": {
+    "prefix": [
+      "clj"
+    ],
+    "body": [
+      "console.log(JSON.stringify($0, null, 2));"
+    ],
+    "description": "Console log whole object"
+  },
+  "Console debug all": {
+    "prefix": [
+      "cdj"
+    ],
+    "body": [
+      "console.debug(JSON.stringify($0, null, 2));"
+    ],
+    "description": "Console debug whole object"
+  },
+  "If": {
+    "prefix": [
+      "if"
+    ],
+    "body": [
+      "if (${1:condition}) {",
+      "\t$0",
+      "}"
+    ],
+    "description": "Console debug whole object"
+  },
+  "If-else": {
+    "prefix": [
+      "ifelse"
+    ],
+    "body": [
+      "if (${1:condition}) {",
+      "\t$2",
+      "} else {",
+      "\t$0",
+      "}"
+    ],
+    "description": "Console debug whole object"
+  },
+  "docblock": {
+    "prefix": [
+      "/**"
+    ],
+    "body": [
+      "/**",
+      " * $0",
+      " */"
+    ]
+  },
+  "trycatch": {
+    "prefix": [
+      "tc"
+    ],
+    "body": [
+      "try {",
+      "\t$0",
+      "} catch (e) {",
+      "\tthrow e;",
+      "}"
+    ],
+    "description": "Try catch block"
+  },
+  "Describe test": {
+    "prefix": [
+      "desc"
+    ],
+    "body": [
+      "describe('${1}', () => {",
+      "\t$0",
+      "})"
+    ],
+    "description": "Describe test"
+  }
+}

config/nvim/snippets/lua.json

@@ -0,0 +1,262 @@
+{
+  "@class (LuaDoc)": {
+    "body": [
+      "---@class (exact) ${1:class_name}",
+      "---@field ${2:field_name} string"
+    ],
+    "description": "https://github.com/LuaLS/lua-language-server/wiki/Annotations#class",
+    "prefix": "@class (LuaDoc)"
+  },
+  "@type (LuaDoc)": {
+    "body": "---@type ${1:string}",
+    "prefix": "@type (LuaDoc)"
+  },
+  "Record (type)": {
+    "body": "---@type table<string, string>",
+    "prefix": "Record (type)"
+  },
+  "count occurrences in string": {
+    "body": "local _, count = ${1:str}:gsub(\"${2:find}\", \"\")",
+    "prefix": "count occurrences in string"
+  },
+  "export module": {
+    "body": [
+      "local M = {}",
+      "--------------------------------------------------------------------------------",
+      "",
+      "$0--------------------------------------------------------------------------------",
+      "return M"
+    ],
+    "prefix": "export module"
+  },
+  "find all in string": {
+    "body": [
+      "local ${1:matches} = {}",
+      "for match in ${2:str}:gmatch(${3:pattern}) do",
+      "\ttable.insert(${1:matches}, match)",
+      "end"
+    ],
+    "prefix": "find all in string"
+  },
+  "for each (list)": {
+    "body": [
+      "for _, ${1:v} in pairs(${2:table}) do",
+      "\t$0",
+      "end"
+    ],
+    "prefix": "for each (list)"
+  },
+  "for each line (of file)": {
+    "body": [
+      "for line in io.lines(${1:filepath}) do",
+      "\t$0",
+      "end"
+    ],
+    "prefix": [
+      "for each line (file)",
+      "read file (as lines)"
+    ]
+  },
+  "home": {
+    "body": "os.getenv(\"HOME\")",
+    "prefix": "home"
+  },
+  "if .. then .. else": {
+    "body": [
+      "if ${1:true} then",
+      "\t$2",
+      "else",
+      "\t$0",
+      "end"
+    ],
+    "filetype": "lua",
+    "prefix": "if .. then .. else"
+  },
+  "nodiscard": {
+    "body": "---@nodiscard",
+    "description": "Luadoc Annotation that a function's return value should not be discarded. https://github.com/LuaLS/lua-language-server/wiki/Annotations#nodiscard",
+    "prefix": "nodiscard"
+  },
+  "path of this file": {
+    "body": "local pathOfThisFile = debug.getinfo(1).source:sub(2)",
+    "prefix": "path of this file"
+  },
+  "path separator (os-independent)": {
+    "body": "local osPathSep = package.config:sub(1, 1)",
+    "prefix": "path separator (os-independent)"
+  },
+  "pcall": {
+    "body": [
+      "local success = pcall(${1:func})",
+      "if not success then",
+      "\t$0",
+      "\treturn",
+      "end"
+    ],
+    "prefix": [
+      "try",
+      "pcall"
+    ]
+  },
+  "read file": {
+    "body": [
+      "---@param filePath string",
+      "---@return string? -- content or error message",
+      "---@return boolean success",
+      "local function readFile(filePath)",
+      "\tlocal file, err = io.open(filePath, \"r\")",
+      "\tif not file then return err, false end",
+      "\tlocal content = file:read(\"*a\")",
+      "\tfile:close()",
+      "\treturn content, true",
+      "end"
+    ],
+    "prefix": "read file"
+  },
+  "redirect (metatable __index)": {
+    "body": [
+      "setmetatable(M, {",
+      "\t__index = function(_, key)",
+      "\t\treturn function(...)",
+      "\t\t\trequire(${1:moduleToRedirectTo})[key](...)",
+      "\t\tend",
+      "\tend,",
+      "})"
+    ],
+    "prefix": "redirect (metatable __index)"
+  },
+  "round number": {
+    "body": "local roundedNum = tonumber(string.format(\"%.${1:decimals}f\", exactNum))",
+    "prefix": "round number"
+  },
+  "safe require": {
+    "body": [
+      "local ok, ${1:module} = require(\"${1:module}\")",
+      "if not (ok and ${1:module}) then return end",
+      "${1:module}.$0"
+    ],
+    "prefix": "safe require"
+  },
+  "sort (table)": {
+    "body": "table.sort(${1:table}, function(a, b) return ${2:a} > ${3:b} end)",
+    "prefix": "sort (table)"
+  },
+  "split (gmatch)": {
+    "body": [
+      "local acc = {}",
+      "for part in ${1:str}:gmatch(\"(.-)\" .. ${2:delimiter}) do",
+      "\ttable.insert(acc, part)",
+      "end"
+    ],
+    "filetype": "lua",
+    "prefix": "split (gmatch)"
+  },
+  "ternary": {
+    "body": "${1:condition} and ${2:value1} or ${3:value2}",
+    "prefix": "ternary"
+  },
+  "trim trailing line break": {
+    "body": ":gsub(\"\\n$\", \"\")",
+    "prefix": "trim"
+  },
+  "write file": {
+    "body": [
+      "---@param str string",
+      "---@param filePath string",
+      "---@return string|nil -- error message",
+      "local function overwriteFile(filePath, str)",
+      "\tlocal file, _ = io.open(filePath, \"w\")",
+      "\tif not file then return end",
+      "\tfile:write(str)",
+      "\tfile:close()",
+      "end"
+    ],
+    "description": "Overwriting file, for appending use `a` instead of `w`.",
+    "prefix": "write file"
+  },
+  "Create Auto Command": {
+    "prefix": "autocmd",
+    "body": [
+      "vim.api.nvim_create_autocmd(\"${1:event}\", {",
+      "  group = vim.api.nvim_create_augroup(\"${2:group}\", { clear = true }),",
+      "  callback = function(ev)",
+      "    ${0}",
+      "  end",
+      "})"
+    ]
+  },
+  "Create Auto Command Group": {
+    "prefix": "augroup",
+    "body": [
+      "vim.api.nvim_create_augroup(\"${1:group}\", { clear = true })$0"
+    ]
+  },
+  "Current Win": {
+    "prefix": "win",
+    "body": "local win = vim.api.nvim_get_current_win()\n$0"
+  },
+  "Current Buf": {
+    "prefix": "buf",
+    "body": "local buf = vim.api.nvim_get_current_buf()\n$0"
+  },
+  "Buf Valid": {
+    "prefix": "bufvalid",
+    "body": "vim.api.nvim_buf_is_valid(${1:buf})"
+  },
+  "Win Valid": {
+    "prefix": "winvalid",
+    "body": "vim.api.nvim_win_is_valid(${1:win})"
+  },
+  "Win Call": {
+    "prefix": "wincall",
+    "body": [
+      "vim.api.nvim_win_call(${1:win}, function(win)",
+      "  ${0}",
+      "end)"
+    ]
+  },
+  "Buf Call": {
+    "prefix": "bufcall",
+    "body": [
+      "vim.api.nvim_buf_call(${1:buf}, function(buf)",
+      "  ${0}",
+      "end)"
+    ]
+  },
+  "Schedule": {
+    "prefix": "schedule",
+    "body": [
+      "vim.schedule(function()",
+      "  ${0}",
+      "end)"
+    ]
+  },
+  "Table Deep Extend": {
+    "prefix": "deepextend",
+    "body": "vim.tbl_deep_extend(\"force\", ${1:table}, ${2:table})$0"
+  },
+  "Table Filter": {
+    "prefix": "filter",
+    "body": [
+      "vim.tbl_filter(function()",
+      "  $0",
+      "end, ${1:table})"
+    ]
+  },
+  "Table Map": {
+    "prefix": "map",
+    "body": [
+      "vim.tbl_map(function()",
+      "  $0",
+      "end, ${1:table})"
+    ]
+  },
+  "Table Values": {
+    "prefix": "values",
+    "body": "vim.tbl_values(${1:table})"
+  },
+  "Table Keys": {
+    "prefix": "keys",
+    "body": "vim.tbl_keys(${1:table})"
+  }
+}

config/nvim/snippets/markdown.json

@@ -0,0 +1,133 @@
+{
+  "Misc": {
+    "body": "Miscellaneous",
+    "prefix": "Misc"
+  },
+  "bash (Codeblock)": {
+    "body": [
+      "```bash",
+      "$CLIPBOARD$0",
+      "```"
+    ],
+    "prefix": "bash (Codeblock)"
+  },
+  "caution (callout)": {
+    "body": [
+      "> [!CAUTION]",
+      "> $0"
+    ],
+    "description": "https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#alerts",
+    "prefix": "caution (callout)"
+  },
+  "details & summary": {
+    "body": [
+      "<details>",
+      "<summary>${1:Text}</summary>",
+      "$0",
+      "</details>"
+    ],
+    "description": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details",
+    "prefix": [
+      "toggle / fold",
+      "details & summary"
+    ]
+  },
+  "ignore file (ltex)": {
+    "body": "<!-- LTeX: enabled=false -->",
+    "prefix": "ignore file (ltex)"
+  },
+  "image": {
+    "body": "<img src=\"${1:image_path}\" alt=\"${2:alt text}\" width=\"${3:50%}\">",
+    "description": "HTML syntax for images used to display images with reduced size",
+    "prefix": "image"
+  },
+  "important (callout)": {
+    "body": [
+      "> [!IMPORTANT]",
+      "> $0"
+    ],
+    "description": "https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#alerts",
+    "prefix": "important (callout)"
+  },
+  "insert table 2x2": {
+    "body": [
+      "| ${1:Column1}   | ${2:Column2}   |",
+      "|--------------- | -------------- |",
+      "| ${3:Item1.1}   | ${4:Item2.1}   |"
+    ],
+    "prefix": "table (2x2)"
+  },
+  "insert toc": {
+    "body": [
+      "## Table of Content",
+      "",
+      "<!-- toc -->"
+    ],
+    "description": "https://github.com/jonschlinkert/markdown-toc#tocinsert",
+    "prefix": "insert toc"
+  },
+  "js (Codeblock)": {
+    "body": [
+      "```js",
+      "$CLIPBOARD$0",
+      "```"
+    ],
+    "prefix": "js (Codeblock)"
+  },
+  "kbd": {
+    "body": "<kbd>$0</kbd>",
+    "description": "HTML tag for keys",
+    "prefix": "kbd"
+  },
+  "lua (Codeblock)": {
+    "body": [
+      "```lua",
+      "$CLIPBOARD$0",
+      "```"
+    ],
+    "prefix": "lua (Codeblock)"
+  },
+  "note (GitHub callout)": {
+    "body": [
+      "> [!NOTE]",
+      "> $0"
+    ],
+    "description": "https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#alerts",
+    "prefix": [
+      "info (callout)",
+      "note (callout)"
+    ]
+  },
+  "py (Codeblock)": {
+    "body": [
+      "```py",
+      "$CLIPBOARD$0",
+      "```"
+    ],
+    "prefix": "py (Codeblock)"
+  },
+  "tip (callout)": {
+    "body": [
+      "> [!TIP]",
+      "> $0"
+    ],
+    "description": "https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#alerts",
+    "prefix": "tip (callout)"
+  },
+  "ts (Codeblock)": {
+    "body": [
+      "```ts",
+      "$CLIPBOARD$0",
+      "```"
+    ],
+    "prefix": "ts (Codeblock)"
+  },
+  "warning (callout)": {
+    "body": [
+      "> [!WARNING]",
+      "> $0"
+    ],
+    "description": "https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#alerts",
+    "prefix": "warning (callout)"
+  }
+}

config/nvim/snippets/php.snippets

@@ -0,0 +1,165 @@
+snippet php "php"
+	<?php
+	${1}
+
+snippet ec "ec"
+	echo '${1}'${2};
+
+snippet vd "vd"
+	var_dump(${1});
+
+# Includes and requires
+
+snippet inc "inc"
+	include_once '${1}';${2}
+
+snippet req "req"
+	require_once '${1}';${2}
+
+# define(...)
+
+snippet def "def"
+	define('${1}'${2});${3}
+
+# Doxygen comments
+
+snippet d "/**"
+	/**
+	* ${1}
+	*/${2}
+
+snippet code "code"
+	* @code
+	* ${1}
+	* @endcode
+
+# Class
+
+snippet cl "cl"
+	class ${1} {
+		${2}
+		function ${3:__construct}(${4}) {
+			${5}
+		}
+	}
+
+snippet pubf "public method"
+	public function ${1}(${2}): $3
+	{
+		${0}
+	}
+
+snippet prof "protected method"
+	protected function ${1}(${2}): $3
+	{
+		${0}
+	}
+
+snippet prif "private method"
+	protected function ${1}(${2}): $3
+	{
+		${0}
+	}
+
+snippet testt "test method (prefix)"
+	public function test_${1}()
+	{
+		${0}
+	}
+
+snippet testa "test method (annotation)"
+	/** @test */
+	public function ${1}()
+	{
+		${0}
+	}
+
+# $this->
+
+snippet . "$this->" i
+	$this->
+
+# If statement
+
+snippet if "if"
+	if (${1}) {
+		${2}
+	}
+
+snippet ife "ife"
+	if (${1}) {
+		${2}
+	} else {
+		${3}
+	}
+
+snippet elif "elif"
+	else if (${1}) {
+		${2}
+	}
+
+snippet el "el"
+	else {
+		${1}
+	}
+
+# Switch
+
+snippet sw "sw"
+	switch (${1}) {
+		default:
+			break;
+	}
+
+snippet case "case"
+	case '${1}':
+		${2}
+		break;${3}
+
+# Do-while loop
+
+snippet do "do"
+	do {
+		${2}
+	} while (${1});
+
+# While loop
+
+snippet wh "wh"
+	while (${1}) {
+		${2}
+	}
+
+# For loop
+
+snippet for "for"
+	for (${1}; ${2}; ${3}) {
+		${4}
+	}
+
+snippet fore "fore"
+	foreach (${1} as ${2}) {
+		${3}
+	}
+
+# Functions and methods
+
+snippet fun "fun"
+	function ${1}(${2}) {
+		${3}
+	}
+
+snippet met "met"
+	${1}function ${2}(${3}) {
+		${4}
+	}
+
+# Return
+
+snippet r "return"
+	return ${1}
+
+# Todos
+
+snippet todo "todo"
+	// TODO ${1}

config/nvim/snippets/sh.json

@@ -0,0 +1,334 @@
+{
+  "PATH (export)": {
+    "body": "export PATH=/usr/local/lib:/usr/local/bin:/opt/homebrew/bin/:\\$PATH",
+    "description": "Extends PATH in a way that homebrew installed CLIs are recognized in ARM and Intel Macs.",
+    "prefix": "PATH (export)"
+  },
+  "awk (get field)": {
+    "body": "awk '{ print $${1:1} }'",
+    "description": "Retrieve a field from the piped in string, with whitespace as the default field delimiter. `$n` means that the nth field will be used.",
+    "prefix": "awk (field)"
+  },
+  "check device name": {
+    "body": "scutil --get ComputerName | grep -q \"$0\"",
+    "prefix": "device name"
+  },
+  "check if dark mode (macOS)": {
+    "body": "defaults read -g AppleInterfaceStyle &>/dev/null; && echo 'isDark'",
+    "prefix": "check if dark mode (macOS)"
+  },
+  "check if in git repo": {
+    "body": "if ! git rev-parse --is-inside-work-tree &>/dev/null ; then print \"\\e[0;33mfile is not ins a git repository.\\e[0m\" && return 1 ; fi",
+    "prefix": "check if in git repo"
+  },
+  "check if installed": {
+    "body": [
+      "if [[ ! -x \"\\$(command -v ${1:cli})\" ]]; then print \"\\e[0;33m${1:cli} not installed.\\e[0m\" && return 1; fi",
+      "$0"
+    ],
+    "description": "https://stackoverflow.com/a/26759734/22114136",
+    "prefix": "check if installed"
+  },
+  "check if on macOS": {
+    "body": "[[ \"\\$OSTYPE\" =~ \"darwin\" ]]",
+    "prefix": "check if on macOS"
+  },
+  "check if process is running": {
+    "body": "pgrep -xq \"${1:process}\" && $0",
+    "prefix": "check if process is running"
+  },
+  "check if sudo user": {
+    "body": "sudo -nv && ${1:some_sudo_action}",
+    "prefix": "check if sudo user"
+  },
+  "confirmation prompt": {
+    "body": [
+      "# confirmation prompt",
+      "print \"\\e[1;34m$0Proceed? (y/n)\\e[0m\"",
+      "read -rk pressed",
+      "echo",
+      "if [[ \"\\$pressed\" != \"y\" ]]; then",
+      "\techo \"Aborted.\"",
+      "\treturn 1",
+      "fi",
+      "echo"
+    ],
+    "prefix": "confirmation prompt"
+  },
+  "default value": {
+    "body": "\\${${1:var}:-${2:default_value}}",
+    "prefix": "default value"
+  },
+  "directory of script": {
+    "body": "\"$(dirname \"$(readlink -f \"\\$0\")\")\"",
+    "prefix": "directory of this script"
+  },
+  "elseif": {
+    "body": "elif [[ ${1:condition} ]]; then\n\t${0}",
+    "description": "Add an elseif to an if statement.",
+    "prefix": "elseif"
+  },
+  "extension": {
+    "body": "ext=${${1:file_name}##*.}",
+    "prefix": "get extension"
+  },
+  "filename": {
+    "body": "file_name=$(basename \"$${1:file_path}\")",
+    "prefix": "filename"
+  },
+  "filename w/o ext": {
+    "body": "${1:file_name}=${${1:file_name}%.*}",
+    "prefix": "filename w/o ext"
+  },
+  "find & xargs": {
+    "body": "find . -print0 | xargs -0 -I '{}'",
+    "prefix": "find & xargs"
+  },
+  "find -exec": {
+    "body": "find . $0 -exec open '{}' \\;",
+    "prefix": "find -exec"
+  },
+  "for each file": {
+    "body": [
+      "for filename in *.txt; do",
+      "\techo \"\\$filename\"",
+      "done"
+    ],
+    "prefix": "for each file"
+  },
+  "for each line (read)": {
+    "body": [
+      "while read -r line; do",
+      "\techo \"\\$line\"$0",
+      "done < \"\\$${1:input_file}\""
+    ],
+    "prefix": "for each line (read)"
+  },
+  "for each line (variable)": {
+    "body": [
+      "echo \"\\$lines\" | while read -r line; do",
+      "\techo \"\\$line\"",
+      "done"
+    ],
+    "prefix": "for each line (variable)"
+  },
+  "for i ..": {
+    "body": [
+      "for ((i = 0; i <= ${1:length}; i++)); do",
+      "   echo \\$i$0",
+      "done"
+    ],
+    "prefix": "for i .."
+  },
+  "function": {
+    "body": "function ${1:name} {\n\t${0}\n}",
+    "prefix": "function"
+  },
+  "get nth line from string": {
+    "body": "line=$(echo \"\\$${1:str}\" | sed -n \"${2:n}p\")",
+    "prefix": "get nth line from string"
+  },
+  "i++": {
+    "body": "((${1:i}++))",
+    "prefix": "i++"
+  },
+  "i--": {
+    "body": "((${1:i}--))",
+    "prefix": "i--"
+  },
+  "if (short)": {
+    "body": "[[ \"\\$${1:var}\" ]] && $0",
+    "prefix": "if (short)"
+  },
+  "if .. then": {
+    "body": [
+      "if [[ \"\\$${1:var}\" ]]; then",
+      "\t$0",
+      "fi"
+    ],
+    "prefix": "if .. then"
+  },
+  "if .. then .. else": {
+    "body": [
+      "if [[ \"$${1:cond}\" ]]; then",
+      "\t$0",
+      "else",
+      "\t",
+      "fi"
+    ],
+    "prefix": "if .. then .. else"
+  },
+  "input (stdin or $1)": {
+    "body": [
+      "if [[ $# -eq 0 ]]; then",
+      "\tinput=$(< /dev/stdin)",
+      "else",
+      "\tinput=\"$1\"",
+      "fi"
+    ],
+    "description": "reads either from STDIN or $1. stdin may have unescaped newlines, which have to be removed, e.g. via `tr -d '\n'`.",
+    "prefix": "input (stdin or $1)"
+  },
+  "notify (msg)": {
+    "body": "osascript -e 'display notification \"\" with title \"${1:msg}\"'",
+    "prefix": "notify (msg)"
+  },
+  "notify (var)": {
+    "body": "osascript -e \"display notification \\\"\\\" with title \\\"$${1:var}\\\"\"",
+    "prefix": "notify (var)"
+  },
+  "null (pipe)": {
+    "body": "&> /dev/null",
+    "prefix": "null (pipe)"
+  },
+  "osascript jxa (run script)": {
+    "body": "osascript -l JavaScript \"${1:file}\"",
+    "prefix": [
+      "jxa (run script)",
+      "osascript -l JavaScript"
+    ]
+  },
+  "plist: extract key": {
+    "body": "plutil -extract name.childkey xml1 -o - example.plist | sed -n 4p | cut -d'>' -f2 | cut -d'<' -f1",
+    "prefix": "plist: extract key"
+  },
+  "print in blue": {
+    "body": "print \"\\e[1;34m$0\\e[0m\"",
+    "prefix": "print in blue"
+  },
+  "progress bar": {
+    "body": [
+      "for _ in {1..100}; do",
+      "\tprintf \"🬋\"",
+      "\tsleep 0.5",
+      "done"
+    ],
+    "prefix": "progress bar"
+  },
+  "quicklook": {
+    "body": "qlmanage -p \"${1:filepath}\"",
+    "description": "QuickLook the file. MacOS only.",
+    "prefix": "quicklook"
+  },
+  "redirect to stderr": {
+    "body": ">&2",
+    "prefix": "redirect to stderr"
+  },
+  "resolve home": {
+    "body": "${1:path}=\"\\${${1:path}/#\\~/\\$HOME}\"",
+    "prefix": "resolve home"
+  },
+  "restart app": {
+    "body": [
+      "killall \"${1:app_name}\"",
+      "while pgrep -xq \"${1:app_name}\"; do sleep 0.1; done",
+      "open -a \"${1:app_name}\""
+    ],
+    "description": "safely restart app, avoiding race condition",
+    "prefix": "restart app"
+  },
+  "sed substitution": {
+    "body": "sed 's/$0//'",
+    "prefix": "sed substitution"
+  },
+  "shebang": {
+    "body": "#!/usr/bin/env zsh",
+    "prefix": "shebang"
+  },
+  "slice": {
+    "body": "${1:var}=\"${${1:var}:${2:from}:${3:to}}\"",
+    "prefix": "slice"
+  },
+  "spinner": {
+    "body": [
+      "# spinner with 20s timeout",
+      "spinner=\"⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏\"",
+      "for i in {1..100}; do",
+      "\tpos=\\$((i % \\${#spinner}))",
+      "\tprintf \"\\r%s\" \"\\${spinner:\\$pos:1}\"",
+      "\tsleep 0.2",
+      "done",
+      "printf \"\\r\" # remove spinner"
+    ],
+    "prefix": "spinner"
+  },
+  "stderr (merge with stdout)": {
+    "body": "2>&1",
+    "prefix": "stderr (merge with stdout)"
+  },
+  "stdin": {
+    "body": "stdin=\\$(< /dev/stdin)",
+    "description": "$(cat) also works. See https://stackoverflow.com/questions/32363887/in-a-bash-function-how-do-i-get-stdin-into-a-variable",
+    "prefix": "stdin"
+  },
+  "stdout is to a terminal": {
+    "body": "[[ -t true ]]",
+    "prefix": "stdout is to a terminal"
+  },
+  "substitute": {
+    "body": "\\${${1:var}//${2:search}/${3:replace}}",
+    "description": "one slash for single substitution, two for global",
+    "prefix": "substitute (expansion)"
+  },
+  "suppress stderr": {
+    "body": "2>/dev/null",
+    "prefix": "suppress stderr"
+  },
+  "switch case": {
+    "body": [
+      "case $${1:var} in",
+      "\"one\" | \"two\")",
+      "\techo \"foo\"",
+      "\t;;",
+      "\"three\")",
+      "\techo \"bar\"",
+      "\t;;",
+      "*)",
+      "\techo \"default\"",
+      "\t;;",
+      "esac"
+    ],
+    "description": "A case command first expands word, and tries to match it against each pattern in turn.",
+    "prefix": "switch case"
+  },
+  "ternary": {
+    "body": "\\$([[ \"${1:cond}\" ]] && echo \"${2:value1}\" || echo \"${3:value2}\")",
+    "prefix": "ternary"
+  },
+  "then": {
+    "body": "then\n\t$0\nfi",
+    "prefix": "then .. fi"
+  },
+  "today (ISO date) + now": {
+    "body": "${1:now}=\\$(date +\"%Y-%m-%d %H:%M:%S\")",
+    "prefix": [
+      "today (ISO date)",
+      "now"
+    ]
+  },
+  "trim whitespace": {
+    "body": "${1:text}=$(echo -n \"$${1:text}\" | sed -e 's/^ *//' -e 's/ *$//')",
+    "prefix": "trim whitespace"
+  },
+  "urlEncode": {
+    "body": "osascript -l JavaScript -e \"encodeURIComponent('${1:text}')\"",
+    "prefix": "urlEncode"
+  },
+  "wait until app running": {
+    "body": "while ! pgrep -xq \"${1:app_name}\"; do sleep 0.1; done",
+    "prefix": "wait until app running"
+  },
+  "wait until app terminated": {
+    "body": "while pgrep -xq \"${1:app_name}\"; do sleep 0.1; done",
+    "prefix": "wait until app terminated"
+  },
+  "while": {
+    "body": "while [[ ${1:condition} ]]; do\n\t${0}\ndone\n",
+    "description": "A while loop by condition.",
+    "prefix": "while"
+  },
+  "xargs (for each line)": {
+    "body": "xargs -I {} ${1:some_cmd} '{}'",
+    "prefix": "xargs (for each line)"
+  }
+}

config/nvim/snippets/yaml.json

@@ -0,0 +1,7 @@
+{
+  "schema (modeline)": {
+    "body": "# yaml-language-server: $$schema=${1:url}",
+    "description": "https://github.com/redhat-developer/yaml-language-server#using-inlined-schema",
+    "prefix": "schema (modeline)"
+  }
+}

config/omp/own.toml

@@ -1,122 +1,116 @@
 "$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"
-final_space = true
-console_title_template = "{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}"
-version = 2
+console_title_template = '{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}'
+version = 3
 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
+final_space = 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_virtual_env = false
+
+[[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', '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/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

docs/nvim-keybindings.md

@@ -2,98 +2,12 @@
 
 ```txt
 
-n  <Space>/    * <Lua 380: ~/.config/nvim/lua/plugins/telescope.lua:82>
+n  <Space>/    * <Lua 196: ~/.config/nvim/lua/plugins/telescope.lua:68>
                  [/] 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>
-                 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>
+n  <Space>ht   * <Lua 192: ~/.config/nvim/lua/plugins/harpoon.lua:43>
                  Open Harpoon Quick menu
-n  <Space>dr   * <Lua 41: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 DAP: Reset
+n  <Space>hw   * <Lua 189: ~/.config/nvim/lua/plugins/harpoon.lua:37>
+                 Open harpoon window with telescope
 x  #           * <Lua 7: vim/_defaults.lua:0>
                  :help v_#-default
 o  %             <Plug>(MatchitOperationForward)
@@ -105,13 +19,20 @@ x  *           * <Lua 3: vim/_defaults.lua:0>
                  :help v_star-default
 x  @           * mode() == 'V' ? ':normal! @'.getcharstr().'<CR>' : '@'
                  :help v_@-default
-n  K           * <Cmd>lua vim.lsp.buf.hover()<CR>
-                 LSP: Hover Documentation
 x  Q           * mode() == 'V' ? ':normal! @<C-R>=reg_recorded()<CR><CR>' : 'Q'
                  :help v_Q-default
-x  S             <Plug>VSurround
+x  R           * <Lua 70: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Treesitter Search
+o  R           * <Lua 69: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Treesitter Search
 n  Y           * y$
                  :help Y-default
+o  Zk          * <Lua 67: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Flash Treesitter
+x  Zk          * <Lua 66: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Flash Treesitter
+n  Zk          * <Lua 59: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Flash Treesitter
 o  [%            <Plug>(MatchitOperationMultiBackward)
 x  [%            <Plug>(MatchitVisualMultiBackward)
 n  [%            <Plug>(MatchitNormalMultiBackward)
@@ -123,27 +44,23 @@ n  ]%            <Plug>(MatchitNormalMultiForward)
 n  ]d          * <Lua 14: vim/_defaults.lua:0>
                  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
+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
+n  gP          * <Lua 52: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:132>
+                 Close preview windows
+n  gpr         * <Lua 25: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:114>
+                 Preview references
+n  gpD         * <Lua 244: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:105>
+                 Preview declaration
+n  gpi         * <Lua 242: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:91>
+                 Preview implementation
+n  gpt         * <Lua 241: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:77>
+                 Preview type definition
+n  gpd         * <Lua 237: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:63>
+                 Preview definition
 o  gc          * <Lua 13: vim/_defaults.lua:0>
                  Comment textobject
 n  gcc         * <Lua 12: vim/_defaults.lua:0>
@@ -160,13 +77,14 @@ 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
+o  r           * <Lua 68: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Remote Flash
+o  zk          * <Lua 65: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Flash
+x  zk          * <Lua 64: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Flash
+n  zk          * <Lua 63: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Flash
 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 +98,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>
+s  <Plug>luasnip-jump-prev * <Lua 315: ~/.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>
+s  <Plug>luasnip-jump-next * <Lua 314: ~/.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>
+s  <Plug>luasnip-prev-choice * <Lua 313: ~/.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>
+s  <Plug>luasnip-next-choice * <Lua 312: ~/.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>
+s  <Plug>luasnip-expand-snippet * <Lua 311: ~/.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>
+s  <Plug>luasnip-expand-or-jump * <Lua 310: ~/.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>
+   <Plug>luasnip-expand-repeat * <Lua 308: ~/.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>
+n  <Plug>luasnip-delete-check * <Lua 306: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:28>
                  LuaSnip: Removes current snippet from jumplist
 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>
                  Show diagnostics under the cursor
+n  <C-L>       * <Cmd>nohlsearch|diffupdate|normal! <C-L><CR>
+                 :help CTRL-L-default
 ```
 
-- Generated on Wed 25 Sep 2024 14:52:25 EEST
+- Generated on Fri  4 Oct 2024 14:49:00 EEST

local/bin/dfm

@@ -392,18 +392,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=(
+    "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
 }
@@ -524,9 +612,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 +650,8 @@ usage()
   echo ""
   section_install
   echo ""
+  section_asdf
+  echo ""
   section_brew
   echo ""
   section_check
@@ -566,14 +663,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/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,40 @@ 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"
+  "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"
+)
+
 # Function to update asdf and plugins
 update_asdf()
 {
@@ -24,43 +55,24 @@ update_asdf()
   asdf global asdf-plugin-manager "$(asdf latest asdf-plugin-manager)"
   asdf-plugin-manager version
   asdf-plugin-manager add-all
+  asdf-plugin-manager update-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"
-    "eza:github.com/lwiechec/asdf-eza.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"
-    "lazygit:github.com/nklmilojevic/asdf-lazygit.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}')
@@ -72,7 +84,7 @@ install_asdf_plugins()
   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
 }
@@ -87,7 +99,7 @@ reshim()
 # create usage function
 usage()
 {
-  echo "Usage: $0 [both|install|add_plugins]"
+  echo "Usage: $0 [both|install|add_plugins|update]"
   exit 1
 }
 
@@ -99,6 +111,10 @@ main()
       update_asdf
       reshim
       ;;
+    "update")
+      update_asdf_commands
+      reshim
+      ;;
     "install")
       update_asdf
       reshim