chore(deps): update asdf tool-versions

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

.browserslistrc

@@ -0,0 +1 @@
+extends @ivuorinen/browserslist-config

.editorconfig

@@ -27,3 +27,9 @@ space_redirects    = true
 keep_padding       = false
 function_next_line = true # --func-next-line
 
+# Ignore the entire "third_party" directory when calling shfmt on directories,
+# such as "shfmt -l -w .". When formatting files directly,
+# like "shfmt -w third_party/foo.sh" or "shfmt --filename=third_party/foo.sh",
+# the ignore logic is applied only when the --apply-ignore flag is given.
+[{tools/**,local/bin/asdf/**,config/cheat/cheatsheets/**}]
+ignore = true

.github/CODE_OF_CONDUCT.md

@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
+- Focusing on what is best not just for us as individuals, but for the
   overall community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or
+- The use of sexualized language or imagery, and sexual attention or
   advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
   address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
+standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
 **Consequence**: A permanent ban from any sort of public interaction within

.github/README.md

@@ -8,6 +8,9 @@ this repository will live accordingly.
 Please for the love of everything good do not use these 1:1 as your own dotfiles,
 fork or download the repo as a zip and go from there with your own configs.
 
+It would be nice if you'd add an issue linking to your fork or repo so I can
+see what interesing stuff you've done with it. Sharing is caring.
+
 ## Setup
 
 ### First time setup
@@ -23,7 +26,11 @@ fork or download the repo as a zip and go from there with your own configs.
 
 ## The looks
 
-![screenshot of tmux with nvim editing this repo](./screenshots/tmux-nvim.png)
+![screenshot of the oh-my-posh shell](./screenshots/oh-my-posh.png)
+
+![screenshot of light version of tmux with nvim editing this repo](./screenshots/tmux-nvim-kickstart-light.png)
+
+![screenshot of dark version of tmux with nvim editing this repo](./screenshots/tmux-nvim-kickstart-dark.png)
 
 ## Interesting files and locations
 
@@ -31,7 +38,7 @@ fork or download the repo as a zip and go from there with your own configs.
 
 | Path                | Description                                  |
 | ------------------- | -------------------------------------------- |
-| `.github`           | GitHub Repository configuration files.       |
+| `.github`           | GitHub Repository configuration files, meta. |
 | `hosts/{hostname}/` | Configs that should apply to that host only. |
 | `local/bin`         | Helper scripts that I've collected or wrote. |
 | `scripts`           | Setup scripts.                               |
@@ -47,7 +54,9 @@ fork or download the repo as a zip and go from there with your own configs.
 
 ### dfm - the dotfiles manager
 
-`.local/bin/dfm` is a shell script that has some tools that help with dotfiles management.
+[`.local/bin/dfm`][dfm] is a shell script that has some tools that help with dotfiles management.
+
+Running `dfm` gives you a list of available commands.
 
 ## Configuration
 
@@ -62,51 +71,8 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
 | `$XDG_DATA_HOME`   | `$HOME/.local/share` | User-specific data files                       |
 | `$XDG_STATE_HOME`  | `$HOME/.local/state` | App state that should persist between restarts |
 
-#### XDG_BIN_HOME (`$HOME/.local/bin`)
-
-`$XDG_BIN_HOME` defines directory that contains local binaries.
-
-User-specific executable files may be stored in `$HOME/.local/bin`.
-Distributions should ensure this directory shows up in the UNIX `$PATH`
-environment variable, at an appropriate place.
-
-#### XDG_DATA_HOME (`$HOME/.local/share`)
-
-`$XDG_DATA_HOME` defines the base directory relative to which
-user-specific _data files_ should be stored.
-
-If `$XDG_DATA_HOME` is either not set or empty,
-a default equal to `$HOME/.local/share` should be used.
-
-#### XDG_CONFIG_HOME (`$HOME/.config`)
-
-`$XDG_CONFIG_HOME` defines the base directory relative to which
-user-specific _configuration files_ should be stored.
-
-If `$XDG_CONFIG_HOME` is either not set or empty,
-a default equal to `$HOME/.config` should be used.
-
-#### XDG_STATE_HOME (`$HOME/.local/state`)
-
-`$XDG_STATE_HOME` defines the base directory relative to which
-user-specific _state files_ should be stored.
-
-If `$XDG_STATE_HOME` is either not set or empty,
-a default equal to `$HOME/.local/state` should be used.
-
-The `$XDG_STATE_HOME` contains _state data_ that should
-_persist between (application) restarts_, but that is not important or
-portable enough to the user that it should be stored in `$XDG_DATA_HOME`.
-
-- It may contain:
-  - actions history (logs, history, recently used files, …)
-  - current state of the application that can be reused
-    on a restart (view, layout, open files, undo history, …)
-
-#### XDG_DATA_DIRS
-
-`$XDG_DATA_DIRS` defines the preference-ordered set of base directories
-to search for data files in addition to the `$XDG_DATA_HOME` base directory.
-The directories in `$XDG_DATA_DIRS` should be seperated with a colon ':'.
+Please see [docs/folders.md][docs-folders] for more information.
 
+[dfm]: https://github.com/ivuorinen/dotfiles/blob/main/local/bin/dfm
+[docs-folders]: https://github.com/ivuorinen/dotfiles/blob/main/docs/folders.md
 [xdg]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html

.github/renovate.json

@@ -1,4 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>ivuorinen/.github:renovate-config"]
+  "extends": ["local>ivuorinen/renovate-config"]
 }

.github/workflows/changelog.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch: # Trigger manually
 jobs:
   debug-changelog:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
       - name: Create changelog text

.github/workflows/linters.yml

@@ -3,7 +3,7 @@ on: [push]
 jobs:
   linters:
     name: Linters
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
       - name: GitHub Actions

.github/workflows/new-release.yml

@@ -7,7 +7,7 @@ permissions:
   contents: write
 jobs:
   new-daily-release:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     outputs:
       created: ${{ steps.daily-version.outputs.created }}
       version: ${{ steps.daily-version.outputs.version }}

.github/workflows/semantic-pr.yml

@@ -0,0 +1,18 @@
+name: Semantic PR
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  semantic-pr:
+    runs-on: self-hosted
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5.5.3
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          validateSingleCommit: true

.github/workflows/update-submodules.yml

@@ -8,7 +8,7 @@ permissions:
   pull-requests: write
 jobs:
   update-submodules:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.gitignore

@@ -1,4 +1,5 @@
 Brewfile.lock.json
+config/nvim/lazy-lock.json
 *.log
 *-secret
 *cache
@@ -9,6 +10,7 @@ config/cheat/cheatsheets/tldr/*
 config/git/credentials
 config/npm/npmrc
 config/zsh/.zcompdump
+config/alacritty/theme-active.toml
 ssh/local.d/*
 !ssh/local.d/.gitkeep
 !.gitkeep

.gitmodules

@@ -41,7 +41,7 @@
 	ignore = dirty
 [submodule "tmux/tmux-window-name"]
 	path = config/tmux/plugins/tmux-window-name
-	url = https://github.com/ofirgall/tmux-window-name.git
+	url = https://github.com/ivuorinen/tmux-window-name.git
 	ignore = dirty
 [submodule "dotbot-pip"]
 	path = tools/dotbot-pip
@@ -52,3 +52,18 @@
 [submodule "tmux/tmux-mode-indicator"]
 	path = config/tmux/plugins/tmux-mode-indicator
 	url = https://github.com/MunifTanjim/tmux-mode-indicator.git
+[submodule "tmux/tmux-current-pane-hostname"]
+	path = config/tmux/plugins/tmux-current-pane-hostname
+	url = https://github.com/soyuka/tmux-current-pane-hostname.git
+[submodule "cheat-tldr"]
+	path = config/cheat/cheatsheets/tldr
+	url = https://github.com/ivuorinen/cheatsheet-tldr.git
+[submodule "nvim-kickstart"]
+	path = config/nvim-kickstart
+	url = https://github.com/ivuorinen/kickstart.nvim
+[submodule "tmux/tmux-dark-notify"]
+	path = config/tmux/plugins/tmux-dark-notify
+	url = https://github.com/erikw/tmux-dark-notify.git
+[submodule "asdf"]
+	path = local/bin/asdf
+	url = https://github.com/asdf-vm/asdf.git

.luarc.json

@@ -0,0 +1,5 @@
+{
+    "diagnostics.globals": [
+        "vim"
+    ]
+}

.nvmrc

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

.prettierignore

@@ -1,8 +1,12 @@
 .mypy_cache/*
-tools/dotbot*
-local/bin/antigen.zsh
-config/cheat/cheatsheets/community
-config/tmux/plugins/*
-lazy-lock.json
 Brewfile.lock.json
-
+config/cheat/cheatsheets/community
+config/cheat/cheatsheets/tldr
+config/fzf/*
+config/nvim-kickstart/*
+config/tmux/plugins/*
+config/zsh/*
+lazy-lock.json
+local/bin/antigen.zsh
+local/bin/asdf
+tools/dotbot*

.prettierrc.js

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

.releaserc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@ivuorinen/semantic-release-config"]
+}

add-submodules.sh

@@ -10,9 +10,16 @@ git submodule add --name dotbot-include \
 git submodule add --name dotbot-pip \
   -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip
 
+git submodule add --name nvim-kickstart \
+  -f https://github.com/ivuorinen/kickstart.nvim config/nvim-kickstart
+
 # other repos
 git submodule add --name cheat-community \
   -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
+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
 
 # tmux plugin manager and plugins
 git submodule add --name tmux/tmux-continuum \
@@ -28,9 +35,13 @@ git submodule add --name tmux/tmux-sessionist \
 git submodule add --name tmux/tmux-suspend \
   -f https://github.com/MunifTanjim/tmux-suspend.git config/tmux/plugins/tmux-suspend
 git submodule add --name tmux/tmux-window-name \
-  -f https://github.com/ofirgall/tmux-window-name.git config/tmux/plugins/tmux-window-name
+  -f https://github.com/ivuorinen/tmux-window-name.git config/tmux/plugins/tmux-window-name
 git submodule add --name tmux/tmux-yank \
   -f https://github.com/tmux-plugins/tmux-yank.git config/tmux/plugins/tmux-yank
+git submodule add --name tmux/tmux-current-pane-hostname \
+  -f https://github.com/soyuka/tmux-current-pane-hostname.git config/tmux/plugins/tmux-current-pane-hostname
+git submodule add --name tmux/tmux-dark-notify \
+  -f https://github.com/erikw/tmux-dark-notify.git config/tmux/plugins/tmux-dark-notify
 
 # Takes submodules and sets them to ignore all changes
 for MODULE in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }'); do

base/bashrc

@@ -1,22 +1,26 @@
 # this is my bashrc config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-# Defaults
 export DOTFILES="$HOME/.dotfiles"
-export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
-# shellcheck source=scripts/shared.sh
-source "$DOTFILES/scripts/shared.sh"
+export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$PATH"
+export SHARED_SCRIPTS_SOURCED=0
 
-# Explicitly set XDG folders
-# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
+source "$DOTFILES/config/shared.sh"
 
-# custom variables
-export XDG_BIN_HOME="$HOME/.local/bin"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_RUNTIME_DIR="$HOME/.local/run"
+# shellcheck source=../config/fzf/fzf.bash
+[ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&
+  source "${DOTFILES}/config/fzf/fzf.bash"
 
 # 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")"
+}
+
+. "$XDG_BIN_HOME/asdf/asdf.sh"
+. "$XDG_BIN_HOME/asdf/completions/asdf.bash"
+
+x-have antidot && {
+  eval "$(antidot init)"
+}

base/huskyrc

@@ -1,6 +1,4 @@
 #!/bin/env bash
 
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"                   # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
-
+[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.config/nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm

base/zshenv

@@ -1,18 +1,6 @@
 # shellcheck shell=bash
 # vim: filetype=zsh
 
-export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
-
 export DOTFILES="$HOME/.dotfiles"
-
-# Explicitly set XDG folders
-# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
-
-# custom variables
-export XDG_BIN_HOME="$HOME/.local/bin"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_RUNTIME_DIR="$HOME/.local/run"
-
+export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$PATH"
+export SHARED_SCRIPTS_SOURCED=0

base/zshrc

@@ -1,82 +1,128 @@
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-source "$DOTFILES/scripts/shared.sh"
+# export VERBOSE=1
+# export DEBUG=1
 
-export COMPLETION_WAITING_DOTS=true
+export DOTFILES="$HOME/.dotfiles"
 
-path_append "/opt/homebrew/bin"
-if type brew &> /dev/null; then
-  eval "$(brew shellenv)"
-  FPATH="$HOMEBREW_PREFIX/share/zsh/site-functions:${FPATH}"
+source "$DOTFILES/config/shared.sh"
+
+x-path-prepend "/usr/local/bin"
+x-path-prepend "/opt/homebrew/bin"
+x-path-prepend "$HOME/.local/share/cargo/bin"
+x-path-prepend "$HOME/.local/share/bob/nvim-bin"
+x-path-prepend "$HOME/.local/bin"
+x-path-prepend "$DOTFILES/local/bin"
+
+eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
+
+# Load asdf
+export ASDF_DIR="$XDG_BIN_HOME/asdf"
+if [[ -d $ASDF_DIR ]]; then
+  [[ -d $ASDF_DIR/bin ]] && x-path-prepend "$ASDF_DIR/bin"
+  [[ -d $ASDF_DIR/shims ]] && x-path-prepend "$ASDF_DIR/shims"
+  [[ -d $ASDF_DIR/completions ]] && fpath=("$ASDF_DIR/completions" $fpath)
+  [[ -d $ASDF_DIR/plugins ]] && fpath=("$ASDF_DIR/plugins" $fpath)
+  source "$ASDF_DIR/asdf.sh"
 fi
 
-path_append "/usr/local/bin"
-path_prepend "$XDG_DATA_HOME/cargo/bin"
-path_prepend "$XDG_BIN_HOME"
-path_prepend "$HOME/.local/go/bin"
-path_prepend "$XDG_DATA_HOME/bob/nvim-bin"
+# Function to load antigen if available
+load_antigen()
+{
+  local antigen_zsh_path="$XDG_BIN_HOME/antigen.zsh"
+  # shellcheck source=../../.local/bin/antigen.zsh
+  if [[ -f "$antigen_zsh_path" ]]; then
+    source "$antigen_zsh_path"
 
-source "$DOTFILES/config/exports-shell"
-source "$DOTFILES/config/exports-apps"
-source "$DOTFILES/config/alias"
-source "$DOTFILES/config/functions"
+    antigen use oh-my-zsh
 
-export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
-x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
+    export ZSH_TMUX_AUTOSTART=true
+    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
 
-# Add completion scripts to zsh path
-FPATH="$ZSH_CUSTOM_COMPLETION_PATH:$FPATH"
+    # z, the zsh version
+    export ZSHZ_DATA="$XDG_STATE_HOME/z"
+    antigen bundle z
 
-# Try to load antigen, if present
-ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
-# shellcheck source=../../.local/bin/antigen.zsh
-[[ -f "$ANTIGEN_ZSH_PATH" ]] && source "$ANTIGEN_ZSH_PATH"
+    # these should be always available
+    antigen bundle brew
+    antigen bundle tmux
+    antigen bundle colored-man-pages
+    antigen bundle ssh-agent
+    antigen bundle jreese/zsh-titles
+    antigen bundle zsh-users/zsh-completions
 
-# antigen is present
-antigen use oh-my-zsh
+    x-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
 
-export ZSH_TMUX_AUTOSTART=true
-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
+    # this needs to be the last item
+    antigen bundle zsh-users/zsh-syntax-highlighting
+    antigen apply
+  fi
+}
 
-export NVM_DIR="$XDG_CONFIG_HOME/nvm"
-export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+# Function to source FZF configuration
+source_fzf_config()
+{
+  local fzf_config="${DOTFILES}/config/fzf/fzf.zsh"
+  if [[ -f "$fzf_config" ]]; then
+    # shellcheck source=config/fzf/fzf.zsh
+    source "$fzf_config"
+  fi
+}
 
-# z, the zsh version
-export ZSHZ_DATA="$XDG_STATE_HOME/z"
-antigen bundle z
+# Function to initialize pyenv if available
+initialize_pyenv()
+{
+  if x-have pyenv; then
+    [[ -d $PYENV_ROOT/bin ]] && x-path-append "$PYENV_ROOT/bin"
+    [[ -d $PYENV_ROOT/shims ]] && x-path-append "$PYENV_ROOT/shims"
+    eval "$(pyenv init -)"
+    eval "$(pyenv virtualenv-init -)"
+  fi
+}
 
-# these should be always available
-antigen bundle tmux
-antigen bundle colored-man-pages
-antigen bundle command-not-found
-antigen bundle ssh-agent
-antigen bundle jreese/zsh-titles
-antigen bundle zsh-users/zsh-completions
+# Function to set up tmux window name plugin if tmux is active
+setup_tmux_window_name_plugin()
+{
+  if [[ -n "$TMUX" ]]; then
+    local tmux_window_name_plugin="$DOTFILES/config/tmux/plugins/tmux-window-name/scripts/rename_session_windows.py"
+    if [[ -f "$tmux_window_name_plugin" ]]; then
+      tmux_window_name()
+      {
+        ($tmux_window_name_plugin &)
+      }
+      add-zsh-hook chpwd tmux_window_name
+      tmux_window_name
+    fi
+  fi
+}
 
-# these should be available if there's need
-have brew && antigen bundle brew
-have php && antigen bundle php
-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
+# Function to initialize antidot if available
+initialize_antidot()
+{
+  if x-have antidot; then
+    eval "$(antidot init)"
+  fi
+}
 
-# nvm is a strange beast
-zstyle ':omz:plugins:nvm' autoload yes
-antigen bundle nvm
-# antigen bundle "$DOTFILES/config/zsh/plugins/nvm-auto-use"
+main()
+{
+  load_antigen
+  source_fzf_config
+  initialize_pyenv
+  setup_tmux_window_name_plugin
+  initialize_antidot
+}
 
-# nice to have stuff
-antigen bundle gcloud
+main "$@"
 
-# this needs to be the last item
-antigen bundle zsh-users/zsh-syntax-highlighting
-antigen apply
-
-# shellcheck source=../config/fzf/fzf.zsh
-[ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
-  && source "${DOTFILES}/config/fzf/fzf.zsh"
-
-# Start starship
-eval "$(starship init zsh)"
+# Herd checks for a few environment variables to inject PHP binaries and configurations.
+# Herd injected PHP binary.
+# export PATH="/Users/ivuorinen/Library/Application\ Support/Herd/bin/":$PATH
+# Herd injected PHP 8.3 configuration.
+# export HERD_PHP_83_INI_SCAN_DIR="/Users/ivuorinen/Library/Application\ Support/Herd/config/php/83/"
+# Herd injected PHP 7.4 configuration.
+# export HERD_PHP_74_INI_SCAN_DIR="/Users/ivuorinen/Library/Application\ Support/Herd/config/php/74/"

config/alacritty/alacritty.toml

@@ -0,0 +1,52 @@
+import = [
+  # Default to night if the copied one doesn't exist.
+  "~/.dotfiles/config/alacritty/theme-night.toml",
+  "~/.config/alacritty/theme-active.toml"
+]
+
+[env]
+TERM = "xterm-256color"
+
+[colors]
+draw_bold_text_with_bright_colors = true
+
+[font]
+size = 14.0
+
+[font.glyph_offset]
+x = 0
+y = 0
+
+[font.normal]
+family = "JetBrainsMonoNL Nerd Font Mono"
+style = "ExtraLight"
+
+[font.italic]
+family = "JetBrainsMonoNL Nerd Font Mono"
+style = "Italic"
+
+[font.bold]
+family = "JetBrainsMonoNL Nerd Font Mono"
+style = "Bold"
+
+[font.offset]
+x = 0
+y = 0
+
+[selection]
+semantic_escape_chars = ",│`|:\"' ()[]{}<>"
+save_to_clipboard = true
+
+[window]
+decorations = "Full"
+dynamic_title = true
+opacity = 0.98
+blur = true
+
+[window.dimensions]
+columns = 200
+lines = 75
+
+[window.padding]
+x = 5
+y = 5

config/alacritty/alacritty.yml

@@ -1,206 +0,0 @@
----
-# Configuration for Alacritty, the GPU enhanced terminal emulator
-
-# Any items in the `env` entry below will be added as
-# environment variables. Some entries may override variables
-# set by alacritty it self.
-env:
-  # TERM env customization.
-  #
-  # If this property is not set, alacritty will set it to xterm-256color.
-  #
-  # Note that some xterm terminfo databases don't declare support for italics.
-  # You can verify this by checking for the presence of `smso` and `sitm` in
-  # `infocmp xterm-256color`.
-  TERM: xterm-256color
-
-# Window dimensions in character columns and lines
-# (changes require restart)
-window:
-  dynamic_title: true
-  dimensions:
-    columns: 130
-    lines: 40
-
-  # Adds this many blank pixels of padding around the window
-  # Units are physical pixels; this is not DPI aware.
-  # (change requires restart)
-  padding:
-    x: 5
-    y: 5
-
-  decorations: buttonless
-
-  opacity: 0.97
-
-# When true, bold text is drawn using the bright variant of colors.
-draw_bold_text_with_bright_colors: true
-
-# Font configuration (changes require restart)
-font:
-  # The normal (roman) font face to use.
-  normal:
-    family: JetBrainsMonoNL Nerd Font Mono
-    # Style can be specified to pick a specific face.
-    style: ExtraLight
-
-    # The bold font face
-  bold:
-    family: JetBrainsMonoNL Nerd Font Mono
-    # Style can be specified to pick a specific face.
-    style: Bold
-
-  # The italic font face
-  italic:
-    family: JetBrainsMonoNL Nerd Font Mono
-    # Style can be specified to pick a specific face.
-    style: Italic
-
-  # Point size of the font
-  size: 14.0
-
-  # Offset is the extra space around each character. offset.y can be thought of
-  # as modifying the linespacing, and offset.x as modifying the letter spacing.
-  offset:
-    x: 0
-    y: 0
-
-  # Glyph offset determines the locations of the glyphs within their cells with
-  # the default being at the bottom. Increase the x offset to move the glyph to
-  # the right, increase the y offset to move the glyph upward.
-  glyph_offset:
-    x: 0
-    y: 0
-
-# Should display the render timer
-debug.render_timer: false
-
-# TokyoNight Alacritty Colors (storm)
-colors:
-  # Default colors
-  primary:
-    background: '0x24283b'
-    foreground: '0xc0caf5'
-
-  # Normal colors
-  normal:
-    black: '0x1d202f'
-    red: '0xf7768e'
-    green: '0x9ece6a'
-    yellow: '0xe0af68'
-    blue: '0x7aa2f7'
-    magenta: '0xbb9af7'
-    cyan: '0x7dcfff'
-    white: '0xa9b1d6'
-
-  # Bright colors
-  bright:
-    black: '0x414868'
-    red: '0xf7768e'
-    green: '0x9ece6a'
-    yellow: '0xe0af68'
-    blue: '0x7aa2f7'
-    magenta: '0xbb9af7'
-    cyan: '0x7dcfff'
-    white: '0xc0caf5'
-
-  indexed_colors:
-    - { index: 16, color: '0xff9e64' }
-    - { index: 17, color: '0xdb4b4b' }
-
-key_bindings:
-  - { key: V, mods: Command, action: Paste }
-  - { key: C, mods: Command, action: Copy }
-  - { key: Q, mods: Command, action: Quit }
-  - { key: W, mods: Command, action: Quit }
-  - { key: N, mods: Command, action: SpawnNewInstance }
-  - { key: Home, chars: "\eOH", mode: AppCursor }
-  - { key: Home, chars: "\e[1~", mode: ~AppCursor }
-  - { key: End, chars: "\eOF", mode: AppCursor }
-  - { key: End, chars: "\e[4~", mode: ~AppCursor }
-  - { key: PageUp, mods: Shift, chars: "\e[5;2~" }
-  - { key: PageUp, mods: Control, chars: "\e[5;5~" }
-  - { key: PageUp, chars: "\e[5~" }
-  - { key: PageDown, mods: Shift, chars: "\e[6;2~" }
-  - { key: PageDown, mods: Control, chars: "\e[6;5~" }
-  - { key: PageDown, chars: "\e[6~" }
-  - { key: Left, mods: Shift, chars: "\e[1;2D" }
-  - { key: Left, mods: Control, chars: "\e[1;5D" }
-  - { key: Left, mods: Alt, chars: "\e[1;3D" }
-  - { key: Left, chars: "\e[D", mode: ~AppCursor }
-  - { key: Left, chars: "\eOD", mode: AppCursor }
-  - { key: Right, mods: Shift, chars: "\e[1;2C" }
-  - { key: Right, mods: Control, chars: "\e[1;5C" }
-  - { key: Right, mods: Alt, chars: "\e[1;3C" }
-  - { key: Right, chars: "\e[C", mode: ~AppCursor }
-  - { key: Right, chars: "\eOC", mode: AppCursor }
-  - { key: Up, mods: Shift, chars: "\e[1;2A" }
-  - { key: Up, mods: Control, chars: "\e[1;5A" }
-  - { key: Up, mods: Alt, chars: "\e[1;3A" }
-  - { key: Up, chars: "\e[A", mode: ~AppCursor }
-  - { key: Up, chars: "\eOA", mode: AppCursor }
-  - { key: Down, mods: Shift, chars: "\e[1;2B" }
-  - { key: Down, mods: Control, chars: "\e[1;5B" }
-  - { key: Down, mods: Alt, chars: "\e[1;3B" }
-  - { key: Down, chars: "\e[B", mode: ~AppCursor }
-  - { key: Down, chars: "\eOB", mode: AppCursor }
-  - { key: Tab, mods: Shift, chars: "\e[Z" }
-  - { key: F1, chars: "\eOP" }
-  - { key: F2, chars: "\eOQ" }
-  - { key: F3, chars: "\eOR" }
-  - { key: F4, chars: "\eOS" }
-  - { key: F5, chars: "\e[15~" }
-  - { key: F6, chars: "\e[17~" }
-  - { key: F7, chars: "\e[18~" }
-  - { key: F8, chars: "\e[19~" }
-  - { key: F9, chars: "\e[20~" }
-  - { key: F10, chars: "\e[21~" }
-  - { key: F11, chars: "\e[23~" }
-  - { key: F12, chars: "\e[24~" }
-  - { key: Back, chars: '' }
-  - { key: Back, mods: Alt, chars: "\e" }
-  - { key: Insert, chars: "\e[2~" }
-  - { key: Delete, chars: "\e[3~" }
-
-  # shortcuts for tmux. the leader key is control-b (0x02)
-  - { key: W, mods: Command, chars: "\x02&" } # close tab (kill)
-  - { key: T, mods: Command, chars: "\x02c" } # new tab
-  - { key: RBracket, mods: Command|Shift, chars: "\x02n" } # select next tab
-  - { key: LBracket, mods: Command|Shift, chars: "\x02p" } # select previous tab
-  - { key: RBracket, mods: Command, chars: "\x02o" } # select next pane
-  - { key: LBracket, mods: Command, chars: "\x02;" } # select last (previously used) pane
-  - { key: F, mods: Command, chars: "\x02/" } # search (upwards) (see tmux.conf)
-
-# Mouse bindings
-#
-# Currently doesn't support modifiers. Both the `mouse` and `action` fields must
-# be specified.
-#
-# Values for `mouse`:
-# - Middle
-# - Left
-# - Right
-# - Numeric identifier such as `5`
-#
-# Values for `action`:
-# - Paste
-# - PasteSelection
-# - Copy (TODO)
-mouse_bindings:
-  - { mouse: Middle, action: PasteSelection }
-
-mouse:
-  double_click: { threshold: 300 }
-  triple_click: { threshold: 300 }
-
-selection:
-  semantic_escape_chars: ',│`|:"'' ()[]{}<>'
-# Shell
-#
-# You can set shell.program to the path of your favorite shell, e.g. /bin/fish.
-# Entries in shell.args are passed unmodified as arguments to the shell.
-#
-#shell:
-#  program: /bin/bash
-#  args:
-#    - --login

config/alacritty/theme-day.toml

@@ -0,0 +1,40 @@
+# TokyoNight Alacritty Colors: Day
+# Default colors
+[colors.primary]
+background = '#e1e2e7'
+foreground = '#3760bf'
+
+#[colors.cursor]
+#cursor = '#3760bf'
+#text = '#e1e2e7'
+
+# Normal colors
+[colors.normal]
+black = '#e9e9ed'
+red = '#f52a65'
+green = '#587539'
+yellow = '#8c6c3e'
+blue = '#2e7de9'
+magenta = '#9854f1'
+cyan = '#007197'
+white = '#6172b0'
+
+# Bright colors
+[colors.bright]
+black = '#a1a6c5'
+red = '#f52a65'
+green = '#587539'
+yellow = '#8c6c3e'
+blue = '#2e7de9'
+magenta = '#9854f1'
+cyan = '#007197'
+white = '#3760bf'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '#b15c00'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#c64343'

config/alacritty/theme-night.toml

@@ -0,0 +1,40 @@
+# TokyoNight Alacritty Colors: Storm
+# Default colors
+[colors.primary]
+background = '#24283b'
+foreground = '#c0caf5'
+
+#[colors.cursor]
+#cursor = '#c0caf5'
+#text = '#24283b'
+
+# Normal colors
+[colors.normal]
+black = '#1d202f'
+red = '#f7768e'
+green = '#9ece6a'
+yellow = '#e0af68'
+blue = '#7aa2f7'
+magenta = '#bb9af7'
+cyan = '#7dcfff'
+white = '#a9b1d6'
+
+# Bright colors
+[colors.bright]
+black = '#414868'
+red = '#f7768e'
+green = '#9ece6a'
+yellow = '#e0af68'
+blue = '#7aa2f7'
+magenta = '#bb9af7'
+cyan = '#7dcfff'
+white = '#c0caf5'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '#ff9e64'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#db4b4b'

config/alias

@@ -1,69 +1,10 @@
 #!/usr/bin/env bash
-# shellcheck source="../scripts/shared.sh"
-# shellcheck disable=1091,2139
-DOTFILES="$HOME/.dotfiles"
-
-# Get installed php versions from brew and setup aliases
-function x-set-php-aliases
-{
-  have brew && {
-    local php_versions=()
-    while IFS="" read -r line; do php_versions+=("$line"); done < <(brew_installed | grep '^php')
-
-    php_error_reporting='-d error_reporting=22527'
-
-    for version in "${php_versions[@]}"; do
-      # drop the dot from version (8.0 -> 80)
-      local php_abbr="${version//\./}"
-      # replace "php@" with "p" so "php@80" becomes "p80"
-      local php_alias="${php_abbr//php@/p}"
-
-      # Fetch the exec path once
-      php_exec="$(brew --prefix "$version")/bin/php"
-
-      # Raw PHP without error_reporting flag.
-      # shellcheck disable=SC2139
-      alias "${php_alias}"r="$php_exec"
-      # PHP with error_reporting flag.
-      # shellcheck disable=SC2139,SC2140
-      alias "$php_alias"="$php_exec $php_error_reporting"
-      # Local PHP Server.
-      # shellcheck disable=SC2139,SC2140
-      alias "${php_alias}s"="$php_exec -S localhost:9000"
-      # Use composer with specific PHP and error_reporting flag on.
-      # shellcheck disable=SC2139,SC2140
-      alias "${php_alias}c"="$php_exec $php_error_reporting $(which composer)"
-    done
-  }
-}
-
-if [[ $(uname) == 'Darwin' ]]; then
-
-  x-set-php-aliases
-
-  # Laravel Sail shortcut
-  alias sail='[ -f sail ] && bash sail || bash vendor/bin/sail'
-
-  # Flush Directory Service cache
-  alias flushdns="sudo dscacheutil -flushcache; sudo killall -HUP mDNSResponder"
-
-  # Lock the screen
-  alias afk="osascript -e 'tell application \"System Events\" to keystroke \"q\" using {command down,control down}'"
-
-  # Empty the Trash on all mounted volumes and the main HDD
-  # Also, clear Apple’s System Logs to improve shell startup speed
-  alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
-fi
-
-# Be nice
-alias please="sudo "
 
 # Color the grep output
-alias grep='grep --color'
+alias grep="grep --color"
 
-! have eza && alias ls='ls --color=auto'
-have eza && {
-  alias ls='eza -h -s=type --git --icons --group-directories-first'
+x-have eza && {
+  alias ls="eza -h -s=type --git --icons --group-directories-first"
 }
 
 # Easier navigation: .., ..., ....
@@ -74,6 +15,14 @@ alias ....="cd ../../.."
 # cd to git root directory
 alias cdgr='cd "$(git root)"'
 
+# interesting folders, and shortcuts
+alias .="cd $HOME"
+alias .b="cd $XDG_BIN_HOME"
+alias .c="cd $HOME/Code"
+alias .d="cd $DOTFILES"
+alias .dx="cd $DOTFILES;ks"
+alias .l="cd $HOME/.local"
+
 # Shortcuts for listing
 alias ll="ls -la"
 alias l="ls -a"
@@ -86,7 +35,7 @@ alias sl="ls"
 alias lsd="ls -lF | grep '^d'"
 
 # IP addresses
-alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
+alias x-ip="dig +short myip.opendns.com @resolver1.opendns.com"
 alias localip="ipconfig getifaddr en1"
 alias ips="ifconfig -a | grep -o 'inet6\? \(\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)\|[a-fA-F0-9:]\+\)' | sed -e 's/inet6* //'"
 
@@ -103,14 +52,15 @@ alias flush="dscacheutil -flushcache"
 # Update locatedb
 alias updatedb="sudo /usr/libexec/locate.updatedb"
 
-# Always return full history
-alias history="history 1"
-
 # tmux: automatically attach or create session with name 'main'
 alias tmux='tmux new-session -A -s main'
 # tmux: attach or create new session
 alias ta='tmux attach || tmux'
 
+# nvim
+alias nvim-ks='NVIM_APPNAME="nvim-kickstart" nvim'
+alias ks='NVIM_APPNAME="nvim-kickstart" nvim'
+
 # watch with: differences, precise, beep and color
 alias watchx='watch -dpbc'
 # delete .DS_Store files
@@ -135,80 +85,30 @@ alias code_scanner='docker run
   registry.gitlab.com/gitlab-org/ci-cd/codequality:"${CODEQUALITY_VERSION:-latest}"
   /code'
 
+alias trivy_scan='docker run -v /var/run/docker.sock:/var/run/docker.sock -v $HOME/Library/Caches:/root/.cache/ aquasec/trivy'
+
 alias zedit='$EDITOR ~/.dotfiles'
 
 alias irssi="irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_CONFIG_HOME/irssi"
 
-if [[ -f "$HOME/.aliases.local" ]]; then
-  # shellcheck disable=SC1091
-  source "$HOME/.aliases.local"
-fi
-
-alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
+alias wget="wget --hsts-file=$XDG_DATA_HOME/wget-hsts"
 alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
 
-# Alacritty preexec hook to update dynamic title
-preexec()
-{
-  print -Pn "\e]0;$1%~\a"
-}
+if [[ $(uname) == 'Darwin' ]]; then
 
-# Update dotfiles
-dfu()
-{
-  (
-    cd "$DOTFILES" && git pull --ff-only && ./install -q
-  )
-}
+  # Laravel Sail shortcut
+  alias sail='[ -f sail ] && bash sail || bash vendor/bin/sail'
 
-# Weather in Tampere, or other city
-weather()
-{
-  # https://github.com/chubin/wttr.in#usage
-  local city="${1:-Tampere}"
-  curl "http://wttr.in/${city// /+}?2nFQM&lang=fi"
-}
+  # Flush Directory Service cache
+  alias flushdns="sudo dscacheutil -flushcache; sudo killall -HUP mDNSResponder"
 
-# Docker
-ssh-docker()
-{
-  docker exec -it "$@" bash
-}
+  # Lock the screen
+  alias afk="osascript -e 'tell application \"System Events\" to keystroke \"q\" using {command down,control down}'"
 
-# All the dig info
-digga()
-{
-  dig +nocmd "$1" any +multiline +noall +answer
-}
+  # Empty the Trash on all mounted volumes and the main HDD
+  # Also, clear Apple's System Logs to improve shell startup speed
+  alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
 
-# Rector project to php version 8.2 by default.
-rector()
-{
-  local php="${1:-82}"
-  docker run -v "$(pwd)":/project rector/rector:latest process \
-    "/project/$1" \
-    --set "php${php}" \
-    --autoload-file /project/vendor/autoload.php
-}
-
-# Commit everything
-commit()
-{
-  commitMessage="$*"
-
-  if [ "$commitMessage" = "" ]; then
-    commitMessage="Automated commit"
-  fi
-
-  git add .
-  eval "git commit -a -m '${commitMessage}'"
-}
-
-scheduler()
-{
-  while :; do
-    php artisan schedule:run
-    echo "Sleeping 60 seconds..."
-    sleep 60
-  done
-}
+  # Using herd for php now, so this is not needed anymore
+  # x-set-php-aliases
+fi

config/amethyst/amethyst.yml

@@ -0,0 +1,364 @@
+---
+# Default settings for amethyst
+# Repo: `https://github.com/ianyh/Amethyst`
+#
+# Note due to issue 1419 (https://github.com/ianyh/Amethyst/issues/1419) some
+# config values may conflict and not work if they are the same as the default
+# values for amathyst. You can see these values on GitHub at
+# https://github.com/ianyh/Amethyst/blob/development/Amethyst/default.amethyst
+# If you're experiencing conflicts and the settings are the same as the default,
+# comment out the commands in this file.
+#
+# Move this file to: `~/.amethyst.yml`
+# In order to register changes restart Amethyst.
+# If you experience issues pulling in the changes you can also
+# quit Amethyst and run: `defaults delete com.amethyst.Amethyst.plist`
+# This removes the current preferences and causes Amethyst to restart
+# with default preferences and pull configs from this file.
+
+# layouts - Ordered list of layouts to use by layout key
+# (default tall, wide, fullscreen, and column).
+layouts:
+  - bsp
+  - tall
+  # - fullscreen
+  # - tall-right
+  # - wide
+  # - two-pane
+  # - middle-wide
+  - 3column-left
+  # - 3column-middle
+  # - 3column-right
+  # - 4column-left
+  # - 4column-right
+  # - column
+  # - row
+  # - floating
+  - widescreen-tall
+  # - widescreen-tall-right
+  # - bsp
+
+# First mod (default option + shift).
+mod1:
+  - option
+  - shift
+  # - control
+  # - command
+
+# Second mod (default option + shift + control).
+mod2:
+  - option
+  - shift
+  - control
+  # - command
+
+# Commands:
+# special key values
+# space
+# enter
+# up
+# right
+# down
+# left
+
+# special characters require quotes
+# '.'
+# ','
+
+# Move to the next layout in the list.
+cycle-layout:
+  mod: mod1
+  key: space
+
+# Move to the previous layout in the list.
+cycle-layout-backward:
+  mod: mod2
+  key: space
+
+# Shrink the main pane by a percentage of the screen
+# dimension as defined by window-resize-step.
+# Note that not all layouts respond to this command.
+shrink-main:
+  mod: mod1
+  key: h
+
+# Expand the main pane by a percentage of the screen dimension
+# as defined by window-resize-step. Note that not all layouts
+# respond to this command.
+expand-main:
+  mod: mod1
+  key: l
+
+# Increase the number of windows in the main pane.
+# Note that not all layouts respond to this command.
+increase-main:
+  mod: mod1
+  key: ','
+
+# Decrease the number of windows in the main pane.
+# Note that not all layouts respond to this command.
+decrease-main:
+  mod: mod1
+  key: '.'
+
+# General purpose command for custom layouts.
+# Functionality is layout-dependent.
+# command1:
+#   mod: <NONE>
+#   key: <NONE>
+# General purpose command for custom layouts.
+# Functionality is layout-dependent.
+# command2:
+#   mod: <NONE>
+#   key: <NONE>
+# General purpose command for custom layouts.
+# Functionality is layout-dependent.
+# command3:
+#   mod: <NONE>
+#   key: <NONE>
+# General purpose command for custom layouts.
+# Functionality is layout-dependent.
+# command4:
+#   mod: <NONE>
+#   key: <NONE>
+
+# Focus the next window in the list going counter-clockwise.
+focus-ccw:
+  mod: mod1
+  key: j
+
+# Focus the next window in the list going clockwise.
+focus-cw:
+  mod: mod1
+  key: k
+
+# Focus the main window in the list.
+focus-main:
+  mod: mod1
+  key: m
+
+# Focus the next screen in the list going counter-clockwise.
+focus-screen-ccw:
+  mod: mod1
+  key: p
+
+# Focus the next screen in the list going clockwise.
+focus-screen-cw:
+  mod: mod1
+  key: n
+
+# Move the currently focused window onto the next
+# screen in the list going counter-clockwise.
+swap-screen-ccw:
+  mod: mod2
+  key: h
+
+# Move the currently focused window onto the next
+# screen in the list going clockwise.
+swap-screen-cw:
+  mod: mod2
+  key: l
+
+# Swap the position of the currently focused window with
+# the next window in the list going counter-clockwise.
+swap-ccw:
+  mod: mod2
+  key: j
+
+# Swap the position of the currently focused window with
+# the next window in the list going clockwise.
+swap-cw:
+  mod: mod2
+  key: k
+
+# Swap the position of the currently focused window
+# with the main window in the list.
+swap-main:
+  mod: mod1
+  key: enter
+
+# Move focus to the n-th screen in the list; e.g.,
+# focus-screen-3 will move mouse focus to the 3rd screen.
+# Note that the main window in the given screen will be focused.
+#focus-screen-n:
+# focus-screen-<screen-number>:
+#   mod: mod1
+#   key: y
+# Move the currently focused window to the n-th screen;
+# e.g., throw-screen-3 will move the window to the 3rd screen.
+# throw-screen-n:
+# throw-screen-<screen-number>:
+#   mod: mod1
+#   key: u
+# Move the currently focused window to the n-th space;
+# e.g., throw-space-3 will move the window to the 3rd space.
+# throw-space-<screen-number>:
+#   mod: mod1
+#   key: i
+
+# Select tall layout
+#select-tall-layout:
+# mod: mod1
+# key: a
+
+# Select wide layout
+#select-wide-layout:
+#  mod: mod1
+#  key: s
+
+# Select fullscreen layout
+select-fullscreen-layout:
+  mod: mod1
+  key: d
+
+# Select column layout
+select-column-layout:
+  mod: mod1
+  key: f
+
+# Move the currently focused window to the space to the left.
+throw-space-left:
+  mod: mod2
+  key: left
+
+# Move currently the focused window to the space to the right.
+throw-space-right:
+  mod: mod2
+  key: right
+
+# Toggle the floating state of the currently focused window;
+# i.e., if it was floating make it tiled and if it was
+# tiled make it floating.
+toggle-float:
+  mod: mod1
+  key: t
+
+# Display the layout HUD with the current layout on each screen.
+display-current-layout:
+  mod: mod1
+  key: i
+
+# Turn on or off tiling entirely.
+toggle-tiling:
+  mod: mod1
+  key: t
+
+# Rerun the current layout's algorithm.
+reevaluate-windows:
+  mod: mod1
+  key: z
+
+# Turn on or off focus-follows-mouse.
+toggle-focus-follows-mouse:
+  mod: mod2
+  key: x
+
+# Automatically quit and reopen Amethyst.
+relaunch-amethyst:
+  mod: mod2
+  key: z
+
+# disable screen padding on builtin display
+disable-padding-on-builtin-display: false
+
+# Boolean flag for whether to add margins between
+# windows (default false).
+window-margins: false
+
+# Boolean flag for whether to set window margins if there is
+# only one window on the screen, assuming window margins
+# are enabled (default false).
+smart-window-margins: true
+
+# # Add 10px margin between windows
+# window-margins: true
+# window-margin-size: 5
+# The size of the margins between windows (in px, default 0).
+window-margin-size: 0
+
+# The max number of windows that may be visible on a screen
+# at one time before additional windows are minimized.
+# A value of 0 disables the feature.
+window-max-count: 0
+
+# The smallest height that a window can be sized to
+# regardless of its layout frame (in px, default 0).
+window-minimum-height: 0
+
+# The smallest width that a window can be sized to
+# regardless of its layout frame (in px, default 0)
+window-minimum-width: 0
+
+# List of bundle identifiers for applications to either be automatically
+# floating or automatically tiled based on floating-is-blacklist (default []).
+floating: []
+
+# Boolean flag determining behavior of the floating list.
+# true if the applications should be floating and all others tiled.
+# false if the applications should be tiled and all others floating (default true).
+floating-is-blacklist: false
+
+# true if screen frames should exclude the status bar.
+# false if the screen frames should include the status bar (default false).
+ignore-menu-bar: false
+
+# true if windows smaller than a 500px square should
+# be floating by default (default true)
+float-small-windows: true
+
+# true if the mouse should move position to the center of a window
+# when it becomes focused (default false).
+# Note that this is largely incompatible with focus-follows-mouse.
+mouse-follows-focus: false
+
+# true if the windows underneath the mouse should become focused as
+# the mouse moves (default false). Note that this is largely
+# incompatible with mouse-follows-focus
+focus-follows-mouse: false
+
+# true if dragging and dropping windows on to each other
+# should swap their positions (default false).
+mouse-swaps-windows: true
+
+# true if changing the frame of a window with the mouse should update the
+# layout to accommodate the change (default false).
+# Note that not all layouts will be able to respond to the change.
+mouse-resizes-windows: true
+
+# true to display the name of the layout when a new layout is selected (default true).
+enables-layout-hud: true
+
+# true to display the name of the layout when moving to a new space (default true).
+enables-layout-hud-on-space-change: true
+
+# true to get updates to beta versions of the software (default false).
+use-canary-build: false
+
+# true to insert new windows into the first position and
+# false to insert new windows into the last position (default false).
+new-windows-to-main: false
+
+# true to automatically move to a space when throwing a window to it (default true).
+follow-space-thrown-windows: true
+
+# The integer percentage of the screen dimension to increment
+# and decrement main pane ratios by (default 5).
+window-resize-step: 5
+
+# Padding to apply between windows and the left edge of the screen (in px, default 0).
+screen-padding-left: 0
+
+# Padding to apply between windows and the right edge of the screen (in px, default 0).
+screen-padding-right: 0
+
+# Padding to apply between windows and the top edge of the screen (in px, default 0).
+screen-padding-top: 0
+
+# Padding to apply between windows and the bottom edge of the screen (in px, default 0).
+screen-padding-bottom: 0
+
+# true to maintain layout state across application executions (default true).
+restore-layouts-on-launch: true
+
+# true to display some optional debug information in the layout HUD (default false).
+debug-layout-info: true

config/amethyst/layouts/almost-maximize.js

@@ -0,0 +1,35 @@
+/**
+ * Almost Maximize
+ * Almost maximizes the window to the screen, leaving a small margin.
+ *
+ * @author Ville Viklund <https://github.com/ville6000>
+ *
+ * @param {Object} windows - All windows in the current space.
+ * @param {Object} screenFrame - The frame of the current screen.
+ * @param {Object} state - The state of the current space.
+ * @param {Object} extendedFrames - The frames of the windows in the current space.
+ * @return {Object} - The frames for the windows in the current space.
+ */
+function layout() {
+  return {
+    name: 'Almost Maximize',
+    getFrameAssignments: (windows, screenFrame, state, extendedFrames) => {
+      const width = screenFrame.width * 0.95
+      const height = screenFrame.height * 0.95
+      const x = (screenFrame.width - width) / 2
+      const y = (screenFrame.height - height) / 2
+      const windowFrames = {}
+
+      windows.forEach(window => {
+        windowFrames[window.id] = {
+          Y: screenFrame.y + y,
+          x: screenFrame.x + x,
+          width,
+          height,
+        }
+      })
+
+      return windowFrames
+    },
+  }
+}

config/asdf/asdfrc

@@ -0,0 +1,5 @@
+# See the docs for explanations: https://asdf-vm.com/manage/configuration.html
+
+legacy_version_file=yes
+use_release_candidates=no
+concurrency=auto

config/asdf/cargo-packages

@@ -0,0 +1,21 @@
+// A cargo subcommand for checking and applying
+// updates to installed executables
+cargo-update
+// Cargo cache management utility
+cargo-cache
+// An incremental parsing system for programming tools
+tree-sitter-cli
+// a subprocess caching utility
+bkt
+// a structural diff that understands syntax
+difftastic
+// A simple, fast and user-friendly alternative to 'find'
+fd-find
+// recursively searches directories for a
+// regex pattern while respecting your gitignore
+ripgrep
+// A version manager for neovim
+bob-nvim
+// bottom, btm - A cross-platform graphical process/system monitor with
+// a customizable interface and a multitude of features.
+bottom

config/asdf/golang-packages

@@ -0,0 +1,21 @@
+// These are golang packages I use,
+// so they should be available with all versions
+
+// sysadmin/scripting utilities, distributed as a single binary
+github.com/skx/sysbox@release-0.18.0
+// Git Profile allows you to switch between user profiles in git repos
+github.com/dotzero/git-profile@v1.4.0
+// An extensible command line tool or library to format yaml files.
+github.com/google/yamlfmt/cmd/yamlfmt@v0.13.0
+// Parsing HTML at the command line
+github.com/ericchiang/pup@v0.4.0
+// HTML to Markdown converter
+github.com/suntong/html2md@v1.5.0
+// cheat allows you to create and view interactive cheatsheets on the cli.
+github.com/cheat/cheat/cmd/cheat@4.4.2
+// Render markdown on the CLI, with pizzazz! 💅
+github.com/charmbracelet/glow@v1.5.1
+// Static checker for GitHub Actions workflow files
+github.com/rhysd/actionlint/cmd/actionlint@v1.7.1
+// Cleans up your $HOME from those pesky dotfiles
+github.com/doron-cohen/antidot@v0.6.3

config/asdf/npm-packages

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

config/asdf/plugin-versions

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

config/asdf/tool-versions

@@ -0,0 +1,29 @@
+1password-cli 2.29.0
+age 1.2.0
+asdf-plugin-manager 1.3.1
+bottom 0.9.7
+dotenv-linter 3.3.0
+editorconfig-checker 2.8.0
+eza 0.18.23
+fd 10.1.0
+github-cli 2.53.0
+golang 1.22.5
+hadolint 2.12.0
+kubectl 1.30.3
+lazygit 0.43.1
+neovim system
+nodejs 22.5.1
+pipx 1.6.0
+pre-commit 3.8.0
+ripgrep 14.1.0
+rust 1.79.0
+semgrep system
+shellcheck 0.10.0
+shfmt 3.8.0
+terraform-ls 0.33.3
+terraform-lsp 0.0.12
+terragrunt 0.64.2
+tf-summarize 0.3.10
+vault 1.17.2+ent
+yamllint 1.35.1
+yq 4.44.2

config/cheat/conf.yml

@@ -1,12 +1,13 @@
+---
 # The editor to use with 'cheat -e <sheet>'. Defaults to $EDITOR or $VISUAL.
 # editor: $EDITOR
 
 # Should 'cheat' always colorize output?
-colorize: true
+colorize: false
 # Which 'chroma' colorscheme should be applied to the output?
 # Options are available here:
 #   https://github.com/alecthomas/chroma/tree/master/styles
-style: 'catppuccin'
+style: 'tokyonight'
 # Which 'chroma' "formatter" should be applied?
 # One of: "terminal", "terminal256", "terminal16m"
 formatter: terminal256
@@ -37,7 +38,7 @@ pager: less -FRX
 #
 # This is very useful when you would like to maintain, for example, a
 # "pristine" repository of community cheatsheets on one cheatpath, and an
-# editable personal reponsity of cheatsheets on another cheatpath.
+# editable personal repository of cheatsheets on another cheatpath.
 #
 # Cheatpaths can be also configured to automatically apply tags to cheatsheets
 # on certain paths, which can be useful for querying purposes.
@@ -71,7 +72,7 @@ cheatpaths:
     tags: [pure-bash-bible]
     readonly: true
   - name: tldr
-    path: ~/.dotfiles/config/cheat/cheatsheets/tldr
+    path: ~/.dotfiles/config/cheat/cheatsheets/tldr/tldr
     tags: [tldr]
     readonly: true
 # While it requires no configuration here, it's also worth noting that

config/exports

@@ -2,7 +2,455 @@
 # shellcheck shell=bash
 # vim: filetype=zsh
 
-source "$DOTFILES/config/exports-shell"
-source "$DOTFILES/config/exports-apps"
+# Set XDG directories if not already set
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME="$HOME/.config"
+[ -z "$XDG_DATA_HOME" ] && export XDG_DATA_HOME="$HOME/.local/share"
+[ -z "$XDG_CACHE_HOME" ] && export XDG_CACHE_HOME="$HOME/.cache"
+[ -z "$XDG_STATE_HOME" ] && export XDG_STATE_HOME="$HOME/.local/state"
+[ -z "$XDG_BIN_HOME" ] && export XDG_BIN_HOME="$HOME/.local/bin"
+
+# if DOTFILES is not set, set it to the default location
+[ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles"
+
+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"
+
+if ! command -v msg &> /dev/null; then
+  # Function to print messages if VERBOSE is enabled
+  # $1 - message (string)
+  msg()
+  {
+    [[ "$VERBOSE" -eq 1 ]] && echo "-> $1"
+    return 0
+  }
+fi
+
+# Cache commands using bkt if installed
+if command -v bkt &> /dev/null; then
+  bkt()
+  {
+    command bkt --cache-dir="$XDG_CACHE_HOME/bkt" "$@"
+  }
+else
+  # If bkt isn't installed, skip its arguments and just execute directly.
+  # Optionally write a msg to stderr suggesting users install bkt.
+  bkt()
+  {
+    while [[ "$1" == --* ]]; do shift; done
+    "$@"
+  }
+fi
+
+# Shorthand for checking if the system has the bin in path,
+# this version does not use caching.
+# Usage: have_command php && php -v
+have_command()
+{
+  [ -z "$1" ] && {
+    echo "Usage: have_command <command>"
+    return 1
+  }
+
+  command -v "$1" &> /dev/null
+}
+
+# Shorthand for checking if the system has the bin in path,
+# this version uses caching.
+# Usage: have php && php -v
+have()
+{
+  bkt -- which "$1" &> /dev/null
+}
+
+# Function to run dark-notify and change alacritty theme
+# It uses flock to prevent running multiple instances.
+# Install flock with `brew install flock` on macOS.
+darknotify_alacritty()
+{
+  x-have flock && [[ -f /tmp/dark-notify-alacritty.lock ]] && return
+  x-have dark-notify && {
+    # subprocess is used to prevent the command from showing it was backgrounded
+    (
+      flock /tmp/dark-notify-alacritty.lock dark-notify \
+        -c "$HOME/.dotfiles/local/bin/x-change-alacritty-theme" &
+    ) &> /dev/null
+  }
+  return 0
+}
+darknotify_alacritty
+
+# Function to list installed Homebrew packages using bkt caching
+brew_installed()
+{
+  bkt -- brew list
+}
+
+# Shorthand for checking if a Homebrew package is installed
+# Usage: have_brew php && php -v
+have_brew()
+{
+  ! have brew && return 125
+
+  if bkt -- brew list "$1" &> /dev/null; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+# Alacritty preexec hook to update dynamic title
+preexec()
+{
+  print -n -P "\e]0;$1%~\a"
+}
+
+# Update dotfiles
+dfu()
+{
+  (
+    cd "$DOTFILES" && git pull --ff-only && ./install
+  )
+}
+
+# Weather in Tampere, or other city
+weather()
+{
+  # https://github.com/chubin/wttr.in#usage
+  local city="${1:-Tampere}"
+  curl "http://wttr.in/${city// /+}?2nFQM&lang=fi"
+}
+
+# Docker
+ssh_docker()
+{
+  docker exec -it "$@" bash
+}
+
+# Rector project to php version 8.2 by default.
+rector()
+{
+  local php="${1:-82}"
+  docker run -v "$(pwd)":/project rector/rector:latest process \
+    "/project/$1" \
+    --set "php${php}" \
+    --autoload-file /project/vendor/autoload.php
+}
+
+# Commit everything
+commit()
+{
+  local commitMessage="$*"
+
+  if [ -z "$commitMessage" ]; then
+    commitMessage="Automated commit"
+  fi
+
+  git add .
+  git commit -a -m "$commitMessage"
+}
+
+scheduler()
+{
+  while :; do
+    php artisan schedule:run
+    echo "Sleeping 60 seconds..."
+    sleep 60
+  done
+}
+
+# Run command silently
+# Usage: silent uptime
+silent()
+{
+  "$@" >&/dev/null
+}
+
+# Check if a file contains non-ascii characters
+nonascii()
+{
+  LC_ALL=C grep -n '[^[:print:][:space:]]' "${@}"
+}
+
+# Remove non-ascii characters from string
+# Usage: strip_nonascii "string"
+strip_nonascii()
+{
+  echo "$1" | LC_ALL=C sed 's/[^[:print:][:space:]]//g'
+}
+
+# Slugify a string
+# Usage: slugify "string"
+slugify()
+{
+  echo "$1" | iconv -t ascii//TRANSLIT | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | tr A-Z a-z
+}
+
+# https://stackoverflow.com/a/85932
+fn_exists()
+{
+  declare -f -F "$1" > /dev/null
+  return $?
+}
+
+# Creates a random string
+rnd()
+{
+  echo $RANDOM | md5sum | head -c 20
+}
+
+# return sha256sum for file
+# $1 - filename (string)
+get_sha256sum()
+{
+  sha256sum "$1" | head -c 64
+}
+
+# Replaceable file
+#
+# $1 - filename (string)
+# $2 - filename (string)
+#
+# Returns 1 when replaceable, 0 when not replaceable.
+replacable()
+{
+  FILE1="$1"
+  FILE2="$2"
+
+  [[ ! -r "$FILE1" ]] && {
+    [[ $VERBOSE -eq 1 ]] && msg_err "File 1 ($FILE1) does not exist"
+    return 0
+  }
+  [[ ! -r "$FILE2" ]] && {
+    [[ $VERBOSE -eq 1 ]] && msg_err "File 2 ($FILE2) does not exist, replaceable"
+    return 1
+  }
+
+  FILE1_HASH=$(get_sha256sum "$FILE1")
+  FILE2_HASH=$(get_sha256sum "$FILE2")
+
+  [[ $FILE1_HASH = "" ]] && {
+    [[ $VERBOSE -eq 1 ]] && msg_err "Could not get hash for file 1 ($FILE1)"
+    return 0
+  }
+  [[ $FILE2_HASH = "" ]] && {
+    [[ $VERBOSE -eq 1 ]] && msg_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"
+    return 0
+  }
+
+  [[ $VERBOSE -eq 1 ]] && msg_warn "Files do not match ($FILE1_HASH != $FILE2_HASH), replaceable"
+
+  return 1
+}
+
+export COMPLETION_WAITING_DOTS=true
+
+# Bash completion file location
+export BASH_COMPLETION_USER_FILE="${XDG_CONFIG_HOME}/bash-completion/bash_completion"
+
+# History env variables
+export HIST_STAMPS="yyyy-mm-dd"
+# Larger bash history (allow 32³ entries; default is 500)
+export HISTSIZE=32768
+export HISTFILESIZE=$HISTSIZE
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+export HISTCONTROL=ignoreboth
+# Make some commands not show up in history
+export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
+# And include the parameter for ZSH
+export HISTORY_IGNORE="(ls|cd|cd -|pwd|exit|date|* --help)"
+
+# Less history location
+export LESSHISTFILE="$XDG_STATE_HOME"/less/history
+
+# Highlight section titles in manual pages
+# export LESS_TERMCAP_md="$ORANGE"
+
+# zsh autoloaded terminfo
+export TERMINFO="${XDG_DATA_HOME}/terminfo"
+export TERMINFO_DIRS="${XDG_DATA_HOME}/terminfo":/usr/share/terminfo
+
+# Don't clear the screen after quitting a manual page
+export MANPAGER="less -X"
+
+# Always enable colored `grep` output
+export GREP_OPTIONS="--color=auto"
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+hash shopt 2> /dev/null && shopt -s checkwinsize
+
+# Antigen configuration
+# https://github.com/zsh-users/antigen/wiki/Configuration
+msg "Setting up Antigen configuration"
+export ADOTDIR="$XDG_DATA_HOME/antigen"
+export ANTIGEN_CACHE="$XDG_CACHE_HOME/antigen"
+export ANTIGEN_SYSTEM_RECEIPT_F=".local/share/antigen/antigen_system_lastupdate"
+export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
+
+# Ansible configuration
+# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
+msg "Setting up Ansible configuration"
+export ANSIBLE_HOME="$XDG_CONFIG_HOME/ansible"
+export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible.cfg"
+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}"
+# This seems wrong, but `asdf info` and `versions.bash` differ on path resolution.
+export ASDF_DEFAULT_TOOL_VERSIONS_FILENAME=".config/asdf/tool-versions"
+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_CRATE_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/cargo-packages"
+export PATH="${ASDF_DIR}/bin:${PATH}"
+
+# bob manages nvim versions
+msg "Setting up bob configuration"
+x-path-prepend "$XDG_DATA_HOME/bob/nvim-bin"
+
+# bkt (shell command caching tool) configuration
+msg "Setting up bkt configuration"
+export BKT_TTL=1m
+
+# brew, https://docs.brew.sh/Manpage
+msg "Setting up Homebrew configuration"
+export HOMEBREW_NO_ANALYTICS=true
+export HOMEBREW_NO_ENV_HINTS=true
+export HOMEBREW_BUNDLE_MAS_SKIP=true
+export HOMEBREW_BUNDLE_FILE="$XDG_CONFIG_HOME/homebrew/Brewfile"
+x-have brew && {
+  eval "$(brew shellenv)"
+}
+
+# composer, https://getcomposer.org/
+msg "Setting up Composer configuration"
+export COMPOSER_HOME="$XDG_STATE_HOME/composer"
+export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
+export PATH="$COMPOSER_BIN:$PATH"
+
+# docker, https://docs.docker.com/engine/reference/commandline/cli/
+msg "Setting up Docker configuration"
+export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
+x-dc "$DOCKER_CONFIG"
+# Docker: Disable snyk ad
+export DOCKER_SCAN_SUGGEST=false
+
+# ffmpeg
+# https://ffmpeg.org/ffmpeg.html
+msg "Setting up FFmpeg configuration"
+export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
+x-have ffmpeg && x-dc "$FFMPEG_DATADIR"
+
+# GnuPG
+# https://gnupg.org/documentation/manuals/gnupg/Invoking-GPG.html
+msg "Setting up GnuPG configuration"
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+
+# Go
+# https://golang.org/doc/code.html
+msg "Setting up Go configuration"
+export GOPATH="$XDG_DATA_HOME/go"
+export GOBIN="$XDG_BIN_HOME"
+
+# nb, https://xwmx.github.io/nb/
+msg "Setting up nb configuration"
+export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
+export NB_DIR="$XDG_STATE_HOME/nb"
+
+# NPM: Add npm packages to path
+msg "Setting up NPM configuration"
+x-have node && {
+  NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
+  export PATH="$NVM_NODE_BIN_DIR:$PATH"
+}
+
+# oh-my-posh (omp) configuration
+msg "Setting up oh-my-posh configuration"
+export OHMYPOSH_CFG="$DOTFILES/config/omp/own.toml"
+
+# op (1Password cli) is present
+msg "Setting up 1Password CLI configuration"
+export OP_CACHE="$XDG_STATE_HOME/1password"
+
+# Python
+#
+# pyenv, python environments
+msg "Setting up Python configuration"
+export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
+export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
+export PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
+x-have pyenv && {
+  eval "$(pyenv init -)"
+}
+
+# Ruby
+#
+# including: bundler, rbenv
+msg "Setting up Ruby configuration"
+export GEM_HOME="${XDG_DATA_HOME}"/gem
+export GEM_SPEC_CACHE="${XDG_CACHE_HOME}"/gem
+export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle
+export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
+export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle
+export RBENV_ROOT="$XDG_STATE_HOME/rbenv"
+x-dc "$RBENV_ROOT"
+x-have gem && export PATH="${GEM_HOME}/bin:$PATH"
+
+# Rust / cargo
+msg "Setting up Rust/Cargo configuration"
+export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export PATH="$CARGO_HOME/bin:$PATH"
+
+# screen
+# https://www.gnu.org/software/screen/manual/screen.html
+msg "Setting up screen configuration"
+export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
+
+# sonarlint
+# https://www.sonarlint.org/
+msg "Setting up Sonarlint configuration"
+export SONARLINT_USER_HOME="$XDG_DATA_HOME/sonarlint"
+
+# terraform
+# https://www.terraform.io/docs/cli/config/config-file.html
+# https://www.terraform.io/docs/cli/config/environment-variables.html
+msg "Setting up Terraform configuration"
+export TF_DATA_DIR="$XDG_STATE_HOME/terraform"
+export TF_CLI_CONFIG_FILE="$XDG_CONFIG_HOME/terraform/terraformrc"
+export TF_PLUGIN_CACHE_DIR="$XDG_CACHE_HOME/terraform/plugin-cache"
+
+# tldr / tealdeer
+msg "Setting up tldr configuration"
+export TEALDEER_CONFIG_DIR="$XDG_CONFIG_HOME/tealdeer/"
+
+# tmux
+# https://tmux.github.io/
+msg "Setting up tmux configuration"
+export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
+
+# wakatime, https://github.com/wakatime/wakatime-cli
+msg "Setting up Wakatime configuration"
+export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
+x-dc "$WAKATIME_HOME"
+
+# Misc
+msg "Setting up miscellaneous configuration"
+export CHEAT_USE_FZF=true
+export SQLITE_HISTORY="${XDG_CACHE_HOME}/sqlite_history"
 
-have nvim && export EDITOR="nvim"

config/exports-apps

@@ -1,120 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck shell=bash
-# shellcheck enable=external-sources
-# shellcheck disable=1091,2139
-# vim: filetype=bash
-
-# Antigen configuration
-# https://github.com/zsh-users/antigen/wiki/Configuration
-export ADOTDIR="$XDG_DATA_HOME/antigen"
-export ANTIGEN_SYSTEM_RECEIPT_F=".local/share/antigen/antigen_system_lastupdate"
-export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
-
-# Ansible configuration
-# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
-export ANSIBLE_HOME="$XDG_CONFIG_HOME/ansible"
-export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible.cfg"
-export ANSIBLE_GALAXY_CACHE_DIR="$XDG_CACHE_HOME/ansible/galaxy_cache"
-x-dc "$ANSIBLE_HOME"
-x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
-
-export ANDROID_HOME="$XDG_DATA_HOME/android"
-
-# bob manages nvim versions
-path_prepend "$XDG_DATA_HOME/bob/nvim-bin"
-have nvim && export EDITOR="nvim"
-
-export HOMEBREW_NO_ENV_HINTS=true
-
-# composer, https://getcomposer.org/
-export COMPOSER_HOME="$XDG_STATE_HOME/composer"
-export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
-path_append "$COMPOSER_BIN"
-
-# docker, https://docs.docker.com/engine/reference/commandline/cli/
-export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
-x-dc "$DOCKER_CONFIG"
-# Docker: Disable snyk ad
-export DOCKER_SCAN_SUGGEST=false
-
-# ffmpeg
-export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
-have ffmpeg && x-dc "$FFMPEG_DATADIR"
-
-# GnuPG
-export GNUPGHOME="$XDG_DATA_HOME/gnupg"
-
-# Go
-export GOPATH="$XDG_DATA_HOME/go"
-export GOBIN="$XDG_BIN_HOME"
-
-# nb, https://xwmx.github.io/nb/
-export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
-export NB_DIR="$XDG_STATE_HOME/nb"
-
-# NPM: Add npm packages to path
-have node && {
-  NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
-  path_append "$NVM_NODE_BIN_DIR"
-}
-
-# op (1Password cli) is present
-export OP_CACHE="$XDG_STATE_HOME/1password"
-have op && {
-  [ "$DOTFILES_CURRENT_SHELL" = "zsh" ] && {
-    eval "$(op completion zsh)"
-    compdef _op op
-  }
-}
-
-# Python
-#
-# pyenv, python environments
-export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
-export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
-have pyenv && {
-  path_append "$PYENV_ROOT/shims"
-  eval "$(pyenv init -)"
-}
-
-# Ruby
-#
-# including: bundler, rbenv
-export GEM_HOME="${XDG_DATA_HOME}"/gem
-export GEM_SPEC_CACHE="${XDG_CACHE_HOME}"/gem
-export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle
-export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
-export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle
-export RBENV_ROOT="$XDG_STATE_HOME/rbenv"
-x-dc "$RBENV_ROOT"
-have gem && path_append "${GEM_HOME}/bin"
-have rbenv && {
-  [ "$DOTFILES_CURRENT_SHELL" = "zsh" ] && eval "$(rbenv init - zsh)"
-  [ "$DOTFILES_CURRENT_SHELL" = "bash" ] && eval "$(rbenv init - bash)"
-}
-
-# Rust / cargo
-export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-export CARGO_HOME="$XDG_DATA_HOME/cargo"
-path_append "$CARGO_HOME/bin"
-
-# screen
-export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
-
-# sonarlint
-export SONARLINT_USER_HOME="$XDG_DATA_HOME/sonarlint"
-
-# tldr / tealdeer
-export TEALDEER_CONFIG_DIR="$XDG_CONFIG_HOME/tealdeer/"
-
-# tmux
-export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
-
-# wakatime, https://github.com/wakatime/wakatime-cli
-export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
-x-dc "$WAKATIME_HOME"
-
-# Misc
-export BAT_THEME="ansi"
-export CHEAT_USE_FZF=true
-export SQLITE_HISTORY="$XDG_CACHE_HOME"/sqlite_history

config/exports-lakka

@@ -1,20 +1,25 @@
 # lakka exports
 
 ## LUA
-have luarocks && $(luarocks path --bin)
+if command -v luarocks &> /dev/null; then
+  eval "$(luarocks path --bin)"
+fi
 
-path_prepend "$HOME/.local/go/bin"
+export PATH="$HOME/.local/go/bin:$PATH"
 
-alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state'
+alias logrotate='/usr/sbin/logrotate -s "$HOME/logs/state"'
 alias nano='nano -wS -$'
 alias gpg=gpg2
 
 ACME_PATH="$HOME/.acme.sh"
 # shellcheck source=$HOME/.acme.sh/acme.sh.env
-[[ -s "$ACME_PATH/acme.sh.env" ]] && . "$ACME_PATH/acme.sh.env"
+if [[ -s "$ACME_PATH/acme.sh.env" ]]; then
+  source "$ACME_PATH/acme.sh.env"
+fi
 
 export RVM_PATH="$HOME/.rvm"
 export PATH="$RVM_PATH/bin:$PATH"
 # shellcheck source=$HOME/.rvm/scripts/rvm
-[[ -s "$RVM_PATH/scripts/rvm" ]] && source "$RVM_PATH/scripts/rvm" # Load RVM into a shell session *as a function*
-
+if [[ -s "$RVM_PATH/scripts/rvm" ]]; then
+  source "$RVM_PATH/scripts/rvm" # Load RVM into a shell session *as a function*
+fi

config/exports-shell

@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck shell=bash
-# shellcheck disable=1091,2046
-# vim: filetype=bash
-
-export DOTFILES="$HOME/.dotfiles"
-
-# Explicitly set XDG folders
-# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
-
-# custom variables
-export XDG_BIN_HOME="$HOME/.local/bin"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_RUNTIME_DIR="$HOME/.local/run"
-
-export LC_ALL=fi_FI.UTF-8
-
-# Bash completion file location
-export BASH_COMPLETION_USER_FILE="${XDG_CONFIG_HOME}/bash-completion/bash_completion"
-
-# History env variables
-export HIST_STAMPS="yyyy-mm-dd"
-# Larger bash history (allow 32³ entries; default is 500)
-export HISTSIZE=32768
-export HISTFILESIZE=$HISTSIZE
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-export HISTCONTROL=ignoreboth
-# Make some commands not show up in history
-export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
-# And include the parameter for ZSH
-export HISTORY_IGNORE="(ls|cd|cd -|pwd|exit|date|* --help)"
-
-# Less history location
-export LESSHISTFILE="$XDG_STATE_HOME"/less/history
-
-# Highlight section titles in manual pages
-export LESS_TERMCAP_md="$ORANGE"
-
-# zsh autoloaded terminfo
-export TERMINFO="$XDG_DATA_HOME"/terminfo
-export TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo:/usr/share/terminfo
-
-# Don’t clear the screen after quitting a manual page
-export MANPAGER="less -X"
-
-# Always enable colored `grep` output
-export GREP_OPTIONS="--color=auto"
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-hash shopt 2> /dev/null && shopt -s checkwinsize
-
-# Set dircolors based on the file, if it exists
-have dircolors && eval $(dircolors "$XDG_CONFIG_HOME/dircolors")
-
-# If we are using zsh, color our dir lists and such
-if [ "$DOTFILES_CURRENT_SHELL" = "-zsh" ]; then
-  [[ $ZSH_VERSION != "" ]] && {
-    autoload -U colors zsh/terminfo compinit
-    colors
-    compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
-
-    x-dc "$XDG_CACHE_HOME/zsh"
-    x-dc "$XDG_STATE_HOME/zsh"
-    export HISTFILE="$XDG_STATE_HOME/zsh/history"
-    zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
-    zstyle ':completion:*' list-colors "$LS_COLORS"
-
-    # Load iterm2 shell integration
-    # https://iterm2.com/documentation-shell-integration.html
-    [[ -f "$XDG_BIN_HOME/iterm2_shell_integration.zsh" ]] \
-      && source "$XDG_BIN_HOME/iterm2_shell_integration.zsh"
-  }
-fi
-
-# If we are using bash
-if [ "$DOTFILES_CURRENT_SHELL" = "bash" ]; then
-  # shellcheck source=../config/fzf/fzf.bash
-  [ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&
-    source "${DOTFILES}/config/fzf/fzf.bash"
-fi

config/functions

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-#
-# shell functions

config/gh-changelog/config.yaml

@@ -1,3 +1,4 @@
+---
 check_for_updates: true
 excluded_labels:
   - maintenance

config/gh/config.yml

@@ -1 +1,3 @@
+---
 git_protocol: https
+version: '1'

config/gh/hosts.yml

@@ -1,3 +1,6 @@
+---
 github.com:
-  user: ivuorinen
   git_protocol: https
+  users:
+    ivuorinen:
+  user: ivuorinen

config/git/gitignore

@@ -18,3 +18,4 @@ composer.phar
 wp_*.sh
 auth.json
 dfm.sh
+.scannerwork

config/homebrew/Brewfile

@@ -1,7 +1,9 @@
 tap "1password/tap"
 tap "anchore/grype"
+tap "cormacrelf/tap"
 tap "ddosify/tap"
 tap "dm3ch/tap"
+tap "doron-cohen/tap"
 tap "gesquive/tap"
 tap "github/gh"
 tap "homebrew/autoupdate"
@@ -9,17 +11,24 @@ tap "homebrew/bundle"
 tap "homebrew/cask-fonts"
 tap "homebrew/services"
 tap "jesseduffield/lazygit"
+tap "k8sgpt-ai/k8sgpt"
+tap "keith/formulae"
 tap "mongodb/brew"
+tap "reviewdog/tap"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
 tap "teamookla/speedtest"
 tap "xwmx/taps"
 # Run your GitHub Actions locally
 brew "act"
+# Simple, modern, secure file encryption
+brew "age"
 # Mozilla CA certificate store
 brew "ca-certificates"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.11"
+# Mozilla CA bundle for Python
+brew "certifi"
+# Cryptographic recipes and primitives for Python
+brew "cryptography"
 # YAML Parser
 brew "libyaml"
 # Automate deployment, configuration, and upgrading
@@ -48,30 +57,26 @@ brew "apr"
 brew "apr-util"
 # Password hashing library and CLI utility
 brew "argon2"
-# Open Source Kubernetes Marketplace
-brew "arkade"
-# Automatic configure script builder
-brew "autoconf"
-# GNU multiple precision arithmetic library
-brew "gmp"
-# GNU File, Shell, and Text utilities
-brew "coreutils"
-# Extendable version manager with support for Ruby, Node.js, Erlang & more
-brew "asdf"
 # Spell checker with better logic than ispell
 brew "aspell"
-# Official Amazon AWS command-line interface
-brew "awscli"
+# Automatic configure script builder
+brew "autoconf"
+# Collection of over 500 reusable autoconf macros
+brew "autoconf-archive"
+# GNU multiple precision arithmetic library
+brew "gmp"
+# Manage compile and link flags for libraries
+brew "pkg-config"
+# Automated text file generator
+brew "autogen"
+# Tool for generating GNU Standards-compliant Makefiles
+brew "automake"
 # Bourne-Again SHell, a UNIX command interpreter
 brew "bash"
 # Clone of cat(1) with syntax highlighting and Git integration
 brew "bat"
-# C/C++ and Java libraries for Unicode and globalization
-brew "icu4c"
 # Yet another cross-platform graphical process/system monitor
 brew "bottom"
-# Switch Apache / Valet / CLI configs between PHP versions
-brew "brew-php-switcher"
 # Software library to render fonts
 brew "freetype"
 # XML-based font configuration API for X Windows
@@ -80,38 +85,22 @@ brew "fontconfig"
 brew "gettext"
 # Core application library for C
 brew "glib"
-# Manage compile and link flags for libraries
-brew "pkg-config"
 # Human-friendly and fast alternative to cut and (sometimes) awk
 brew "choose-rust"
 # Cross-platform make
 brew "cmake"
-# Get, unpack, build, and install modules from CPAN
-brew "cpanminus"
+# GNU File, Shell, and Text utilities
+brew "coreutils"
 # Open source suite of directory software
 brew "openldap"
 # Get a file from an HTTP, HTTPS or FTP server
 brew "curl"
-# Diff that understands syntax
-brew "difftastic"
-# Tool for exploring each layer in a docker image
-brew "dive"
 # Lightweight DNS forwarder and DHCP server
 brew "dnsmasq"
-# Command-line DNS client
-brew "dog"
 # Lightning-fast linter for .env files written in Rust
 brew "dotenv-linter"
-# Tool to verify that your files are in harmony with your .editorconfig
-brew "editorconfig-checker"
-# Useful examples at the command-line
-brew "eg-examples"
-# OpenType text shaping engine
-brew "harfbuzz"
-# Development kit for the Java programming language
-brew "openjdk"
-# Run arbitrary commands when files change
-brew "entr"
+# Spellchecker wrapping library
+brew "enchant"
 # Perl lib for reading and writing EXIF metadata
 brew "exiftool"
 # Simple, fast and user-friendly alternative to find
@@ -127,7 +116,7 @@ brew "fzf"
 # Graphics library to dynamically manipulate images
 brew "gd"
 # Disk usage analyzer with console interface written in Go
-brew "gdu", link: false
+brew "gdu"
 # GitHub command-line tool
 brew "gh"
 # Distributed revision control system
@@ -138,8 +127,6 @@ brew "git-crypt"
 brew "git-extras"
 # See your latest local git branches, formatted real fancy
 brew "git-recent"
-# Open-source GitLab command-line tool
-brew "glab"
 # Render markdown on the CLI
 brew "glow"
 # GNU implementation of the famous stream editor
@@ -158,6 +145,10 @@ brew "gpgme"
 brew "gpg-tui"
 # 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
@@ -172,52 +163,52 @@ brew "gzip"
 brew "hadolint"
 # Improved top (interactive process viewer)
 brew "htop"
-# Website copier/offline browser
-brew "httrack"
-# Configurable static site generator
-brew "hugo"
+# Portable abstraction of the hierarchical topology of modern architectures
+brew "hwloc"
 # ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
 brew "libheif"
 # Tools and libraries to manipulate images in many formats
 brew "imagemagick"
+# Modular IRC client
+brew "irssi"
 # Lightweight and flexible command-line JSON processor
 brew "jq"
+# JSON parser for C
+brew "json-c"
+# Scanning your k8s clusters, diagnosing, and triaging issues in simple English
+brew "k8sgpt"
 # Network authentication protocol
 brew "krb5"
-# Lazier way to manage everything docker
-brew "lazydocker"
+# 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"
-# Linguistic software and Finnish dictionary
-brew "libvoikko"
-# Rainbows and unicorns in your console!
-brew "lolcat"
+# Multi-platform support library with a focus on asynchronous I/O
+brew "libuv"
 # Package manager for the Lua programming language
 brew "luarocks"
+# LZMA-based compression program similar to gzip or bzip2
+brew "lzip"
 # Swiss Army Knife for macOS
 brew "m-cli"
-# Mac App Store command-line interface
-brew "mas"
+# Collection of tools that nobody wrote when UNIX was young
+brew "moreutils"
+# Mongrel of mail user agents (part elm, pine, mush, mh, etc.)
+brew "mutt"
 # NCurses Disk Usage
 brew "ncdu"
 # HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server
 brew "nginx"
 # Port scanning utility for large networks
 brew "nmap"
-# Manage multiple Node.js versions
-brew "nvm"
-# Development kit for the Java programming language
-brew "openjdk@11"
-# Generate clients, server & docs from an OpenAPI spec (v2, v3)
-brew "openapi-generator"
-# Swiss-army knife of markup format conversion
-brew "pandoc"
-# Highly capable, feature-rich programming language
-brew "perl"
+# ISO-C API and CLI for generating UUIDs
+brew "ossp-uuid"
 # General-purpose scripting language
-brew "php@8.1"
-# Simple Python style checker in one Python file
-brew "pycodestyle"
+brew "php"
+# Coreutils progress viewer
+brew "progress"
 # Python version management
 brew "pyenv"
 # Migrate pip packages from one Python version to another
@@ -225,13 +216,11 @@ brew "pyenv-pip-migrate"
 # Pyenv plugin to manage virtualenv
 brew "pyenv-virtualenv"
 # Interpreted, interactive, object-oriented programming language
-brew "python@3.10"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.8"
+brew "python@3.11"
+# Install various Ruby versions and implementations
+brew "ruby-build"
 # Ruby version manager
 brew "rbenv"
-# RC file (dotfile) management
-brew "rcm"
 # Search tool like grep and The Silver Searcher
 brew "ripgrep"
 # Safe, concurrent, practical language
@@ -240,16 +229,10 @@ brew "rust"
 brew "shellcheck"
 # Autoformat shell script source code
 brew "shfmt"
-# Support CI generation of SBOMs via golang tooling
-brew "spdx-sbom-generator"
-# Version control system designed to be a better CVS
-brew "subversion"
 # Feature-rich console based todo list manager
 brew "task"
 # Terminal user interface for taskwarrior
 brew "taskwarrior-tui"
-# Very fast implementation of tldr in Rust
-brew "tealdeer"
 # Send macOS User Notifications from the command-line
 brew "terminal-notifier"
 # Thin wrapper for Terraform e.g. for locking state
@@ -258,78 +241,47 @@ brew "terragrunt"
 brew "testssl"
 # Terraform version manager inspired by rbenv
 brew "tfenv"
+# Linter for Terraform files
+brew "tflint"
 # Static analysis security scanner for your terraform code
 brew "tfsec"
-# Programmatically correct mistyped console commands
-brew "thefuck"
 # Terminal multiplexer
 brew "tmux"
 # Display directories as trees (with optional color/HTML output)
 brew "tree"
-# Vulnerability scanner for container images, file systems, and Git repos
-brew "trivy"
-# Modern watch command
-brew "viddy"
 # Tool for creating isolated virtual python environments
 brew "virtualenv"
 # Command-line interface to the WakaTime api
 brew "wakatime-cli"
 # Executes a program periodically, showing output fullscreen
 brew "watch"
-# Watch files and take action when they change
-brew "watchman"
 # Internet file retriever
 brew "wget"
-# Personal information dashboard for your terminal
-brew "wtfutil"
 # Check your $HOME for unwanted files and directories
 brew "xdg-ninja", args: ["HEAD"]
-# Hackable, minimal, fast TUI file explorer
-brew "xplr"
 # JavaScript package manager
 brew "yarn"
-# A vulnerability scanner for container images and filesystems
-brew "anchore/grype/grype"
-# High-performance load testing tool, written in Golang.
-brew "ddosify/tap/ddosify"
+# Watcher for macOS 10.14+ light/dark mode changes
+brew "cormacrelf/tap/dark-notify"
+# Cleans up your $HOME from those pesky dotfiles
+brew "doron-cohen/tap/antidot"
 # lets you quickly switch between multiple git user profiles
 brew "gesquive/tap/git-user"
-# A simple terminal UI for git commands, written in Go
-brew "jesseduffield/lazygit/lazygit"
-# High-performance, schema-free, document-oriented database
-brew "mongodb/brew/mongodb-community"
-# Imagick PHP extension
-brew "shivammathur/extensions/imagick@8.2"
-# Xdebug PHP extension
-brew "shivammathur/extensions/xdebug@7.4"
-# Xdebug PHP extension
-brew "shivammathur/extensions/xdebug@8.0"
-# Xdebug PHP extension
-brew "shivammathur/extensions/xdebug@8.1"
-# General-purpose scripting language
-brew "shivammathur/php/php"
-# General-purpose scripting language
-brew "shivammathur/php/php@7.4"
-# General-purpose scripting language
-brew "shivammathur/php/php@8.0"
-# Ookla Speedtest
-brew "teamookla/speedtest/speedtest"
+brew "keith/formulae/reminders-cli"
+# Automated code review tool integrated with any code analysis tools regardless of programming language.
+brew "reviewdog/tap/reviewdog"
 # Command-line interface for 1Password
 cask "1password-cli"
 # GPU-accelerated terminal emulator
 cask "alacritty"
-# Turn audio CDs and files into audiobooks
-cask "audiobook-builder"
 # Text editor
 cask "coda"
 # Universal database tool and SQL client
 cask "dbeaver-community"
 # Database version management tool
 cask "dbngin"
-# App to build and share containerized applications and microservices
+# App to build and share containerised applications and microservices
 cask "docker"
-# UI toolkit for building applications for mobile, web and desktop
-cask "flutter"
 # Unofficial overcast.fm podcast app
 cask "fog"
 # Typeface made for developers
@@ -348,12 +300,12 @@ cask "font-source-serif-pro"
 cask "fontplop"
 # GIT client
 cask "fork"
-# Set of tools to manage resources and applications hosted on Google Cloud
-cask "google-cloud-sdk"
 # HTTP and GraphQL Client
 cask "insomnia"
 # JetBrains tools manager
 cask "jetbrains-toolbox"
+# End-to-end encryption software
+cask "keybase"
 # Kubernetes IDE
 cask "lens"
 # Keep all tasks from your todo apps on your menu bar
@@ -364,32 +316,28 @@ cask "ngrok"
 cask "notunes"
 # Knowledge base that works on top of a local folder of plain text Markdown files
 cask "obsidian"
-# Scheduling application focusing on organization
+# Scheduling application focusing on organisation
 cask "omnifocus"
 # Collaboration platform for API development
 cask "postman"
 # Display image info and preview unsupported formats in QuickLook
 cask "qlimagesize"
-# QuickLook generator for Markdown files
+# Quick Look generator for Markdown files
 cask "qlmarkdown"
-# QuickLook plugin for plaintext files without an extension
+# Quick Look plugin for plaintext files without an extension
 cask "qlstephen"
-# QuickLook plugin for JSON files
+# Quick Look plugin for JSON files
 cask "quicklook-json"
-# QuickLook generator for Adobe Swatch Exchange files
+# Quick Look generator for Adobe Swatch Exchange files
 cask "quicklookase"
 # Automatically hides or quits apps after periods of inactivity
 cask "quitter"
 # Control your tools with a few keystrokes
 cask "raycast"
-# Move and resize windows using keyboard shortcuts or snap areas
-cask "rectangle"
-# GUI for rsync
-cask "rsyncosx"
-# GUI for rsync
-cask "rsyncui"
 # MySQL/MariaDB database management
 cask "sequel-ace"
+# Plugin for AWS CLI to start and end sessions that connect to managed instances
+cask "session-manager-plugin"
 # Collection of apps available by subscription
 cask "setapp"
 # Team communication and collaboration software
@@ -400,95 +348,13 @@ cask "soundsource"
 cask "suspicious-package"
 # Quicklook extension for source files
 cask "syntax-highlight"
+# Configuration application for the Ultimate Hacking Keyboard
+cask "uhk-agent"
 # Open-source code editor
 cask "visual-studio-code"
 # Multimedia player
 cask "vlc"
 # Spell-checking service for Finnish
 cask "voikkospellservice"
-# Rust-based terminal
-cask "warp"
-mas "1Password for Safari", id: 1569813296
-mas "Actions", id: 1586435171
-mas "Audiobook Builder", id: 1437681957
-mas "Ivory", id: 6444602274
-mas "Keynote", id: 409183694
-mas "LastPass", id: 926036361
-mas "Numbers", id: 409203825
-mas "Pages", id: 409201541
-mas "Pixelmator Pro", id: 1289583905
-mas "Tailscale", id: 1475387142
-mas "Xcode", id: 497799835
-vscode "akamud.vscode-theme-onelight"
-vscode "amiralizadeh9480.laravel-extra-intellisense"
-vscode "andrewleedham.vscode-css-modules"
-vscode "andrewmcodes.tailwindcss-extension-pack"
-vscode "austenc.tailwind-docs"
-vscode "bmewburn.vscode-intelephense-client"
-vscode "Box-Of-Hats.bemhelper"
-vscode "bradlc.vscode-tailwindcss"
-vscode "christian-kohler.npm-intellisense"
-vscode "christian-kohler.path-intellisense"
-vscode "DavidAnson.vscode-markdownlint"
-vscode "dbaeumer.vscode-eslint"
-vscode "DotJoshJohnson.xml"
-vscode "eamodio.gitlens"
-vscode "EditorConfig.EditorConfig"
-vscode "esbenp.prettier-vscode"
-vscode "formulahendry.auto-close-tag"
-vscode "formulahendry.auto-rename-tag"
-vscode "formulahendry.code-runner"
-vscode "foxundermoon.shell-format"
-vscode "gencer.html-slim-scss-css-class-completion"
-vscode "github.vscode-github-actions"
-vscode "GitHub.vscode-pull-request-github"
-vscode "GraphQL.vscode-graphql"
-vscode "GraphQL.vscode-graphql-execution"
-vscode "GraphQL.vscode-graphql-syntax"
-vscode "heybourn.headwind"
-vscode "JohnnyMorganz.stylua"
-vscode "jumpinjackie.vscode-map-preview"
-vscode "k--kato.intellij-idea-keybindings"
-vscode "liamhammett.inline-parameters"
-vscode "macieklad.tailwind-sass-syntax"
-vscode "MehediDracula.php-namespace-resolver"
-vscode "mikestead.dotenv"
-vscode "MisterJ.vue-volar-extention-pack"
-vscode "MrChetan.phpstorm-parameter-hints-in-vscode"
-vscode "mrorz.language-gettext"
-vscode "ms-azuretools.vscode-docker"
-vscode "ms-python.python"
-vscode "ms-python.vscode-pylance"
-vscode "ms-toolsai.jupyter"
-vscode "ms-toolsai.jupyter-renderers"
-vscode "ms-toolsai.vscode-jupyter-cell-tags"
-vscode "ms-toolsai.vscode-jupyter-slideshow"
-vscode "ms-vscode-remote.remote-containers"
-vscode "ms-vscode-remote.remote-wsl"
-vscode "ms-vscode.cpptools"
-vscode "msjsdiag.vscode-react-native"
-vscode "mtxr.sqltools"
-vscode "neilbrayfield.php-docblocker"
-vscode "nhoizey.gremlins"
-vscode "octref.vetur"
-vscode "oderwat.indent-rainbow"
-vscode "pflannery.vscode-versionlens"
-vscode "phiter.phpstorm-snippets"
-vscode "sibiraj-s.vscode-scss-formatter"
-vscode "SonarSource.sonarlint-vscode"
-vscode "stylelint.vscode-stylelint"
-vscode "sumneko.lua"
-vscode "syler.sass-indented"
-vscode "timonwong.shellcheck"
-vscode "tootone.org-mode"
-vscode "valeryanm.vscode-phpsab"
-vscode "Vue.volar"
-vscode "Vue.vscode-typescript-vue-plugin"
-vscode "WakaTime.vscode-wakatime"
-vscode "wix.vscode-import-cost"
-vscode "XadillaX.viml"
-vscode "xdebug.php-debug"
-vscode "xdebug.php-pack"
-vscode "yinfei.luahelper"
-vscode "yoavbls.pretty-ts-errors"
-vscode "ZainChen.json"
+# Application for generating TOTP and HOTP codes
+cask "yubico-authenticator"

config/nvim/.luarc.json

@@ -1,5 +1,3 @@
 {
-    "diagnostics.globals": [
-        "vim"
-    ]
-}
+  "diagnostics.globals": ["vim"]
+}

config/nvim/lazy-lock.json

@@ -1,75 +0,0 @@
-{
-  "LazyVim": { "branch": "main", "commit": "ea4174d46016dd191de48c03bdf23462483f9f6a" },
-  "LuaSnip": { "branch": "master", "commit": "0df29db3543837f8b41597f2640397c5ec792b7b" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "f3c4985093716c8ddf93731609ebfc1df7c5335d" },
-  "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
-  "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" },
-  "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" },
-  "catppuccin": { "branch": "main", "commit": "fc537040147f0374a22b88142a20eb6781141f0b" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "comment-box.nvim": { "branch": "main", "commit": "dd1a48f8d06102e9b87ae1e0069bc365c006979b" },
-  "conform.nvim": { "branch": "master", "commit": "4db76a68b47aa6e9777e4da4aed16f0fff74920e" },
-  "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
-  "copilot.lua": { "branch": "master", "commit": "1a8032ae496916ccc7a7a52ee79194fbef29f462" },
-  "dashboard-nvim": { "branch": "master", "commit": "8721edccead31c07c2cda0bc5ac75b0491b5adcd" },
-  "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" },
-  "edgy.nvim": { "branch": "main", "commit": "4a4bab427e31eb37678bae3e478f166aae9deff3" },
-  "flash.nvim": { "branch": "main", "commit": "6d76c5dee65181ab55cbdfb0760260e800d643f4" },
-  "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
-  "gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" },
-  "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "0fe34b4c1b926e106d105d3ae88ef6cbf6743572" },
-  "lazy.nvim": { "branch": "main", "commit": "33c447b96e1cb1a5a2be87982d5d32bb5054079d" },
-  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "397273083f988c1a17acf3816947cd198338e700" },
-  "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
-  "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
-  "mini.ai": { "branch": "main", "commit": "10ad2ed049fb681a829b44aeb23443c0a9c910ae" },
-  "mini.animate": { "branch": "main", "commit": "6e6f2ee99fec91985d3817bfc74fbb4a0aff1c44" },
-  "mini.bufremove": { "branch": "main", "commit": "75be0b153b0cd2499c031e57d44cde8dad4766e4" },
-  "mini.comment": { "branch": "main", "commit": "2c7a512dad27e34a26d0f7d5d5bc2579f88167dc" },
-  "mini.indentscope": { "branch": "main", "commit": "cbc07203ca8faae952ca373c1f6cc5881ce97af0" },
-  "mini.pairs": { "branch": "main", "commit": "6f6bd7ed5757b40bc29c73dac0d743e4e6978124" },
-  "mini.surround": { "branch": "main", "commit": "68ce058ef9716d7d955b79363845d2dd003d6500" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "6f8c49956c89e9fefae6acdfe1d57c6293b0a03d" },
-  "neoconf.nvim": { "branch": "main", "commit": "393d37abd9d82adcac627309a41758ae8e140d9e" },
-  "neodev.nvim": { "branch": "main", "commit": "a4b6e7ca11ff5be2264d5c169fcedd97d8699ec4" },
-  "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" },
-  "noice.nvim": { "branch": "main", "commit": "7ed897d77d13eb4a9f4ab576f58db9bdda9af6ec" },
-  "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" },
-  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
-  "nvim-lint": { "branch": "master", "commit": "0f54481d7537a6872f7bb021575366657e123474" },
-  "nvim-lspconfig": { "branch": "master", "commit": "bb8e3dfbe10d80c294bb609c4bb4bba3ecdfbfe2" },
-  "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
-  "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" },
-  "nvim-spectre": { "branch": "master", "commit": "696cff781a4a7ecc91549736835e2acbd00fe859" },
-  "nvim-treesitter": { "branch": "master", "commit": "783e5fc3079680b307e8ac518935317907e71a59" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "4cf64264c049c55f256550ad247b606f3e53bc77" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "76c7a89b41de77a4f83fb77fa072c5ad7605fe3b" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" },
-  "nvim-ufo": { "branch": "main", "commit": "f7eea53e88456403212df074b9aa3148a3908435" },
-  "nvim-web-devicons": { "branch": "master", "commit": "a1e6268779411048a87f767a27380089362a0ce2" },
-  "persistence.nvim": { "branch": "main", "commit": "8f7cbccfb506fe6cb35db9ad966137c363b049c5" },
-  "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
-  "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" },
-  "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" },
-  "stickybuf.nvim": { "branch": "master", "commit": "ae746b982f9c3b6880d62f221c56ec4d7bb239f6" },
-  "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
-  "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
-  "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" },
-  "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
-  "tokyonight.nvim": { "branch": "main", "commit": "dce0ab49ae751f4f3617ab42d6f20c72369c7cb1" },
-  "trouble.nvim": { "branch": "main", "commit": "02219b557d4726a789be58c5d6bd6e139c46a9fe" },
-  "venv-selector.nvim": { "branch": "main", "commit": "ff3342d4ae8723fab38fed8969b0a1e2c8b6281a" },
-  "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" },
-  "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
-  "vim-wakatime": { "branch": "master", "commit": "8def67a31eed4b4de3144cb8b2fc96b5e002f883" },
-  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
-  "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" }
-}

