chore(deps): update node to v22.9.0 (#27)

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.editorconfig

@@ -19,7 +19,7 @@ indent_size = 1
 indent_size = 1
 indent_style = tab
 
-[{local/bin/*,**/*.sh,**/zshrc,config/*}]
+[{local/bin/*,**/*.sh,**/zshrc,config/*,scripts/*}]
 shell_variant      = bash # --language-variant
 binary_next_line   = true
 switch_case_indent = true # --case-indent

.github/workflows/changelog.yml

@@ -1,3 +1,4 @@
+---
 name: Debug Changelog # Workflow name displayed on GitHub
 on:
   workflow_dispatch: # Trigger manually

.github/workflows/linters.yml

@@ -1,3 +1,4 @@
+---
 name: reviewdog
 on: [push]
 jobs:

.github/workflows/new-release.yml

@@ -1,21 +1,24 @@
-name: Release Daily State # Workflow name displayed on GitHub
+---
+name: Release Daily State
 on:
-  workflow_dispatch: # Trigger manually
+  workflow_dispatch:
   schedule:
-    - cron: '30 20 * * *' # UTC is 2-3 hours behind Europe/Helsinki, my timezone
-permissions:
-  contents: write
+    - cron: '0 21 * * *' # 00:00 at Europe/Helsinki
 jobs:
   new-daily-release:
     runs-on: self-hosted
+    permissions:
+      contents: write
     outputs:
       created: ${{ steps.daily-version.outputs.created }}
       version: ${{ steps.daily-version.outputs.version }}
     steps:
-      - uses: actions/checkout@v4 # Checkout our working repository
+      - uses: actions/checkout@v4
+
       - name: Create tag if necessary
         uses: fregante/daily-version-action@v2
         id: daily-version
+
       - name: Create changelog text
         if: steps.daily-version.outputs.created
         id: changelog
@@ -23,6 +26,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config_file: .github/tag-changelog-config.js
+
       - name: Create release
         if: steps.daily-version.outputs.created
         uses: actions/create-release@latest

.github/workflows/semantic-pr.yml

@@ -1,3 +1,4 @@
+---
 name: Semantic PR
 
 on:

.github/workflows/update-submodules.yml

@@ -1,13 +1,14 @@
+---
 name: Update submodules
 on:
   schedule: [{ cron: 0 3 * * * }]
   workflow_dispatch:
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
 jobs:
   update-submodules:
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
     runs-on: self-hosted
     steps:
       - name: Checkout repository

.markdownlintignore

@@ -1,6 +1,8 @@
-# only care about files that are under our control
+# only care about files that are directly under our control
 config/cheat/cheatsheets/community/*
+config/cheat/cheatsheets/tldr/*
 config/tmux/plugins/*
+local/bin/asdf/*
 tools/*
 node_modules/*
 

.nvmrc

@@ -1 +1 @@
-22.7.0
+22.9.0

.pre-commit-config.yaml

@@ -0,0 +1,50 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: trailing-whitespace
+        args: [--markdown-linebreak-ext=md]
+      - id: check-case-conflict
+      - id: check-merge-conflict
+      - id: check-shebang-scripts-are-executable
+      - id: check-symlinks
+      - id: check-toml
+      - id: check-xml
+      - id: check-yaml
+        args: [--allow-multiple-documents]
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args: [--fix=auto]
+      - id: pretty-format-json
+        args: [--autofix, --no-sort-keys]
+
+  - repo: https://github.com/igorshubovych/markdownlint-cli
+    rev: v0.41.0
+    hooks:
+      - id: markdownlint
+        args: [-c, .markdownlint.yaml, --fix]
+
+  - repo: https://github.com/adrienverge/yamllint
+    rev: v1.35.1
+    hooks:
+      - id: yamllint
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.8
+    hooks:
+      - id: prettier
+
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.10.0.1
+    hooks:
+      - id: shellcheck
+
+  - repo: https://github.com/scop/pre-commit-shfmt
+    rev: v3.9.0-1
+    hooks:
+      - id: shfmt
+
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.7.1
+    hooks:
+      - id: actionlint

.prettierrc.js

@@ -1,5 +1,4 @@
 module.exports = {
-  plugins: ['prettier-plugin-sh'],
   ...require('@ivuorinen/prettier-config'),
   trailingComma: 'all',
   // Add custom options below:

.python-version

@@ -1 +1 @@
-3.12
+3.12.6

base/tool-versions

@@ -1,29 +1,30 @@
+asdf-plugin-manager 1.3.1
+nodejs 22.8.0
+golang 1.23.1
+python 3.12.6
+ruby 3.3.4
+rust 1.81.0
+direnv 2.34.0
+eza 0.19.3
+fd 10.2.0
 1password-cli 2.30.0
 age 1.2.0
-asdf-plugin-manager 1.3.1
 bottom 0.10.2
-direnv 2.34.0
 dotenv-linter 3.3.0
 editorconfig-checker 2.8.0
-eza 0.19.0
-fd 10.1.0
-github-cli 2.55.0
-golang 1.23.0
+github-cli 2.56.0
 hadolint 2.12.0
-kubectl 1.31.0
-lazygit 0.43.1
-nodejs 22.6.0
-pipx 1.6.0
+kubectl 1.31.1
+pipx 1.7.1
 pre-commit 3.8.0
-ripgrep 14.1.0
-ruby 3.3.4
-rust 1.80.1
-semgrep system
+ripgrep 14.1.1
 shellcheck 0.10.0
-shfmt 3.8.0
-terraform-lsp 0.0.12
-terragrunt 0.66.3
+shfmt 3.9.0
+terragrunt 0.67.5
 tf-summarize 0.3.10
-vault 1.17.3+ent
 yamllint 1.35.1
 yq 4.44.3
+bats 1.11.0
+gitleaks 8.18.4
+delta 0.18.1
+lazygit 0.44.0

base/zshrc

@@ -23,15 +23,20 @@ load_antigen()
 
     antigen use oh-my-zsh
 
+    # Disable ls colors to avoid issues with eza
+    export DISABLE_LS_COLORS=true
+
     export ZSH_TMUX_AUTOSTART=false
     export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
     export ZSH_TMUX_UNICODE=true
     export ZSH_TMUX_AUTOQUIT=false
     export ZSH_TMUX_DEFAULT_SESSION_NAME=main
 
-    zstyle :omz:plugins:eza 'dirs-first' yes
-    zstyle :omz:plugins:eza 'git-status' yes
-    zstyle :omz:plugins:eza 'icons' yes
+    zstyle ':omz:plugins:eza' 'dirs-first' yes
+    zstyle ':omz:plugins:eza' 'git-status' yes
+    zstyle ':omz:plugins:eza' 'icons' yes
+    zstyle ':omz:plugins:eza' 'ls' yes
+    zstyle ':omz:plugins:eza' 'prompt' yes
 
     if [[ "$OSTYPE" == darwin* ]]; then
       zstyle :omz:plugins:ssh-agent keychain yes
@@ -51,7 +56,7 @@ load_antigen()
     antigen bundle ssh-agent
     antigen bundle gpg-agent
     antigen bundle brew
-    antigen bundle tmux
+    # antigen bundle tmux
     antigen bundle colored-man-pages
     antigen bundle zsh-users/zsh-completions
     antigen bundle eza

config/alias

@@ -53,14 +53,17 @@ alias flush="dscacheutil -flushcache"
 alias updatedb="sudo /usr/libexec/locate.updatedb"
 
 # tmux: automatically attach or create session with name 'main'
-alias tmux='tmux new-session -A -s main'
+alias tm='command tmux new-session -A -s main'
 # tmux: attach or create new session
-alias ta='tmux attach || tmux'
+alias ta='command tmux attach || command tmux'
 
 # nvim
 alias nvim-ks='NVIM_APPNAME="nvim-kickstart" nvim'
 alias ks='NVIM_APPNAME="nvim-kickstart" nvim'
 
+# xdg-ninja aliases for better experience
+alias xdg='xdg-ninja --skip-ok --skip-unsupported'
+
 # watch with: differences, precise, beep and color
 alias watchx='watch -dpbc'
 # delete .DS_Store files
@@ -119,6 +122,7 @@ X_ALIAS_FILES=(
   "$HOME/.config/alias-$(hostname)-secret"
 )
 for aliasFile in "${X_ALIAS_FILES[@]}"; do
+  # shellcheck source=$HOME/.config/alias-secret
   [ -f "$aliasFile" ] && source "$aliasFile" && msg "Sourced $aliasFile"
 done
 unset X_ALIAS_FILES

config/asdf-direnv/zshrc

@@ -0,0 +1,3 @@
+### Do not edit. This was autogenerated by 'asdf direnv setup' ###
+export ASDF_DIRENV_BIN="$(asdf where direnv)/bin/direnv"
+eval "$($ASDF_DIRENV_BIN hook zsh)"

config/asdf/plugin-versions

@@ -1,28 +1,27 @@
-1password-cli         https://github.com/NeoHsu/asdf-1password-cli.git            f5d5aab
-age                   https://github.com/threkk/asdf-age.git                      4df80a0
-asdf-plugin-manager   https://github.com/asdf-community/asdf-plugin-manager.git   50d2735
-bottom                https://github.com/carbonteq/asdf-btm.git                   fd8a55a
-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                    08c1b65
-fd                    https://gitlab.com/wt0f/asdf-fd.git                         17d56e0
-github-cli            https://github.com/bartlomiejdanek/asdf-github-cli.git      e0605b7
-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
-neovim                https://github.com/richin13/asdf-neovim                     d6118ad
-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
-ripgrep               https://gitlab.com/wt0f/asdf-ripgrep.git                    e836665
-rust                  https://github.com/code-lever/asdf-rust.git                 95acf4f
-semgrep               https://github.com/brentjanderson/asdf-semgrep.git          13ff78b
-shellcheck            https://github.com/luizm/asdf-shellcheck.git                780d78d
-shfmt                 https://github.com/luizm/asdf-shfmt.git                     a42c5ff
-terraform-ls          https://github.com/asdf-community/asdf-hashicorp.git        f1602b6
-terraform-lsp         https://github.com/bartlomiejdanek/asdf-terraform-lsp.git   bba7106
-terragrunt            https://github.com/ohmer/asdf-terragrunt                    4a6651a
-tf-summarize          https://github.com/adamcrews/asdf-tf-summarize.git          880ad26
-vault                 https://github.com/asdf-community/asdf-hashicorp.git        f1602b6
-yamllint              https://github.com/ericcornelissen/asdf-yamllint.git        d5c3161
-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                               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
+eza                   https://github.com/lwiechec/asdf-eza.git                             eee3d59
+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

config/asdf/python-packages

@@ -0,0 +1,2 @@
+ansible
+pipenv

config/cheat/conf.yml

@@ -7,7 +7,7 @@ colorize: false
 # Which 'chroma' colorscheme should be applied to the output?
 # Options are available here:
 #   https://github.com/alecthomas/chroma/tree/master/styles
-style: 'tokyonight'
+# style: 'tokyonight-day'
 # Which 'chroma' "formatter" should be applied?
 # One of: "terminal", "terminal256", "terminal16m"
 formatter: terminal256

config/direnv/direnv.toml

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

config/direnv/lib/use_asdf.sh

@@ -0,0 +1,4 @@
+### Do not edit. This was autogenerated by 'asdf direnv setup' ###
+use_asdf() {
+  source_env "$(asdf direnv envrc "$@")"
+}

config/exports

@@ -15,6 +15,12 @@
 
 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
@@ -87,7 +93,7 @@ darknotify_alacritty()
   }
   return 0
 }
-darknotify_alacritty
+# darknotify_alacritty
 
 # Function to list installed Homebrew packages using bkt caching
 brew_installed()
@@ -141,7 +147,7 @@ rector()
 {
   local php="${1:-82}"
   docker run -v "$(pwd)":/project rector/rector:latest process \
-    "/project/$1" \
+    "/project/" \
     --set "php${php}" \
     --autoload-file /project/vendor/autoload.php
 }
@@ -264,6 +270,7 @@ export BASH_COMPLETION_USER_FILE="${XDG_CONFIG_HOME}/bash-completion/bash_comple
 
 # History env variables
 export HIST_STAMPS="yyyy-mm-dd"
+export HISTFILE="${XDG_STATE_HOME}/zsh/history"
 # Larger bash history (allow 32³ entries; default is 500)
 export HISTSIZE=32768
 export HISTFILESIZE=$HISTSIZE
@@ -322,15 +329,37 @@ 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_NODEJS_LEGACY_FILE_DYNAMIC_STRATEGY="latest_available"
-export ASDF_NPM_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/npm-packages"
-export ASDF_GOLANG_MOD_VERSION_ENABLED=true
-export ASDF_GOLANG_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/golang-packages"
+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
+# https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html
+msg "Setting up AWS configuration"
+export AWS_CONFIG_FILE="${XDG_STATE_HOME}/aws/config"
+export AWS_SHARED_CREDENTIALS_FILE="${XDG_STATE_HOME}/aws/credentials"
+export AWS_DATA_PATH="${XDG_DATA_HOME}/aws"
+export AWS_DEFAULT_REGION="eu-west-1"
+export AWS_DEFAULT_OUTPUT="table"
+export AWS_CONFIGURE_KEYS=true
+export AWS_CONFIGURE_REGION=true
+export AWS_CONFIGURE_OUTPUT=true
+export AWS_CONFIGURE_PROFILE=true
+export AWS_CONFIGURE_PROMPT=true
+export AWS_CONFIGURE_PROMPT_DEFAULT="default"
+
 # bob manages nvim versions
 msg "Setting up bob configuration"
 x-path-prepend "$XDG_DATA_HOME/bob/nvim-bin"
@@ -346,6 +375,8 @@ export HOMEBREW_NO_ENV_HINTS=true
 export HOMEBREW_BUNDLE_MAS_SKIP=true
 export HOMEBREW_BUNDLE_FILE="$XDG_CONFIG_HOME/homebrew/Brewfile"
 x-have brew && {
+  # Add brew autocompletion to fpath
+  FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
   eval "$(brew shellenv)"
 }
 
@@ -358,11 +389,12 @@ export PATH="$COMPOSER_BIN:$PATH"
 # direnv, https://direnv.net/
 # https://direnv.net/docs/hook.html
 # Set the hook to show the direnv message in a different color
-export DIRENV_LOG_FORMAT=$'\033[2mdirenv: %s\033[0m'
+# export DIRENV_LOG_FORMAT=$'\033[2mdirenv: %s\033[0m'
+export DIRENV_LOG_FORMAT=
 
 # docker, https://docs.docker.com/engine/reference/commandline/cli/
 msg "Setting up Docker configuration"
-export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
+export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
 x-dc "$DOCKER_CONFIG"
 # Docker: Disable snyk ad
 export DOCKER_SCAN_SUGGEST=false
@@ -376,7 +408,7 @@ x-have ffmpeg && x-dc "$FFMPEG_DATADIR"
 # GnuPG
 # https://gnupg.org/documentation/manuals/gnupg/Invoking-GPG.html
 msg "Setting up GnuPG configuration"
-export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
 
 # Go
 # https://golang.org/doc/code.html
@@ -410,6 +442,8 @@ export OP_CACHE="$XDG_STATE_HOME/1password"
 msg "Setting up Python configuration"
 export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
 export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
+## for MichaelAquilina/zsh-autoswitch-virtualenv
+export AUTOSWITCH_VIRTUAL_ENV_DIR="$WORKON_HOME"
 export PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
 x-have pyenv && {
   eval "$(pyenv init -)"
@@ -434,6 +468,7 @@ msg "Setting up Rust/Cargo configuration"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export PATH="$CARGO_HOME/bin:$PATH"
+export RUST_WITHOUT=rust-docs
 
 # screen
 # https://www.gnu.org/software/screen/manual/screen.html

config/git/gitignore

@@ -19,3 +19,4 @@ wp_*.sh
 auth.json
 dfm.sh
 .scannerwork
+.phpactor.json

config/git/shared

@@ -17,11 +17,12 @@
   llog = log --pretty=fuller
   logs = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
   nah = !git reset --hard && git clean -df
+  recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
   reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
   reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
-  recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
   rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
   tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
+  undo = reset --soft HEAD^
   undo-commit = reset HEAD~ --soft
 
 [filter "lfs"]
@@ -30,15 +31,6 @@
   process = git-lfs filter-process
   required = true
 
-[diff]
-  tool = difftastic
-
-[difftool]
-  prompt = false
-
-[difftool "difftastic"]
-  cmd = difft "$LOCAL" "$REMOTE"
-
 [color]
   ui = true
   diff = auto

config/nvim/lazyvim.json

@@ -29,7 +29,7 @@
     "lazyvim.plugins.extras.util.mini-hipatterns"
   ],
   "news": {
-    "NEWS.md": "6077"
+    "NEWS.md": "6520"
   },
   "version": 6
-}
+}

config/nvim/lua/config/keymaps.lua

@@ -6,17 +6,11 @@ local wk = require("which-key")
 -- ╭──────────────────────────────────────────────────────────╮
 -- │                       Comment box                        │
 -- ╰──────────────────────────────────────────────────────────╯
-wk.register({
-  ["<Leader>"] = {
-    b = {
-      c = {
-        name = "□ Comment boxes",
-        b = { "<Cmd>CBccbox<CR>", "Box Title" },
-        t = { "<Cmd>CBllline<CR>", "Titled Line" },
-        l = { "<Cmd>CBline<CR>", "Simple Line" },
-        m = { "<Cmd>CBllbox14<CR>", "Marked" },
-        d = { "<Cmd>CBd<CR>", "Remove a box" },
-      },
-    },
-  },
+wk.add({
+  { "<Leader>bc", group = "□ Comment box" },
+  { "<Leader>bcb", "<Cmd>CBccbox<CR>", desc = "Box Title" },
+  { "<Leader>bcd", "<Cmd>CBd<CR>", desc = "Remove a box" },
+  { "<Leader>bcl", "<Cmd>CBline<CR>", desc = "Simple Line" },
+  { "<Leader>bcm", "<Cmd>CBllbox14<CR>", desc = "Marked" },
+  { "<Leader>bct", "<Cmd>CBllline<CR>", desc = "Titled Line" },
 })

config/nvm/default-packages

@@ -1,7 +0,0 @@
-blade-formatter
-corepack
-editorconfig-checker
-github-release-notes
-neovim
-stylelint-lsp
-

config/omp/own.json

@@ -2,6 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
   "final_space": true,
   "console_title_template": "{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}",
+  "auto_upgrade": true,
   "blocks": [
     {
       "alignment": "left",
@@ -111,7 +112,9 @@
         {
           "background": "transparent",
           "foreground": "lightGreen",
-          "foreground_templates": ["{{ if gt .Code 0 }}red{{ end }}"],
+          "foreground_templates": [
+            "{{ if gt .Code 0 }}red{{ end }}"
+          ],
           "properties": {
             "always_enabled": true
           },
@@ -126,7 +129,9 @@
   "transient_prompt": {
     "background": "transparent",
     "foreground": "lightGreen",
-    "foreground_templates": ["{{ if gt .Code 0 }}red{{ end }}"],
+    "foreground_templates": [
+      "{{ if gt .Code 0 }}red{{ end }}"
+    ],
     "template": "\u279c "
   },
   "version": 2

config/omp/own.toml

@@ -2,6 +2,7 @@
 final_space = true
 console_title_template = "{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}"
 version = 2
+auto_upgrade = true
 
 [[blocks]]
 alignment = "left"
@@ -28,13 +29,15 @@ type = "prompt"
     style = "mixed"
 
     [blocks.segments.mapped_locations]
-    "~/Code/*" = ""
+    "~/Code/*" = ""
+    "~/Code/ivuorinen/" = ""
 
   [[blocks.segments]]
   type = "git"
   style = "plain"
   foreground = "lightGreen"
-  template = "{{ .UpstreamIcon }}{{ 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 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

config/omp/zen.toml

@@ -3,6 +3,7 @@
 version = 2
 final_space = true
 console_title_template = '{{ .Shell }} in {{ .Folder }}'
+auto_upgrade = true
 
 [[blocks]]
   type = 'prompt'

docs/tmux-keybindings.md

@@ -79,4 +79,3 @@ Leader: `<ctrl><space>`
     S-Left  Move the visible part of the window left
     S-Right Move the visible part of the window right
 ```
-

docs/wezterm-keybindings.md

@@ -4,276 +4,276 @@
 Default key table
 -----------------
 
-	CTRL                 Tab                ->   ActivateTabRelative(1)
-	SHIFT | CTRL         Tab                ->   ActivateTabRelative(-1)
-	ALT                  Enter              ->   ToggleFullScreen
-	CTRL                 !                  ->   ActivateTab(0)
-	SHIFT | CTRL         !                  ->   ActivateTab(0)
-	ALT | CTRL           "                  ->   SplitVertical(SpawnCommand domain=CurrentPaneDomain)
-	SHIFT | ALT | CTRL   "                  ->   SplitVertical(SpawnCommand domain=CurrentPaneDomain)
-	CTRL                 #                  ->   ActivateTab(2)
-	SHIFT | CTRL         #                  ->   ActivateTab(2)
-	CTRL                 $                  ->   ActivateTab(3)
-	SHIFT | CTRL         $                  ->   ActivateTab(3)
-	CTRL                 %                  ->   ActivateTab(4)
-	SHIFT | CTRL         %                  ->   ActivateTab(4)
-	ALT | CTRL           %                  ->   SplitHorizontal(SpawnCommand domain=CurrentPaneDomain)
-	SHIFT | ALT | CTRL   %                  ->   SplitHorizontal(SpawnCommand domain=CurrentPaneDomain)
-	CTRL                 &                  ->   ActivateTab(6)
-	SHIFT | CTRL         &                  ->   ActivateTab(6)
-	SHIFT | ALT | CTRL   '                  ->   SplitVertical(SpawnCommand domain=CurrentPaneDomain)
-	CTRL                 (                  ->   ActivateTab(-1)
-	SHIFT | CTRL         (                  ->   ActivateTab(-1)
-	CTRL                 )                  ->   ResetFontSize
-	SHIFT | CTRL         )                  ->   ResetFontSize
-	CTRL                 *                  ->   ActivateTab(7)
-	SHIFT | CTRL         *                  ->   ActivateTab(7)
-	CTRL                 +                  ->   IncreaseFontSize
-	SHIFT | CTRL         +                  ->   IncreaseFontSize
-	CTRL                 -                  ->   DecreaseFontSize
-	SHIFT | CTRL         -                  ->   DecreaseFontSize
-	SUPER                -                  ->   DecreaseFontSize
-	CTRL                 0                  ->   ResetFontSize
-	SHIFT | CTRL         0                  ->   ResetFontSize
-	SUPER                0                  ->   ResetFontSize
-	SHIFT | CTRL         1                  ->   ActivateTab(0)
-	SUPER                1                  ->   ActivateTab(0)
-	SHIFT | CTRL         2                  ->   ActivateTab(1)
-	SUPER                2                  ->   ActivateTab(1)
-	SHIFT | CTRL         3                  ->   ActivateTab(2)
-	SUPER                3                  ->   ActivateTab(2)
-	SHIFT | CTRL         4                  ->   ActivateTab(3)
-	SUPER                4                  ->   ActivateTab(3)
-	SHIFT | CTRL         5                  ->   ActivateTab(4)
-	SHIFT | ALT | CTRL   5                  ->   SplitHorizontal(SpawnCommand domain=CurrentPaneDomain)
-	SUPER                5                  ->   ActivateTab(4)
-	SHIFT | CTRL         6                  ->   ActivateTab(5)
-	SUPER                6                  ->   ActivateTab(5)
-	SHIFT | CTRL         7                  ->   ActivateTab(6)
-	SUPER                7                  ->   ActivateTab(6)
-	SHIFT | CTRL         8                  ->   ActivateTab(7)
-	SUPER                8                  ->   ActivateTab(7)
-	SHIFT | CTRL         9                  ->   ActivateTab(-1)
-	SUPER                9                  ->   ActivateTab(-1)
-	CTRL                 =                  ->   IncreaseFontSize
-	SHIFT | CTRL         =                  ->   IncreaseFontSize
-	SUPER                =                  ->   IncreaseFontSize
-	CTRL                 @                  ->   ActivateTab(1)
-	SHIFT | CTRL         @                  ->   ActivateTab(1)
-	CTRL                 C                  ->   CopyTo(Clipboard)
-	SHIFT | CTRL         C                  ->   CopyTo(Clipboard)
-	CTRL                 F                  ->   Search(CurrentSelectionOrEmptyString)
-	SHIFT | CTRL         F                  ->   Search(CurrentSelectionOrEmptyString)
-	CTRL                 H                  ->   HideApplication
-	SHIFT | CTRL         H                  ->   HideApplication
-	CTRL                 K                  ->   ClearScrollback(ScrollbackOnly)
-	SHIFT | CTRL         K                  ->   ClearScrollback(ScrollbackOnly)
-	CTRL                 L                  ->   ShowDebugOverlay
-	SHIFT | CTRL         L                  ->   ShowDebugOverlay
-	CTRL                 M                  ->   Hide
-	SHIFT | CTRL         M                  ->   Hide
-	CTRL                 N                  ->   SpawnWindow
-	SHIFT | CTRL         N                  ->   SpawnWindow
-	CTRL                 P                  ->   ActivateCommandPalette
-	SHIFT | CTRL         P                  ->   ActivateCommandPalette
-	CTRL                 Q                  ->   QuitApplication
-	SHIFT | CTRL         Q                  ->   QuitApplication
-	CTRL                 R                  ->   ReloadConfiguration
-	SHIFT | CTRL         R                  ->   ReloadConfiguration
-	CTRL                 T                  ->   SpawnTab(CurrentPaneDomain)
-	SHIFT | CTRL         T                  ->   SpawnTab(CurrentPaneDomain)
-	CTRL                 U                  ->   CharSelect(CharSelectArguments { group: None, copy_on_select: true, copy_to: ClipboardAndPrimarySelection })
-	SHIFT | CTRL         U                  ->   CharSelect(CharSelectArguments { group: None, copy_on_select: true, copy_to: ClipboardAndPrimarySelection })
-	CTRL                 V                  ->   PasteFrom(Clipboard)
-	SHIFT | CTRL         V                  ->   PasteFrom(Clipboard)
-	CTRL                 W                  ->   CloseCurrentTab { confirm: true }
-	SHIFT | CTRL         W                  ->   CloseCurrentTab { confirm: true }
-	CTRL                 X                  ->   ActivateCopyMode
-	SHIFT | CTRL         X                  ->   ActivateCopyMode
-	CTRL                 Z                  ->   TogglePaneZoomState
-	SHIFT | CTRL         Z                  ->   TogglePaneZoomState
-	SHIFT | SUPER        [                  ->   ActivateTabRelative(-1)
-	SHIFT | SUPER        ]                  ->   ActivateTabRelative(1)
-	CTRL                 ^                  ->   ActivateTab(5)
-	SHIFT | CTRL         ^                  ->   ActivateTab(5)
-	CTRL                 _                  ->   DecreaseFontSize
-	SHIFT | CTRL         _                  ->   DecreaseFontSize
-	SHIFT | CTRL         c                  ->   CopyTo(Clipboard)
-	SUPER                c                  ->   CopyTo(Clipboard)
-	SHIFT | CTRL         f                  ->   Search(CurrentSelectionOrEmptyString)
-	SUPER                f                  ->   Search(CurrentSelectionOrEmptyString)
-	SHIFT | CTRL         h                  ->   HideApplication
-	SUPER                h                  ->   HideApplication
-	SHIFT | CTRL         k                  ->   ClearScrollback(ScrollbackOnly)
-	SUPER                k                  ->   ClearScrollback(ScrollbackOnly)
-	SHIFT | CTRL         l                  ->   ShowDebugOverlay
-	SHIFT | CTRL         m                  ->   Hide
-	SUPER                m                  ->   Hide
-	SHIFT | CTRL         n                  ->   SpawnWindow
-	SUPER                n                  ->   SpawnWindow
-	SHIFT | CTRL         p                  ->   ActivateCommandPalette
-	SHIFT | CTRL         q                  ->   QuitApplication
-	SUPER                q                  ->   QuitApplication
-	SHIFT | CTRL         r                  ->   ReloadConfiguration
-	SUPER                r                  ->   ReloadConfiguration
-	SHIFT | CTRL         t                  ->   SpawnTab(CurrentPaneDomain)
-	SUPER                t                  ->   SpawnTab(CurrentPaneDomain)
-	SHIFT | CTRL         u                  ->   CharSelect(CharSelectArguments { group: None, copy_on_select: true, copy_to: ClipboardAndPrimarySelection })
-	SHIFT | CTRL         v                  ->   PasteFrom(Clipboard)
-	SUPER                v                  ->   PasteFrom(Clipboard)
-	SHIFT | CTRL         w                  ->   CloseCurrentTab { confirm: true }
-	SUPER                w                  ->   CloseCurrentTab { confirm: true }
-	SHIFT | CTRL         x                  ->   ActivateCopyMode
-	SHIFT | CTRL         z                  ->   TogglePaneZoomState
-	SUPER                {                  ->   ActivateTabRelative(-1)
-	SHIFT | SUPER        {                  ->   ActivateTabRelative(-1)
-	SUPER                }                  ->   ActivateTabRelative(1)
-	SHIFT | SUPER        }                  ->   ActivateTabRelative(1)
-	SHIFT | CTRL         Space (Physical)   ->   QuickSelect
-	SHIFT                PageUp             ->   ScrollByPage(NotNan(-1.0))
-	CTRL                 PageUp             ->   ActivateTabRelative(-1)
-	SHIFT | CTRL         PageUp             ->   MoveTabRelative(-1)
-	SHIFT                PageDown           ->   ScrollByPage(NotNan(1.0))
-	CTRL                 PageDown           ->   ActivateTabRelative(1)
-	SHIFT | CTRL         PageDown           ->   MoveTabRelative(1)
-	SHIFT | CTRL         LeftArrow          ->   ActivatePaneDirection(Left)
-	SHIFT | ALT | CTRL   LeftArrow          ->   AdjustPaneSize(Left, 1)
-	SHIFT | CTRL         RightArrow         ->   ActivatePaneDirection(Right)
-	SHIFT | ALT | CTRL   RightArrow         ->   AdjustPaneSize(Right, 1)
-	SHIFT | CTRL         UpArrow            ->   ActivatePaneDirection(Up)
-	SHIFT | ALT | CTRL   UpArrow            ->   AdjustPaneSize(Up, 1)
-	SHIFT | CTRL         DownArrow          ->   ActivatePaneDirection(Down)
-	SHIFT | ALT | CTRL   DownArrow          ->   AdjustPaneSize(Down, 1)
-	                     Copy               ->   CopyTo(Clipboard)
-	                     Paste              ->   PasteFrom(Clipboard)
+ CTRL                 Tab                ->   ActivateTabRelative(1)
+ SHIFT | CTRL         Tab                ->   ActivateTabRelative(-1)
+ ALT                  Enter              ->   ToggleFullScreen
+ CTRL                 !                  ->   ActivateTab(0)
+ SHIFT | CTRL         !                  ->   ActivateTab(0)
+ ALT | CTRL           "                  ->   SplitVertical(SpawnCommand domain=CurrentPaneDomain)
+ SHIFT | ALT | CTRL   "                  ->   SplitVertical(SpawnCommand domain=CurrentPaneDomain)
+ CTRL                 #                  ->   ActivateTab(2)
+ SHIFT | CTRL         #                  ->   ActivateTab(2)
+ CTRL                 $                  ->   ActivateTab(3)
+ SHIFT | CTRL         $                  ->   ActivateTab(3)
+ CTRL                 %                  ->   ActivateTab(4)
+ SHIFT | CTRL         %                  ->   ActivateTab(4)
+ ALT | CTRL           %                  ->   SplitHorizontal(SpawnCommand domain=CurrentPaneDomain)
+ SHIFT | ALT | CTRL   %                  ->   SplitHorizontal(SpawnCommand domain=CurrentPaneDomain)
+ CTRL                 &                  ->   ActivateTab(6)
+ SHIFT | CTRL         &                  ->   ActivateTab(6)
+ SHIFT | ALT | CTRL   '                  ->   SplitVertical(SpawnCommand domain=CurrentPaneDomain)
+ CTRL                 (                  ->   ActivateTab(-1)
+ SHIFT | CTRL         (                  ->   ActivateTab(-1)
+ CTRL                 )                  ->   ResetFontSize
+ SHIFT | CTRL         )                  ->   ResetFontSize
+ CTRL                 *                  ->   ActivateTab(7)
+ SHIFT | CTRL         *                  ->   ActivateTab(7)
+ CTRL                 +                  ->   IncreaseFontSize
+ SHIFT | CTRL         +                  ->   IncreaseFontSize
+ CTRL                 -                  ->   DecreaseFontSize
+ SHIFT | CTRL         -                  ->   DecreaseFontSize
+ SUPER                -                  ->   DecreaseFontSize
+ CTRL                 0                  ->   ResetFontSize
+ SHIFT | CTRL         0                  ->   ResetFontSize
+ SUPER                0                  ->   ResetFontSize
+ SHIFT | CTRL         1                  ->   ActivateTab(0)
+ SUPER                1                  ->   ActivateTab(0)
+ SHIFT | CTRL         2                  ->   ActivateTab(1)
+ SUPER                2                  ->   ActivateTab(1)
+ SHIFT | CTRL         3                  ->   ActivateTab(2)
+ SUPER                3                  ->   ActivateTab(2)
+ SHIFT | CTRL         4                  ->   ActivateTab(3)
+ SUPER                4                  ->   ActivateTab(3)
+ SHIFT | CTRL         5                  ->   ActivateTab(4)
+ SHIFT | ALT | CTRL   5                  ->   SplitHorizontal(SpawnCommand domain=CurrentPaneDomain)
+ SUPER                5                  ->   ActivateTab(4)
+ SHIFT | CTRL         6                  ->   ActivateTab(5)
+ SUPER                6                  ->   ActivateTab(5)
+ SHIFT | CTRL         7                  ->   ActivateTab(6)
+ SUPER                7                  ->   ActivateTab(6)
+ SHIFT | CTRL         8                  ->   ActivateTab(7)
+ SUPER                8                  ->   ActivateTab(7)
+ SHIFT | CTRL         9                  ->   ActivateTab(-1)
+ SUPER                9                  ->   ActivateTab(-1)
+ CTRL                 =                  ->   IncreaseFontSize
+ SHIFT | CTRL         =                  ->   IncreaseFontSize
+ SUPER                =                  ->   IncreaseFontSize
+ CTRL                 @                  ->   ActivateTab(1)
+ SHIFT | CTRL         @                  ->   ActivateTab(1)
+ CTRL                 C                  ->   CopyTo(Clipboard)
+ SHIFT | CTRL         C                  ->   CopyTo(Clipboard)
+ CTRL                 F                  ->   Search(CurrentSelectionOrEmptyString)
+ SHIFT | CTRL         F                  ->   Search(CurrentSelectionOrEmptyString)
+ CTRL                 H                  ->   HideApplication
+ SHIFT | CTRL         H                  ->   HideApplication
+ CTRL                 K                  ->   ClearScrollback(ScrollbackOnly)
+ SHIFT | CTRL         K                  ->   ClearScrollback(ScrollbackOnly)
+ CTRL                 L                  ->   ShowDebugOverlay
+ SHIFT | CTRL         L                  ->   ShowDebugOverlay
+ CTRL                 M                  ->   Hide
+ SHIFT | CTRL         M                  ->   Hide
+ CTRL                 N                  ->   SpawnWindow
+ SHIFT | CTRL         N                  ->   SpawnWindow
+ CTRL                 P                  ->   ActivateCommandPalette
+ SHIFT | CTRL         P                  ->   ActivateCommandPalette
+ CTRL                 Q                  ->   QuitApplication
+ SHIFT | CTRL         Q                  ->   QuitApplication
+ CTRL                 R                  ->   ReloadConfiguration
+ SHIFT | CTRL         R                  ->   ReloadConfiguration
+ CTRL                 T                  ->   SpawnTab(CurrentPaneDomain)
+ SHIFT | CTRL         T                  ->   SpawnTab(CurrentPaneDomain)
+ CTRL                 U                  ->   CharSelect(CharSelectArguments { group: None, copy_on_select: true, copy_to: ClipboardAndPrimarySelection })
+ SHIFT | CTRL         U                  ->   CharSelect(CharSelectArguments { group: None, copy_on_select: true, copy_to: ClipboardAndPrimarySelection })
+ CTRL                 V                  ->   PasteFrom(Clipboard)
+ SHIFT | CTRL         V                  ->   PasteFrom(Clipboard)
+ CTRL                 W                  ->   CloseCurrentTab { confirm: true }
+ SHIFT | CTRL         W                  ->   CloseCurrentTab { confirm: true }
+ CTRL                 X                  ->   ActivateCopyMode
+ SHIFT | CTRL         X                  ->   ActivateCopyMode
+ CTRL                 Z                  ->   TogglePaneZoomState
+ SHIFT | CTRL         Z                  ->   TogglePaneZoomState
+ SHIFT | SUPER        [                  ->   ActivateTabRelative(-1)
+ SHIFT | SUPER        ]                  ->   ActivateTabRelative(1)
+ CTRL                 ^                  ->   ActivateTab(5)
+ SHIFT | CTRL         ^                  ->   ActivateTab(5)
+ CTRL                 _                  ->   DecreaseFontSize
+ SHIFT | CTRL         _                  ->   DecreaseFontSize
+ SHIFT | CTRL         c                  ->   CopyTo(Clipboard)
+ SUPER                c                  ->   CopyTo(Clipboard)
+ SHIFT | CTRL         f                  ->   Search(CurrentSelectionOrEmptyString)
+ SUPER                f                  ->   Search(CurrentSelectionOrEmptyString)
+ SHIFT | CTRL         h                  ->   HideApplication
+ SUPER                h                  ->   HideApplication
+ SHIFT | CTRL         k                  ->   ClearScrollback(ScrollbackOnly)
+ SUPER                k                  ->   ClearScrollback(ScrollbackOnly)
+ SHIFT | CTRL         l                  ->   ShowDebugOverlay
+ SHIFT | CTRL         m                  ->   Hide
+ SUPER                m                  ->   Hide
+ SHIFT | CTRL         n                  ->   SpawnWindow
+ SUPER                n                  ->   SpawnWindow
+ SHIFT | CTRL         p                  ->   ActivateCommandPalette
+ SHIFT | CTRL         q                  ->   QuitApplication
+ SUPER                q                  ->   QuitApplication
+ SHIFT | CTRL         r                  ->   ReloadConfiguration
+ SUPER                r                  ->   ReloadConfiguration
+ SHIFT | CTRL         t                  ->   SpawnTab(CurrentPaneDomain)
+ SUPER                t                  ->   SpawnTab(CurrentPaneDomain)
+ SHIFT | CTRL         u                  ->   CharSelect(CharSelectArguments { group: None, copy_on_select: true, copy_to: ClipboardAndPrimarySelection })
+ SHIFT | CTRL         v                  ->   PasteFrom(Clipboard)
+ SUPER                v                  ->   PasteFrom(Clipboard)
+ SHIFT | CTRL         w                  ->   CloseCurrentTab { confirm: true }
+ SUPER                w                  ->   CloseCurrentTab { confirm: true }
+ SHIFT | CTRL         x                  ->   ActivateCopyMode
+ SHIFT | CTRL         z                  ->   TogglePaneZoomState
+ SUPER                {                  ->   ActivateTabRelative(-1)
+ SHIFT | SUPER        {                  ->   ActivateTabRelative(-1)
+ SUPER                }                  ->   ActivateTabRelative(1)
+ SHIFT | SUPER        }                  ->   ActivateTabRelative(1)
+ SHIFT | CTRL         Space (Physical)   ->   QuickSelect
+ SHIFT                PageUp             ->   ScrollByPage(NotNan(-1.0))
+ CTRL                 PageUp             ->   ActivateTabRelative(-1)
+ SHIFT | CTRL         PageUp             ->   MoveTabRelative(-1)
+ SHIFT                PageDown           ->   ScrollByPage(NotNan(1.0))
+ CTRL                 PageDown           ->   ActivateTabRelative(1)
+ SHIFT | CTRL         PageDown           ->   MoveTabRelative(1)
+ SHIFT | CTRL         LeftArrow          ->   ActivatePaneDirection(Left)
+ SHIFT | ALT | CTRL   LeftArrow          ->   AdjustPaneSize(Left, 1)
+ SHIFT | CTRL         RightArrow         ->   ActivatePaneDirection(Right)
+ SHIFT | ALT | CTRL   RightArrow         ->   AdjustPaneSize(Right, 1)
+ SHIFT | CTRL         UpArrow            ->   ActivatePaneDirection(Up)
+ SHIFT | ALT | CTRL   UpArrow            ->   AdjustPaneSize(Up, 1)
+ SHIFT | CTRL         DownArrow          ->   ActivatePaneDirection(Down)
+ SHIFT | ALT | CTRL   DownArrow          ->   AdjustPaneSize(Down, 1)
+                      Copy               ->   CopyTo(Clipboard)
+                      Paste              ->   PasteFrom(Clipboard)
 
 Key Table: copy_mode
 --------------------
 
-	        Tab          ->   CopyMode(MoveForwardWord)
-	SHIFT   Tab          ->   CopyMode(MoveBackwardWord)
-	        Enter        ->   CopyMode(MoveToStartOfNextLine)
-	        Escape       ->   CopyMode(Close)
-	        Space        ->   CopyMode(SetSelectionMode(Some(Cell)))
-	        $            ->   CopyMode(MoveToEndOfLineContent)
-	SHIFT   $            ->   CopyMode(MoveToEndOfLineContent)
-	        ,            ->   CopyMode(JumpReverse)
-	        0            ->   CopyMode(MoveToStartOfLine)
-	        ;            ->   CopyMode(JumpAgain)
-	        F            ->   CopyMode(JumpBackward { prev_char: false })
-	SHIFT   F            ->   CopyMode(JumpBackward { prev_char: false })
-	        G            ->   CopyMode(MoveToScrollbackBottom)
-	SHIFT   G            ->   CopyMode(MoveToScrollbackBottom)
-	        H            ->   CopyMode(MoveToViewportTop)
-	SHIFT   H            ->   CopyMode(MoveToViewportTop)
-	        L            ->   CopyMode(MoveToViewportBottom)
-	SHIFT   L            ->   CopyMode(MoveToViewportBottom)
-	        M            ->   CopyMode(MoveToViewportMiddle)
-	SHIFT   M            ->   CopyMode(MoveToViewportMiddle)
-	        O            ->   CopyMode(MoveToSelectionOtherEndHoriz)
-	SHIFT   O            ->   CopyMode(MoveToSelectionOtherEndHoriz)
-	        T            ->   CopyMode(JumpBackward { prev_char: true })
-	SHIFT   T            ->   CopyMode(JumpBackward { prev_char: true })
-	        V            ->   CopyMode(SetSelectionMode(Some(Line)))
-	SHIFT   V            ->   CopyMode(SetSelectionMode(Some(Line)))
-	        ^            ->   CopyMode(MoveToStartOfLineContent)
-	SHIFT   ^            ->   CopyMode(MoveToStartOfLineContent)
-	        b            ->   CopyMode(MoveBackwardWord)
-	ALT     b            ->   CopyMode(MoveBackwardWord)
-	CTRL    b            ->   CopyMode(PageUp)
-	CTRL    c            ->   CopyMode(Close)
-	CTRL    d            ->   CopyMode(MoveByPage(NotNan(0.5)))
-	        e            ->   CopyMode(MoveForwardWordEnd)
-	        f            ->   CopyMode(JumpForward { prev_char: false })
-	ALT     f            ->   CopyMode(MoveForwardWord)
-	CTRL    f            ->   CopyMode(PageDown)
-	        g            ->   CopyMode(MoveToScrollbackTop)
-	CTRL    g            ->   CopyMode(Close)
-	        h            ->   CopyMode(MoveLeft)
-	        j            ->   CopyMode(MoveDown)
-	        k            ->   CopyMode(MoveUp)
-	        l            ->   CopyMode(MoveRight)
-	ALT     m            ->   CopyMode(MoveToStartOfLineContent)
-	        o            ->   CopyMode(MoveToSelectionOtherEnd)
-	        q            ->   CopyMode(Close)
-	        t            ->   CopyMode(JumpForward { prev_char: true })
-	CTRL    u            ->   CopyMode(MoveByPage(NotNan(-0.5)))
-	        v            ->   CopyMode(SetSelectionMode(Some(Cell)))
-	CTRL    v            ->   CopyMode(SetSelectionMode(Some(Block)))
-	        w            ->   CopyMode(MoveForwardWord)
-	        y            ->   Multiple([CopyTo(ClipboardAndPrimarySelection), CopyMode(Close)])
-	        PageUp       ->   CopyMode(PageUp)
-	        PageDown     ->   CopyMode(PageDown)
-	        End          ->   CopyMode(MoveToEndOfLineContent)
-	        Home         ->   CopyMode(MoveToStartOfLine)
-	        LeftArrow    ->   CopyMode(MoveLeft)
-	ALT     LeftArrow    ->   CopyMode(MoveBackwardWord)
-	        RightArrow   ->   CopyMode(MoveRight)
-	ALT     RightArrow   ->   CopyMode(MoveForwardWord)
-	        UpArrow      ->   CopyMode(MoveUp)
-	        DownArrow    ->   CopyMode(MoveDown)
+         Tab          ->   CopyMode(MoveForwardWord)
+ SHIFT   Tab          ->   CopyMode(MoveBackwardWord)
+         Enter        ->   CopyMode(MoveToStartOfNextLine)
+         Escape       ->   CopyMode(Close)
+         Space        ->   CopyMode(SetSelectionMode(Some(Cell)))
+         $            ->   CopyMode(MoveToEndOfLineContent)
+ SHIFT   $            ->   CopyMode(MoveToEndOfLineContent)
+         ,            ->   CopyMode(JumpReverse)
+         0            ->   CopyMode(MoveToStartOfLine)
+         ;            ->   CopyMode(JumpAgain)
+         F            ->   CopyMode(JumpBackward { prev_char: false })
+ SHIFT   F            ->   CopyMode(JumpBackward { prev_char: false })
+         G            ->   CopyMode(MoveToScrollbackBottom)
+ SHIFT   G            ->   CopyMode(MoveToScrollbackBottom)
+         H            ->   CopyMode(MoveToViewportTop)
+ SHIFT   H            ->   CopyMode(MoveToViewportTop)
+         L            ->   CopyMode(MoveToViewportBottom)
+ SHIFT   L            ->   CopyMode(MoveToViewportBottom)
+         M            ->   CopyMode(MoveToViewportMiddle)
+ SHIFT   M            ->   CopyMode(MoveToViewportMiddle)
+         O            ->   CopyMode(MoveToSelectionOtherEndHoriz)
+ SHIFT   O            ->   CopyMode(MoveToSelectionOtherEndHoriz)
+         T            ->   CopyMode(JumpBackward { prev_char: true })
+ SHIFT   T            ->   CopyMode(JumpBackward { prev_char: true })
+         V            ->   CopyMode(SetSelectionMode(Some(Line)))
+ SHIFT   V            ->   CopyMode(SetSelectionMode(Some(Line)))
+         ^            ->   CopyMode(MoveToStartOfLineContent)
+ SHIFT   ^            ->   CopyMode(MoveToStartOfLineContent)
+         b            ->   CopyMode(MoveBackwardWord)
+ ALT     b            ->   CopyMode(MoveBackwardWord)
+ CTRL    b            ->   CopyMode(PageUp)
+ CTRL    c            ->   CopyMode(Close)
+ CTRL    d            ->   CopyMode(MoveByPage(NotNan(0.5)))
+         e            ->   CopyMode(MoveForwardWordEnd)
+         f            ->   CopyMode(JumpForward { prev_char: false })
+ ALT     f            ->   CopyMode(MoveForwardWord)
+ CTRL    f            ->   CopyMode(PageDown)
+         g            ->   CopyMode(MoveToScrollbackTop)
+ CTRL    g            ->   CopyMode(Close)
+         h            ->   CopyMode(MoveLeft)
+         j            ->   CopyMode(MoveDown)
+         k            ->   CopyMode(MoveUp)
+         l            ->   CopyMode(MoveRight)
+ ALT     m            ->   CopyMode(MoveToStartOfLineContent)
+         o            ->   CopyMode(MoveToSelectionOtherEnd)
+         q            ->   CopyMode(Close)
+         t            ->   CopyMode(JumpForward { prev_char: true })
+ CTRL    u            ->   CopyMode(MoveByPage(NotNan(-0.5)))
+         v            ->   CopyMode(SetSelectionMode(Some(Cell)))
+ CTRL    v            ->   CopyMode(SetSelectionMode(Some(Block)))
+         w            ->   CopyMode(MoveForwardWord)
+         y            ->   Multiple([CopyTo(ClipboardAndPrimarySelection), CopyMode(Close)])
+         PageUp       ->   CopyMode(PageUp)
+         PageDown     ->   CopyMode(PageDown)
+         End          ->   CopyMode(MoveToEndOfLineContent)
+         Home         ->   CopyMode(MoveToStartOfLine)
+         LeftArrow    ->   CopyMode(MoveLeft)
+ ALT     LeftArrow    ->   CopyMode(MoveBackwardWord)
+         RightArrow   ->   CopyMode(MoveRight)
+ ALT     RightArrow   ->   CopyMode(MoveForwardWord)
+         UpArrow      ->   CopyMode(MoveUp)
+         DownArrow    ->   CopyMode(MoveDown)
 
 Key Table: search_mode
 ----------------------
 
-	       Enter       ->   CopyMode(PriorMatch)
-	       Escape      ->   CopyMode(Close)
-	CTRL   n           ->   CopyMode(NextMatch)
-	CTRL   p           ->   CopyMode(PriorMatch)
-	CTRL   r           ->   CopyMode(CycleMatchType)
-	CTRL   u           ->   CopyMode(ClearPattern)
-	       PageUp      ->   CopyMode(PriorMatchPage)
-	       PageDown    ->   CopyMode(NextMatchPage)
-	       UpArrow     ->   CopyMode(PriorMatch)
-	       DownArrow   ->   CopyMode(NextMatch)
+        Enter       ->   CopyMode(PriorMatch)
+        Escape      ->   CopyMode(Close)
+ CTRL   n           ->   CopyMode(NextMatch)
+ CTRL   p           ->   CopyMode(PriorMatch)
+ CTRL   r           ->   CopyMode(CycleMatchType)
+ CTRL   u           ->   CopyMode(ClearPattern)
+        PageUp      ->   CopyMode(PriorMatchPage)
+        PageDown    ->   CopyMode(NextMatchPage)
+        UpArrow     ->   CopyMode(PriorMatch)
+        DownArrow   ->   CopyMode(NextMatch)
 
 Mouse
 -----
 
-	               Down { streak: 1, button: Left }           ->   SelectTextAtMouseCursor(Cell)
-	SHIFT          Down { streak: 1, button: Left }           ->   ExtendSelectionToMouseCursor(Cell)
-	ALT            Down { streak: 1, button: Left }           ->   SelectTextAtMouseCursor(Block)
-	SHIFT | ALT    Down { streak: 1, button: Left }           ->   ExtendSelectionToMouseCursor(Block)
-	               Down { streak: 1, button: Middle }         ->   PasteFrom(PrimarySelection)
-	               Down { streak: 1, button: WheelUp(1) }     ->   ScrollByCurrentEventWheelDelta
-	               Down { streak: 1, button: WheelDown(1) }   ->   ScrollByCurrentEventWheelDelta
-	               Down { streak: 2, button: Left }           ->   SelectTextAtMouseCursor(Word)
-	               Down { streak: 3, button: Left }           ->   SelectTextAtMouseCursor(Line)
-	               Drag { streak: 1, button: Left }           ->   ExtendSelectionToMouseCursor(Cell)
-	ALT            Drag { streak: 1, button: Left }           ->   ExtendSelectionToMouseCursor(Block)
-	SHIFT | CTRL   Drag { streak: 1, button: Left }           ->   StartWindowDrag
-	SUPER          Drag { streak: 1, button: Left }           ->   StartWindowDrag
-	               Drag { streak: 2, button: Left }           ->   ExtendSelectionToMouseCursor(Word)
-	               Drag { streak: 3, button: Left }           ->   ExtendSelectionToMouseCursor(Line)
-	               Up { streak: 1, button: Left }             ->   CompleteSelectionOrOpenLinkAtMouseCursor(ClipboardAndPrimarySelection)
-	SHIFT          Up { streak: 1, button: Left }             ->   CompleteSelectionOrOpenLinkAtMouseCursor(ClipboardAndPrimarySelection)
-	ALT            Up { streak: 1, button: Left }             ->   CompleteSelection(ClipboardAndPrimarySelection)
-	SHIFT | ALT    Up { streak: 1, button: Left }             ->   CompleteSelectionOrOpenLinkAtMouseCursor(PrimarySelection)
-	               Up { streak: 2, button: Left }             ->   CompleteSelection(ClipboardAndPrimarySelection)
-	               Up { streak: 3, button: Left }             ->   CompleteSelection(ClipboardAndPrimarySelection)
+                Down { streak: 1, button: Left }           ->   SelectTextAtMouseCursor(Cell)
+ SHIFT          Down { streak: 1, button: Left }           ->   ExtendSelectionToMouseCursor(Cell)
+ ALT            Down { streak: 1, button: Left }           ->   SelectTextAtMouseCursor(Block)
+ SHIFT | ALT    Down { streak: 1, button: Left }           ->   ExtendSelectionToMouseCursor(Block)
+                Down { streak: 1, button: Middle }         ->   PasteFrom(PrimarySelection)
+                Down { streak: 1, button: WheelUp(1) }     ->   ScrollByCurrentEventWheelDelta
+                Down { streak: 1, button: WheelDown(1) }   ->   ScrollByCurrentEventWheelDelta
+                Down { streak: 2, button: Left }           ->   SelectTextAtMouseCursor(Word)
+                Down { streak: 3, button: Left }           ->   SelectTextAtMouseCursor(Line)
+                Drag { streak: 1, button: Left }           ->   ExtendSelectionToMouseCursor(Cell)
+ ALT            Drag { streak: 1, button: Left }           ->   ExtendSelectionToMouseCursor(Block)
+ SHIFT | CTRL   Drag { streak: 1, button: Left }           ->   StartWindowDrag
+ SUPER          Drag { streak: 1, button: Left }           ->   StartWindowDrag
+                Drag { streak: 2, button: Left }           ->   ExtendSelectionToMouseCursor(Word)
+                Drag { streak: 3, button: Left }           ->   ExtendSelectionToMouseCursor(Line)
+                Up { streak: 1, button: Left }             ->   CompleteSelectionOrOpenLinkAtMouseCursor(ClipboardAndPrimarySelection)
+ SHIFT          Up { streak: 1, button: Left }             ->   CompleteSelectionOrOpenLinkAtMouseCursor(ClipboardAndPrimarySelection)
+ ALT            Up { streak: 1, button: Left }             ->   CompleteSelection(ClipboardAndPrimarySelection)
+ SHIFT | ALT    Up { streak: 1, button: Left }             ->   CompleteSelectionOrOpenLinkAtMouseCursor(PrimarySelection)
+                Up { streak: 2, button: Left }             ->   CompleteSelection(ClipboardAndPrimarySelection)
+                Up { streak: 3, button: Left }             ->   CompleteSelection(ClipboardAndPrimarySelection)
 
 Mouse: alt_screen
 -----------------
 
-	               Down { streak: 1, button: Left }     ->   SelectTextAtMouseCursor(Cell)
-	SHIFT          Down { streak: 1, button: Left }     ->   ExtendSelectionToMouseCursor(Cell)
-	ALT            Down { streak: 1, button: Left }     ->   SelectTextAtMouseCursor(Block)
-	SHIFT | ALT    Down { streak: 1, button: Left }     ->   ExtendSelectionToMouseCursor(Block)
-	               Down { streak: 1, button: Middle }   ->   PasteFrom(PrimarySelection)
-	               Down { streak: 2, button: Left }     ->   SelectTextAtMouseCursor(Word)
-	               Down { streak: 3, button: Left }     ->   SelectTextAtMouseCursor(Line)
-	               Drag { streak: 1, button: Left }     ->   ExtendSelectionToMouseCursor(Cell)
-	ALT            Drag { streak: 1, button: Left }     ->   ExtendSelectionToMouseCursor(Block)
-	SHIFT | CTRL   Drag { streak: 1, button: Left }     ->   StartWindowDrag
-	SUPER          Drag { streak: 1, button: Left }     ->   StartWindowDrag
-	               Drag { streak: 2, button: Left }     ->   ExtendSelectionToMouseCursor(Word)
-	               Drag { streak: 3, button: Left }     ->   ExtendSelectionToMouseCursor(Line)
-	               Up { streak: 1, button: Left }       ->   CompleteSelectionOrOpenLinkAtMouseCursor(ClipboardAndPrimarySelection)
-	SHIFT          Up { streak: 1, button: Left }       ->   CompleteSelectionOrOpenLinkAtMouseCursor(ClipboardAndPrimarySelection)
-	ALT            Up { streak: 1, button: Left }       ->   CompleteSelection(ClipboardAndPrimarySelection)
-	SHIFT | ALT    Up { streak: 1, button: Left }       ->   CompleteSelectionOrOpenLinkAtMouseCursor(PrimarySelection)
-	               Up { streak: 2, button: Left }       ->   CompleteSelection(ClipboardAndPrimarySelection)
-	               Up { streak: 3, button: Left }       ->   CompleteSelection(ClipboardAndPrimarySelection)
+                Down { streak: 1, button: Left }     ->   SelectTextAtMouseCursor(Cell)
+ SHIFT          Down { streak: 1, button: Left }     ->   ExtendSelectionToMouseCursor(Cell)
+ ALT            Down { streak: 1, button: Left }     ->   SelectTextAtMouseCursor(Block)
+ SHIFT | ALT    Down { streak: 1, button: Left }     ->   ExtendSelectionToMouseCursor(Block)
+                Down { streak: 1, button: Middle }   ->   PasteFrom(PrimarySelection)
+                Down { streak: 2, button: Left }     ->   SelectTextAtMouseCursor(Word)
+                Down { streak: 3, button: Left }     ->   SelectTextAtMouseCursor(Line)
+                Drag { streak: 1, button: Left }     ->   ExtendSelectionToMouseCursor(Cell)
+ ALT            Drag { streak: 1, button: Left }     ->   ExtendSelectionToMouseCursor(Block)
+ SHIFT | CTRL   Drag { streak: 1, button: Left }     ->   StartWindowDrag
+ SUPER          Drag { streak: 1, button: Left }     ->   StartWindowDrag
+                Drag { streak: 2, button: Left }     ->   ExtendSelectionToMouseCursor(Word)
+                Drag { streak: 3, button: Left }     ->   ExtendSelectionToMouseCursor(Line)
+                Up { streak: 1, button: Left }       ->   CompleteSelectionOrOpenLinkAtMouseCursor(ClipboardAndPrimarySelection)
+ SHIFT          Up { streak: 1, button: Left }       ->   CompleteSelectionOrOpenLinkAtMouseCursor(ClipboardAndPrimarySelection)
+ ALT            Up { streak: 1, button: Left }       ->   CompleteSelection(ClipboardAndPrimarySelection)
+ SHIFT | ALT    Up { streak: 1, button: Left }       ->   CompleteSelectionOrOpenLinkAtMouseCursor(PrimarySelection)
+                Up { streak: 2, button: Left }       ->   CompleteSelection(ClipboardAndPrimarySelection)
+                Up { streak: 3, button: Left }       ->   CompleteSelection(ClipboardAndPrimarySelection)
 
 ```
 

install.conf.yaml

@@ -53,6 +53,7 @@
       mode: 0600
       path: ssh/*
 - shell:
+    - bash add-submodules.sh
     - git submodule update --init --recursive --force
     - bash local/bin/dfm install all
 - pipx:

local/bin/dfm

@@ -161,7 +161,7 @@ section_install()
       ;;
     asdf)
       msg "Installing asdf..."
-      bash "$DOTFILES/scripts/install-asdf.sh" \
+      bash "$DOTFILES/scripts/install-asdf.sh both" \
         && msg_yay "asdf installed!"
       ;;
     cargo)

local/bin/x-term-colors

@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+#
+#   This file echoes a bunch of 24-bit color codes
+#   to the terminal to demonstrate its functionality.
+#   The foreground escape sequence is ^[38;2;<r>;<g>;<b>m
+#   The background escape sequence is ^[48;2;<r>;<g>;<b>m
+#   <r> <g> <b> range from 0 to 255 inclusive.
+#   The escape sequence ^[0m returns output to default
+
+setBackgroundColor()
+{
+    echo -en "\x1b[48;2;$1;$2;$3""m"
+}
+
+resetOutput()
+{
+    echo -en "\x1b[0m\n"
+}
+
+# Gives a color $1/255 % along HSV
+# Who knows what happens when $1 is outside 0-255
+# Echoes "$red $green $blue" where
+# $red $green and $blue are integers
+# ranging between 0 and 255 inclusive
+rainbowColor()
+{
+    let h=$1/43
+    let f=$1-43*$h
+    let t=$f*255/43
+    let q=255-t
+
+    if [ $h -eq 0 ]
+    then
+        echo "255 $t 0"
+    elif [ $h -eq 1 ]
+    then
+        echo "$q 255 0"
+    elif [ $h -eq 2 ]
+    then
+        echo "0 255 $t"
+    elif [ $h -eq 3 ]
+    then
+        echo "0 $q 255"
+    elif [ $h -eq 4 ]
+    then
+        echo "$t 0 255"
+    elif [ $h -eq 5 ]
+    then
+        echo "255 0 $q"
+    else
+        # execution should never reach here
+        echo "0 0 0"
+    fi
+}
+
+for i in $(seq 0 127); do
+    setBackgroundColor "$i" 0 0
+    echo -en " "
+done
+resetOutput
+for i in $(seq 255 128); do
+    setBackgroundColor "$i" 0 0
+    echo -en " "
+done
+resetOutput
+
+for i in $(seq 0 127); do
+    setBackgroundColor 0 "$i" 0
+    echo -n " "
+done
+resetOutput
+for i in $(seq 255 128); do
+    setBackgroundColor 0 "$i" 0
+    echo -n " "
+done
+resetOutput
+
+for i in $(seq 0 127); do
+    setBackgroundColor 0 0 "$i"
+    echo -n " "
+done
+resetOutput
+for i in $(seq 255 128); do
+    setBackgroundColor 0 0 "$i"
+    echo -n " "
+done
+resetOutput
+
+for i in $(seq 0 127); do
+    setBackgroundColor $(rainbowColor "$i")
+    echo -n " "
+done
+resetOutput
+for i in $(seq 255 128); do
+    setBackgroundColor $(rainbowColor "$i")
+    echo -n " "
+done
+resetOutput
+

package.json

@@ -2,7 +2,6 @@
   "name": "ivuorinen-dotfiles",
   "version": "1.0.0",
   "description": "ivuorinen's dotfiles, this is for linting and formatters",
-  "main": "index.js",
   "directories": {
     "doc": "docs"
   },
@@ -28,8 +27,7 @@
   },
   "homepage": "https://github.com/ivuorinen/dotfiles#readme",
   "devDependencies": {
-    "@ivuorinen/base-configs": "^2.0.0",
-    "prettier-plugin-sh": "^0.14.0"
+    "@ivuorinen/base-configs": "^2.0.0"
   },
   "packageManager": "yarn@1.22.22"
 }

scripts/install-asdf.sh

@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 #
-# Install asdf
+# Install asdf and plugins I use
+#
+# It also updates asdf and the plugins, and then reshim asdf.
+#
+# Usage: ./install-asdf.sh [both|install|add_plugins]
+# Author: Ismo Vuorinen <https://github.com/ivuorinen>
+# License: MIT
+#
 source "${DOTFILES}/config/shared.sh"
 
 export ASDF_DIR="${XDG_BIN_HOME}/asdf"
@@ -12,8 +19,6 @@ msg "Sourcing asdf in your shell"
 # Function to update asdf and plugins
 update_asdf()
 {
-  asdf update
-
   asdf plugin add asdf-plugin-manager https://github.com/asdf-community/asdf-plugin-manager.git
   asdf install asdf-plugin-manager latest
   asdf global asdf-plugin-manager "$(asdf latest asdf-plugin-manager)"
@@ -21,58 +26,91 @@ update_asdf()
   asdf-plugin-manager add-all
 
   asdf install
-}
 
-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"
-  "ripgrep:gitlab.com/wt0f/asdf-ripgrep.git"
-  "rust:github.com/code-lever/asdf-rust.git"
-  "semgrep:github.com/brentjanderson/asdf-semgrep.git"
-  "shellcheck:github.com/luizm/asdf-shellcheck.git"
-  "shfmt:github.com/luizm/asdf-shfmt.git"
-  "terraform-ls:github.com/asdf-community/asdf-hashicorp.git"
-  "terraform-lsp:github.com/bartlomiejdanek/asdf-terraform-lsp.git"
-  "terragrunt:github.com/ohmer/asdf-terragrunt.git"
-  "tf-summarize:github.com/adamcrews/asdf-tf-summarize.git"
-  "vault:github.com/asdf-community/asdf-hashicorp.git"
-  "yamllint:github.com/ericcornelissen/asdf-yamllint.git"
-  "yq:github.com/sudermanjr/asdf-yq.git"
-)
+  return 0
+}
 
 # Function to install asdf plugins
 install_asdf_plugins()
 {
-  msg "Installing asdf plugins, if not already installed"
+  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}')
     URL=$(echo "${item}" | awk -F ":" '{print $2}')
+
     asdf plugin add "${CMD}" "https://${URL}"
     asdf install "${CMD}" latest
     asdf global "${CMD}" "$(asdf latest "${CMD}")"
   done
+
+  msg "Exporting asdf plugin versions"
+  asdf-plugin-manager export > "${XDG_CONFIG_HOME}/asdf/plugin-versions"
+
+  return 0
+}
+
+reshim()
+{
+  msg "Reshim asdf"
+  asdf reshim
+  return 0
+}
+
+# create usage function
+usage()
+{
+  echo "Usage: $0 [both|install|add_plugins]"
+  exit 1
 }
 
 main()
 {
-  update_asdf
-  install_asdf_plugins
-  msg "Reshim asdf"
-  asdf reshim
+  case $1 in
+    "both")
+      install_asdf_plugins
+      update_asdf
+      reshim
+      ;;
+    "install")
+      update_asdf
+      reshim
+      ;;
+    "add_plugins")
+      install_asdf_plugins
+      reshim
+      ;;
+    *)
+      usage
+      ;;
+  esac
 }
 
 main "$@"

scripts/install-cargo-packages.sh

@@ -2,6 +2,10 @@
 # Install cargo/rust packages.
 #
 # shellcheck source=shared.sh
+
+echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+exit 0
+
 eval "$HOME/.dotfiles/config/shared.sh"
 
 msg "Starting to install rust/cargo packages"

scripts/install-go-packages.sh

@@ -2,6 +2,10 @@
 # Install Go packages
 #
 # shellcheck source=shared.sh
+
+echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+exit 0
+
 eval "$DOTFILES/config/shared.sh"
 
 # Enable verbosity with VERBOSE=1

scripts/install-npm-packages.sh

@@ -2,6 +2,10 @@
 # Install npm packages globally.
 #
 # shellcheck source=shared.sh
+
+echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+exit 0
+
 eval "$DOTFILES/config/shared.sh"
 
 # Enable verbosity with VERBOSE=1

scripts/install-pip-packages.sh

@@ -2,6 +2,10 @@
 # Install python/pip packages.
 #
 # shellcheck source=shared.sh
+
+echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+exit 0
+
 source "${DOTFILES}/config/shared.sh"
 
 # Enable verbosity with VERBOSE=1