feat(nvim): mini.nvim plugins + cleanup

chore(config): tweaks to configs and scripts
feat(shell): switched to antidote, asdf changes
2026-01-28 21:45:44 +00:00 · 2024-11-22 17:58:52 +02:00 · 2024-11-22 17:54:37 +02:00 · 2024-11-22 17:53:46 +02:00 · 2024-11-21 10:16:24 +02:00 · 2024-11-19 11:20:24 +02:00
38 changed files with 388 additions and 397 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,5 @@ config/gnupg/s
 config/gnupg/private-keys-v1.d
 config/nvim/spell/*
 !config/nvim/spell/.gitkeep
+antidote_plugins.zsh

--- a/.gitmodules
+++ b/.gitmodules
@@ -23,10 +23,6 @@
 	path = config/tmux/plugins/tmux-continuum
 	url = https://github.com/tmux-plugins/tmux-continuum
 	ignore = dirty
-[submodule "tmux/tmux-resurrect"]
-	path = config/tmux/plugins/tmux-resurrect
-	url = https://github.com/tmux-plugins/tmux-resurrect
-	ignore = dirty
 [submodule "tmux/tmux-sensible"]
 	path = config/tmux/plugins/tmux-sensible
 	url = https://github.com/tmux-plugins/tmux-sensible.git
@@ -64,3 +60,7 @@
 [submodule "asdf"]
 	path = local/bin/asdf
 	url = https://github.com/asdf-vm/asdf.git
+[submodule "antidote"]
+	path = tools/antidote
+	url = https://github.com/mattmc3/antidote.git
+	shallow = true
--- a/.ignore
+++ b/.ignore
@@ -1,6 +1,7 @@
 .git/**
 config/cheat/cheatsheets/community/**
-tools/dotbot/**
+node_modules
+tools/antidote/**
 tools/dotbot-brew/**
 tools/dotbot-include/**
-node_modules
+tools/dotbot/**
--- a/.nvmrc
+++ b/.nvmrc
@@ -0,0 +1 @@
+22.11.0
--- a/.python-version
+++ b/.python-version
@@ -0,0 +1 @@
+3.13.0
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +0,0 @@
-python 3.13.0
-nodejs 22.11.0
--- a/add-submodules.sh
+++ b/add-submodules.sh
@@ -17,14 +17,16 @@ git submodule add --name cheat-tldr \
  -f https://github.com/ivuorinen/cheatsheet-tldr.git config/cheat/cheatsheets/tldr
 git submodule add --name asdf \
  -f https://github.com/asdf-vm/asdf.git local/bin/asdf
+git submodule add --name antidote \
+  --depth 1 \
+  -f https://github.com/mattmc3/antidote.git tools/antidote \
+

 # tmux plugin manager and plugins
 git submodule add --name tmux/tmux-continuum \
  -f https://github.com/tmux-plugins/tmux-continuum config/tmux/plugins/tmux-continuum
 git submodule add --name tmux/tmux-mode-indicator \
  -f https://github.com/MunifTanjim/tmux-mode-indicator.git config/tmux/plugins/tmux-mode-indicator
-git submodule add --name tmux/tmux-resurrect \
-  -f https://github.com/tmux-plugins/tmux-resurrect config/tmux/plugins/tmux-resurrect
 git submodule add --name tmux/tmux-sensible \
  -f https://github.com/tmux-plugins/tmux-sensible.git config/tmux/plugins/tmux-sensible
 git submodule add --name tmux/tmux-sessionist \
@@ -45,10 +47,14 @@ for MODULE in $(git config --file .gitmodules --get-regexp path | awk '{ print $
  git config "submodule.${MODULE}.ignore" all
 done

+# Mark certain repositories shallow
+git config -f .gitmodules submodule.antidote.shallow true
+
 # remove old submodules
 [ -d "config/tmux/plugins/tpm" ] && rm -rf config/tmux/plugins/tpm
 [ -d "config/tmux/plugins/tmux" ] && rm -rf config/tmux/plugins/tmux
 [ -d "config/tmux/plugins/tmux-menus" ] && rm -rf config/tmux/plugins/tmux-menus
+[ -d "config/tmux/plugins/tmux-resurrect" ] && rm -rf config/tmux/plugins/tmux-resurrect
 [ -d "tools/dotbot-crontab" ] && rm -rf tools/dotbot-crontab
 [ -d "tools/dotbot-snap" ] && rm -rf tools/dotbot-snap
 [ -d "config/nvim-kickstart" ] && rm -rf config/nvim-kickstart
--- a/base/bashrc
+++ b/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")"
+}
--- a/base/envrc
+++ b/base/envrc
@@ -1 +1,2 @@
+use node
 use asdf
--- a/base/nvmrc
+++ b/base/nvmrc
@@ -0,0 +1 @@
+lts/*
--- a/base/tool-versions
+++ b/base/tool-versions
@@ -1,7 +1,5 @@
 asdf-plugin-manager 1.4.0
-nodejs 23.1.0
 golang 1.23.3
-python 3.12.7
 ruby 3.3.4
 rust 1.82.0
 direnv 2.35.0
@@ -14,7 +12,6 @@ editorconfig-checker 2.8.0
 github-cli 2.61.0
 hadolint 2.12.0
 kubectl 1.31.2
-pipx 1.7.1
 pre-commit 4.0.1
 ripgrep 14.1.1
 shellcheck 0.10.0
@@ -26,3 +23,5 @@ yq 4.44.3
 bats 1.11.0
 gitleaks 8.18.4
 delta 0.18.1
+eza 0.20.8
+sops 3.9.1
--- a/base/zshrc
+++ b/base/zshrc
@@ -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,9 +11,36 @@ 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"

+ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"

+load_antidote()
+{
+  [[ ! -d "$ANTIDOTE_DIR" ]] && {
+    git submodule add \
+      --name antidote \
+      --depth=1 \
+      -f https://github.com/mattmc3/antidote.git "${ANTIDOTE_DIR}"
+    git config -f .gitmodules submodule.antidote.shallow true
+  }
+  zstyle ':antidote:bundle' use-friendly-names 'yes'
+
+  zsh_plugins=${ANTIDOTE_PLUGINS}
+  [[ -f ${zsh_plugins}.txt ]] || touch ${zsh_plugins}.txt
+  # Lazy-load antidote from its functions directory.
+  FPATH="$ANTIDOTE_DIR/functions:$FPATH"
+  autoload -Uz antidote
+  # Generate a new static file whenever .zsh_plugins.txt is updated.
+  if [[ ! ${zsh_plugins}.zsh -nt ${zsh_plugins}.txt ]]; then
+    antidote bundle <${zsh_plugins}.txt >|${zsh_plugins}.zsh
+  fi
+
+  # Source your static plugins file.
+  source ${zsh_plugins}.zsh
+}
+
 # Function to load antigen if available
 load_antigen()
 {
@@ -44,10 +72,15 @@ load_antigen()
    zstyle :omz:plugins:ssh-agent lazy yes
    zstyle :omz:plugins:ssh-agent quiet yes

+    # nvm
+    zstyle ':omz:plugins:nvm' autoload yes
+
    # z, the zsh version
    export ZSHZ_DATA="$XDG_STATE_HOME/z"
    antigen bundle z

+    antigen bundle nvm
+
    # these should be always available
    antigen bundle jreese/zsh-titles
    antigen bundle brew
@@ -88,19 +121,12 @@ 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"
-}
-
-main "$@"
-
-# Lando
-export PATH="$HOME/.lando/bin${PATH+:$PATH}"; #landopath
+# load_antigen
+load_antidote
+source_fzf_config
+setup_tmux_window_name_plugin
+x-have antidot && eval "$(antidot init)"

+autoload -Uz compinit bashcompinit
+compinit -d $ZSH_COMPDUMP
+bashcompinit
--- a/config/asdf/plugin-versions
+++ b/config/asdf/plugin-versions
@@ -7,16 +7,14 @@ delta                 https://github.com/andweeb/asdf-delta.git
 direnv                https://github.com/asdf-community/asdf-direnv.git           6ff3dbe
 dotenv-linter         https://github.com/wesleimp/asdf-dotenv-linter.git          1369f53
 editorconfig-checker  https://github.com/gabitchov/asdf-editorconfig-checker.git  585c1d5
+eza                   https://github.com/lwiechec/asdf-eza.git                    11f578d
 fd                    https://gitlab.com/wt0f/asdf-fd.git                         17d56e0
 github-cli            https://github.com/bartlomiejdanek/asdf-github-cli.git      e0605b7
 gitleaks              https://github.com/jmcvetta/asdf-gitleaks.git               0cc0d7e
 golang                https://github.com/asdf-community/asdf-golang.git           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
--- a/config/asdf/python-packages
+++ b/config/asdf/python-packages
@@ -1,5 +1,4 @@
 ansible
 pipenv
-semgrep
 neovim
 libtmux
--- a/config/exports
+++ b/config/exports
@@ -14,29 +14,20 @@
 # if DOTFILES is not set, set it to the default location
 [ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles"

+# zsh completions directory
+[ -z "$ZSH_COMPLETIONS" ] && export ZSH_COMPLETIONS="$XDG_CONFIG_HOME/zsh/completion"
+
 export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"

-# Load bash completions if available for zsh
-if [[ -n "$ZSH_VERSION" ]]; then
-  autoload bashcompinit
-  bashcompinit
-fi
-
-# Load asdf
-export ASDF_DIR="$XDG_BIN_HOME/asdf"
-if [[ -d $ASDF_DIR ]]; then
-  [[ -d $ASDF_DIR/completions ]] && fpath=("$ASDF_DIR/completions" $fpath)
-  [[ -d $ASDF_DIR/plugins ]] && fpath=("$ASDF_DIR/plugins" $fpath)
-  source "$ASDF_DIR/asdf.sh"
-fi
-export PATH="$ASDF_DIR/bin:$ASDF_DIR/shims:$PATH"
+# Add zsh completions to FPATH, compinit will be called later
+FPATH="$ZSH_COMPLETIONS:$FPATH"

 if ! command -v msg &> /dev/null; then
  # Function to print messages if VERBOSE is enabled
  # $1 - message (string)
  msg()
  {
-    [[ "$VERBOSE" -eq 1 ]] && echo "-> $1"
+    [[ "$VERBOSE" -eq 1 ]] && msgr msg "-> $1"
    return 0
  }
 fi
@@ -124,7 +115,7 @@ preexec()
 dfu()
 {
  (
-    cd "$DOTFILES" && git pull --ff-only && ./install
+    cd "$DOTFILES" && git rebase --ff --autostash && ./install
  )
 }

@@ -233,11 +224,11 @@ replacable()
  FILE2="$2"

  [[ ! -r "$FILE1" ]] && {
-    [[ $VERBOSE -eq 1 ]] && msg_err "File 1 ($FILE1) does not exist"
+    [[ $VERBOSE -eq 1 ]] && msgr err "File 1 ($FILE1) does not exist"
    return 0
  }
  [[ ! -r "$FILE2" ]] && {
-    [[ $VERBOSE -eq 1 ]] && msg_err "File 2 ($FILE2) does not exist, replaceable"
+    [[ $VERBOSE -eq 1 ]] && msgr err "File 2 ($FILE2) does not exist, replaceable"
    return 1
  }

@@ -245,20 +236,20 @@ replacable()
  FILE2_HASH=$(get_sha256sum "$FILE2")

  [[ $FILE1_HASH = "" ]] && {
-    [[ $VERBOSE -eq 1 ]] && msg_err "Could not get hash for file 1 ($FILE1)"
+    [[ $VERBOSE -eq 1 ]] && msgr err "Could not get hash for file 1 ($FILE1)"
    return 0
  }
  [[ $FILE2_HASH = "" ]] && {
-    [[ $VERBOSE -eq 1 ]] && msg_err "Could not get hash for file 2 ($FILE2), replaceable"
+    [[ $VERBOSE -eq 1 ]] && msgr err "Could not get hash for file 2 ($FILE2), replaceable"
    return 1
  }

  [[ "$FILE1_HASH" == "$FILE2_HASH" ]] && {
-    [[ $VERBOSE -eq 1 ]] && msg_ok "Files match, not replaceable: $FILE1"
+    [[ $VERBOSE -eq 1 ]] && msgr ok "Files match, not replaceable: $FILE1"
    return 0
  }

-  [[ $VERBOSE -eq 1 ]] && msg_warn "Files do not match ($FILE1_HASH != $FILE2_HASH), replaceable"
+  [[ $VERBOSE -eq 1 ]] && msgr warn "Files do not match ($FILE1_HASH != $FILE2_HASH), replaceable"

  return 1
 }
@@ -304,6 +295,42 @@ hash shopt 2> /dev/null && shopt -s checkwinsize

 export SHORT_HOST=$(hostname -s)

+# asdf
+# https://github.com/asdf-vm/asdf
+msg "Setting up asdf configuration"
+export ASDF_DIR="${XDG_BIN_HOME}/asdf"
+if [[ -d $ASDF_DIR ]]; then
+  [[ -d $ASDF_DIR/completions ]] && FPATH="$ASDF_DIR/completions:$FPATH"
+  [[ -d $ASDF_DIR/plugins ]] && FPATH="$ASDF_DIR/plugins:$FPATH"
+
+  export ASDF_CONFIG_FILE="${XDG_CONFIG_HOME}/asdf/asdfrc"
+  export ASDF_DATA_DIR="${ASDF_DIR}"
+  export ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME="${XDG_CONFIG_HOME}/asdf/plugin-versions"
+  export ASDF_LOG_FILE="${XDG_CACHE_HOME}/asdf/asdf.log"
+  export ASDF_FORCE_PREPEND=yes
+  ## Default package files
+  export ASDF_CRATE_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/cargo-packages"
+  export ASDF_GEM_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/gem-packages"
+  export ASDF_GOLANG_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/golang-packages"
+  export ASDF_NPM_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/npm-packages"
+  export ASDF_PYTHON_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/python-packages"
+  ## Plugin configuration
+  export ASDF_DIRENV_IGNORE_MISSING_PLUGINS=1
+  export ASDF_GOLANG_MOD_VERSION_ENABLED=true
+  export ASDF_NODEJS_LEGACY_FILE_DYNAMIC_STRATEGY="latest_available"
+  ## Add asdf to path
+  export PATH="${ASDF_DIR}/bin:${PATH}"
+
+  source "$ASDF_DIR/asdf.sh"
+fi
+
+# Antidote configuration
+# https://getantidote.github.io/
+msg "Setting up Antidote configuration"
+export ANTIDOTE_DIR="$DOTFILES/tools/antidote"
+export ANTIDOTE_HOME="$XDG_CACHE_HOME/antidote"
+export ANTIDOTE_PLUGINS="$XDG_CONFIG_HOME/zsh/antidote_plugins"
+
 # Antigen configuration
 # https://github.com/zsh-users/antigen/wiki/Configuration
 msg "Setting up Antigen configuration"
@@ -321,28 +348,6 @@ export ANSIBLE_GALAXY_CACHE_DIR="$XDG_CACHE_HOME/ansible/galaxy_cache"
 x-dc "$ANSIBLE_HOME"
 x-dc "$ANSIBLE_GALAXY_CACHE_DIR"

-# asdf
-# https://github.com/asdf-vm/asdf
-msg "Setting up asdf configuration"
-export ASDF_DIR="${XDG_BIN_HOME}/asdf"
-export ASDF_CONFIG_FILE="${XDG_CONFIG_HOME}/asdf/asdfrc"
-export ASDF_DATA_DIR="${ASDF_DIR}"
-export ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME="${XDG_CONFIG_HOME}/asdf/plugin-versions"
-export ASDF_LOG_FILE="${XDG_CACHE_HOME}/asdf/asdf.log"
-export ASDF_FORCE_PREPEND=yes
-## Default package files
-export ASDF_CRATE_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/cargo-packages"
-export ASDF_GEM_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/gem-packages"
-export ASDF_GOLANG_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/golang-packages"
-export ASDF_NPM_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/npm-packages"
-export ASDF_PYTHON_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/python-packages"
-## Plugin configuration
-export ASDF_DIRENV_IGNORE_MISSING_PLUGINS=1
-export ASDF_GOLANG_MOD_VERSION_ENABLED=true
-export ASDF_NODEJS_LEGACY_FILE_DYNAMIC_STRATEGY="latest_available"
-## Add asdf to path
-export PATH="${ASDF_DIR}/bin:${PATH}"
-
 # aws
 # https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html
 # https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html
@@ -413,6 +418,9 @@ msg "Setting up Go configuration"
 export GOPATH="$XDG_DATA_HOME/go"
 export GOBIN="$XDG_BIN_HOME"

+# Lando
+export PATH="$HOME/.lando/bin${PATH+:$PATH}" #landopath
+
 # NPM: Add npm packages to path
 msg "Setting up NPM configuration"
 x-have node && {
@@ -437,6 +445,8 @@ export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
 ## for MichaelAquilina/zsh-autoswitch-virtualenv
 export AUTOSWITCH_VIRTUAL_ENV_DIR="$WORKON_HOME"
 export PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
+[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+x-have pyenv && eval "$(pyenv init -)"

 # Rust / cargo
 msg "Setting up Rust/Cargo configuration"
--- a/config/git/gitignore
+++ b/config/git/gitignore
@@ -20,3 +20,4 @@ auth.json
 dfm.sh
 .scannerwork
 .phpactor.json
+.zsh_history
--- a/config/homebrew/Brewfile
+++ b/config/homebrew/Brewfile
@@ -53,6 +53,10 @@ brew "aspell"
 brew "autoconf"
 # Collection of over 500 reusable autoconf macros
 brew "autoconf-archive"
+# Cryptographic recipes and primitives for Python
+brew "cryptography"
+# Official Amazon AWS command-line interface
+brew "awscli"
 # Bourne-Again SHell, a UNIX command interpreter
 brew "bash"
 # GNU multiple precision arithmetic library
@@ -71,8 +75,6 @@ brew "gettext"
 brew "glib"
 # Mozilla CA bundle for Python
 brew "certifi"
-# Cryptographic recipes and primitives for Python
-brew "cryptography"
 # Get a file from an HTTP, HTTPS or FTP server
 brew "curl"
 # Lightweight DNS forwarder and DHCP server
@@ -85,6 +87,12 @@ brew "freetds"
 brew "gd"
 # GitHub command-line tool
 brew "gh"
+# OpenType text shaping engine
+brew "harfbuzz"
+# Secure hashing function
+brew "libb2"
+# Framework for layout and rendering of i18n text
+brew "pango"
 # Distributed revision control system
 brew "git"
 # Render markdown on the CLI
@@ -97,12 +105,6 @@ brew "gnutls"
 brew "gnupg"
 # Image manipulation
 brew "netpbm"
-# C/C++ and Java libraries for Unicode and globalization
-brew "icu4c"
-# OpenType text shaping engine
-brew "harfbuzz"
-# Framework for layout and rendering of i18n text
-brew "pango"
 # Library to render SVG files using Cairo
 brew "librsvg"
 # Graph visualization software from AT&T and Bell Labs
@@ -127,8 +129,6 @@ brew "json-c"
 brew "krb5"
 # Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
 brew "legitify"
-# Secure hashing function
-brew "libb2"
 # Postgres C API library
 brew "libpq"
 # Multi-platform support library with a focus on asynchronous I/O
@@ -143,10 +143,14 @@ brew "m-cli"
 brew "nginx"
 # Port scanning utility for large networks
 brew "nmap"
+# Libraries for security-enabled client and server applications
+brew "nss"
 # Open source suite of directory software
 brew "openldap"
 # General-purpose scripting language
 brew "php"
+# General-purpose scripting language
+brew "php@8.2"
 # Manage compile and link flags for libraries
 brew "pkg-config"
 # Send macOS User Notifications from the command-line
@@ -204,6 +208,8 @@ cask "font-open-sans"
 cask "font-roboto"
 cask "font-source-code-pro"
 cask "font-source-code-pro-for-powerline"
+cask "font-source-sans-pro"
+cask "font-source-serif-pro"
 # GIT client
 cask "fork"
 # HTTP and GraphQL Client
--- a/config/nvim/lua/plugins/dap.lua
+++ b/config/nvim/lua/plugins/dap.lua
@@ -1,25 +0,0 @@
-return {
-  {
-    'rcarriga/nvim-dap-ui',
-    dependencies = {
-      'mfussenegger/nvim-dap',
-      'nvim-neotest/nvim-nio',
-      'theHamsta/nvim-dap-virtual-text',
-      'ray-x/go.nvim',
-      'ray-x/guihua.lua',
-      'leoluz/nvim-dap-go',
-    },
-    setup = function()
-      require('dapui').setup()
-      require('dap-go').setup()
-      require('nvim-dap-virtual-text').setup {}
-
-      vim.fn.sign_define('DapBreakpoint', {
-        text = '🔴',
-        texthl = 'DapBreakpoint',
-        linehl = 'DapBreakpoint',
-        numhl = 'DapBreakpoint',
-      })
-    end,
-  },
-}
--- a/config/nvim/lua/plugins/flash.lua
+++ b/config/nvim/lua/plugins/flash.lua
@@ -1,3 +1,6 @@
+-- Navigate your code with search labels, enhanced
+-- character motions and Treesitter integration
+-- https://github.com/folke/flash.nvim
 return {
  'folke/flash.nvim',
  event = 'VeryLazy',
--- a/config/nvim/lua/plugins/lualine.lua
+++ b/config/nvim/lua/plugins/lualine.lua
@@ -38,15 +38,13 @@ return {
          'diagnostics',
        },
        lualine_c = {
-          'buffers',
-          -- 'filename',
+          'filename',
        },
        lualine_x = {
-          -- 'fileformat',
          'filetype',
        },
        lualine_y = {
-          -- 'progress'
+          'location',
        },
        lualine_z = {
          {
--- a/config/nvim/lua/plugins/mini.lua
+++ b/config/nvim/lua/plugins/mini.lua
@@ -0,0 +1,40 @@
+-- https://github.com/echasnovski/mini.nvim
+-- https://github.com/echasnovski/mini.nvim/tree/main?tab=readme-ov-file#modules
+return {
+  -- Presets for common options and mappings
+  { 'echasnovski/mini.basics', version = '*' },
+
+  -- Visualize and work with indent scope
+  -- Replaced lukas-reineke/indent-blankline.nvim
+  { 'echasnovski/mini.indentscope', version = '*', opts = {} },
+
+  -- Animate common Neovim actions
+  -- Replaced anuvyklack/windows.nvim
+  { 'echasnovski/mini.animate', version = '*', opts = {} },
+
+  -- Fast and feature-rich surround actions
+  -- Replaced kylechui/nvim-surround
+  { 'echasnovski/mini.surround', version = '*', opts = {} },
+
+  -- Icons
+  {
+    'echasnovski/mini.icons',
+    opts = {
+      file = {
+        ['.keep'] = { glyph = '󰊢', hl = 'MiniIconsGrey' },
+        ['devcontainer.json'] = { glyph = '', hl = 'MiniIconsAzure' },
+      },
+      filetype = {
+        dotenv = { glyph = '', hl = 'MiniIconsYellow' },
+      },
+    },
+  },
+
+  -- Split and join arguments, lists, and other sequences
+  -- Replaced Wansmer/treesj
+  { 'echasnovski/mini.splitjoin', version = '*', opts = {} },
+
+  -- Work with diff hunks
+  -- Replaced lewis6991/gitsigns.nvim
+  { 'echasnovski/mini.diff', version = '*', opts = {} },
+}
--- a/config/nvim/lua/plugins/refactoring.lua
+++ b/config/nvim/lua/plugins/refactoring.lua
@@ -1,8 +0,0 @@
-- The Refactoring library based off the Refactoring book by Martin Fowler
-- https://github.com/ThePrimeagen/refactoring.nvim
-return {
-  'ThePrimeagen/refactoring.nvim',
-  version = '*',
-  dependencies = { 'nvim-lua/plenary.nvim', 'nvim-treesitter/nvim-treesitter' },
-  opts = {},
-}
--- a/config/nvim/lua/plugins/surround.lua
+++ b/config/nvim/lua/plugins/surround.lua
@@ -1,8 +0,0 @@
-- Add/change/delete surrounding delimiter pairs with ease.
-- https://github.com/kylechui/nvim-surround
-return {
-  'kylechui/nvim-surround',
-  version = '*',
-  event = 'VeryLazy',
-  opts = {},
-}
--- a/config/nvim/lua/plugins/treesj.lua
+++ b/config/nvim/lua/plugins/treesj.lua
@@ -1,9 +0,0 @@
-- Neovim plugin for splitting/joining blocks of code
-- https://github.com/Wansmer/treesj
-return {
-  'Wansmer/treesj',
-  dependencies = { 'nvim-treesitter/nvim-treesitter' },
-  opts = {
-    use_default_keymaps = false,
-  },
-}
--- a/config/nvim/lua/plugins/ui.lua
+++ b/config/nvim/lua/plugins/ui.lua
@@ -100,108 +100,13 @@ return {
  -- https://github.com/xiyaowong/nvim-transparent
  { 'xiyaowong/nvim-transparent', opts = {} },

-  -- Twilight is a Lua plugin for Neovim 0.5 that dims inactive
-  -- portions of the code you're editing using TreeSitter.
-  -- https://github.com/folke/twilight.nvim
-  { 'folke/twilight.nvim', opts = {} },
-
-  -- Indent guides for Neovim
-  -- https://github.com/lukas-reineke/indent-blankline.nvim
-  {
-    'lukas-reineke/indent-blankline.nvim',
-    main = 'ibl',
-    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',
-        },
-        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,
-    opts = {
-      signs = {
-        add = { text = '+' },
-        change = { text = '~' },
-        delete = { text = '_' },
-        topdelete = { text = '‾' },
-        changedelete = { text = '~' },
-      },
-      current_line_blame = false,
-      on_attach = function(bufnr)
-        local gs = require 'gitsigns'
-
-        local function map(mode, l, r, opts)
-          opts = opts or {}
-          opts.buffer = bufnr
-          vim.keymap.set(mode, l, r, opts)
-        end
-
-        -- Navigation
-        map('n', 'gn', function()
-          if vim.wo.diff then return ']c' end
-          vim.schedule(function() gs.next_hunk() end)
-          return '<Ignore>'
-        end, { expr = true })
-
-        map('n', 'gp', function()
-          if vim.wo.diff then return '[c' end
-          vim.schedule(function() gs.prev_hunk() end)
-          return '<Ignore>'
-        end, { expr = true })
-      end,
-    },
-  },
-
  -- Seamless navigation between tmux panes and vim splits
  -- https://github.com/christoomey/vim-tmux-navigator
  {
@@ -270,18 +175,6 @@ return {
  -- https://github.com/LudoPinelli/comment-box.nvim
  { 'LudoPinelli/comment-box.nvim', opts = {} },

-  -- Automatically expand width of the current window.
-  -- Maximizes and restore it. And all this with nice animations!
-  -- https://github.com/anuvyklack/windows.nvim
-  {
-    'anuvyklack/windows.nvim',
-    dependencies = {
-      'anuvyklack/middleclass',
-      'anuvyklack/animation.nvim',
-    },
-    opts = {},
-  },
-
  -- Plugin to improve viewing Markdown files in Neovim
  -- https://github.com/MeanderingProgrammer/render-markdown.nvim
  {
--- a/config/nvim/lua/plugins/which-key.lua
+++ b/config/nvim/lua/plugins/which-key.lua
@@ -47,13 +47,6 @@ return {
        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' },
@@ -62,55 +55,6 @@ return {
      { '<leader>cbm', '<Cmd>CBllbox14<CR>', desc = 'CommentBox: Marked' },
      { '<leader>cbt', '<Cmd>CBllline<CR>', desc = 'CommentBox: Titled Line' },

-      -- ── Code: Refactoring ───────────────────────────────────────────────
-      { '<leader>cx', group = '[x] Refactoring' },
-      {
-        mode = { 'x' },
-        -- Extract function supports only visual mode
-        {
-          '<leader>cxe',
-          "<cmd>lua require('refactoring').refactor('Extract Function')<cr>",
-          desc = 'Extract Function',
-        },
-        {
-          '<leader>cxf',
-          "<cmd>lua require('refactoring').refactor('Extract Function To File')<cr>",
-          desc = 'Extract Function to File',
-        },
-        -- Extract variable supports only visual mode
-        {
-          '<leader>cxv',
-          "<cmd>lua require('refactoring').refactor('Extract Variable')<cr>",
-          desc = 'Extract Variable',
-        },
-      },
-      -- Inline func supports only normal
-      {
-        '<leader>cxif',
-        "<cmd>lua require('refactoring').refactor('Inline Function')<cr>",
-        desc = 'Inline Function',
-      },
-      -- Extract block supports only normal mode
-      {
-        '<leader>cxb',
-        "<cmd>lua require('refactoring').refactor('Extract Block')<cr>",
-        desc = 'Extract Block',
-      },
-      {
-        '<leader>cxbf',
-        "<cmd>lua require('refactoring').refactor('Extract Block To File')<cr>",
-        desc = 'Extract Block to File',
-      },
-      {
-        mode = { 'n', 'x' },
-        -- Inline var supports both normal and visual mode
-        {
-          '<leader>cxiv',
-          "<cmd>lua require('refactoring').refactor('Inline Variable')<cr>",
-          desc = 'Inline Variable',
-        },
-      },
-
      -- ── Code: LSPSaga ───────────────────────────────────────────────────
      -- See: lua/plugins/lsp.lua
      {
@@ -196,38 +140,6 @@ return {
        desc = 'Telescope import',
      },

-      -- ── DAP ─────────────────────────────────────────────────────────────
-      { '<leader>d', group = '[d] DAP' },
-      {
-        {
-          '<leader>db',
-          '<cmd>DapToggleBreakpoint',
-          desc = 'DAP: Toggle Breakpoint',
-        },
-        { '<leader>dc', '<cmd>DapContinue', desc = 'DAP: Continue' },
-        {
-          '<leader>do',
-          '<cmd>lua vim.diagnostic.open_float()<CR>',
-          desc = 'Diagnostic: Open float',
-        },
-        {
-          '<leader>dq',
-          '<cmd>lua vim.diagnostic.setloclist()<CR>',
-          desc = 'Diagnostic: Set loc list',
-        },
-        {
-          '<leader>dr',
-          "<cmd>lua require('dapui').open({reset = true})<CR>",
-          desc = 'DAP: Reset',
-        },
-        {
-          '<leader>ds',
-          '<cmd>lua require("telescope.builtin").lsp_document_symbols()<CR>',
-          desc = 'LSP: Document Symbols',
-        },
-        { '<leader>dt', '<cmd>DapUiToggle', desc = 'DAP: Toggle UI' },
-      },
-
      -- ── Harpoon ─────────────────────────────────────────────────────────
      -- See: lua/plugins/telescope.lua
      { '<leader>h', group = '[h] Harpoon' },
@@ -381,7 +293,6 @@ return {
          '<cmd>TransparentToggle<CR>',
          desc = 'Toggle Transparency',
        },
-        { '<leader>tw', '<cmd>Twilight<cr>', desc = 'Toggle Twilight' },
      },

      -- ── Workspace ───────────────────────────────────────────────────────
@@ -513,7 +424,7 @@ return {

      -- ── Text manipulation in visual mode ────────────────────────────────
      {
-        mode = 'v',
+        mode = { 'v', 'n' },
        { '>', '>gv', desc = 'Indent Right' },
        { '<', '<gv', desc = 'Indent Left' },
        { 'J', "<cmd>m '>+1<CR>gv=gv", desc = 'Move Block Down' },
--- a/config/omp/own.toml
+++ b/config/omp/own.toml
@@ -97,7 +97,8 @@ final_space = true

    [blocks.segments.properties]
      display_mode = 'context'
-      fetch_virtual_env = false
+      fetch_version = true
+      fetch_virtual_env = true

 [[blocks]]
  type = 'prompt'
--- a/config/tmux/plugins/tmux-resurrect
+++ b/config/tmux/plugins/tmux-resurrect
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -147,16 +147,12 @@ 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', 'direnv']" # Default is []
+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'
-
 ## https://github.com/MunifTanjim/tmux-mode-indicator
 set -g @mode_indicator_prefix_mode_style 'bg=default,fg=#7aa2f7'
 set -g @mode_indicator_copy_mode_style 'bg=default,fg=yellow'
@@ -169,7 +165,6 @@ 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-mode-indicator/mode_indicator.tmux
--- a/config/zsh/antidote_plugins.txt
+++ b/config/zsh/antidote_plugins.txt
@@ -0,0 +1,31 @@
+# This file is for Antidote plugins
+# https://getantidote.github.io/usage
+# vim: ft=ini
+
+# set up Zsh completions with plugins
+mattmc3/ez-compinit
+zsh-users/zsh-completions kind:fpath path:src
+
+# frameworks like oh-my-zsh are supported
+getantidote/use-omz        # handle OMZ dependencies
+ohmyzsh/ohmyzsh path:lib   # load OMZ's library
+ohmyzsh/ohmyzsh path:plugins/colored-man-pages  # load OMZ plugins
+
+ohmyzsh/ohmyzsh path:plugins/colored-man-pages
+ohmyzsh/ohmyzsh path:plugins/extract
+ohmyzsh/ohmyzsh path:plugins/z
+ohmyzsh/ohmyzsh path:plugins/eza
+
+# Add some programmer plugins
+ohmyzsh/ohmyzsh path:plugins/git
+ohmyzsh/ohmyzsh path:plugins/golang
+ohmyzsh/ohmyzsh path:plugins/python
+ohmyzsh/ohmyzsh path:plugins/nvm
+
+# Add core plugins that make Zsh a bit more like Fish
+zsh-users/zsh-completions path:src kind:fpath
+zdharma-continuum/fast-syntax-highlighting
+
+# Add some plugins that are not in OMZ
+jreese/zsh-titles
+yuki-ycino/tms
--- a/docs/nvim-keybindings.md
+++ b/docs/nvim-keybindings.md
@@ -2,11 +2,11 @@

 ```txt

-n  <Space>/    * <Lua 196: ~/.config/nvim/lua/plugins/telescope.lua:68>
+n  <Space>/    * <Lua 398: ~/.config/nvim/lua/plugins/telescope.lua:95>
                 [/] Fuzzily search in current buffer]
-n  <Space>ht   * <Lua 192: ~/.config/nvim/lua/plugins/harpoon.lua:43>
+n  <Space>ht   * <Lua 393: ~/.config/nvim/lua/plugins/harpoon.lua:43>
                 Open Harpoon Quick menu
-n  <Space>hw   * <Lua 189: ~/.config/nvim/lua/plugins/harpoon.lua:37>
+n  <Space>hw   * <Lua 390: ~/.config/nvim/lua/plugins/harpoon.lua:37>
                 Open harpoon window with telescope
 x  #           * <Lua 7: vim/_defaults.lua:0>
                 :help v_#-default
@@ -21,46 +21,100 @@ x  @           * mode() == 'V' ? ':normal! @'.getcharstr().'<CR>' : '@'
                 :help v_@-default
 x  Q           * mode() == 'V' ? ':normal! @<C-R>=reg_recorded()<CR><CR>' : 'Q'
                 :help v_Q-default
-x  R           * <Lua 70: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+o  R           * <Lua 102: ~/.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>
+x  R           * <Lua 99: ~/.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>
+n  Zk          * <Lua 98: ~/.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>
+o  Zk          * <Lua 96: ~/.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>
+x  Zk          * <Lua 95: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
                 Flash Treesitter
 o  [%            <Plug>(MatchitOperationMultiBackward)
 x  [%            <Plug>(MatchitVisualMultiBackward)
 n  [%            <Plug>(MatchitNormalMultiBackward)
+o  [h          * V<Cmd>lua MiniDiff.goto_hunk('prev')<CR>
+                 Previous hunk
+x  [h          * <Cmd>lua MiniDiff.goto_hunk('prev')<CR>
+                 Previous hunk
+n  [h          * <Cmd>lua MiniDiff.goto_hunk('prev')<CR>
+                 Previous hunk
+o  [H          * V<Cmd>lua MiniDiff.goto_hunk('first')<CR>
+                 First hunk
+x  [H          * <Cmd>lua MiniDiff.goto_hunk('first')<CR>
+                 First hunk
+n  [H          * <Cmd>lua MiniDiff.goto_hunk('first')<CR>
+                 First hunk
+o  [i          * <Cmd>lua MiniIndentscope.operator('top')<CR>
+                 Go to indent scope top
+x  [i          * <Cmd>lua MiniIndentscope.operator('top')<CR>
+                 Go to indent scope top
+n  [i          * <Cmd>lua MiniIndentscope.operator('top', true)<CR>
+                 Go to indent scope top
 n  [d          * <Lua 15: vim/_defaults.lua:0>
                 Jump to the previous diagnostic
 o  ]%            <Plug>(MatchitOperationMultiForward)
 x  ]%            <Plug>(MatchitVisualMultiForward)
 n  ]%            <Plug>(MatchitNormalMultiForward)
+o  ]H          * V<Cmd>lua MiniDiff.goto_hunk('last')<CR>
+                 Last hunk
+x  ]H          * <Cmd>lua MiniDiff.goto_hunk('last')<CR>
+                 Last hunk
+n  ]H          * <Cmd>lua MiniDiff.goto_hunk('last')<CR>
+                 Last hunk
+o  ]h          * V<Cmd>lua MiniDiff.goto_hunk('next')<CR>
+                 Next hunk
+x  ]h          * <Cmd>lua MiniDiff.goto_hunk('next')<CR>
+                 Next hunk
+n  ]h          * <Cmd>lua MiniDiff.goto_hunk('next')<CR>
+                 Next hunk
+o  ]i          * <Cmd>lua MiniIndentscope.operator('bottom')<CR>
+                 Go to indent scope bottom
+x  ]i          * <Cmd>lua MiniIndentscope.operator('bottom')<CR>
+                 Go to indent scope bottom
+n  ]i          * <Cmd>lua MiniIndentscope.operator('bottom', true)<CR>
+                 Go to indent scope bottom
 n  ]d          * <Lua 14: vim/_defaults.lua:0>
                 Jump to the next diagnostic
 x  a%            <Plug>(MatchitVisualTextObject)
+o  ai          * <Cmd>lua MiniIndentscope.textobject(true)<CR>
+                 Object scope with border
+x  ai          * <Cmd>lua MiniIndentscope.textobject(true)<CR>
+                 Object scope with border
 n  gR          * :RegexplainerToggle<CR>
                 Toggle Regexplainer
 o  g%            <Plug>(MatchitOperationBackward)
 x  g%            <Plug>(MatchitVisualBackward)
 n  g%            <Plug>(MatchitNormalBackward)
-n  gP          * <Lua 52: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:132>
+n  gP          * <Lua 454: ~/.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>
+n  gpr         * <Lua 453: ~/.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>
+n  gpD         * <Lua 452: ~/.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>
+n  gpi         * <Lua 451: ~/.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>
+n  gpt         * <Lua 450: ~/.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>
+n  gpd         * <Lua 449: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:63>
                 Preview definition
+x  gS          * :<C-U>lua MiniSplitjoin.toggle({ region = MiniSplitjoin.get_visual_region() })<CR>
+                 Toggle arguments
+n  gS          * v:lua.MiniSplitjoin.operator("toggle") . " "
+                 Toggle arguments
+o  gh          * <Cmd>lua MiniDiff.textobject()<CR>
+                 Hunk range textobject
+x  gH          * <Lua 417: ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua:960>
+                 Reset hunks
+n  gH          * <Lua 416: ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua:960>
+                 Reset hunks
+x  gh          * <Lua 415: ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua:958>
+                 Apply hunks
+n  gh          * <Lua 414: ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua:958>
+                 Apply hunks
 o  gc          * <Lua 13: vim/_defaults.lua:0>
                 Comment textobject
 n  gcc         * <Lua 12: vim/_defaults.lua:0>
@@ -73,17 +127,57 @@ x  gx          * <Lua 9: vim/_defaults.lua:0>
                 Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)
 n  gx          * <Lua 8: vim/_defaults.lua:0>
                 Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)
+o  ii          * <Cmd>lua MiniIndentscope.textobject(false)<CR>
+                 Object scope
+x  ii          * <Cmd>lua MiniIndentscope.textobject(false)<CR>
+                 Object scope
 n  j           * v:count == 0 ? 'gj' : 'j'
                 Move down
 n  k           * v:count == 0 ? 'gk' : 'k'
                 Move up
-o  r           * <Lua 68: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+o  r           * <Lua 97: ~/.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>
+n  shn         * <Lua 547: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Highlight next surrounding
+n  sFn         * <Lua 546: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Find next left surrounding
+n  sfn         * <Lua 545: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Find next right surrounding
+n  srn         * <Lua 544: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Replace next surrounding
+n  sdn         * <Lua 543: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Delete next surrounding
+n  shl         * <Lua 542: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Highlight previous surrounding
+n  sFl         * <Lua 541: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Find previous left surrounding
+n  sfl         * <Lua 540: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Find previous right surrounding
+n  srl         * <Lua 539: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Replace previous surrounding
+n  sdl         * <Lua 538: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Delete previous surrounding
+x  sa          * :<C-U>lua MiniSurround.add('visual')<CR>
+                 Add surrounding to selection
+n  sn          * <Lua 537: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:895>
+                 Update `MiniSurround.config.n_lines`
+n  sh          * <Lua 536: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Highlight surrounding
+n  sF          * <Lua 535: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Find left surrounding
+n  sf          * <Lua 534: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Find right surrounding
+n  sr          * <Lua 533: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Replace surrounding
+n  sd          * <Lua 532: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Delete surrounding
+n  sa          * <Lua 531: ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua:1260>
+                 Add surrounding
+n  zk          * <Lua 100: ~/.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>
+o  zk          * <Lua 94: ~/.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>
+x  zk          * <Lua 92: ~/.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>
@@ -98,21 +192,21 @@ 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>
-s  <Plug>luasnip-jump-prev * <Lua 315: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:57>
+s  <Plug>luasnip-jump-prev * <Lua 345: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:57>
                 LuaSnip: Jump to the previous node
-s  <Plug>luasnip-jump-next * <Lua 314: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:54>
+s  <Plug>luasnip-jump-next * <Lua 344: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:54>
                 LuaSnip: Jump to the next node
-s  <Plug>luasnip-prev-choice * <Lua 313: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:51>
+s  <Plug>luasnip-prev-choice * <Lua 343: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:51>
                 LuaSnip: Change to the previous choice from the choiceNode
-s  <Plug>luasnip-next-choice * <Lua 312: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:48>
+s  <Plug>luasnip-next-choice * <Lua 342: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:48>
                 LuaSnip: Change to the next choice from the choiceNode
-s  <Plug>luasnip-expand-snippet * <Lua 311: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:45>
+s  <Plug>luasnip-expand-snippet * <Lua 341: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:45>
                 LuaSnip: Expand the current snippet
-s  <Plug>luasnip-expand-or-jump * <Lua 310: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:42>
+s  <Plug>luasnip-expand-or-jump * <Lua 340: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:42>
                 LuaSnip: Expand or jump in the current snippet
-   <Plug>luasnip-expand-repeat * <Lua 308: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:35>
+   <Plug>luasnip-expand-repeat * <Lua 338: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:35>
                 LuaSnip: Repeat last node expansion
-n  <Plug>luasnip-delete-check * <Lua 306: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:28>
+n  <Plug>luasnip-delete-check * <Lua 336: ~/.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-W><C-D>    <C-W>d
@@ -123,4 +217,4 @@ n  <C-L>       * <Cmd>nohlsearch|diffupdate|normal! <C-L><CR>
                 :help CTRL-L-default
 ```

- Generated on Fri  4 Oct 2024 14:49:00 EEST
+- Generated on Fri 22 Nov 2024 15:30:39 EET
--- a/scripts/install-asdf.sh
+++ b/scripts/install-asdf.sh
@@ -33,10 +33,7 @@ ASDF_INSTALLABLES=(
  "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"
--- a/scripts/install-npm-packages.sh
+++ b/scripts/install-npm-packages.sh
@@ -3,18 +3,15 @@
 #
 # shellcheck source=shared.sh

-echo "This file ($0) has been deprecated in favor of asdf. Please use asdf instead."
-exit 0
-
 eval "$DOTFILES/config/shared.sh"

 # Enable verbosity with VERBOSE=1
 VERBOSE="${VERBOSE:-0}"

-msg "Starting to install npm packages"
+msgr msg "Starting to install npm packages"

 if ! command -v npm &> /dev/null; then
-  msg_err "npm could not be found."
+  msgr err "npm could not be found."
  exit 0
 fi

@@ -38,9 +35,9 @@ install_packages()
    if [[ ${pkg:0:1} == "#" ]]; then continue; fi

    if npm ls -g -p "$pkg" &> /dev/null; then
-      msg_run_done "$pkg" "already installed"
+      msgr run_done "$pkg" "already installed"
    else
-      msg_run "Installing npm package:" "$pkg"
+      msgr run "Installing npm package:" "$pkg"
      npm install -g --no-fund --no-progress --no-timing "$pkg"
    fi
    echo ""
@@ -50,7 +47,7 @@ install_packages()
 # Function to upgrade all global npm packages
 upgrade_global_packages()
 {
-  msg_run "Upgrading all global packages"
+  msgr run "Upgrading all global packages"
  npm -g --no-progress --no-timing --no-fund outdated
  npm -g --no-timing --no-fund upgrade
 }
@@ -58,7 +55,7 @@ upgrade_global_packages()
 # Function to clean npm cache
 clean_npm_cache()
 {
-  msg_run "Cleaning up npm cache"
+  msgr run "Cleaning up npm cache"
  npm cache verify
  npm cache clean --force
  npm cache verify
@@ -69,7 +66,7 @@ main()
  install_packages
  upgrade_global_packages
  clean_npm_cache
-  msg_yay "npm package installations complete"
+  msgr yay "npm package installations complete"
 }

 main "$@"
--- a/scripts/install-pip-packages.sh
+++ b/scripts/install-pip-packages.sh
@@ -3,9 +3,6 @@
 #
 # shellcheck source=shared.sh

-echo "This file ($0) has been deprecated in favor of asdf. Please use asdf instead."
-exit 0
-
 source "${DOTFILES}/config/shared.sh"

 # Enable verbosity with VERBOSE=1
--- a/scripts/set-macos-defaults.sh
+++ b/scripts/set-macos-defaults.sh
@@ -131,7 +131,7 @@ systemsetup -settimezone "Europe/Helsinki" > /dev/null
 defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false

 # Stop iTunes from responding to the keyboard media keys
-#launchctl unload -w /System/Library/LaunchAgents/com.apple.rcd.plist 2> /dev/null
+launchctl unload -w /System/Library/LaunchAgents/com.apple.rcd.plist 2> /dev/null

 ###############################################################################
 # Screen                                                                      #
--- a/scripts/shared.sh
+++ b/scripts/shared.sh
@@ -11,7 +11,7 @@
 [ -z "$SHARED_SCRIPTS_SOURCED" ] && {

  source "${DOTFILES}/config/shared.sh"
-  msgr done "(!) shared.sh not sourced"
+  msgr warn "(!) shared.sh not sourced"

  # Set variable that checks if the shared.sh script has been sourced only once
  # shellcheck disable=SC2034
--- a/tools/antidote
+++ b/tools/antidote
--- a/yarn.lock
+++ b/yarn.lock
@@ -2706,9 +2706,9 @@ cosmiconfig@^9.0.0:
    parse-json "^5.2.0"

 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
  dependencies:
    path-key "^3.1.0"
    shebang-command "^2.0.0"
Author	SHA1	Message	Date
Ismo Vuorinen	5ab0f89765	feat(nvim): mini.nvim plugins + cleanup	2024-11-22 17:58:52 +02:00
Ismo Vuorinen	d585d61537	chore(config): tweaks to configs and scripts	2024-11-22 17:54:37 +02:00
Ismo Vuorinen	746646ae55	feat(shell): switched to antidote, asdf changes	2024-11-22 17:53:46 +02:00
dependabot[bot]	6e69ec6410	chore(deps): bump cross-spawn from 7.0.3 to 7.0.6 (#43 ) Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-11-21 10:16:24 +02:00
Ismo Vuorinen	af123e5138	chore(deps): update brewfile	2024-11-19 11:20:24 +02:00
Ismo Vuorinen	3879289559	feat(tmux): removal of tmux-resurrect	2024-11-18 11:42:58 +02:00
Ismo Vuorinen	392628e733	fix(shell): fixes to zsh and bash configs	2024-11-16 16:30:57 +02:00