config/nvim/lazyvim.json

@@ -1,24 +1,35 @@
 {
   "extras": [
     "lazyvim.plugins.extras.coding.copilot",
-    "lazyvim.plugins.extras.editor.symbols-outline",
+    "lazyvim.plugins.extras.coding.yanky",
+    "lazyvim.plugins.extras.editor.aerial",
+    "lazyvim.plugins.extras.editor.aerial",
+    "lazyvim.plugins.extras.editor.harpoon2",
+    "lazyvim.plugins.extras.editor.leap",
+    "lazyvim.plugins.extras.editor.outline",
+    "lazyvim.plugins.extras.editor.refactoring",
     "lazyvim.plugins.extras.formatting.black",
     "lazyvim.plugins.extras.formatting.prettier",
+    "lazyvim.plugins.extras.lang.ansible",
     "lazyvim.plugins.extras.lang.docker",
     "lazyvim.plugins.extras.lang.go",
     "lazyvim.plugins.extras.lang.json",
+    "lazyvim.plugins.extras.lang.markdown",
+    "lazyvim.plugins.extras.lang.php",
     "lazyvim.plugins.extras.lang.python",
     "lazyvim.plugins.extras.lang.tailwind",
     "lazyvim.plugins.extras.lang.terraform",
     "lazyvim.plugins.extras.lang.typescript",
+    "lazyvim.plugins.extras.lang.vue",
     "lazyvim.plugins.extras.lang.yaml",
     "lazyvim.plugins.extras.linting.eslint",
     "lazyvim.plugins.extras.ui.edgy",
     "lazyvim.plugins.extras.ui.mini-animate",
-    "lazyvim.plugins.extras.vscode"
+    "lazyvim.plugins.extras.util.dot",
+    "lazyvim.plugins.extras.util.mini-hipatterns"
   ],
   "news": {
-    "NEWS.md": "2123"
+    "NEWS.md": "6077"
   },
-  "version": 2
-}
+  "version": 6
+}

config/nvim/lua/config/keymaps.lua

@@ -1,19 +1,22 @@
 -- Keymaps are automatically loaded on the VeryLazy event
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
 -- Add any additional keymaps here
+local wk = require("which-key")
 
-local keymap = vim.keymap.set
-
---         ╭──────────────────────────────────────────────────────────╮
---         │                       Comment box                        │
---         ╰──────────────────────────────────────────────────────────╯
-local cb = require("comment-box")
-
--- left aligned fixed size box with left aligned text
-keymap({ "n", "v" }, "<Leader>bcb", cb.lbox, { desc = "Comment: Left aligned" })
--- centered adapted box with centered text
-keymap({ "n", "v" }, "<Leader>bcc", cb.ccbox, { desc = "Comment: Centered" })
-
--- centered line
-keymap("n", "<Leader>bcl", cb.cline, { desc = "Comment: Centered line" })
-keymap("i", "<M-l>", cb.cline, { desc = "Comment: Centered line" })
+-- ╭──────────────────────────────────────────────────────────╮
+-- │                       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" },
+      },
+    },
+  },
+})

config/nvim/lua/config/lazy.lua

@@ -12,9 +12,14 @@ require("lazy").setup({
     {
       "LazyVim/LazyVim",
       import = "lazyvim.plugins",
+      opts = {
+        colorscheme = "tokyonight",
+      },
     },
     {
       "folke/tokyonight.nvim",
+      lazy = false,
+      priority = 1000,
       opts = {
         style = "night",
         transparent = true,
@@ -23,6 +28,8 @@ require("lazy").setup({
           sidebars = "transparent",
           floats = "transparent",
         },
+        dim_inactive = true,
+        lualine_bold = true,
       },
     },
     { import = "plugins" },
@@ -33,8 +40,8 @@ require("lazy").setup({
     lazy = false,
     -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
     -- have outdated releases, which may break your Neovim install.
-    version = false, -- always use the latest git commit
-    -- version = "*", -- try installing the latest stable version for plugins that support semver
+    -- version = false, -- always use the latest git commit
+    version = "*", -- try installing the latest stable version for plugins that support semver
   },
   install = { colorscheme = { "tokyonight" } },
   checker = { enabled = true }, -- automatically check for plugin updates

config/nvim/lua/plugins/coding.lua

@@ -15,6 +15,10 @@ return {
       },
     },
     keys = {
+      {
+        "<leader>ba",
+        desc = "Annotations / Comments",
+      },
       {
         "<leader>baa",
         function()
@@ -52,6 +56,15 @@ return {
       },
     },
   },
+  {
+    "laytan/tailwind-sorter.nvim",
+    dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-lua/plenary.nvim" },
+    build = "cd formatter && npm i && npm run build",
+    config = true,
+    opts = {
+      on_save_enabled = true,
+    },
+  },
   -- Describe the regexp under the cursor
   -- https://github.com/bennypowers/nvim-regexplainer
   {
@@ -68,10 +81,12 @@ return {
   -- Clarify and beautify your comments using boxes and lines.
   -- https://github.com/LudoPinelli/comment-box.nvim
   { "LudoPinelli/comment-box.nvim", opts = {} },
+  -- Mason
+  -- https://github.com/williamboman/mason.nvim
   {
     "williamboman/mason.nvim",
-    opts = {
-      ensure_installed = {
+    opts = function(_, opts)
+      vim.list_extend(opts.ensure_installed, {
         "actionlint",
         "ansible-language-server",
         "ansible-lint",
@@ -86,18 +101,24 @@ return {
         "dockerfile-language-server",
         "editorconfig-checker",
         "fixjson",
+        "flake8",
         "html-lsp",
         "jq",
+        "jsonlint",
+        "luacheck",
         "nginx-language-server",
         "php-cs-fixer",
+        "phpcs",
+        "phpmd",
         "semgrep",
-        "sonarlint-language-server",
-        "stylua",
         "shellcheck",
         "shfmt",
-        "flake8",
-      },
-    },
+        "sonarlint-language-server",
+        "stylelint",
+        "stylua",
+        "yamllint",
+      })
+    end,
   },
   -- Vim plugin for automatic time tracking and metrics generated from your programming activity.
   -- https://github.com/wakatime/vim-wakatime

config/nvim/lua/plugins/lang-php.lua

@@ -12,6 +12,7 @@ return {
     opts = function(_, opts)
       vim.list_extend(opts.ensure_installed, {
         "phpactor",
+        "intelephense",
       })
     end,
   },

config/nvim/lua/plugins/tools.lua

@@ -1,24 +0,0 @@
-return {
-  {
-    "williamboman/mason.nvim",
-    opts = {
-      ensure_installed = {
-        "actionlint",
-        "ansible-lint",
-        "bash-language-server",
-        "commitlint",
-        "flake8",
-        "intelephense",
-        "jsonlint",
-        "luacheck",
-        "phpcs",
-        "phpmd",
-        "shellcheck",
-        "shfmt",
-        "stylelint",
-        "stylua",
-        "yamllint",
-      },
-    },
-  },
-}

config/nvim/lua/plugins/ui.lua

@@ -1,5 +1,27 @@
 -- luacheck: globals vim
 return {
+  -- Neotree configuration
+  {
+    "nvim-neo-tree/neo-tree.nvim",
+    opts = {
+      filesystem = {
+        filtered_items = {
+          always_show = {
+            ".github",
+            ".gitignore",
+            ".editorconfig",
+            ".python-version",
+            ".nvmrc",
+            ".env",
+            ".env.example",
+          },
+        },
+      },
+    },
+  },
+  -- Cloak allows you to overlay *'s over defined patterns in defined files.
+  -- https://github.com/laytan/cloak.nvim
+  { "laytan/cloak.nvim" },
   -- Not UFO in the sky, but an ultra fold in Neovim.
   -- https://github.com/kevinhwang91/nvim-ufo/
   {
@@ -33,7 +55,7 @@ return {
     end,
     opts = {
       open_fold_hl_timeout = 150,
-      close_fold_kinds = { "imports", "comment" },
+      close_fold_kinds_for_ft = { "imports", "comment" },
       preview = {
         win_config = {
           border = { "", "─", "", "", "", "─", "", "" },

config/nvim/stylua.toml

@@ -1,3 +1,3 @@
 indent_type = "Spaces"
 indent_width = 2
-column_width = 120
+column_width = 120

config/omp/own.json

@@ -0,0 +1,133 @@
+{
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "final_space": true,
+  "console_title_template": "{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}",
+  "blocks": [
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "foreground": "cyan",
+          "style": "powerline",
+          "template": "{{ .Icon }}",
+          "type": "os"
+        },
+        {
+          "type": "session",
+          "style": "plain",
+          "template": " {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}"
+        },
+        {
+          "foreground": "cyan",
+          "properties": {
+            "style": "mixed"
+          },
+          "style": "plain",
+          "template": " {{ .Path }} ",
+          "type": "path",
+          "mapped_locations": {
+            "~/Code/*": "\uF09B"
+          }
+        },
+        {
+          "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 }}",
+          "properties": {
+            "fetch_status": true,
+            "fetch_upstream_icon": true,
+            "untracked_modes": {
+              "~/Code/oh-my-posh/": "no"
+            }
+          }
+        },
+        {
+          "type": "terraform",
+          "style": "plain",
+          "foreground": "#000000",
+          "background": "#ebcc34",
+          "template": "{{.WorkspaceName}}"
+        }
+      ],
+      "type": "prompt"
+    },
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "foreground": "#68a063",
+          "properties": {
+            "display_mode": "files",
+            "fetch_package_manager": true,
+            "fetch_version": true
+          },
+          "style": "plain",
+          "template": " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}",
+          "type": "node"
+        },
+        {
+          "foreground": "#4063D8",
+          "properties": {
+            "display_mode": "files",
+            "fetch_version": true
+          },
+          "style": "plain",
+          "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "type": "crystal"
+        },
+        {
+          "foreground": "#DE3F24",
+          "properties": {
+            "display_mode": "files",
+            "fetch_version": true
+          },
+          "style": "plain",
+          "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "type": "ruby"
+        },
+        {
+          "foreground": "#FED142",
+          "properties": {
+            "display_mode": "context",
+            "fetch_virtual_env": false
+          },
+          "style": "plain",
+          "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "type": "python"
+        },
+        {
+          "type": "php",
+          "style": "plain",
+          "template": "  {{ .Full }} "
+        }
+      ],
+      "type": "prompt"
+    },
+    {
+      "alignment": "left",
+      "newline": true,
+      "segments": [
+        {
+          "background": "transparent",
+          "foreground": "lightGreen",
+          "foreground_templates": ["{{ if gt .Code 0 }}red{{ end }}"],
+          "properties": {
+            "always_enabled": true
+          },
+          "style": "plain",
+          "template": "\u279c",
+          "type": "status"
+        }
+      ],
+      "type": "prompt"
+    }
+  ],
+  "transient_prompt": {
+    "background": "transparent",
+    "foreground": "lightGreen",
+    "foreground_templates": ["{{ if gt .Code 0 }}red{{ end }}"],
+    "template": "\u279c "
+  },
+  "version": 2
+}

config/omp/own.toml

@@ -0,0 +1,119 @@
+"$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"
+final_space = true
+console_title_template = "{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}"
+version = 2
+
+[[blocks]]
+alignment = "left"
+type = "prompt"
+
+  [[blocks.segments]]
+  foreground = "cyan"
+  style = "powerline"
+  template = "{{ .Icon }}"
+  type = "os"
+
+  [[blocks.segments]]
+  type = "session"
+  style = "plain"
+  template = " {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}"
+
+  [[blocks.segments]]
+  foreground = "cyan"
+  style = "plain"
+  template = " {{ .Path }} "
+  type = "path"
+
+    [blocks.segments.properties]
+    style = "mixed"
+
+    [blocks.segments.mapped_locations]
+    "~/Code/*" = ""
+
+  [[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 }}"
+
+    [blocks.segments.properties]
+    fetch_status = true
+    fetch_upstream_icon = true
+
+      [blocks.segments.properties.untracked_modes]
+      "~/Code/oh-my-posh/" = "no"
+
+  [[blocks.segments]]
+  type = "terraform"
+  style = "plain"
+  foreground = "#000000"
+  background = "#ebcc34"
+  template = "{{.WorkspaceName}}"
+
+[[blocks]]
+alignment = "left"
+type = "prompt"
+
+  [[blocks.segments]]
+  foreground = "#68a063"
+  style = "plain"
+  template = " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}"
+  type = "node"
+
+    [blocks.segments.properties]
+    display_mode = "files"
+    fetch_package_manager = true
+    fetch_version = true
+
+  [[blocks.segments]]
+  foreground = "#4063D8"
+  style = "plain"
+  template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
+  type = "crystal"
+
+    [blocks.segments.properties]
+    display_mode = "files"
+    fetch_version = true
+
+  [[blocks.segments]]
+  foreground = "#DE3F24"
+  style = "plain"
+  template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
+  type = "ruby"
+
+    [blocks.segments.properties]
+    display_mode = "files"
+    fetch_version = true
+
+  [[blocks.segments]]
+  foreground = "#FED142"
+  style = "plain"
+  template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
+  type = "python"
+
+    [blocks.segments.properties]
+    display_mode = "context"
+    fetch_virtual_env = false
+
+[[blocks]]
+  alignment = "left"
+  newline = true
+  type = "prompt"
+
+  [[blocks.segments]]
+  background = "transparent"
+  foreground = "lightGreen"
+  foreground_templates = [ "{{ if gt .Code 0 }}red{{ end }}" ]
+  style = "plain"
+  template = "➜"
+  type = "status"
+
+    [blocks.segments.properties]
+    always_enabled = true
+
+[transient_prompt]
+background = "transparent"
+foreground = "lightGreen"
+foreground_templates = [ "{{ if gt .Code 0 }}red{{ end }}" ]
+template = "➜ "
+

config/omp/zen.toml

@@ -0,0 +1,74 @@
+#:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
+
+version = 2
+final_space = true
+console_title_template = '{{ .Shell }} in {{ .Folder }}'
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    type = 'path'
+    style = 'plain'
+    background = 'transparent'
+    foreground = 'blue'
+    template = '{{ .Path }}'
+
+    [blocks.segments.properties]
+      style = 'full'
+
+  [[blocks.segments]]
+    type = 'git'
+    style = 'plain'
+    foreground = 'p:grey'
+    background = 'transparent'
+    template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}*{{ end }} <cyan>{{ if gt .Behind 0 }}⇣{{ end }}{{ if gt .Ahead 0 }}⇡{{ end }}</>'
+
+    [blocks.segments.properties]
+      branch_icon = ''
+      commit_icon = '@'
+      fetch_status = true
+
+[[blocks]]
+  type = 'rprompt'
+  overflow = 'hidden'
+
+  [[blocks.segments]]
+    type = 'executiontime'
+    style = 'plain'
+    foreground = 'yellow'
+    background = 'transparent'
+    template = '{{ .FormattedMs }}'
+
+    [blocks.segments.properties]
+      threshold = 5000
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    type = 'text'
+    style = 'plain'
+    foreground_templates = [
+      "{{if gt .Code 0}}red{{end}}",
+      "{{if eq .Code 0}}magenta{{end}}",
+    ]
+    background = 'transparent'
+    template = '❯'
+
+[transient_prompt]
+  foreground_templates = [
+    "{{if gt .Code 0}}red{{end}}",
+    "{{if eq .Code 0}}magenta{{end}}",
+  ]
+  background = 'transparent'
+  template = '❯ '
+
+[secondary_prompt]
+  foreground = 'magenta'
+  background = 'transparent'
+  template = '❯❯ '

config/shared.sh

@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+#
+# Shared configuration
+#
+# shellcheck shell=bash
+
+# Defaults
+[ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles"
+export DOTFILES_CURRENT_SHELL=$(basename "$SHELL")
+
+# Enable verbosity with VERBOSE=1
+VERBOSE="${VERBOSE:-0}"
+# Enable debugging with DEBUG=1
+DEBUG="${DEBUG:-0}"
+
+# Enable debugging with DEBUG=1
+[ "${DEBUG:-0}" -eq 1 ] && set -x
+
+# Explicitly set XDG folders, if not already set
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME="$HOME/.config"
+[ -z "$XDG_DATA_HOME" ] && export XDG_DATA_HOME="$HOME/.local/share"
+[ -z "$XDG_CACHE_HOME" ] && export XDG_CACHE_HOME="$HOME/.cache"
+[ -z "$XDG_STATE_HOME" ] && export XDG_STATE_HOME="$HOME/.local/state"
+[ -z "$XDG_BIN_HOME" ] && export XDG_BIN_HOME="$HOME/.local/bin"
+
+# Paths
+x-path-prepend "/usr/local/bin"
+x-path-prepend "/opt/homebrew/bin"
+x-path-prepend "$XDG_DATA_HOME/cargo/bin"
+x-path-prepend "$XDG_DATA_HOME/bob/nvim-bin"
+x-path-prepend "$DOTFILES/local/bin"
+x-path-prepend "$XDG_BIN_HOME"
+
+# Custom completion paths
+[ -z "$ZSH_CUSTOM_COMPLETION_PATH" ] && export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
+x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
+export FPATH="$ZSH_CUSTOM_COMPLETION_PATH:$FPATH"
+
+if ! declare -f msg > /dev/null; then
+  # Function to print messages if VERBOSE is enabled
+  # $1 - message (string)
+  msg()
+  {
+    [ "$VERBOSE" -eq 1 ] && echo "$1"
+    return 0
+  }
+  msg "msg was not defined, defined it now"
+fi
+
+if ! declare -f msg_err > /dev/null; then
+  msg "msg_err was not defined, defined it now"
+  # Function to print error messages and exit
+  # $1 - error message (string)
+  msg_err()
+  {
+    echo "(!) ERROR: $1" >&2
+    exit 1
+  }
+fi
+
+if ! declare -f msg_done > /dev/null; then
+  msg "msg_done was not defined, defined it now"
+  # Function to print done message
+  # $1 - message (string)
+  msg_done()
+  {
+    echo "✓ $1"
+    return 0
+  }
+fi
+
+if ! declare -f msg_run > /dev/null; then
+  msg "msg_run was not defined, defined it now"
+  # Function to print running message
+  # $1 - message (string)
+  msg_run()
+  {
+    echo "→ $1"
+    return 0
+  }
+fi
+
+if ! declare -f msg_ok > /dev/null; then
+  msg "msg_ok was not defined, defined it now"
+  # Function to print ok message
+  # $1 - message (string)
+  msg_ok()
+  {
+    echo "✓ $1"
+    return 0
+  }
+fi
+
+source "$DOTFILES/config/exports"
+source "$DOTFILES/config/alias"

config/terraform/terraformrc

@@ -0,0 +1,2 @@
+plugin_cache_dir   = "$HOME/.cache/terraform/plugin-cache"
+

config/tmux/theme-dark.conf

@@ -0,0 +1,7 @@
+set-option -g status-style 'fg=#cad3f5,bg=default'
+set-window-option -g window-status-style 'fg=#cad3f5,bg=default dim'
+set-window-option -g window-status-current-style 'fg=#04a5e5,bg=default'
+set-window-option -g window-status-activity-style 'fg=#cad3f5,bg=default nodim'
+set-window-option -g window-status-bell-style 'fg=#cad3f5,bg=default'
+set -g message-style 'fg=#c6a0f6 bg=#24273a bold'
+

config/tmux/theme-light.conf

@@ -0,0 +1,7 @@
+set-option -g status-style 'fg=#4c4f69,bg=#eff1f5'
+set-window-option -g window-status-style 'fg=#4c4f69,bg=#eff1f5 dim'
+set-window-option -g window-status-current-style 'fg=#8839ef,bg=#eff1f5'
+set-window-option -g window-status-activity-style 'fg=#4c4f69,bg=#eff1f5 nodim'
+set-window-option -g window-status-bell-style 'fg=#4c4f69,bg=#eff1f5'
+set -g message-style 'fg=#8839ef bg=#e6e9ef bold' # fg magenta, bg black
+

config/tmux/tmux.conf

@@ -1,6 +1,6 @@
 # ~/.config/tmux/tmux.conf, or .dotfiles/config/tmux/tmux.conf
 #
-# Contains configuration from the follwing sources:
+# Contains configuration from the following sources:
 # - https://tmuxguide.readthedocs.io/en/latest/tmux/tmux.html
 # - https://github.com/dreamsofcode-io/tmux/blob/main/tmux.conf
 
@@ -8,8 +8,8 @@
 #  │ Bindings                                                 │
 #  ╰──────────────────────────────────────────────────────────╯
 
-# Set <prefix> to Control + Space
-unbind C-b
+# Set <prefix> to Control + Space, keeping the default of C-b intact.
+# unbind C-b
 set -g prefix C-Space
 bind C-Space send-prefix
 
@@ -25,10 +25,6 @@ bind -n M-Right select-pane -R
 bind -n M-Up    select-pane -U
 bind -n M-Down  select-pane -D
 
-# Control-Tab & Control-Shift-Tab to switch windows
-bind -n C-Tab   previous-window
-bind -n C-S-Tab next-window
-
 # Reload tmux config with <prefix> + r
 bind r source-file ~/.dotfiles/config/tmux/tmux.conf \; display "tmux cfg reloaded!"
 
@@ -47,6 +43,7 @@ bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
 bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
 bind '"' split-window -v -c "#{pane_current_path}"
 bind '!' split-window -h -c "#{pane_current_path}"
+bind '^' switch-client -t'{marked}'
 
 # synchronize all panes in a window
 bind y setw synchronize-panes
@@ -56,9 +53,6 @@ bind y setw synchronize-panes
 unbind [
 bind Escape copy-mode
 
-# start selection with 'space' and copy using 'y'
-#bind -t vi-copy 'y' copy-selection
-
 # paste using 'p'
 unbind p
 bind p paste-buffer
@@ -67,9 +61,29 @@ bind p paste-buffer
 #  │ Settings                                                 │
 #  ╰──────────────────────────────────────────────────────────╯
 
+set -g default-terminal "tmux-256color"
+set -ag terminal-overrides ",xterm-256color:RGB"
+
+# Setting status on
+set -g status "on"
+
+# Hide clock
+set -g display-time 0
+
+# Activity Monitoring (for when something happens in another pain)
+set -g monitor-activity on
+set -g visual-activity off
+set -g visual-bell off
+
 # Expose window title
 set-option -g set-titles on
 
+# Set bigger history limit
+set -g history-limit 20000
+
+# Keep Tmux alive when the initial command is finished
+set -g remain-on-exit off
+
 # Mouse support
 set -g mouse on
 
@@ -85,8 +99,27 @@ set-option -g renumber-windows on
 # set vi-mode
 set-window-option -g mode-keys vi
 
-# Set theme to tokyonight
-source-file ~/.dotfiles/config/tmux/tokyonight_storm.tmux
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Theme                                                    │
+#  ╰──────────────────────────────────────────────────────────╯
+
+set -g status-left-length "0"
+set -g status-right-length "30"
+
+set-option -g status-position "bottom"
+set-option -g status-justify left
+set-option -g status-left ''
+set-option -g window-status-format ' #I:#W '
+set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag, ◈ ,} '
+
+set-option -g status-right "#{hostname_short}/#S #{tmux_mode_indicator}"
+
+set -g pane-border-style "fg=#3b4261"
+set -g pane-active-border-style "fg=#7aa2f7"
+
+# https://github.com/erikw/tmux-dark-notify
+set -g @dark-notify-theme-path-light '~/.dotfiles/config/tmux/theme-light.conf'
+set -g @dark-notify-theme-path-dark  '~/.dotfiles/config/tmux/theme-dark.conf'
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Plugins related configurations                           │
@@ -100,32 +133,42 @@ set -g @suspend_key 'F12'
 ##  A plugin to name your tmux windows smartly.
 ## https://github.com/ofirgall/tmux-window-name
 ### Maximum name length of a window
-set -g @tmux_window_name_max_name_len "30"
+set -g @tmux_window_name_max_name_len "20"
 ### Replace $HOME with ~ in window names
 set -g @tmux_window_name_use_tilde "True"
+set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh', 'oh-my-posh']"
+set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
+set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases', 'oh-my-posh', 'antidot']" # Default is []
+set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local')]"
 
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'
-set -g @continuum-boot 'on'
-set -g @continuum-boot-options 'alacritty'
 
 ## https://github.com/tmux-plugins/tmux-resurrect
 set -g @resurrect-strategy-nvim 'session'
-set -g @resurrect-dir '$HOME/.local/state/tmux/tmux-resurrect'
+set -g @resurrect-dir '~/.local/state/tmux/tmux-resurrect'
 
-# Modified from tokyonight_storm to include tmux_mode_indicator
-set -g status-right "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#1f2335] #{prefix_highlight} #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %H:%M #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1d202f,bg=#7aa2f7,bold] #h #{tmux_mode_indicator}"
+## 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'
+set -g @mode_indicator_empty_mode_style 'bg=default,fg=#7aa2f7'
+set -g @mode_indicator_sync_mode_style 'bg=default,fg=red'
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Plugins                                                  │
 #  ╰──────────────────────────────────────────────────────────╯
 
 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
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-suspend/suspend.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-yank/yank.tmux
-run-shell ~/.dotfiles/config/tmux/plugins/tmux-window-name/tmux_window_name.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-current-pane-hostname/current_pane_hostname.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-dark-notify/main.tmux
+
+if-shell "test -e $HOME/.local/state/tmux/tmux-dark-notify-theme.conf" \
+  "source-file $HOME/.local/state/tmux/tmux-dark-notify-theme.conf"
 

config/tmux/tokyonight_storm.tmux

@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-# TokyoNight colors for Tmux
-
-set -g mode-style "fg=#7aa2f7,bg=#3b4261"
-
-set -g message-style "fg=#7aa2f7,bg=#3b4261"
-set -g message-command-style "fg=#7aa2f7,bg=#3b4261"
-
-set -g pane-border-style "fg=#3b4261"
-set -g pane-active-border-style "fg=#7aa2f7"
-
-set -g status "on"
-set -g status-justify "left"
-
-set -g status-style "fg=#7aa2f7,bg=#1f2335"
-
-set -g status-left-length "100"
-set -g status-right-length "100"
-
-set -g status-left-style NONE
-set -g status-right-style NONE
-
-set -g status-left "#[fg=#1d202f,bg=#7aa2f7,bold] #S #[fg=#7aa2f7,bg=#1f2335,nobold,nounderscore,noitalics]"
-set -g status-right "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#1f2335] #{prefix_highlight} #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %I:%M %p #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1d202f,bg=#7aa2f7,bold] #h "
-if-shell '[ "$(tmux show-option -gqv "clock-mode-style")" == "24" ]' {
-  set -g status-right "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#1f2335] #{prefix_highlight} #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %H:%M #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1d202f,bg=#7aa2f7,bold] #h "
-}
-
-setw -g window-status-activity-style "underscore,fg=#a9b1d6,bg=#1f2335"
-setw -g window-status-separator ""
-setw -g window-status-style "NONE,fg=#a9b1d6,bg=#1f2335"
-setw -g window-status-format "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[default] #I  #W #F #[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]"
-setw -g window-status-current-format "#[fg=#1f2335,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261,bold] #I  #W #F #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]"
-
-# tmux-plugins/tmux-prefix-highlight support
-set -g @prefix_highlight_output_prefix "#[fg=#e0af68]#[bg=#1f2335]#[fg=#1f2335]#[bg=#e0af68]"
-set -g @prefix_highlight_output_suffix ""

config/user-dirs.dirs

@@ -0,0 +1,15 @@
+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run.
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+# 
+XDG_DESKTOP_DIR="$HOME/Desktop"
+XDG_DOWNLOAD_DIR="$HOME/Downloads"
+XDG_TEMPLATES_DIR="$HOME/"
+XDG_PUBLICSHARE_DIR="$HOME/"
+XDG_DOCUMENTS_DIR="$HOME/"
+XDG_MUSIC_DIR="$HOME/"
+XDG_PICTURES_DIR="$HOME/"
+XDG_VIDEOS_DIR="$HOME/"

config/user-dirs.locale

@@ -0,0 +1 @@
+en_US

config/wtf/config.yml

@@ -1,3 +1,4 @@
+---
 wtf:
   colors:
     background: black

docs/folders.md

@@ -0,0 +1,53 @@
+# Interesting folders
+
+## XDG
+
+XDG is a set of specifications that provide a standard for the organization
+of user-specific files and directories. It is based on the _XDG Base Directory Specification_.
+
+### XDG_BIN_HOME (`$HOME/.local/bin`)
+
+`$XDG_BIN_HOME` defines directory that contains local binaries.
+
+User-specific executable files may be stored in `$HOME/.local/bin`.
+Distributions should ensure this directory shows up in the UNIX `$PATH`
+environment variable, at an appropriate place.
+
+### XDG_DATA_HOME (`$HOME/.local/share`)
+
+`$XDG_DATA_HOME` defines the base directory relative to which
+user-specific _data files_ should be stored.
+
+If `$XDG_DATA_HOME` is either not set or empty,
+a default equal to `$HOME/.local/share` should be used.
+
+### XDG_CONFIG_HOME (`$HOME/.config`)
+
+`$XDG_CONFIG_HOME` defines the base directory relative to which
+user-specific _configuration files_ should be stored.
+
+If `$XDG_CONFIG_HOME` is either not set or empty,
+a default equal to `$HOME/.config` should be used.
+
+### XDG_STATE_HOME (`$HOME/.local/state`)
+
+`$XDG_STATE_HOME` defines the base directory relative to which
+user-specific _state files_ should be stored.
+
+If `$XDG_STATE_HOME` is either not set or empty,
+a default equal to `$HOME/.local/state` should be used.
+
+The `$XDG_STATE_HOME` contains _state data_ that should
+_persist between (application) restarts_, but that is not important or
+portable enough to the user that it should be stored in `$XDG_DATA_HOME`.
+
+- It may contain:
+  - actions history (logs, history, recently used files, …)
+  - current state of the application that can be reused
+    on a restart (view, layout, open files, undo history, …)
+
+### XDG_DATA_DIRS
+
+`$XDG_DATA_DIRS` defines the preference-ordered set of base directories
+to search for data files in addition to the `$XDG_DATA_HOME` base directory.
+The directories in `$XDG_DATA_DIRS` should be separated with a colon ':'.

docs/nvim-keybindings.md

@@ -1,220 +1,233 @@
 # nvim keybindings
 
+```txt
+
+n  <Esc>       * <Cmd>nohlsearch<CR>
+n  <Space>tc   * <Cmd>CloakToggle<CR>
+                 Toggle Cloak
+n  <Space>zg   * :Rg<CR>
+                 FZF: search with rg (aka live grep).
+n  <Space>zm   * :Maps<CR>
+                 FZF: search mappings.
+n  <Space>zh   * :History<CR>
+                 FZF: search history of opened files
+n  <Space>zb   * :Buffers<CR>
+                 FZF: search open buffers.
+n  <Space>zt   * :Windows<CR>
+                 FZF: search open tabs.
+n  <Space>zc   * :Commands<CR>
+                 FZF: search commands.
+n  <Space>zf   * :FZF<Space>
+                 FZF: search for files in given path.
+   <Space>f    * <Lua 69: ~/.dotfiles/config/nvim-kickstart/init.lua:505>
+                 [F]ormat buffer
+n  <Space>e    * <Lua 52: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <Space>4    * <Lua 49: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 harpoon to file 4
+n  <Space>3    * <Lua 48: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 harpoon to file 3
+n  <Space>2    * <Lua 47: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 harpoon to file 2
+n  <Space>1    * <Lua 46: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 harpoon to file 1
+n  <Space>xn   * <Lua 45: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 harpoon to next file
+n  <Space>xN   * <Lua 44: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 harpoon to previous file
+n  <Space>xa   * <Lua 43: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 harpoon quick menu
+n  <Space>xA   * <Lua 42: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 harpoon file
+n  <Space>5    * <Lua 39: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 harpoon to file 5
+n  <Space>tz   * <Lua 37: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Toggle ZenMode
+n  <Space>qq   * <Cmd>wq!<CR>
+                 Quickly Quit
+n  <Space>bq   * <Lua 27: ~/.local/share/bob/v0.10.0/nvim-macos-arm64/share/nvim/runtime/lua/vim/diagnostic.lua:1984>
+                 Open diagnostic [Q]uickfix list
+n  <Space>be   * <Lua 26: ~/.local/share/bob/v0.10.0/nvim-macos-arm64/share/nvim/runtime/lua/vim/diagnostic.lua:1694>
+                 Show diagnostic [E]rror messages
+x  #           * <Lua 7: vim/_defaults.lua:0>
+                 :help v_#-default
+o  %             <Plug>(MatchitOperationForward)
+x  %             <Plug>(MatchitVisualForward)
+n  %             <Plug>(MatchitNormalForward)
+n  &           * :&&<CR>
+                 :help &-default
+x  *           * <Lua 3: vim/_defaults.lua:0>
+                 :help v_star-default
+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
+n  Y           * y$
+                 :help Y-default
+o  [%            <Plug>(MatchitOperationMultiBackward)
+x  [%            <Plug>(MatchitVisualMultiBackward)
+n  [%            <Plug>(MatchitNormalMultiBackward)
+n  [d          * <Lua 15: vim/_defaults.lua:0>
+                 Jump to the previous diagnostic
+o  ]%            <Plug>(MatchitOperationMultiForward)
+x  ]%            <Plug>(MatchitVisualMultiForward)
+n  ]%            <Plug>(MatchitNormalMultiForward)
+n  ]d          * <Lua 14: vim/_defaults.lua:0>
+                 Jump to the next diagnostic
+x  a%            <Plug>(MatchitVisualTextObject)
+o  al            <Lua 236: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Around last textobject
+o  an            <Lua 235: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Around next textobject
+x  al            <Lua 232: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Around last textobject
+x  an            <Lua 231: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Around next textobject
+o  a             <Lua 229: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Around textobject
+x  a             <Lua 227: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Around textobject
+n  dj          * <Lua 25: ~/.local/share/bob/v0.10.0/nvim-macos-arm64/share/nvim/runtime/lua/vim/diagnostic.lua:1222>
+                 Go to next [D]iagnostic message
+n  dk          * <Lua 23: ~/.local/share/bob/v0.10.0/nvim-macos-arm64/share/nvim/runtime/lua/vim/diagnostic.lua:1145>
+                 Go to previous [D]iagnostic message
+o  g%            <Plug>(MatchitOperationBackward)
+x  g%            <Plug>(MatchitVisualBackward)
+n  g%            <Plug>(MatchitNormalBackward)
+o  g]            <Lua 226: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1169>
+                 Move to right "around"
+x  g]            <Lua 225: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1169>
+                 Move to right "around"
+n  g]            <Lua 224: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1169>
+                 Move to right "around"
+o  g[            <Lua 223: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1168>
+                 Move to left "around"
+x  g[            <Lua 222: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1168>
+                 Move to left "around"
+n  g[            <Lua 221: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1168>
+                 Move to left "around"
+n  gcA         * <Lua 209: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:218>
+                 Comment insert end of line
+n  gcO         * <Lua 208: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:179>
+                 Comment insert above
+n  gco         * <Lua 11: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:182>
+                 Comment insert below
+x  gb          * <Plug>(comment_toggle_blockwise_visual)
+                 Comment toggle blockwise (visual)
+n  gbc         * <Lua 12: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/init.lua:107>
+                 Comment toggle current block
+n  gb          * <Plug>(comment_toggle_blockwise)
+                 Comment toggle blockwise
+o  gc          * <Lua 13: vim/_defaults.lua:0>
+                 Comment textobject
+n  gcc         * <Lua 10: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/init.lua:103>
+                 Comment toggle current line
+x  gc          * <Plug>(comment_toggle_linewise_visual)
+                 Comment toggle linewise (visual)
+n  gc          * <Plug>(comment_toggle_linewise)
+                 Comment toggle linewise
+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  il            <Lua 238: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Inside last textobject
+o  in            <Lua 237: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Inside next textobject
+x  il            <Lua 234: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Inside last textobject
+x  in            <Lua 233: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Inside next textobject
+o  i             <Lua 230: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Inside textobject
+x  i             <Lua 228: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1172>
+                 Inside textobject
+n  shn         * <Lua 255: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Highlight next surrounding
+n  sFn         * <Lua 254: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Find next left surrounding
+n  sfn         * <Lua 253: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Find next right surrounding
+n  srn         * <Lua 252: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Replace next surrounding
+n  sdn         * <Lua 251: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Delete next surrounding
+n  shl         * <Lua 250: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Highlight previous surrounding
+n  sFl         * <Lua 249: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Find previous left surrounding
+n  sfl         * <Lua 248: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Find previous right surrounding
+n  srl         * <Lua 247: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Replace previous surrounding
+n  sdl         * <Lua 246: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Delete previous surrounding
+x  sa          * :<C-U>lua MiniSurround.add('visual')<CR>
+                 Add surrounding to selection
+n  sn          * <Lua 245: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:892>
+                 Update `MiniSurround.config.n_lines`
+n  sh          * <Lua 244: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Highlight surrounding
+n  sF          * <Lua 243: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Find left surrounding
+n  sf          * <Lua 242: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Find right surrounding
+n  sr          * <Lua 241: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Replace surrounding
+n  sd          * <Lua 240: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Delete surrounding
+n  sa          * <Lua 239: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1252>
+                 Add surrounding
+x  <Plug>(MatchitVisualTextObject)   <Plug>(MatchitVisualMultiBackward)o<Plug>(MatchitVisualMultiForward)
+o  <Plug>(MatchitOperationMultiForward) * :<C-U>call matchit#MultiMatch("W",  "o")<CR>
+o  <Plug>(MatchitOperationMultiBackward) * :<C-U>call matchit#MultiMatch("bW", "o")<CR>
+x  <Plug>(MatchitVisualMultiForward) * :<C-U>call matchit#MultiMatch("W",  "n")<CR>m'gv``
+x  <Plug>(MatchitVisualMultiBackward) * :<C-U>call matchit#MultiMatch("bW", "n")<CR>m'gv``
+n  <Plug>(MatchitNormalMultiForward) * :<C-U>call matchit#MultiMatch("W",  "n")<CR>
+n  <Plug>(MatchitNormalMultiBackward) * :<C-U>call matchit#MultiMatch("bW", "n")<CR>
+o  <Plug>(MatchitOperationBackward) * :<C-U>call matchit#Match_wrapper('',0,'o')<CR>
+o  <Plug>(MatchitOperationForward) * :<C-U>call matchit#Match_wrapper('',1,'o')<CR>
+x  <Plug>(MatchitVisualBackward) * :<C-U>call matchit#Match_wrapper('',0,'v')<CR>m'gv``
+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>
+n  <C-P>       * :Files<CR>
+                 FZF: search for files starting at current directory.
+o  <Plug>(fzf-maps-o) * <C-C>:<C-U>call fzf#vim#maps('o', 0)<CR>
+x  <Plug>(fzf-maps-x) * :<C-U>call fzf#vim#maps('x', 0)<CR>
+n  <Plug>(fzf-maps-n) * :<C-U>call fzf#vim#maps('n', 0)<CR>
+n  <Plug>(fzf-normal) * <Nop>
+n  <Plug>(fzf-insert) * i
+x  <Plug>(comment_toggle_blockwise_visual) * <Esc><Cmd>lua require("Comment.api").locked("toggle.blockwise")(vim.fn.visualmode())<CR>
+                 Comment toggle blockwise (visual)
+x  <Plug>(comment_toggle_linewise_visual) * <Esc><Cmd>lua require("Comment.api").locked("toggle.linewise")(vim.fn.visualmode())<CR>
+                 Comment toggle linewise (visual)
+n  <Plug>(comment_toggle_blockwise_count) * <Lua 206: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
+                 Comment toggle blockwise with count
+n  <Plug>(comment_toggle_linewise_count) * <Lua 205: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
+                 Comment toggle linewise with count
+n  <Plug>(comment_toggle_blockwise_current) * <Lua 204: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
+                 Comment toggle current block
+n  <Plug>(comment_toggle_linewise_current) * <Lua 203: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
+                 Comment toggle current line
+n  <Plug>(comment_toggle_blockwise) * <Lua 202: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
+                 Comment toggle blockwise
+n  <Plug>(comment_toggle_linewise) * <Lua 201: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
+                 Comment toggle linewise
+n  <C-Bslash>  * <Lua 58: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <C-S>       * <Cmd>w<CR>
+                 Save file
+n  <C-K>       * <Lua 59: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <C-J>       * <Lua 54: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <C-H>       * <Lua 57: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <Down>      * <Cmd>echo "Use j to move!!"<CR>
+n  <Up>        * <Cmd>echo "Use k to move!!"<CR>
+n  <Right>     * <Cmd>echo "Use l to move!!"<CR>
+n  <Left>      * <Cmd>echo "Use h to move!!"<CR>
+n  <C-W><C-D>    <C-W>d
+                 Show diagnostics under the cursor
+n  <C-W>d      * <Lua 16: vim/_defaults.lua:0>
+                 Show diagnostics under the cursor
+n  <C-L>       * <Lua 56: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
 ```
-n  !           * <Cmd>lua require("which-key").show("!", {mode = "n", auto = true})<CR>
-n  '           * <Cmd>lua require("which-key").show("'", {mode = "n", auto = true})<CR>
-n  "           * <Cmd>lua require("which-key").show("\"", {mode = "n", auto = true})<CR>
-n  [           * <Cmd>lua require("which-key").show("[", {mode = "n", auto = true})<CR>
-n  [b          * <Lua 246: ~/.config/nvim/lua/astronvim/mappings.lua:54> Previous buffer
-n  [g          * <Lua 277: ~/.config/nvim/lua/astronvim/mappings.lua:150> Previous Git hunk
-n  [t          * <Lua 281: ~/.config/nvim/lua/astronvim/mappings.lua:120> Previous tab
-n  ]           * <Cmd>lua require("which-key").show("]", {mode = "n", auto = true})<CR>
-n  ]b          * <Lua 250: ~/.config/nvim/lua/astronvim/mappings.lua:52> Next buffer
-n  ]g          * <Lua 278: ~/.config/nvim/lua/astronvim/mappings.lua:149> Next Git hunk
-n  ]t          * <Lua 282: ~/.config/nvim/lua/astronvim/mappings.lua:119> Next tab
-n  @           * <Cmd>lua require("which-key").show("@", {mode = "n", auto = true})<CR>
-n  \           * <Cmd>split<CR> Horizontal Split
-n  &           * :&&<CR> Nvim builtin
-n  `* <Cmd>lua require("which-key").show("`", {mode = "n", auto = true})<CR>
-n  <           * <Cmd>lua require("which-key").show("<", {mode = "n", auto = true})<CR>
-n  <b          * <Lua 297: ~/.config/nvim/lua/astronvim/mappings.lua:62> Move buffer tab left
-n  <C-'>       * <Cmd>ToggleTerm<CR> Toggle terminal
-n  <C-Down>    * <Lua 263: ~/.config/nvim/lua/astronvim/mappings.lua:213> Resize split down
-n  <C-H>       * <Lua 266: ~/.config/nvim/lua/astronvim/mappings.lua:208> Move to left split
-n  <C-J>       * <Lua 283: ~/.config/nvim/lua/astronvim/mappings.lua:209> Move to below split
-n  <C-K>       * <Lua 327: ~/.config/nvim/lua/astronvim/mappings.lua:210> Move to above split
-n  <C-L>       * <Lua 265: ~/.config/nvim/lua/astronvim/mappings.lua:211> Move to right split
-n  <C-Left>    * <Lua 262: ~/.config/nvim/lua/astronvim/mappings.lua:214> Resize split left
-n  <C-N>       * <Lua 79: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Goto next mark
-n  <C-P>       * <Lua 80: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Goto previous mark
-n  <C-Q>       * <Cmd>q!<CR> Force quit
-n  <C-Right>   * <Lua 261: ~/.config/nvim/lua/astronvim/mappings.lua:215> Resize split right
-n  <C-S>       * <Cmd>w!<CR> Force write
-n  <C-Up>      * <Lua 264: ~/.config/nvim/lua/astronvim/mappings.lua:212> Resize split up
-n  <C-W>       * <Cmd>lua require("which-key").show("\23", {mode = "n", auto = true})<CR>
-n  <CR>        *@<Lua 391: ~/.local/share/nvim/lazy/alpha-nvim/lua/alpha.lua:705>
-n  <F10>       * <Lua 348: ~/.config/nvim/lua/astronvim/mappings.lua:353> Debugger: Step Over
-n  <F11>       * <Lua 333: ~/.config/nvim/lua/astronvim/mappings.lua:354> Debugger: Step Into
-n  <F17>       * <Lua 344: ~/.config/nvim/lua/astronvim/mappings.lua:341> Debugger: Stop
-n  <F21>       * <Lua 342: ~/.config/nvim/lua/astronvim/mappings.lua:343> Debugger: Conditional Breakpoint
-n  <F23>       * <Lua 331: ~/.config/nvim/lua/astronvim/mappings.lua:355> Debugger: Step Out
-n  <F29>       * <Lua 334: ~/.config/nvim/lua/astronvim/mappings.lua:350> Debugger: Restart
-n  <F5>        * <Lua 341: ~/.config/nvim/lua/astronvim/mappings.lua:340> Debugger: Start
-n  <F6>        * <Lua 339: ~/.config/nvim/lua/astronvim/mappings.lua:351> Debugger: Pause
-n  <F7>        * <Cmd>ToggleTerm<CR> Toggle terminal
-n  <F9>        * <Lua 337: ~/.config/nvim/lua/astronvim/mappings.lua:352> Debugger: Toggle Breakpoint
-n  <M-CR>      *@<Lua 394: ~/.local/share/nvim/lazy/alpha-nvim/lua/alpha.lua:708>
-n  <Plug>PlenaryTestFile *:lua require('plenary.test_harness').test_directory(vim.fn.expand("%:p"))<CR>
-n  <Space>     * <Cmd>lua require("which-key").show(" ", {mode = "n", auto = true})<CR>
-n  <Space>/    * <Lua 279: ~/.config/nvim/lua/astronvim/mappings.lua:139> Comment line
-n  <Space><Space> * <Lua 49: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Harpoon
-n  <Space><Space>a * <Lua 81: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Add file
-n  <Space><Space>e * <Lua 82: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Toggle quick menu
-n  <Space><Space>j * <Lua 48: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Goto to TMUX tmux window
-n  <Space><Space>m * <Lua 83: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Show marks in Telescope
-n  <Space><Space>t * <Lua 84: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Goto to terminal window
-n  <Space>a    * <Lua 102: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Annotation
-n  <Space>a<CR> * <Lua 103: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Current
-n  <Space>ac   * <Lua 104: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Class
-n  <Space>af   * <Lua 105: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Function
-n  <Space>aF   * <Lua 96: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> File
-n  <Space>at   * <Lua 86: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Type
-n  <Space>b\   * <Lua 285: ~/.config/nvim/lua/astronvim/mappings.lua:100> Horizontal split buffer from tabline
-n  <Space>b|   * <Lua 284: ~/.config/nvim/lua/astronvim/mappings.lua:109> Vertical split buffer from tabline
-n  <Space>bb   * <Lua 294: ~/.config/nvim/lua/astronvim/mappings.lua:71> Select buffer from tabline
-n  <Space>bC   * <Lua 295: ~/.config/nvim/lua/astronvim/mappings.lua:69> Close all buffers
-n  <Space>bc   * <Lua 296: ~/.config/nvim/lua/astronvim/mappings.lua:68> Close all buffers except current
-n  <Space>bd   * <Lua 293: ~/.config/nvim/lua/astronvim/mappings.lua:77> Delete buffer from tabline
-n  <Space>bD   * <Lua 320: ~/.config/astronvim/lua/user/mappings.lua:13> Pick to close
-n  <Space>bl   * <Lua 292: ~/.config/nvim/lua/astronvim/mappings.lua:85> Close all buffers to the left
-n  <Space>bn   * <Cmd>tabnew<CR> New tab
-n  <Space>br   * <Lua 291: ~/.config/nvim/lua/astronvim/mappings.lua:87> Close all buffers to the right
-n  <Space>bse  * <Lua 290: ~/.config/nvim/lua/astronvim/mappings.lua:90> Sort by extension (buffers)
-n  <Space>bsi  * <Lua 287: ~/.config/nvim/lua/astronvim/mappings.lua:96> Sort by buffer number (buffers)
-n  <Space>bsm  * <Lua 286: ~/.config/nvim/lua/astronvim/mappings.lua:98> Sort by modification (buffers)
-n  <Space>bsp  * <Lua 288: ~/.config/nvim/lua/astronvim/mappings.lua:94> Sort by full path (buffers)
-n  <Space>bsr  * <Lua 289: ~/.config/nvim/lua/astronvim/mappings.lua:92> Sort by relative path (buffers)
-n  <Space>C    * <Lua 299: ~/.config/nvim/lua/astronvim/mappings.lua:50> Force close buffer
-n  <Space>c    * <Lua 300: ~/.config/nvim/lua/astronvim/mappings.lua:49> Close buffer
-n  <Space>dB   * <Lua 328: ~/.config/nvim/lua/astronvim/mappings.lua:357> Clear Breakpoints
-n  <Space>db   * <Lua 329: ~/.config/nvim/lua/astronvim/mappings.lua:356> Toggle Breakpoint (F9)
-n  <Space>dC   * <Lua 324: ~/.config/nvim/lua/astronvim/mappings.lua:360> Conditional Breakpoint (S-F9)
-n  <Space>dc   * <Lua 326: ~/.config/nvim/lua/astronvim/mappings.lua:358> Start/Continue (F5)
-n  <Space>dE   * <Lua 308: ~/.config/nvim/lua/astronvim/mappings.lua:379> Evaluate Input
-n  <Space>dh   * <Lua 305: ~/.config/nvim/lua/astronvim/mappings.lua:388> Debugger Hover
-n  <Space>di   * <Lua 323: ~/.config/nvim/lua/astronvim/mappings.lua:367> Step Into (F11)
-n  <Space>dO   * <Lua 321: ~/.config/nvim/lua/astronvim/mappings.lua:369> Step Out (S-F11)
-n  <Space>do   * <Lua 322: ~/.config/nvim/lua/astronvim/mappings.lua:368> Step Over (F10)
-n  <Space>dp   * <Lua 316: ~/.config/nvim/lua/astronvim/mappings.lua:372> Pause (F6)
-n  <Space>dQ   * <Lua 318: ~/.config/nvim/lua/astronvim/mappings.lua:371> Terminate Session (S-F5)
-n  <Space>dq   * <Lua 319: ~/.config/nvim/lua/astronvim/mappings.lua:370> Close Session
-n  <Space>dR   * <Lua 312: ~/.config/nvim/lua/astronvim/mappings.lua:374> Toggle REPL
-n  <Space>dr   * <Lua 314: ~/.config/nvim/lua/astronvim/mappings.lua:373> Restart (C-F5)
-n  <Space>ds   * <Lua 310: ~/.config/nvim/lua/astronvim/mappings.lua:375> Run To Cursor
-n  <Space>du   * <Lua 315: ~/.config/nvim/lua/astronvim/mappings.lua:387> Toggle Debugger UI
-n  <Space>e    * <Cmd>Neotree toggle<CR> Toggle Explorer
-n  <Space>f'   * <Lua 255: ~/.config/nvim/lua/astronvim/mappings.lua:241> Find marks
-n  <Space>f<CR> * <Lua 256: ~/.config/nvim/lua/astronvim/mappings.lua:240> Resume previous search
-n  <Space>fa   * <Lua 254: ~/.config/nvim/lua/astronvim/mappings.lua:243> Find AstroNvim config files
-n  <Space>fb   * <Lua 253: ~/.config/nvim/lua/astronvim/mappings.lua:263> Find buffers
-n  <Space>fC   * <Lua 251: ~/.config/nvim/lua/astronvim/mappings.lua:266> Find commands
-n  <Space>fc   * <Lua 252: ~/.config/nvim/lua/astronvim/mappings.lua:265> Find for word under cursor
-n  <Space>fF   * <Lua 248: ~/.config/nvim/lua/astronvim/mappings.lua:269> Find all files
-n  <Space>ff   * <Lua 249: ~/.config/nvim/lua/astronvim/mappings.lua:267> Find files
-n  <Space>fh   * <Lua 247: ~/.config/nvim/lua/astronvim/mappings.lua:272> Find help
-n  <Space>fk   * <Lua 245: ~/.config/nvim/lua/astronvim/mappings.lua:273> Find keymaps
-n  <Space>fm   * <Lua 309: ~/.config/nvim/lua/astronvim/mappings.lua:274> Find man
-n  <Space>fn   * <Lua 242: ~/.config/nvim/lua/astronvim/mappings.lua:277> Find notifications
-n  <Space>fo   * <Lua 240: ~/.config/nvim/lua/astronvim/mappings.lua:279> Find history
-n  <Space>fr   * <Lua 239: ~/.config/nvim/lua/astronvim/mappings.lua:280> Find registers
-n  <Space>ft   * <Lua 238: ~/.config/nvim/lua/astronvim/mappings.lua:282> Find themes
-n  <Space>fW   * <Lua 236: ~/.config/nvim/lua/astronvim/mappings.lua:285> Find words in all files
-n  <Space>fw   * <Lua 237: ~/.config/nvim/lua/astronvim/mappings.lua:283> Find words
-n  <Space>gb   * <Lua 259: ~/.config/nvim/lua/astronvim/mappings.lua:237> Git branches
-n  <Space>gc   * <Lua 258: ~/.config/nvim/lua/astronvim/mappings.lua:238> Git commits
-n  <Space>gd   * <Lua 268: ~/.config/nvim/lua/astronvim/mappings.lua:159> View Git diff
-n  <Space>gg   * <Lua 304: ~/.config/nvim/lua/astronvim/mappings.lua:312> ToggleTerm lazygit
-n  <Space>gh   * <Lua 273: ~/.config/nvim/lua/astronvim/mappings.lua:154> Reset Git hunk
-n  <Space>gL   * <Lua 275: ~/.config/nvim/lua/astronvim/mappings.lua:152> View full Git blame
-n  <Space>gl   * <Lua 276: ~/.config/nvim/lua/astronvim/mappings.lua:151> View Git blame
-n  <Space>gp   * <Lua 274: ~/.config/nvim/lua/astronvim/mappings.lua:153> Preview Git hunk
-n  <Space>gr   * <Lua 272: ~/.config/nvim/lua/astronvim/mappings.lua:155> Reset Git buffer
-n  <Space>gS   * <Lua 270: ~/.config/nvim/lua/astronvim/mappings.lua:157> Stage Git buffer
-n  <Space>gs   * <Lua 271: ~/.config/nvim/lua/astronvim/mappings.lua:156> Stage Git hunk
-n  <Space>gt   * <Lua 257: ~/.config/nvim/lua/astronvim/mappings.lua:239> Git status
-n  <Space>gu   * <Lua 269: ~/.config/nvim/lua/astronvim/mappings.lua:158> Unstage Git hunk
-n  <Space>h    * <Lua 280: ~/.config/nvim/lua/astronvim/mappings.lua:125> Home Screen
-n  <Space>lD   * <Lua 313: ~/.config/nvim/lua/astronvim/mappings.lua:293> Search diagnostics
-n  <Space>ls   * <Lua 235: ~/.config/nvim/lua/astronvim/mappings.lua:295> Search symbols
-n  <Space>lS   * <Lua 260: ~/.config/nvim/lua/astronvim/mappings.lua:230> Symbols outline
-n  <Space>n    * <Cmd>enew<CR> New File
-n  <Space>o    * <Lua 267: ~/.config/nvim/lua/astronvim/mappings.lua:166> Toggle Explorer Focus
-n  <Space>p    * <Cmd>lua require("which-key").show(" p", {mode = "n", auto = true})<CR>
-n  <Space>pA   * <Cmd>AstroUpdate<CR> AstroNvim Update
-n  <Space>pa   * <Cmd>AstroUpdatePackages<CR> Update Plugins and Mason
-n  <Space>pi   * <Lua 307: ~/.config/nvim/lua/astronvim/mappings.lua:36> Plugins Install
-n  <Space>pl   * <Cmd>AstroChangelog<CR> AstroNvim Changelog
-n  <Space>pm   * <Cmd>Mason<CR> Mason Installer
-n  <Space>pM   * <Cmd>MasonUpdateAll<CR> Mason Update
-n  <Space>pS   * <Lua 233: ~/.config/nvim/lua/astronvim/mappings.lua:38> Plugins Sync
-n  <Space>ps   * <Lua 234: ~/.config/nvim/lua/astronvim/mappings.lua:37> Plugins Status
-n  <Space>pU   * <Lua 229: ~/.config/nvim/lua/astronvim/mappings.lua:40> Plugins Update
-n  <Space>pu   * <Lua 231: ~/.config/nvim/lua/astronvim/mappings.lua:39> Plugins Check Updates
-n  <Space>pv   * <Cmd>AstroVersion<CR> AstroNvim Version
-n  <Space>q    * <Cmd>confirm q<CR> Quit
-n  <Space>s    * <Lua 45: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Search / Replace
-n  <Space>S.   * <Cmd>SessionManager! load_current_dir_session<CR> Load current directory session
-n  <Space>Sd   * <Cmd>SessionManager! delete_session<CR> Delete session
-n  <Space>Sf   * <Cmd>SessionManager! load_session<CR> Search sessions
-n  <Space>sf   * <Lua 36: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Spectre (current file)
-n  <Space>Sl   * <Cmd>SessionManager! load_last_session<CR> Load last session
-n  <Space>Ss   * <Cmd>SessionManager! save_current_session<CR> Save this session
-n  <Space>ss   * <Lua 35: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Spectre
-n  <Space>tf   * <Cmd>ToggleTerm direction=float<CR> ToggleTerm float
-n  <Space>th   * <Cmd>ToggleTerm size=10 direction=horizontal<CR> ToggleTerm horizontal split
-n  <Space>tl   * <Lua 232: ~/.config/nvim/lua/astronvim/mappings.lua:313> ToggleTerm lazygit
-n  <Space>tn   * <Lua 230: ~/.config/nvim/lua/astronvim/mappings.lua:316> ToggleTerm node
-n  <Space>tp   * <Lua 311: ~/.config/nvim/lua/astronvim/mappings.lua:325> ToggleTerm python
-n  <Space>tt   * <Lua 306: ~/.config/nvim/lua/astronvim/mappings.lua:322> ToggleTerm btm
-n  <Space>tu   * <Lua 355: ~/.config/nvim/lua/astronvim/mappings.lua:319> ToggleTerm gdu
-n  <Space>tv   * <Cmd>ToggleTerm size=80 direction=vertical<CR> ToggleTerm vertical split
-n  <Space>ua   * <Lua 350: ~/.config/nvim/lua/astronvim/utils/ui.lua:27> Toggle autopairs
-n  <Space>ub   * <Lua 303: ~/.config/nvim/lua/astronvim/utils/ui.lua:58> Toggle background
-n  <Space>uC   * <Cmd>ColorizerToggle<CR> Toggle color highlight
-n  <Space>uc   * <Lua 354: ~/.config/nvim/lua/astronvim/utils/ui.lua:64> Toggle autocompletion
-n  <Space>ud   * <Lua 353: ~/.config/nvim/lua/astronvim/utils/ui.lua:43> Toggle diagnostics
-n  <Space>ug   * <Lua 301: ~/.config/nvim/lua/astronvim/utils/ui.lua:134> Toggle signcolumn
-n  <Space>uh   * <Lua 352: ~/.config/nvim/lua/astronvim/utils/ui.lua:215> Toggle foldcolumn
-n  <Space>ui   * <Lua 325: ~/.config/nvim/lua/astronvim/utils/ui.lua:146> Change indent setting
-n  <Space>ul   * <Lua 330: ~/.config/nvim/lua/astronvim/utils/ui.lua:117> Toggle statusline
-n  <Space>uL   * <Lua 345: ~/.config/nvim/lua/astronvim/utils/ui.lua:98> Toggle CodeLens
-n  <Space>uN   * <Lua 340: ~/.config/nvim/lua/astronvim/utils/ui.lua:21> Toggle UI notifications
-n  <Space>un   * <Lua 343: ~/.config/nvim/lua/astronvim/utils/ui.lua:161> Change line numbering
-n  <Space>up   * <Lua 338: ~/.config/nvim/lua/astronvim/utils/ui.lua:183> Toggle paste mode
-n  <Space>uS   * <Lua 332: ~/.config/nvim/lua/astronvim/utils/ui.lua:111> Toggle conceal
-n  <Space>us   * <Lua 335: ~/.config/nvim/lua/astronvim/utils/ui.lua:177> Toggle spellcheck
-n  <Space>uT   * <Cmd>TransparentToggle<CR> Toggle transparency
-n  <Space>ut   * <Lua 302: ~/.config/nvim/lua/astronvim/utils/ui.lua:105> Toggle tabline
-n  <Space>uu   * <Lua 351: ~/.config/nvim/lua/astronvim/utils/ui.lua:208> Toggle URL highlight
-n  <Space>uw   * <Lua 349: ~/.config/nvim/lua/astronvim/utils/ui.lua:189> Toggle wrap
-n  <Space>uy   * <Lua 346: ~/.config/nvim/lua/astronvim/utils/ui.lua:195> Toggle syntax highlight
-n  <Space>w    * <Cmd>w<CR> Save
-n  <Space>x    * <Lua 126: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Trouble
-n  <Space>xl   * <Lua 171: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Location List (Trouble)
-n  <Space>xq   * <Lua 172: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Quickfix List (Trouble)
-n  <Space>xX   * <Lua 132: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Workspace Diagnostics (Trouble)
-n  <Space>xx   * <Lua 170: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Document Diagnostics (Trouble)
-n  >           * <Cmd>lua require("which-key").show(">", {mode = "n", auto = true})<CR>
-n  >b          * <Lua 298: ~/.config/nvim/lua/astronvim/mappings.lua:58> Move buffer tab right
-n  |           * <Cmd>vsplit<CR> Vertical Split
-n  c           * <Cmd>lua require("which-key").show("c", {mode = "n", auto = true})<CR>
-n  d           * <Cmd>lua require("which-key").show("d", {mode = "n", auto = true})<CR>
-n  g           * <Cmd>lua require("which-key").show("g", {mode = "n", auto = true})<CR>
-n  gb          * <Lua 123: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Comment toggle blockwise
-n  gc          * <Lua 107: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Comment toggle linewise
-n  gx          * <Lua 241: ~/.config/nvim/lua/astronvim/utils/init.lua:134> Open the file under cursor with system app
-n  j           * v:count == 0 ? 'gj' : 'j' Move cursor down
-n  k           * v:count == 0 ? 'gk' : 'k' Move cursor up
-n  v           * <Cmd>lua require("which-key").show("v", {mode = "n", auto = true})<CR>
-n  y           * <Cmd>lua require("which-key").show("y", {mode = "n", auto = true})<CR>
-n  Y           * y$ Nvim builtin
-n  z           * <Cmd>lua require("which-key").show("z", {mode = "n", auto = true})<CR>
-n  zM          * <Lua 244: ~/.config/nvim/lua/astronvim/mappings.lua:395> Close all folds
-n  zm          * <Lua 317: ~/.config/nvim/lua/astronvim/mappings.lua:397> Fold more
-n  zp          * <Lua 347: ~/.config/nvim/lua/astronvim/mappings.lua:398> Peek fold
-n  zr          * <Lua 243: ~/.config/nvim/lua/astronvim/mappings.lua:396> Fold less
-n  zR          * <Lua 336: ~/.config/nvim/lua/astronvim/mappings.lua:394> Open all folds
-v  <Tab>       * >gv indent line
-v  <S-Tab>     * <gv unindent line
-v  <Space>/    * <Esc><Cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR> Toggle comment line
-v  <Space>dE   * <Lua 228: ~/.config/nvim/lua/astronvim/mappings.lua:386> Evaluate Input
-v  gb          * <Lua 124: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Comment toggle blockwise
-v  gc          * <Lua 114: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Comment toggle linewise
-x  "           * <Cmd>lua require("which-key").show("\"", {mode = "v", auto = true})<CR>
-x  ** y/\V<C-R>"<CR> Nvim builtin
-x  #           * y?\V<C-R>"<CR> Nvim builtin
-x  <Space>     * <Cmd>lua require("which-key").show(" ", {mode = "v", auto = true})<CR>
-x  <Space>s    * <Lua 46: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Search / Replace
-x  <Space>sw   * <Lua 47: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Spectre (current word)
-x  g           * <Cmd>lua require("which-key").show("g", {mode = "v", auto = true})<CR>
-```
+
+- Generated on Mon 22 Jul 2024 17:32:22 EEST

docs/tmux-keybindings.md

@@ -3,296 +3,80 @@
 Leader: `<ctrl><space>`
 
 ```
-bind-key    -T copy-mode    C-Space              send-keys -X begin-selection
-bind-key    -T copy-mode    C-a                  send-keys -X start-of-line
-bind-key    -T copy-mode    C-b                  send-keys -X cursor-left
-bind-key    -T copy-mode    C-c                  send-keys -X cancel
-bind-key    -T copy-mode    C-e                  send-keys -X end-of-line
-bind-key    -T copy-mode    C-f                  send-keys -X cursor-right
-bind-key    -T copy-mode    C-g                  send-keys -X clear-selection
-bind-key    -T copy-mode    C-k                  send-keys -X copy-pipe-end-of-line-and-cancel
-bind-key    -T copy-mode    C-n                  send-keys -X cursor-down
-bind-key    -T copy-mode    C-p                  send-keys -X cursor-up
-bind-key    -T copy-mode    C-r                  command-prompt -i -I "#{pane_search_string}" -T search -p "(search up)" { send-keys -X search-backward-incremental "%%" }
-bind-key    -T copy-mode    C-s                  command-prompt -i -I "#{pane_search_string}" -T search -p "(search down)" { send-keys -X search-forward-incremental "%%" }
-bind-key    -T copy-mode    C-v                  send-keys -X page-down
-bind-key    -T copy-mode    C-w                  send-keys -X copy-pipe-and-cancel
-bind-key    -T copy-mode    Escape               send-keys -X cancel
-bind-key    -T copy-mode    Space                send-keys -X page-down
-bind-key    -T copy-mode    !                    send-keys -X copy-pipe-and-cancel "tr -d '
-' | pbcopy"
-bind-key    -T copy-mode    ,                    send-keys -X jump-reverse
-bind-key    -T copy-mode    \;                   send-keys -X jump-again
-bind-key    -T copy-mode    F                    command-prompt -1 -p "(jump backward)" { send-keys -X jump-backward "%%" }
-bind-key    -T copy-mode    N                    send-keys -X search-reverse
-bind-key    -T copy-mode    P                    send-keys -X toggle-position
-bind-key    -T copy-mode    R                    send-keys -X rectangle-toggle
-bind-key    -T copy-mode    T                    command-prompt -1 -p "(jump to backward)" { send-keys -X jump-to-backward "%%" }
-bind-key    -T copy-mode    X                    send-keys -X set-mark
-bind-key    -T copy-mode    Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
-bind-key    -T copy-mode    f                    command-prompt -1 -p "(jump forward)" { send-keys -X jump-forward "%%" }
-bind-key    -T copy-mode    g                    command-prompt -p "(goto line)" { send-keys -X goto-line "%%" }
-bind-key    -T copy-mode    n                    send-keys -X search-again
-bind-key    -T copy-mode    q                    send-keys -X cancel
-bind-key    -T copy-mode    r                    send-keys -X refresh-from-pane
-bind-key    -T copy-mode    t                    command-prompt -1 -p "(jump to forward)" { send-keys -X jump-to-forward "%%" }
-bind-key    -T copy-mode    y                    send-keys -X copy-pipe-and-cancel pbcopy
-bind-key    -T copy-mode    MouseDown1Pane       select-pane
-bind-key    -T copy-mode    MouseDrag1Pane       select-pane \; send-keys -X begin-selection
-bind-key    -T copy-mode    MouseDragEnd1Pane    send-keys -X copy-pipe-and-cancel
-bind-key    -T copy-mode    WheelUpPane          select-pane \; send-keys -X -N 5 scroll-up
-bind-key    -T copy-mode    WheelDownPane        select-pane \; send-keys -X -N 5 scroll-down
-bind-key    -T copy-mode    DoubleClick1Pane     select-pane \; send-keys -X select-word \; run-shell -d 0.3 \; send-keys -X copy-pipe-and-cancel
-bind-key    -T copy-mode    TripleClick1Pane     select-pane \; send-keys -X select-line \; run-shell -d 0.3 \; send-keys -X copy-pipe-and-cancel
-bind-key    -T copy-mode    Home                 send-keys -X start-of-line
-bind-key    -T copy-mode    End                  send-keys -X end-of-line
-bind-key    -T copy-mode    NPage                send-keys -X page-down
-bind-key    -T copy-mode    PPage                send-keys -X page-up
-bind-key    -T copy-mode    Up                   send-keys -X cursor-up
-bind-key    -T copy-mode    Down                 send-keys -X cursor-down
-bind-key    -T copy-mode    Left                 send-keys -X cursor-left
-bind-key    -T copy-mode    Right                send-keys -X cursor-right
-bind-key    -T copy-mode    M-C-b                send-keys -X previous-matching-bracket
-bind-key    -T copy-mode    M-C-f                send-keys -X next-matching-bracket
-bind-key    -T copy-mode    M-1                  command-prompt -N -I 1 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode    M-2                  command-prompt -N -I 2 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode    M-3                  command-prompt -N -I 3 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode    M-4                  command-prompt -N -I 4 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode    M-5                  command-prompt -N -I 5 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode    M-6                  command-prompt -N -I 6 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode    M-7                  command-prompt -N -I 7 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode    M-8                  command-prompt -N -I 8 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode    M-9                  command-prompt -N -I 9 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode    M-<                  send-keys -X history-top
-bind-key    -T copy-mode    M->                  send-keys -X history-bottom
-bind-key    -T copy-mode    M-R                  send-keys -X top-line
-bind-key    -T copy-mode    M-b                  send-keys -X previous-word
-bind-key    -T copy-mode    M-f                  send-keys -X next-word-end
-bind-key    -T copy-mode    M-m                  send-keys -X back-to-indentation
-bind-key    -T copy-mode    M-r                  send-keys -X middle-line
-bind-key    -T copy-mode    M-v                  send-keys -X page-up
-bind-key    -T copy-mode    M-w                  send-keys -X copy-pipe-and-cancel
-bind-key    -T copy-mode    M-x                  send-keys -X jump-to-mark
-bind-key    -T copy-mode    M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer"
-bind-key    -T copy-mode    "M-{"                send-keys -X previous-paragraph
-bind-key    -T copy-mode    "M-}"                send-keys -X next-paragraph
-bind-key    -T copy-mode    M-Up                 send-keys -X halfpage-up
-bind-key    -T copy-mode    M-Down               send-keys -X halfpage-down
-bind-key    -T copy-mode    C-Up                 send-keys -X scroll-up
-bind-key    -T copy-mode    C-Down               send-keys -X scroll-down
-bind-key    -T copy-mode-vi C-b                  send-keys -X page-up
-bind-key    -T copy-mode-vi C-c                  send-keys -X cancel
-bind-key    -T copy-mode-vi C-d                  send-keys -X halfpage-down
-bind-key    -T copy-mode-vi C-e                  send-keys -X scroll-down
-bind-key    -T copy-mode-vi C-f                  send-keys -X page-down
-bind-key    -T copy-mode-vi C-h                  send-keys -X cursor-left
-bind-key    -T copy-mode-vi C-j                  send-keys -X copy-pipe-and-cancel
-bind-key    -T copy-mode-vi Enter                send-keys -X copy-pipe-and-cancel
-bind-key    -T copy-mode-vi C-u                  send-keys -X halfpage-up
-bind-key    -T copy-mode-vi C-v                  send-keys -X rectangle-toggle
-bind-key    -T copy-mode-vi C-y                  send-keys -X scroll-up
-bind-key    -T copy-mode-vi Escape               send-keys -X clear-selection
-bind-key    -T copy-mode-vi Space                send-keys -X begin-selection
-bind-key    -T copy-mode-vi !                    send-keys -X copy-pipe-and-cancel "tr -d '
-' | pbcopy"
-bind-key    -T copy-mode-vi \#                   send-keys -FX search-backward "#{copy_cursor_word}"
-bind-key    -T copy-mode-vi \$                   send-keys -X end-of-line
-bind-key    -T copy-mode-vi \%                   send-keys -X next-matching-bracket
-bind-key    -T copy-mode-vi *                    send-keys -FX search-forward "#{copy_cursor_word}"
-bind-key    -T copy-mode-vi ,                    send-keys -X jump-reverse
-bind-key    -T copy-mode-vi /                    command-prompt -T search -p "(search down)" { send-keys -X search-forward "%%" }
-bind-key    -T copy-mode-vi 0                    send-keys -X start-of-line
-bind-key    -T copy-mode-vi 1                    command-prompt -N -I 1 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode-vi 2                    command-prompt -N -I 2 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode-vi 3                    command-prompt -N -I 3 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode-vi 4                    command-prompt -N -I 4 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode-vi 5                    command-prompt -N -I 5 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode-vi 6                    command-prompt -N -I 6 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode-vi 7                    command-prompt -N -I 7 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode-vi 8                    command-prompt -N -I 8 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode-vi 9                    command-prompt -N -I 9 -p (repeat) { send-keys -N "%%" }
-bind-key    -T copy-mode-vi :                    command-prompt -p "(goto line)" { send-keys -X goto-line "%%" }
-bind-key    -T copy-mode-vi \;                   send-keys -X jump-again
-bind-key    -T copy-mode-vi ?                    command-prompt -T search -p "(search up)" { send-keys -X search-backward "%%" }
-bind-key    -T copy-mode-vi A                    send-keys -X append-selection-and-cancel
-bind-key    -T copy-mode-vi B                    send-keys -X previous-space
-bind-key    -T copy-mode-vi D                    send-keys -X copy-pipe-end-of-line-and-cancel
-bind-key    -T copy-mode-vi E                    send-keys -X next-space-end
-bind-key    -T copy-mode-vi F                    command-prompt -1 -p "(jump backward)" { send-keys -X jump-backward "%%" }
-bind-key    -T copy-mode-vi G                    send-keys -X history-bottom
-bind-key    -T copy-mode-vi H                    send-keys -X top-line
-bind-key    -T copy-mode-vi J                    send-keys -X scroll-down
-bind-key    -T copy-mode-vi K                    send-keys -X scroll-up
-bind-key    -T copy-mode-vi L                    send-keys -X bottom-line
-bind-key    -T copy-mode-vi M                    send-keys -X middle-line
-bind-key    -T copy-mode-vi N                    send-keys -X search-reverse
-bind-key    -T copy-mode-vi P                    send-keys -X toggle-position
-bind-key    -T copy-mode-vi T                    command-prompt -1 -p "(jump to backward)" { send-keys -X jump-to-backward "%%" }
-bind-key    -T copy-mode-vi V                    send-keys -X select-line
-bind-key    -T copy-mode-vi W                    send-keys -X next-space
-bind-key    -T copy-mode-vi X                    send-keys -X set-mark
-bind-key    -T copy-mode-vi Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
-bind-key    -T copy-mode-vi ^                    send-keys -X back-to-indentation
-bind-key    -T copy-mode-vi b                    send-keys -X previous-word
-bind-key    -T copy-mode-vi e                    send-keys -X next-word-end
-bind-key    -T copy-mode-vi f                    command-prompt -1 -p "(jump forward)" { send-keys -X jump-forward "%%" }
-bind-key    -T copy-mode-vi g                    send-keys -X history-top
-bind-key    -T copy-mode-vi h                    send-keys -X cursor-left
-bind-key    -T copy-mode-vi j                    send-keys -X cursor-down
-bind-key    -T copy-mode-vi k                    send-keys -X cursor-up
-bind-key    -T copy-mode-vi l                    send-keys -X cursor-right
-bind-key    -T copy-mode-vi n                    send-keys -X search-again
-bind-key    -T copy-mode-vi o                    send-keys -X other-end
-bind-key    -T copy-mode-vi q                    send-keys -X cancel
-bind-key    -T copy-mode-vi r                    send-keys -X refresh-from-pane
-bind-key    -T copy-mode-vi t                    command-prompt -1 -p "(jump to forward)" { send-keys -X jump-to-forward "%%" }
-bind-key    -T copy-mode-vi v                    send-keys -X begin-selection
-bind-key    -T copy-mode-vi w                    send-keys -X next-word
-bind-key    -T copy-mode-vi y                    send-keys -X copy-pipe-and-cancel pbcopy
-bind-key    -T copy-mode-vi \{                   send-keys -X previous-paragraph
-bind-key    -T copy-mode-vi \}                   send-keys -X next-paragraph
-bind-key    -T copy-mode-vi MouseDown1Pane       select-pane
-bind-key    -T copy-mode-vi MouseDrag1Pane       select-pane \; send-keys -X begin-selection
-bind-key    -T copy-mode-vi MouseDragEnd1Pane    send-keys -X copy-pipe-and-cancel
-bind-key    -T copy-mode-vi WheelUpPane          select-pane \; send-keys -X -N 5 scroll-up
-bind-key    -T copy-mode-vi WheelDownPane        select-pane \; send-keys -X -N 5 scroll-down
-bind-key    -T copy-mode-vi DoubleClick1Pane     select-pane \; send-keys -X select-word \; run-shell -d 0.3 \; send-keys -X copy-pipe-and-cancel
-bind-key    -T copy-mode-vi TripleClick1Pane     select-pane \; send-keys -X select-line \; run-shell -d 0.3 \; send-keys -X copy-pipe-and-cancel
-bind-key    -T copy-mode-vi BSpace               send-keys -X cursor-left
-bind-key    -T copy-mode-vi NPage                send-keys -X page-down
-bind-key    -T copy-mode-vi PPage                send-keys -X page-up
-bind-key    -T copy-mode-vi Up                   send-keys -X cursor-up
-bind-key    -T copy-mode-vi Down                 send-keys -X cursor-down
-bind-key    -T copy-mode-vi Left                 send-keys -X cursor-left
-bind-key    -T copy-mode-vi Right                send-keys -X cursor-right
-bind-key    -T copy-mode-vi M-x                  send-keys -X jump-to-mark
-bind-key    -T copy-mode-vi M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer"
-bind-key    -T copy-mode-vi C-Up                 send-keys -X scroll-up
-bind-key    -T copy-mode-vi C-Down               send-keys -X scroll-down
-bind-key    -T prefix       C-Space              send-prefix
-bind-key    -T prefix       C-n                  next-window
-bind-key    -T prefix       C-o                  rotate-window
-bind-key    -T prefix       C-p                  previous-window
-bind-key    -T prefix       C-r                  run-shell $HOME/.dotfiles/config/tmux/plugins/tmux-resurrect/scripts/restore.sh
-bind-key    -T prefix       C-s                  run-shell $HOME/.dotfiles/config/tmux/plugins/tmux-resurrect/scripts/save.sh
-bind-key    -T prefix       C-z                  suspend-client
-bind-key    -T prefix       Escape               copy-mode
-bind-key    -T prefix       Space                next-layout
-bind-key    -T prefix       !                    split-window -h -c "#{pane_current_path}"
-bind-key    -T prefix       \"                   split-window -v -c "#{pane_current_path}"
-bind-key    -T prefix       \#                   list-buffers
-bind-key    -T prefix       \$                   command-prompt -I "#S" { rename-session "%%" }
-bind-key    -T prefix       \%                   split-window -h
-bind-key    -T prefix       &                    confirm-before -p "kill-window #W? (y/n)" kill-window
-bind-key    -T prefix       \'                   command-prompt -T window-target -p index { select-window -t ":%%" }
-bind-key    -T prefix       (                    switch-client -p
-bind-key    -T prefix       )                    switch-client -n
-bind-key    -T prefix       ,                    command-prompt -I "#W" { rename-window "%%" }
-bind-key    -T prefix       -                    delete-buffer
-bind-key    -T prefix       .                    command-prompt -T target { move-window -t "%%" }
-bind-key    -T prefix       /                    command-prompt -k -p key { list-keys -1N "%%" }
-bind-key    -T prefix       0                    select-window -t :=0
-bind-key    -T prefix       1                    select-window -t :=1
-bind-key    -T prefix       2                    select-window -t :=2
-bind-key    -T prefix       3                    select-window -t :=3
-bind-key    -T prefix       4                    select-window -t :=4
-bind-key    -T prefix       5                    select-window -t :=5
-bind-key    -T prefix       6                    select-window -t :=6
-bind-key    -T prefix       7                    select-window -t :=7
-bind-key    -T prefix       8                    select-window -t :=8
-bind-key    -T prefix       9                    select-window -t :=9
-bind-key    -T prefix       :                    command-prompt
-bind-key    -T prefix       \;                   last-pane
-bind-key    -T prefix       <                    display-menu -T "#[align=centre]#{window_index}:#{window_name}" -x W -y W "#{?#{>:#{session_windows},1},,-}Swap Left" l { swap-window -t :-1 } "#{?#{>:#{session_windows},1},,-}Swap Right" r { swap-window -t :+1 } "#{?pane_marked_set,,-}Swap Marked" s { swap-window } '' Kill X { kill-window } Respawn R { respawn-window -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } Rename n { command-prompt -F -I "#W" { rename-window -t "#{window_id}" "%%" } } '' "New After" w { new-window -a } "New At End" W { new-window }
-bind-key    -T prefix       =                    choose-buffer -Z
-bind-key    -T prefix       >                    display-menu -T "#[align=centre]#{pane_index} (#{pane_id})" -x P -y P "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}" < { send-keys -X history-top } "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}" > { send-keys -X history-bottom } '' "#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},}" C-r { if-shell -F "#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}" "copy-mode -t=" ; send-keys -X -t = search-backward "#{q:mouse_word}" } "#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},}" C-y { copy-mode -q ; send-keys -l "#{q:mouse_word}" } "#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},}" c { copy-mode -q ; set-buffer "#{q:mouse_word}" } "#{?mouse_line,Copy Line,}" l { copy-mode -q ; set-buffer "#{q:mouse_line}" } '' "Horizontal Split" h { split-window -h } "Vertical Split" v { split-window -v } '' "#{?#{>:#{window_panes},1},,-}Swap Up" u { swap-pane -U } "#{?#{>:#{window_panes},1},,-}Swap Down" d { swap-pane -D } "#{?pane_marked_set,,-}Swap Marked" s { swap-pane } '' Kill X { kill-pane } Respawn R { respawn-pane -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } "#{?#{>:#{window_panes},1},,-}#{?window_zoomed_flag,Unzoom,Zoom}" z { resize-pane -Z }
-bind-key    -T prefix       ?                    list-keys -N
-bind-key    -T prefix       @                    run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-sessionist/scripts/promote_pane.sh '#{session_name}' '#{pane_id}' '#{pane_current_path}'"
-bind-key    -T prefix       C                    run-shell $HOME/.dotfiles/config/tmux/plugins/tmux-sessionist/scripts/new_session_prompt.sh
-bind-key    -T prefix       D                    choose-client -Z
-bind-key    -T prefix       E                    select-layout -E
-bind-key    -T prefix       I                    run-shell $HOME/.dotfiles/config/tmux/plugins/tpm/bindings/install_plugins
-bind-key    -T prefix       L                    switch-client -l
-bind-key    -T prefix       M                    select-pane -M
-bind-key    -T prefix       N                    new-window
-bind-key    -T prefix       R                    run-shell " \
-			tmux source-file ~/.tmux.conf > /dev/null; \
-			tmux display-message \"Sourced .tmux.conf!\""
-bind-key    -T prefix       S                    switch-client -l
-bind-key    -T prefix       U                    run-shell $HOME/.dotfiles/config/tmux/plugins/tpm/bindings/update_plugins
-bind-key    -T prefix       X                    run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-sessionist/scripts/kill_session_prompt.sh '#{session_name}' '#{session_id}'"
-bind-key    -T prefix       Y                    run-shell -b $HOME/.dotfiles/config/tmux/plugins/tmux-yank/scripts/copy_pane_pwd.sh
-bind-key    -T prefix       ]                    paste-buffer -p
-bind-key    -T prefix       c                    new-window
-bind-key    -T prefix       d                    detach-client
-bind-key    -T prefix       f                    command-prompt { find-window -Z "%%" }
-bind-key    -T prefix       g                    run-shell $HOME/.dotfiles/config/tmux/plugins/tmux-sessionist/scripts/goto_session.sh
-bind-key    -T prefix       h                    select-pane -L
-bind-key    -T prefix       i                    display-message
-bind-key    -T prefix       j                    select-pane -D
-bind-key    -T prefix       k                    select-pane -U
-bind-key    -T prefix       l                    select-pane -R
-bind-key    -T prefix       m                    run-shell $HOME/.dotfiles/config/tmux/plugins/tmux-menus/items/main.sh
-bind-key    -T prefix       n                    next-window
-bind-key    -T prefix       o                    select-pane -t :.+
-bind-key    -T prefix       p                    paste-buffer
-bind-key    -T prefix       q                    display-panes
-bind-key    -T prefix       r                    source-file $HOME/.dotfiles/config/tmux/tmux.conf \; display-message "tmux cfg reloaded!"
-bind-key    -T prefix       s                    choose-tree -Zs
-bind-key    -T prefix       t                    clock-mode
-bind-key    -T prefix       w                    choose-tree -Zw
-bind-key    -T prefix       x                    confirm-before -p "kill-pane #P? (y/n)" kill-pane
-bind-key    -T prefix       y                    run-shell -b $HOME/.dotfiles/config/tmux/plugins/tmux-yank/scripts/copy_line.sh
-bind-key    -T prefix       z                    resize-pane -Z
-bind-key    -T prefix       \{                   swap-pane -U
-bind-key    -T prefix       \}                   swap-pane -D
-bind-key    -T prefix       \~                   show-messages
-bind-key -r -T prefix       DC                   refresh-client -c
-bind-key    -T prefix       PPage                copy-mode -u
-bind-key -r -T prefix       Up                   select-pane -U
-bind-key -r -T prefix       Down                 select-pane -D
-bind-key -r -T prefix       Left                 select-pane -L
-bind-key -r -T prefix       Right                select-pane -R
-bind-key    -T prefix       M-1                  select-layout even-horizontal
-bind-key    -T prefix       M-2                  select-layout even-vertical
-bind-key    -T prefix       M-3                  select-layout main-horizontal
-bind-key    -T prefix       M-4                  select-layout main-vertical
-bind-key    -T prefix       M-5                  select-layout tiled
-bind-key    -T prefix       M-c                  attach-session -c "#{pane_current_path}"
-bind-key    -T prefix       M-n                  next-window -a
-bind-key    -T prefix       M-o                  rotate-window -D
-bind-key    -T prefix       M-p                  previous-window -a
-bind-key    -T prefix       M-u                  run-shell $HOME/.dotfiles/config/tmux/plugins/tpm/bindings/clean_plugins
-bind-key -r -T prefix       M-Up                 resize-pane -U 5
-bind-key -r -T prefix       M-Down               resize-pane -D 5
-bind-key -r -T prefix       M-Left               resize-pane -L 5
-bind-key -r -T prefix       M-Right              resize-pane -R 5
-bind-key -r -T prefix       C-Up                 resize-pane -U
-bind-key -r -T prefix       C-Down               resize-pane -D
-bind-key -r -T prefix       C-Left               resize-pane -L
-bind-key -r -T prefix       C-Right              resize-pane -R
-bind-key -r -T prefix       S-Up                 refresh-client -U 10
-bind-key -r -T prefix       S-Down               refresh-client -D 10
-bind-key -r -T prefix       S-Left               refresh-client -L 10
-bind-key -r -T prefix       S-Right              refresh-client -R 10
-bind-key    -T root         MouseDown1Pane       select-pane -t = \; send-keys -M
-bind-key    -T root         MouseDown1Status     select-window -t =
-bind-key    -T root         MouseDown2Pane       select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { paste-buffer -p }
-bind-key    -T root         MouseDown3Pane       if-shell -F -t = "#{||:#{mouse_any_flag},#{&&:#{pane_in_mode},#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}}}" { select-pane -t = ; send-keys -M } { display-menu -T "#[align=centre]#{pane_index} (#{pane_id})" -t = -x M -y M "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}" < { send-keys -X history-top } "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}" > { send-keys -X history-bottom } '' "#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},}" C-r { if-shell -F "#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}" "copy-mode -t=" ; send-keys -X -t = search-backward "#{q:mouse_word}" } "#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},}" C-y { copy-mode -q ; send-keys -l "#{q:mouse_word}" } "#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},}" c { copy-mode -q ; set-buffer "#{q:mouse_word}" } "#{?mouse_line,Copy Line,}" l { copy-mode -q ; set-buffer "#{q:mouse_line}" } '' "Horizontal Split" h { split-window -h } "Vertical Split" v { split-window -v } '' "#{?#{>:#{window_panes},1},,-}Swap Up" u { swap-pane -U } "#{?#{>:#{window_panes},1},,-}Swap Down" d { swap-pane -D } "#{?pane_marked_set,,-}Swap Marked" s { swap-pane } '' Kill X { kill-pane } Respawn R { respawn-pane -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } "#{?#{>:#{window_panes},1},,-}#{?window_zoomed_flag,Unzoom,Zoom}" z { resize-pane -Z } }
-bind-key    -T root         MouseDown3Status     display-menu -T "#[align=centre]#{window_index}:#{window_name}" -t = -x W -y W "#{?#{>:#{session_windows},1},,-}Swap Left" l { swap-window -t :-1 } "#{?#{>:#{session_windows},1},,-}Swap Right" r { swap-window -t :+1 } "#{?pane_marked_set,,-}Swap Marked" s { swap-window } '' Kill X { kill-window } Respawn R { respawn-window -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } Rename n { command-prompt -F -I "#W" { rename-window -t "#{window_id}" "%%" } } '' "New After" w { new-window -a } "New At End" W { new-window }
-bind-key    -T root         MouseDown3StatusLeft display-menu -T "#[align=centre]#{session_name}" -t = -x M -y W Next n { switch-client -n } Previous p { switch-client -p } '' Renumber N { move-window -r } Rename n { command-prompt -I "#S" { rename-session "%%" } } '' "New Session" s { new-session } "New Window" w { new-window }
-bind-key    -T root         MouseDrag1Pane       if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -M }
-bind-key    -T root         MouseDrag1Border     resize-pane -M
-bind-key    -T root         WheelUpPane          if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -e }
-bind-key    -T root         WheelUpStatus        previous-window
-bind-key    -T root         WheelDownStatus      next-window
-bind-key    -T root         DoubleClick1Pane     select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -H ; send-keys -X select-word ; run-shell -d 0.3 ; send-keys -X copy-pipe-and-cancel }
-bind-key    -T root         TripleClick1Pane     select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -H ; send-keys -X select-line ; run-shell -d 0.3 ; send-keys -X copy-pipe-and-cancel }
-bind-key    -T root         M-MouseDown3Pane     display-menu -T "#[align=centre]#{pane_index} (#{pane_id})" -t = -x M -y M "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}" < { send-keys -X history-top } "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}" > { send-keys -X history-bottom } '' "#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},}" C-r { if-shell -F "#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}" "copy-mode -t=" ; send-keys -X -t = search-backward "#{q:mouse_word}" } "#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},}" C-y { copy-mode -q ; send-keys -l "#{q:mouse_word}" } "#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},}" c { copy-mode -q ; set-buffer "#{q:mouse_word}" } "#{?mouse_line,Copy Line,}" l { copy-mode -q ; set-buffer "#{q:mouse_line}" } '' "Horizontal Split" h { split-window -h } "Vertical Split" v { split-window -v } '' "#{?#{>:#{window_panes},1},,-}Swap Up" u { swap-pane -U } "#{?#{>:#{window_panes},1},,-}Swap Down" d { swap-pane -D } "#{?pane_marked_set,,-}Swap Marked" s { swap-pane } '' Kill X { kill-pane } Respawn R { respawn-pane -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } "#{?#{>:#{window_panes},1},,-}#{?window_zoomed_flag,Unzoom,Zoom}" z { resize-pane -Z }
-bind-key    -T root         M-Up                 select-pane -U
-bind-key    -T root         M-Down               select-pane -D
-bind-key    -T root         M-Left               select-pane -L
-bind-key    -T root         M-Right              select-pane -R
-bind-key    -T root         C-Tab                previous-window
-bind-key    -T root         C-S-Tab              next-window
+    C-o     Rotate through the panes
+    C-z     Suspend the current client
+    Space   Select next layout
+    #       List all paste buffers
+    $       Rename current session
+    %       Split window horizontally
+    &       Kill current window
+    '       Prompt for window index to select
+    (       Switch to previous client
+    )       Switch to next client
+    ,       Rename current window
+    -       Delete the most recent paste buffer
+    .       Move the current window
+    /       Describe key binding
+    0       Select window 0
+    1       Select window 1
+    2       Select window 2
+    3       Select window 3
+    4       Select window 4
+    5       Select window 5
+    6       Select window 6
+    7       Select window 7
+    8       Select window 8
+    9       Select window 9
+    :       Prompt for a command
+    ;       Move to the previously active pane
+    =       Choose a paste buffer from a list
+    ?       List key bindings
+    D       Choose and detach a client from a list
+    E       Spread panes out evenly
+    L       Switch to the last client
+    M       Clear the marked pane
+    ]       Paste the most recent paste buffer
+    c       Create a new window
+    d       Detach the current client
+    f       Search for a pane
+    i       Display window information
+    m       Toggle the marked pane
+    n       Select the next window
+    o       Select the next pane
+    q       Display pane numbers
+    s       Choose a session from a list
+    t       Show a clock
+    w       Choose a window from a list
+    x       Kill the active pane
+    z       Zoom the active pane
+    {       Swap the active pane with the pane above
+    }       Swap the active pane with the pane below
+    ~       Show messages
+    DC      Reset so the visible part of the window follows the cursor
+    PPage   Enter copy mode and scroll up
+    Up      Select the pane above the active pane
+    Down    Select the pane below the active pane
+    Left    Select the pane to the left of the active pane
+    Right   Select the pane to the right of the active pane
+    M-1     Set the even-horizontal layout
+    M-2     Set the even-vertical layout
+    M-3     Set the main-horizontal layout
+    M-4     Set the main-vertical layout
+    M-5     Select the tiled layout
+    M-n     Select the next window with an alert
+    M-o     Rotate through the panes in reverse
+    M-p     Select the previous window with an alert
+    M-Up    Resize the pane up by 5
+    M-Down  Resize the pane down by 5
+    M-Left  Resize the pane left by 5
+    M-Right Resize the pane right by 5
+    C-Up    Resize the pane up
+    C-Down  Resize the pane down
+    C-Left  Resize the pane left
+    C-Right Resize the pane right
+    S-Up    Move the visible part of the window up
+    S-Down  Move the visible part of the window down
+    S-Left  Move the visible part of the window left
+    S-Right Move the visible part of the window right
 ```
+

hosts/air/install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring air"

hosts/lakka/install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring lakka"

hosts/tunkki/install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring tunkki"

hosts/v/install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring v"

install

@@ -25,9 +25,9 @@ git submodule update --init --recursive "${DOTBOT_DIR}"
 if [ "${DOTBOT_HOST}" != "" ]; then
   DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}"
   echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}"
-  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] &&
-    echo "(!) Found $DOTBOT_HOST_CONFIG" &&
-    "$DOTBOT_BIN_PATH" \
+  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \
+    && echo "(!) Found $DOTBOT_HOST_CONFIG" \
+    && "$DOTBOT_BIN_PATH" \
       -d "$BASEDIR" \
       --plugin-dir=tools/dotbot-brew \
       --plugin-dir=tools/dotbot-include \

install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - clean:
     ~/:
@@ -15,6 +16,8 @@
     ~/.local/bin:
     ~/.local/run:
     ~/.local/share:
+    ~/.local/share/gnupg:
+      mode: 0700
     ~/.local/state:
     ~/.ssh:
       mode: 0700

local/bin/dfm

@@ -14,16 +14,92 @@
 
 SCRIPT=$(basename "$0")
 
+if ! declare -f msg > /dev/null; then
+  # Function to print messages if VERBOSE is enabled
+  # $1 - message (string)
+  msg()
+  {
+    [ "$VERBOSE" -eq 1 ] && echo "$1"
+    return 0
+  }
+fi
+
+if ! declare -f msg_err > /dev/null; then
+  # Function to print error messages and exit
+  # $1 - error message (string)
+  msg_err()
+  {
+    echo "(!) ERROR: $1" >&2
+    exit 1
+  }
+fi
+
+if ! declare -f msg_done > /dev/null; then
+  # Function to print done message
+  # $1 - message (string)
+  msg_done()
+  {
+    echo "✓ $1"
+    return 0
+  }
+fi
+
 VERSION_NVM="v0.39.5"
 
-export DOTFILES="$HOME/.dotfiles"
-# shellcheck source=./../../scripts/shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
-
 # Loads configs for better installation experience
-x-load-configs
+source "$DOTFILES/config/shared.sh"
 
-function section_install
+source "${DOTFILES}/local/bin/msgr"
+
+# -- Menu builder -- #
+menu_section()
+{
+  LINE=$(printf '%-18s [ %-15s ]\n' "$1" "$2")
+  echo -e " $(__log_marker) $LINE"
+}
+menu_item()
+{
+  LINE=$(printf '%-15s %-30s\n' "$1" "$2")
+  echo -e "$(__log_indent)$(__log_marker) $LINE"
+}
+
+# Takes a bash array ("cow:moo", "dinosaur:roar") and loops
+# through the keys to build menu section listing.
+menu_usage_header()
+{
+  MENU_CMD="$1"
+  shift
+  MENU_ARRAY=("$@")
+
+  KEYS=""
+  for item in "${MENU_ARRAY[@]}"; do
+    CMD=$(echo "${item}" | awk -F ":" '{print $1}')
+    KEYS+="${CMD} | "
+  done
+
+  # "???" removes 3 last characters, being " | " from the end
+  menu_section "$MENU_CMD" "${KEYS%???}"
+}
+
+# Takes the usage command "$0 dotfiles" and a
+# bash array ("cow:moo" "dinosaur:roar") and loops
+# through in building a menu for dfm command usage listing.
+menu_usage()
+{
+  MENU_CMD="$1"
+  shift
+  MENU_ARRAY=("$@")
+
+  msg "$MENU_CMD"
+
+  for item in "${MENU_ARRAY[@]}"; do
+    CMD=$(echo "${item}" | awk -F ":" '{print $1}')
+    DESC=$(echo "${item}" | awk -F ":" '{print $2}')
+    menu_item "$CMD" "$DESC"
+  done
+}
+
+section_install()
 {
   USAGE_PREFIX="$SCRIPT install <command>"
 
@@ -42,8 +118,10 @@ function section_install
     "macos:Setup nice macOS defaults"
     "neofetch:Install neofetch"
     "nvm:Install Node Version Manager (nvm)"
+    "nvm-latest:Install latest lts node using nvm"
     "npm:Install NPM Packages"
     "ntfy:Install ntfy"
+    "ohmybash:Install oh-my-bash"
     "pip:Install pip/python packages"
     "z:Install z"
   )
@@ -51,104 +129,152 @@ function section_install
   case "$1" in
     all)
       msgr msg "Starting to install all and reloading configurations..."
-      x-load-configs
       $0 install macos
       $0 install fonts
       $0 install antigen
       $0 brew install
-      $0 install pip
-      $0 install cargo
+      $0 install ohmyposh
+      $0 install asdf
+      # $0 install ohmybash
+      # $0 install pip
+      # $0 install cargo
       $0 install composer
-      $0 install dotenv
+      # $0 install dotenv
       $0 install fzf
-      $0 install gh
-      $0 install go
+      # $0 install gh
+      # $0 install go
       $0 install cheat-databases
       $0 install imagick
-      $0 install neofetch
-      $0 install nvm
-      $0 install npm
+      # $0 install neofetch
+      # $0 install nvm
+      # $0 install npm
       $0 install ntfy
       $0 install z
       msgr msg "Reloading configurations again..."
-      x-load-configs
+      source "$DOTFILES/config/shared.sh"
       msgr yay "All done!"
       ;;
     antigen)
+      msg "Installing antigen..."
       curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
         && msg_yay "New antigen installed!"
       ;;
+    asdf)
+      msg "Installing asdf..."
+      bash "$DOTFILES/scripts/install-asdf.sh" \
+        && msg_yay "asdf installed!"
+      ;;
     cargo)
+      msg "Installing cargo packages..."
       bash "$DOTFILES/scripts/install-cargo-packages.sh" \
         && msg_yay "cargo packages installed!"
       ;;
     cheat-databases)
+      msg "Installing cheat databases..."
       for database in "$DOTFILES"/scripts/install-cheat-*; do
         bash "$database" \
           && msg_yay "Cheat: $database run"
       done
       ;;
     composer)
+      msg "Installing composer..."
       bash "$DOTFILES/scripts/install-composer.sh" \
         && msg_yay "composer installed!"
       ;;
     dotenv)
+      msg "Installing dotenv-linter..."
       curl -sSfL \
         https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh \
         | sh -s -- -b "$XDG_BIN_HOME" \
         && msg_yay "dotenv-linter installed!"
       ;;
     fonts)
+      msg "Installing fonts..."
       bash "$DOTFILES/scripts/install-fonts.sh" \
         && msg_yay "Installed fonts!"
       ;;
     fzf)
+      msg "Installing fzf..."
       bash "$DOTFILES/scripts/install-fzf.sh" \
         && msg_yay "fzf installed!"
       ;;
     gh)
+      msg "Installing GitHub CLI Extensions..."
       bash "$DOTFILES/scripts/install-gh-extensions.sh" \
         && msg_yay "github cli extensions installed!"
       ;;
     go)
+      msg "Installing Go Packages..."
       bash "$DOTFILES/scripts/install-go-packages.sh" \
         && msg_yay "go packages installed!"
       ;;
     imagick)
+      msg "Installing ImageMagick CLI..."
       curl -L https://imagemagick.org/archive/binaries/magick > "$XDG_BIN_HOME/magick" \
         && chmod +x "$XDG_BIN_HOME/magick" \
         && msg_yay "imagick installed!"
       ;;
     starship)
+      msg "Installing starship.rs..."
       curl -sS https://starship.rs/install.sh | sh -s -- \
         --bin-dir ~/.local/bin \
         --yes \
         && msg_yay "starship installed!"
       ;;
     macos)
+      msg "Setting up macOS defaults..."
       bash "$DOTFILES/scripts/set-macos-defaults.sh" \
         && msg_yay "Brewfile defined apps has been installed!"
       ;;
     neofetch)
+      msg "Installing neofetch..."
       bash "$DOTFILES/scripts/install-neofetch.sh" \
         && msg_yay "neofetch installed!"
       ;;
     nvm)
-      curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash \
-        && nvm install --lts --latest-npm --default
+      msg "Installing nvm..."
+      curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash
       git checkout "$DOTFILES/base/zshrc"
+      git checkout "$DOTFILES/base/bashrc"
+      $0 install nvm-latest
       msg_yay "nvm installed!"
       ;;
+    nvm-latest)
+      msg "Installing latest lts node..."
+      if [ -n "$NVM_DIR" ]; then
+        [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+      fi
+      nvm install --lts --latest-npm --default
+      git checkout "$DOTFILES/base/zshrc"
+      git checkout "$DOTFILES/base/bashrc"
+      msg_yay "latest lts node installed!"
+      ;;
     npm)
+      msg "NPM Packages install started..."
       bash "$DOTFILES/scripts/install-npm-packages.sh" \
         && msg_yay "NPM Packages have been installed!"
       ;;
     ntfy)
+      msg "ntfy install started..."
       bash "$DOTFILES/scripts/install-ntfy.sh" \
         && msg_yay "ntfy installed!"
       ;;
-    pip) bash "$DOTFILES/scripts/install-pip-packages.sh" ;;
+    ohmybash)
+      msg "oh-my-bash install started..."
+      bash "$DOTFILES/scripts/install-ohmybash.sh" \
+        && msg_yay "oh-my-bash installed!"
+      ;;
+    ohmyposh)
+      msg "oh-my-posh install started..."
+      bash "$DOTFILES/scripts/install-ohmyposh.sh" \
+        && msg_yay "oh-my-posh installed!"
+      ;;
+    pip)
+      msg "pip install started..."
+      bash "$DOTFILES/scripts/install-pip-packages.sh"
+      ;;
     z)
+      msg "Installing z..."
       bash "$DOTFILES/scripts/install-z.sh" \
         && msg_yay "z has been installed!"
       ;;
@@ -156,7 +282,7 @@ function section_install
   esac
 }
 
-function section_brew
+section_brew()
 {
   USAGE_PREFIX="$SCRIPT brew <command>"
 
@@ -165,9 +291,11 @@ function section_brew
     "update:Updates and upgrades brew packages"
     "updatebundle:Updates Brewfile with descriptions"
     "autoupdate:Setups brew auto-update and runs it immediately"
+    "leaves:List brew leaves (installed on request)"
+    "clean:Clean up brew packages"
   )
 
-  have brew && {
+  x-have brew && {
     case "$1" in
       install)
         brew bundle install --file="$BREWFILE" --force --quiet && msg_yay "Done!"
@@ -177,12 +305,18 @@ function section_brew
         msg_yay "Done!"
         ;;
       updatebundle)
-        # Updates .dotfiles/Brewfile with descriptions
+        # Updates .dotfiles/homebrew/Brewfile with descriptions
         brew bundle dump \
           --force \
           --file="$BREWFILE" \
           --describe && msg_yay "Done!"
         ;;
+      leaves)
+        brew leaves --installed-on-request
+        ;;
+      clean)
+        brew bundle cleanup --file="$BREWFILE" && msg_yay "Done!"
+        ;;
       autoupdate)
         brew autoupdate delete
         brew autoupdate start 43200 --upgrade --cleanup --immediate
@@ -193,10 +327,10 @@ function section_brew
     esac
   }
 
-  ! have brew && menu_section "$USAGE_PREFIX" "brew not available on this system"
+  ! x-have brew && menu_section "$USAGE_PREFIX" "brew not available on this system"
 }
 
-function section_helpers
+section_helpers()
 {
   USAGE_PREFIX="$SCRIPT helpers <command>"
   MENU=(
@@ -212,21 +346,23 @@ function section_helpers
   esac
 }
 
-function section_docs
+section_docs()
 {
   USAGE_PREFIX="$SCRIPT docs <command>"
 
   MENU=(
     "tmux:Update tmux keybindings documentation"
+    "nvim:Update nvim keybindings documentation"
   )
 
   case "$1" in
     tmux) bash "$DOTFILES/local/bin/x-dfm-docs-xterm-keybindings" ;;
+    nvim) bash "$DOTFILES/scripts/create-nvim-keymaps.sh" ;;
     *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
   esac
 }
 
-function section_dotfiles
+section_dotfiles()
 {
   USAGE_PREFIX="$SCRIPT dotfiles <command>"
 
@@ -258,14 +394,14 @@ function section_dotfiles
       msg_ok "Deleted old nvim files (share, state and cache + config)"
       ln -s "$DOTFILES/config/nvim" ~/.config/nvim
       msg_ok "Linked nvim and astronvim"
-      have npm && $0 install npm
+      x-have npm && $0 install npm
       msg_ok "Installed packages"
       msg_done "nvim reset!"
       ;;
     yamlfmt)
       # format yaml files
-      have yamlfmt && yamlfmt -conf "$DOTFILES/.yamlfmt"
-      ! have yamlfmt && msg_err "yamlfmt not found"
+      x-have yamlfmt && yamlfmt -conf "$DOTFILES/.yamlfmt"
+      ! x-have yamlfmt && msg_err "yamlfmt not found"
       ;;
     shfmt)
       # Format shell scripts according to following rules.
@@ -282,7 +418,7 @@ function section_dotfiles
   esac
 }
 
-function section_check
+section_check()
 {
   USAGE_PREFIX="$SCRIPT check <command>"
   X_HOSTNAME=$(hostname)
@@ -307,7 +443,7 @@ function section_check
 }
 
 # Secret menu for visual tests
-function section_tests
+section_tests()
 {
   USAGE_PREFIX="$SCRIPT tests <command>"
 
@@ -336,7 +472,7 @@ function section_tests
   esac
 }
 
-function usage
+usage()
 {
   echo ""
   msg_prompt "Usage: $SCRIPT <section> <command>"

local/bin/git-dirty

@@ -19,20 +19,28 @@
 # Default dir to check, can be overridden in env (.bashrc, .zshrc, ...)
 : "${GIT_DIRTY_DIR:=$HOME/Code}"
 
-# If user has provided folder as a first argument, use it.
-if [ "$1" != "" ]; then
-  GIT_DIRTY_DIR="$1"
-fi
+# Enable verbosity with VERBOSE=1
+VERBOSE="${VERBOSE:-0}"
 
 # UTF-8 ftw
 GITDIRTY="❌ "
 GITCLEAN="✅ "
 
+# Function to print messages if VERBOSE is enabled
+# $1 - message (string)
+msg()
+{
+  [ "$VERBOSE" -eq 1 ] && echo "$1"
+}
+
+# Function to handle errors
 catch()
 {
   echo "Error $1 occurred on $2"
 }
 
+# Function to check the git status of a directory
+# $1 - directory (string)
 gitdirty()
 {
   local d="$1"
@@ -40,13 +48,13 @@ gitdirty()
 
   if [[ -d "$d" ]]; then
     if [[ -e "$d/.ignore" ]]; then
-      echo -e ""
+      msg "Skipping ignored directory: $d"
     else
       # Check that $d is not '--', 'vendor', or 'node_modules'
       if [[ "${d:0:2}" == "--" ]] || [[ "$d" == "vendor" ]] || [[ "$d" == "node_modules" ]]; then
-        echo ""
+        msg "Skipping excluded directory: $d"
       else
-        cd "$d"
+        cd "$d" || exit
 
         # If we have `.git` folder, check it.
         if [[ -d ".git" ]]; then
@@ -60,12 +68,14 @@ gitdirty()
           # If it wasn't git repository, check subdirectories.
           gitdirtyrepos ./*
         fi
+        cd - > /dev/null || exit
       fi
-      cd .. > /dev/null
     fi
   fi
 }
 
+# Function to check git status for multiple directories
+# $@ - directories
 gitdirtyrepos()
 {
   for x in "$@"; do
@@ -73,10 +83,20 @@ gitdirtyrepos()
   done
 }
 
-set -e
-trap 'case $? in
-        139) echo "segfault occurred";;
-        11) echo "ssegfault occurred";;
-      esac' EXIT
+# Main function
+main()
+{
+  # If user has provided folder as a first argument, use it.
+  if [ "${1:-}" != "" ]; then
+    GIT_DIRTY_DIR="$1"
+  fi
 
-gitdirtyrepos "$GIT_DIRTY_DIR"
+  trap 'case $? in
+            139) echo "segfault occurred";;
+            11) echo "segfault occurred";;
+          esac' EXIT
+
+  gitdirtyrepos "$GIT_DIRTY_DIR"
+}
+
+main "$@"

local/bin/git-fsck-dirs

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+# FSCK subfolders git projects.
+#
+# Actions taken: git fsck --no-dangling --full
+#
+# Copyright 2023 Ismo Vuorinen. All Rights Reserved.
+# License: MIT <https://opensource.org/license/mit/>
+
+set -euo pipefail
+
+# Enable verbosity with VERBOSE=1
+VERBOSE="${VERBOSE:-0}"
+
+# Function to print messages if VERBOSE is enabled
+# $1 - message (string)
+msg()
+{
+  [ "$VERBOSE" -eq 1 ] && echo "$1"
+}
+
+# Function to perform git fsck on a repository
+# $1 - directory (string)
+fsck_repo()
+{
+  local dir=$1
+  msg "Processing dir: $dir"
+  (
+    cd "$dir" || exit 1
+    if [ -d ".git" ]; then
+      git fsck --no-dangling --full --no-progress
+      echo ""
+    fi
+  )
+}
+
+# Main function
+main()
+{
+  local starting_path=${1:-$(pwd)}
+  local dirs
+  dirs=$(find "$starting_path" -mindepth 1 -maxdepth 1 -type d)
+
+  for dir in $dirs; do
+    fsck_repo "$dir"
+  done
+
+  echo ""
+  echo "Done."
+}
+
+main "$@"

local/bin/git-update-dirs

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+#
+# Updates subfolders git projects.
+#
+# Actions taken: pull with rebase, autostashes own changes
+# and prunes branches no longer in the remote.
+#
+# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
+# License: MIT <https://opensource.org/license/mit/>
+
+set -euo pipefail
+
+# Enable verbosity with VERBOSE=1
+VERBOSE="${VERBOSE:-0}"
+
+# Function to print messages if VERBOSE is enabled
+# $1 - message (string)
+msg()
+{
+  [ "$VERBOSE" -eq 1 ] && echo "$1"
+}
+
+# Function to update a git repository
+# $1 - directory (string)
+update_repo()
+{
+  local dir=$1
+  (
+    cd "$dir" || exit
+    msg "Updating $dir"
+    git pull --rebase --autostash --prune
+  )
+}
+
+# Main function to update all subfolder git repositories
+main()
+{
+  for dir in */; do
+    update_repo "$dir"
+  done
+
+  echo "Done."
+  echo ""
+}
+
+main "$@"

local/bin/msgr

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# msgr / Messanger helper
+# msgr / Messenger helper
 # Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
 # MIT License, https://opensource.org/license/mit/
 

local/bin/python

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# work around https://github.com/Microsoft/vscode/issues/3941
-# and anyone else who expects to see a 'python' executable
-
-exec python3 "$@"

local/bin/x-backup-folder

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+#
+# Backup a folder with a timestamp
+# Usage: x-backup-folder folder_to_backup [filename]
+# If filename is not provided, folder_to_backup will be used
+#
+# Example: x-backup-folder ~/Documents/MyFolder
+#
+# Copyright (c) 2022 Ismo Vuorinen. All Rights Reserved.
+# Licensed under the MIT license.
+
+set -euo pipefail
+
+# Enable verbosity with VERBOSE=1
+VERBOSE="${VERBOSE:-0}"
+
+# Function to print usage information
+usage()
+{
+  echo "Usage: $0 folder_to_backup [filename]"
+  exit 1
+}
+
+# Function to print messages if VERBOSE is enabled
+# $1 - message (string)
+msg()
+{
+  [[ "$VERBOSE" -eq 1 ]] && echo "$1"
+}
+
+# Function to print error messages and exit
+# $1 - error message (string)
+msg_err()
+{
+  echo "(!) ERROR: $1" >&2
+  exit 1
+}
+
+# Function to sanitize the filename
+# $1 - filename (string)
+sanitize_filename()
+{
+  local filename=$1
+  echo "$filename" | tr '/' '_' | iconv -t ascii//TRANSLIT | sed -r 's/[^a-zA-Z0-9]+/_/g' | sed -r 's/^_+|_+$//g'
+}
+
+# Function to backup the directory
+# $1 - directory to backup (string)
+# $2 - filename prefix (string)
+backup_directory()
+{
+  local directory=$1
+  local filename=$2
+
+  local sanitized_filename
+  sanitized_filename=$(sanitize_filename "$filename")
+
+  local timestamp
+  timestamp=$(date "+%Y%m%d_%H%M%S")
+  local filename_timestamp="${sanitized_filename}_${timestamp}"
+
+  msg "Backing up directory '$directory' to '${filename_timestamp}.tar.gz'"
+
+  tar cvzf "${filename_timestamp}.tar.gz" "${directory}/"
+
+  msg "Backup completed and saved to '${filename_timestamp}.tar.gz'"
+}
+
+# Main function
+main()
+{
+  if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then
+    usage
+  fi
+
+  local directory=$1
+  local filename=${2:-$directory}
+
+  if [ -z "$directory" ]; then
+    msg_err "DIRECTORY (first argument) is missing"
+  fi
+
+  backup_directory "$directory" "$filename"
+}
+
+main "$@"

local/bin/x-backup-folder.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-DIRECTORY=$1
-FILENAME=$2
-
-if [ -z "${DIRECTORY}" ]; then
-  echo "DIRECTORY (first argument) is missing"
-  echo "Usage: $0 folder_to_backup"
-  exit
-fi
-
-if [ -z "${FILENAME}" ]; then
-  FILENAME=$DIRECTORY
-fi
-
-FILENAME=$(
-  ${FILENAME} \
-    | tr '/' _ \
-    | iconv -t ascii//TRANSLIT \
-    | sed -r s/[^a-zA-Z0-9]+/_/g \
-    | sed -r s/^_+\|-+$//g
-)
-
-TIMESTAMP=$(date "+%Y%m%d_%H%M%S")
-FILENAME_TIMESTAMP="${FILENAME}_${TIMESTAMP}"
-
-tar cvzf "${FILENAME_TIMESTAMP}.tar.gz" "${DIRECTORY}/"

local/bin/x-backup-mysql-with-prefix

@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+#
+# Backup local MySQL Database tables with a certain prefix.
+# Ismo Vuorinen <https://github.com/ivuorinen> 2018
+# License: MIT
+
+set -euo pipefail
+
+# Enable verbosity with VERBOSE=1
+VERBOSE="${VERBOSE:-0}"
+# Default database
+DEFAULT_DATABASE="wordpress"
+
+# Function to print usage information
+usage()
+{
+  echo "(>) Usage: $SCRIPT <TABLE_PREFIX> <FILENAME_PREFIX> [<DATABASE>]"
+  echo " * <TABLE_PREFIX>    = database table prefix, e.g. 'wp_'"
+  echo " * <FILENAME_PREFIX> = FILENAME prefix, defaults to table prefix. Use something descriptive e.g. 'wordpress'"
+  echo " * <DATABASE>        = [optional] Third argument DATABASE, defaults to '$DEFAULT_DATABASE'."
+  exit 1
+}
+
+# Function to print messages if VERBOSE is enabled
+# $1 - message (string)
+msg()
+{
+  [[ "$VERBOSE" -eq 1 ]] && echo "$1"
+}
+
+# Function to print error messages and exit
+# $1 - error message (string)
+msg_err()
+{
+  echo "(!) ERROR: $1" >&2
+  exit 1
+}
+
+# Function to backup MySQL tables with a certain prefix
+# $1 - table prefix (string)
+# $2 - filename prefix (string)
+# $3 - database name (string)
+backup_mysql_tables()
+{
+  local prefix=$1
+  local filename=$2
+  local database=$3
+
+  local timestamp
+  timestamp=$(date "+%Y%m%d_%H%M%S")
+  local filename_timestamp="${database}_${filename}_${timestamp}.sql"
+
+  msg "Backing up tables with prefix '$prefix' from database '$database' to file '$filename_timestamp'"
+
+  mysqldump \
+    "${database}" \
+    "$(
+      echo "show tables like '${prefix}%';" \
+        | mysql "${database}" \
+        | sed '/Tables_in/d'
+    )" > "${filename_timestamp}"
+
+  msg "Backup completed and saved to '$filename_timestamp'"
+}
+
+# Main function
+main()
+{
+  if [ "$#" -lt 2 ] || [ "$#" -gt 3 ]; then
+    usage
+  fi
+
+  local prefix=$1
+  local filename=$2
+  local database=${3:-$DEFAULT_DATABASE}
+
+  if [ -z "$prefix" ]; then
+    msg_err "TABLE_PREFIX (first argument) is missing"
+  fi
+
+  if [ -z "$filename" ]; then
+    filename=$prefix
+  fi
+
+  backup_mysql_tables "$prefix" "$filename" "$database"
+}
+
+# Script name for usage information
+SCRIPT=$(basename "$0")
+
+main "$@"

local/bin/x-backup-mysql-with-prefix.sh

@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-#
-# Backup local MySQL Database tables with certain prefix.
-# Ismo Vuorinen <https://github.com/ivuorinen> 2018
-#
-
-SCRIPT=$(basename "$0")
-PREFIX=$1
-FILENAME=$2
-DATABASE=$3
-
-: "${VERBOSE:=0}"
-: "${DEFAULT_DATABASE:="wordpress"}"
-
-if [ -z "${PREFIX}" ]; then
-  echo "(!) TABLE_PREFIX (first argument) is missing"
-  echo "(>) Usage: $SCRIPT <TABLE_PREFIX> <FILENAME_PREFIX> [<DATABASE>]"
-  echo " * <TABLE_PREFIX>    = database table prefix, e.g. 'wp_'"
-  echo " * <FILENAME_PREFIX> = FILENAME prefix, defaults to table prefix. Use something descriptive e.g. 'wordpress'"
-  echo " * <DATABASE>        = [optional] Third argument DATABASE, defaults to '$DEFAULT_DATABASE'."
-  exit 0
-fi
-
-if [ -z "${FILENAME}" ]; then
-  # echo "FILENAME (second argument) is missing, using PREFIX ($PREFIX)"
-  FILENAME=$PREFIX
-fi
-
-if [ -z "${DATABASE}" ]; then
-  # echo "DATABASE (third argument) is missing, using default ($DEFAULT_DATABASE)"
-  DATABASE=$DEFAULT_DATABASE
-fi
-
-TIMESTAMP=$(date "+%Y%m%d_%H%M%S")
-FILENAME_TIMESTAMP="${DATABASE}_${FILENAME}_${TIMESTAMP}.sql"
-
-mysqldump \
-  "${DATABASE}" \
-  "$(
-    echo "show tables like '${PREFIX}%';" \
-      | mysql "${DATABASE}" \
-      | sed '/Tables_in/d'
-  )" > "${FILENAME_TIMESTAMP}"

local/bin/x-change-alacritty-theme

@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+#
+# Adapted from https://gist.github.com/xqm32/17777d035930d622d0ff7530bfab61fd
+#
+
+set -euo pipefail
+
+# Enable verbosity with VERBOSE=1
+VERBOSE="${VERBOSE:-0}"
+
+A_DIR="$HOME/.config/alacritty"
+
+# Function to print usage information
+usage()
+{
+  echo "Usage: $0 <theme>"
+  echo "Available themes: (dark|night) to turn dark mode on, (day|light) to turn off"
+  exit 1
+}
+
+# Function to print messages if VERBOSE is enabled
+# $1 - message (string)
+msg()
+{
+  [[ "$VERBOSE" -eq 1 ]] && echo "$1"
+  return 0
+}
+
+# Function to set the alacritty theme
+# $1 - theme (string)
+set_alacritty_theme()
+{
+  local theme=$1
+  local theme_file="$A_DIR/theme-$theme.toml"
+  msg "Setting alacritty theme to $theme ($theme_file)"
+  cp -f "$theme_file" "$A_DIR/theme-active.toml"
+  return 0
+}
+
+# Function to notify alacritty about the changes
+notify_alacritty()
+{
+  msg "Notifying alacritty about the changes"
+  touch "$A_DIR/alacritty.toml"
+  return 0
+}
+
+# Main function
+main()
+{
+  if [ "$#" -ne 1 ]; then
+    usage
+  fi
+
+  local alacritty_theme=$1
+
+  case "$alacritty_theme" in
+    day | light)
+      set_alacritty_theme "day"
+      ;;
+    *)
+      set_alacritty_theme "night"
+      ;;
+  esac
+
+  notify_alacritty
+  msg "Theme set successfully!"
+  exit 0
+}
+
+main "$@"

local/bin/x-check-git-attributes

@@ -1,19 +1,41 @@
 #!/usr/bin/env bash
 #
-# Check git repo's files .gitattributes and are all of them mapped.
+# Check git repo's files .gitattributes and ensure all of them are mapped.
 # Ismo Vuorinen <https://github.com/ivuorinen> 2022
-#
+source "${DOTFILES}/config/shared.sh"
 
-if ! command -v git &> /dev/null; then
-  echo "git could not be found, please install it first"
-  exit 1
-fi
+set -euo pipefail
 
-missing_attributes=$(git ls-files | git check-attr -a --stdin | grep "text: auto")
+# Enable verbosity with VERBOSE=1
+VERBOSE="${VERBOSE:-0}"
 
-if [[ "$missing_attributes" ]]; then
-  echo ".gitattributes rule missing for the following files:"
-  echo "$missing_attributes"
-else
-  echo "All files have a corresponding rule in .gitattributes"
-fi
+# Function to check if git is installed
+check_git_installed()
+{
+  if ! command -v git &> /dev/null; then
+    msg_err "git could not be found, please install it first"
+  fi
+}
+
+# Function to check for missing .gitattributes
+check_gitattributes()
+{
+  local missing_attributes
+  missing_attributes=$(git ls-files | git check-attr -a --stdin | grep "text: auto" || true)
+
+  if [[ -n "$missing_attributes" ]]; then
+    echo ".gitattributes rule missing for the following files:"
+    echo "$missing_attributes"
+  else
+    echo "All files have a corresponding rule in .gitattributes"
+  fi
+}
+
+# Main function
+main()
+{
+  check_git_installed
+  check_gitattributes
+}
+
+main "$@"