chore(config): update Brewfile, zed settings

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

.editorconfig

@@ -8,6 +8,12 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.md]
+max_line_length = 100
+
+[*.lua]
+max_line_length = 120
+
 [*.php]
 indent_size = 4
 
@@ -20,6 +26,8 @@ indent_size = 1
 indent_style = tab
 
 [{local/bin/*,**/*.sh,**/zshrc,config/*,scripts/*}]
+indent_size        = 2
+tab_width          = 2
 shell_variant      = bash # --language-variant
 binary_next_line   = true
 switch_case_indent = true # --case-indent
@@ -31,5 +39,5 @@ function_next_line = true # --func-next-line
 # 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/**}]
+[{tools/**,local/bin/asdf/**,config/cheat/cheatsheets/**,config/tmux/plugins/**}]
 ignore = true

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @ivuorinen

.github/README.md

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

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

@@ -2,7 +2,8 @@
 name: Pre-commit autoupdate
 on:
   schedule:
-    - cron: "0 0 * * *"
+    # At 04:00 on Monday and Thursday.
+    - cron: "0 4 * * 1,4"
   workflow_dispatch:
 jobs:
   auto-update:
@@ -12,7 +13,7 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5.2.0
+      - uses: actions/setup-python@v5.4.0
       - run: pip install pre-commit && pre-commit autoupdate
       - uses: peter-evans/create-pull-request@v7
         with:

.github/workflows/sync-labels.yml

@@ -0,0 +1,23 @@
+---
+name: Sync labels
+
+# yamllint disable-line rule:truthy
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - .github/workflows/sync-labels.yml
+      - .github/labels.yml
+  schedule:
+    - cron: "34 5 * * *"
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  SyncLabels:
+    permissions:
+      issues: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ivuorinen/actions/sync-labels@main

.github/workflows/update-submodules.yml

@@ -1,7 +1,9 @@
 ---
 name: Update submodules
 on:
-  schedule: [{ cron: 0 3 * * * }]
+  schedule:
+    # At 04:00 on Monday and Thursday.
+    - cron: "0 4 * * 1,4"
   workflow_dispatch:
 jobs:
   update-submodules:

.gitignore

@@ -1,31 +1,35 @@
-Brewfile.lock.json
-lazy-lock.json
-config/nvim/lazy-lock.json
-*.log
+!.gitkeep
 *-secret
+*.bak
+*.log
+*.socket
 *cache
+.env
 .idea
+.nfs*
 .vscode
+Brewfile.lock.json
+antidote_plugins.zsh
+config/alacritty/theme-active.toml
 config/cheat/cheatsheets/pure-bash-bible/*
 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
-.env
-local/share/fonts/*
-node_modules
-.nfs*
-*.socket
-iTermServer-*
-lock
-config/iterm2/AppSupport
 config/gnupg/S.*
-config/gnupg/s
 config/gnupg/private-keys-v1.d
+config/gnupg/s
+config/iterm2/AppSupport
+config/npm/npmrc
+config/nvim/lazy-lock.json
 config/nvim/spell/*
 !config/nvim/spell/.gitkeep
-
+config/zed/*
+!config/zed/settings.json
+config/zsh/.zcompdump
+iTermServer-*
+lazy-lock.json
+local/share/fonts/*
+local/bin/asdf/plugins/*
+lock
+node_modules
+ssh/local.d/*
+!ssh/local.d/.gitkeep

.gitmodules

@@ -1,4 +1,4 @@
-# vim: set expandtab:
+# vim: noexpandtab filetype=gitconfig
 [submodule "dotbot"]
 	path = tools/dotbot
 	url = https://github.com/anishathalye/dotbot.git
@@ -23,44 +23,69 @@
 	path = config/tmux/plugins/tmux-continuum
 	url = https://github.com/tmux-plugins/tmux-continuum
 	ignore = dirty
-[submodule "tmux/tmux-resurrect"]
-	path = config/tmux/plugins/tmux-resurrect
-	url = https://github.com/tmux-plugins/tmux-resurrect
-	ignore = dirty
+
 [submodule "tmux/tmux-sensible"]
 	path = config/tmux/plugins/tmux-sensible
 	url = https://github.com/tmux-plugins/tmux-sensible.git
 	ignore = dirty
+
 [submodule "tmux/tmux-sessionist"]
 	path = config/tmux/plugins/tmux-sessionist
 	url = https://github.com/tmux-plugins/tmux-sessionist.git
 	ignore = dirty
+
 [submodule "tmux/tmux-yank"]
 	path = config/tmux/plugins/tmux-yank
 	url = https://github.com/tmux-plugins/tmux-yank.git
 	ignore = dirty
+
 [submodule "tmux/tmux-window-name"]
 	path = config/tmux/plugins/tmux-window-name
 	url = https://github.com/ivuorinen/tmux-window-name.git
 	ignore = dirty
+
 [submodule "dotbot-pip"]
 	path = tools/dotbot-pip
 	url = https://github.com/sobolevn/dotbot-pip.git
+	ignore = dirty
+
 [submodule "tmux/tmux-suspend"]
 	path = config/tmux/plugins/tmux-suspend
 	url = https://github.com/MunifTanjim/tmux-suspend.git
+	ignore = dirty
+
 [submodule "tmux/tmux-mode-indicator"]
 	path = config/tmux/plugins/tmux-mode-indicator
 	url = https://github.com/MunifTanjim/tmux-mode-indicator.git
+	ignore = dirty
+
 [submodule "tmux/tmux-current-pane-hostname"]
 	path = config/tmux/plugins/tmux-current-pane-hostname
 	url = https://github.com/soyuka/tmux-current-pane-hostname.git
+	ignore = dirty
+
 [submodule "cheat-tldr"]
 	path = config/cheat/cheatsheets/tldr
 	url = https://github.com/ivuorinen/cheatsheet-tldr.git
+	ignore = dirty
+
 [submodule "tmux/tmux-dark-notify"]
 	path = config/tmux/plugins/tmux-dark-notify
 	url = https://github.com/erikw/tmux-dark-notify.git
+	ignore = dirty
+
 [submodule "asdf"]
 	path = local/bin/asdf
 	url = https://github.com/asdf-vm/asdf.git
+	ignore = dirty
+
+[submodule "antidote"]
+	path = tools/antidote
+	url = https://github.com/mattmc3/antidote.git
+	shallow = true
+	ignore = dirty
+
+[submodule "dotbot-asdf"]
+	path = tools/dotbot-asdf
+	url = https://github.com/sobolevn/dotbot-asdf
+	ignore = dirty

.ignore

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

.luarc.json

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

.nvmrc

@@ -0,0 +1 @@
+22.13.1

.pre-commit-config.yaml

@@ -2,10 +2,14 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
+      - id: requirements-txt-fixer
+      - id: detect-aws-credentials
+      - id: detect-private-key
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
       - id: check-case-conflict
       - id: check-merge-conflict
+      - id: check-executables-have-shebangs
       - id: check-shebang-scripts-are-executable
       - id: check-symlinks
       - id: check-toml
@@ -19,32 +23,37 @@ repos:
         args: [--autofix, --no-sort-keys]
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.44.0
     hooks:
       - id: markdownlint
-        args: [-c, .markdownlint.yaml, --fix]
+        args: [-c, .markdownlint.json, --fix]
 
   - repo: https://github.com/adrienverge/yamllint
     rev: v1.35.1
     hooks:
       - id: yamllint
 
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8
-    hooks:
-      - id: prettier
-
-  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.10.0.1
+  - repo: https://github.com/koalaman/shellcheck-precommit
+    rev: v0.10.0
     hooks:
       - id: shellcheck
 
   - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.9.0-1
+    rev: v3.10.0-2
     hooks:
       - id: shfmt
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.3
+    rev: v1.7.7
     hooks:
       - id: actionlint
+
+  - repo: https://github.com/renovatebot/pre-commit-hooks
+    rev: 39.161.4
+    hooks:
+      - id: renovate-config-validator
+
+  - repo: https://github.com/JohnnyMorganz/StyLua
+    rev: v2.0.2
+    hooks:
+      - id: stylua # or stylua-system / stylua-github

.prettierignore

@@ -1,12 +1,14 @@
+# vim: ft=gitignore
 .mypy_cache/*
 Brewfile.lock.json
 config/cheat/cheatsheets/community
 config/cheat/cheatsheets/tldr
 config/fzf/*
-config/nvim-kickstart/*
+config/nvim/*
 config/tmux/plugins/*
 config/zsh/*
 lazy-lock.json
 local/bin/antigen.zsh
 local/bin/asdf
+tools/antidote/*
 tools/dotbot*

.python-version

@@ -0,0 +1 @@
+3.13.2

.shellcheckrc

@@ -24,3 +24,7 @@ disable=SC1091
 # SC2174: When used with -p, -m only applies to the deepest directory.
 # https://github.com/koalaman/shellcheck/wiki/SC2174
 disable=SC2174
+
+# SC2016: Expressions don't expand in single quotes, use double quotes for that.
+# https://www.shellcheck.net/wiki/SC2016
+disable=SC2016

.tool-versions

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

add-submodules.sh

@@ -9,6 +9,8 @@ git submodule add --name dotbot-include \
   -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include
 git submodule add --name dotbot-pip \
   -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip
+git submodule add --name dotbot-asdf \
+  -f https://github.com/sobolevn/dotbot-asdf tools/dotbot-asdf
 
 # other repos
 git submodule add --name cheat-community \
@@ -17,14 +19,15 @@ git submodule add --name cheat-tldr \
   -f https://github.com/ivuorinen/cheatsheet-tldr.git config/cheat/cheatsheets/tldr
 git submodule add --name asdf \
   -f https://github.com/asdf-vm/asdf.git local/bin/asdf
+git submodule add --name antidote \
+  --depth 1 \
+  -f https://github.com/mattmc3/antidote.git tools/antidote
 
 # tmux plugin manager and plugins
 git submodule add --name tmux/tmux-continuum \
   -f https://github.com/tmux-plugins/tmux-continuum config/tmux/plugins/tmux-continuum
 git submodule add --name tmux/tmux-mode-indicator \
   -f https://github.com/MunifTanjim/tmux-mode-indicator.git config/tmux/plugins/tmux-mode-indicator
-git submodule add --name tmux/tmux-resurrect \
-  -f https://github.com/tmux-plugins/tmux-resurrect config/tmux/plugins/tmux-resurrect
 git submodule add --name tmux/tmux-sensible \
   -f https://github.com/tmux-plugins/tmux-sensible.git config/tmux/plugins/tmux-sensible
 git submodule add --name tmux/tmux-sessionist \
@@ -42,13 +45,18 @@ git submodule add --name tmux/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
-  git config "submodule.${MODULE}.ignore" all
+  echo "Ignoring submodule changes for submodule.${MODULE}..."
+  git config "submodule.${MODULE}.ignore" "dirty"
 done
 
+# Mark certain repositories shallow
+git config -f .gitmodules submodule.antidote.shallow true
+
 # remove old submodules
 [ -d "config/tmux/plugins/tpm" ] && rm -rf config/tmux/plugins/tpm
 [ -d "config/tmux/plugins/tmux" ] && rm -rf config/tmux/plugins/tmux
 [ -d "config/tmux/plugins/tmux-menus" ] && rm -rf config/tmux/plugins/tmux-menus
+[ -d "config/tmux/plugins/tmux-resurrect" ] && rm -rf config/tmux/plugins/tmux-resurrect
 [ -d "tools/dotbot-crontab" ] && rm -rf tools/dotbot-crontab
 [ -d "tools/dotbot-snap" ] && rm -rf tools/dotbot-snap
 [ -d "config/nvim-kickstart" ] && rm -rf config/nvim-kickstart

base/bashrc

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

base/envrc

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

base/ignore

@@ -0,0 +1,6 @@
+Applications/
+Library/
+Movies/
+Music/
+Pictures/
+Google Drive/

base/nvmrc

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

base/tool-versions

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

base/zshrc

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

config/act/actrc

@@ -1,3 +1,4 @@
+--container-architecture linux/amd64
 -P ubuntu-latest=catthehacker/ubuntu:act-latest
 -P ubuntu-22.04=catthehacker/ubuntu:act-22.04
 -P ubuntu-20.04=catthehacker/ubuntu:act-20.04

config/aerospace/aerospace.toml

@@ -0,0 +1,244 @@
+# Start AeroSpace at login
+start-at-login = false
+
+# Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization
+enable-normalization-flatten-containers = true
+enable-normalization-opposite-orientation-for-nested-containers = true
+
+# See: https://nikitabobko.github.io/AeroSpace/guide#layouts
+# The 'accordion-padding' specifies the size of accordion padding
+# You can set 0 to disable the padding feature
+accordion-padding = 10
+
+# Possible values: tiles|accordion
+default-root-container-layout = 'tiles'
+
+# Possible values: horizontal|vertical|auto
+# 'auto' means: wide monitor (anything wider than high) gets horizontal orientation,
+#               tall monitor (anything higher than wide) gets vertical orientation
+default-root-container-orientation = 'auto'
+
+# Mouse follows focus when focused monitor changes
+# Drop it from your config, if you don't like this behavior
+# See https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks
+# See https://nikitabobko.github.io/AeroSpace/commands#move-mouse
+# Fallback value (if you omit the key): on-focused-monitor-changed = []
+on-focused-monitor-changed = ['move-mouse monitor-lazy-center']
+
+# You can effectively turn off macOS "Hide application" (cmd-h) feature by toggling this flag
+# Useful if you don't use this macOS feature, but accidentally hit cmd-h or cmd-alt-h key
+# Also see: https://nikitabobko.github.io/AeroSpace/goodness#disable-hide-app
+automatically-unhide-macos-hidden-apps = true
+
+# [[on-window-detected]]
+# if.app-id = 'com.apple.systempreferences'
+# if.app-name-regex-substring = 'settings'
+# if.window-title-regex-substring = 'substring'
+# if.workspace = 'workspace-name'
+# if.during-aerospace-startup = true
+# check-further-callbacks = true
+# run = ['layout floating', 'move-node-to-workspace S']  # The callback itself
+
+[[on-window-detected]]
+if.app-name-regex-substring = 'settings' # All settings
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.apple.systempreferences' # macOS System Preferences
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.1password.1password' # 1Password
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'org.ferdium.ferdium-app' # Ferdium, has WhatsApp etc.
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.jetbrains.PhpStorm' # PhpStorm
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.apple.finder' # Finder
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.apple.Preview' # Preview
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.apple.mail' # Mail
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.DanPristupov.Fork' # Fork
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.flexibits.fantastical2.mac' # Fantastical
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'org.whispersystems.signal-desktop' # Signal
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.tidal.desktop' # TIDAL
+run = ['layout floating', 'move-node-to-workspace 2'] # Float and move to workspace 2
+
+[[on-window-detected]]
+if.app-id = 'com.apple.TV' # Apple TV app
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.setapp.DesktopClient' # Setapp
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.electron.dockerdesktop' # Docker Desktop
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.tinyspeck.slackmacgap' # Slack
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'md.obsidia' # Obsidian
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.todoist.mac.Todoist' # Todoist
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.apple.backup.launcher' # TimeMachine
+run = ['layout floating']
+
+
+# Possible values: (qwerty|dvorak)
+# See https://nikitabobko.github.io/AeroSpace/guide#key-mapping
+[key-mapping]
+preset = 'qwerty'
+
+# Gaps between windows (inner-*) and between monitor edges (outer-*).
+# Possible values:
+# - Constant:     gaps.outer.top = 8
+# - Per monitor:  gaps.outer.top = [{ monitor.main = 16 }, { monitor."some-pattern" = 32 }, 24]
+#                 In this example, 24 is a default value when there is no match.
+#                 Monitor pattern is the same as for 'workspace-to-monitor-force-assignment'.
+#                 See: https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors
+[gaps]
+inner.horizontal = 5
+inner.vertical =   5
+outer.top = [{ monitor.'^built-in retina display$' = 0 }, 0]
+outer.right =      0
+outer.bottom =     0
+outer.left =       0
+
+# 'main' binding mode declaration
+# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes
+# 'main' binding mode must be always presented
+# Fallback value (if you omit the key): mode.main.binding = {}
+[mode.main.binding]
+
+cmd-h = [] # Disable "hide application"
+cmd-alt-h = [] # Disable "hide others"
+
+# All possible keys:
+# - Letters.        a, b, c, ..., z
+# - Numbers.        0, 1, 2, ..., 9
+# - Keypad numbers. keypad0, keypad1, keypad2, ..., keypad9
+# - F-keys.         f1, f2, ..., f20
+# - Special keys.   minus, equal, period, comma, slash, backslash, quote, semicolon, backtick,
+#                   leftSquareBracket, rightSquareBracket, space, enter, esc, backspace, tab
+# - Keypad special. keypadClear, keypadDecimalMark, keypadDivide, keypadEnter, keypadEqual,
+#                   keypadMinus, keypadMultiply, keypadPlus
+# - Arrows.         left, down, up, right
+
+# All possible modifiers: cmd, alt, ctrl, shift
+
+# All possible commands: https://nikitabobko.github.io/AeroSpace/commands
+
+# See: https://nikitabobko.github.io/AeroSpace/commands#exec-and-forget
+# You can uncomment the following lines to open up terminal with alt + enter shortcut (like in i3)
+# alt-enter = '''exec-and-forget osascript -e '
+# tell application "Terminal"
+#     do script
+#     activate
+# end tell'
+# '''
+
+# alt-cmd-shift-f = 'fullscreen'
+# alt-shift-f = 'layout floating'
+# alt-shift-tab = 'move-workspace-to-monitor --wrap-around next'
+
+# See: https://nikitabobko.github.io/AeroSpace/commands#focus
+alt-h = 'focus left'
+alt-j = 'focus down'
+alt-k = 'focus up'
+alt-l = 'focus right'
+
+# See: https://nikitabobko.github.io/AeroSpace/commands#workspace
+alt-shift-1 = 'workspace 1' # Main
+alt-shift-2 = 'workspace 2' # Media
+ctrl-shift-1 = 'move-node-to-workspace 1' # Move node to Main
+ctrl-shift-2 = 'move-node-to-workspace 2' # Move node to Media
+
+alt-shift-tab = 'workspace-back-and-forth' # Switch between workspaces
+ctrl-shift-tab = 'move-workspace-to-monitor --wrap-around prev'
+
+# See: https://nikitabobko.github.io/AeroSpace/commands#mode
+# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes
+alt-a = 'mode apps'
+alt-s = 'mode service'
+alt-m = 'mode move'
+
+# ╭──────────────────────────────────────────────────────────╮
+# │                          alt-m                           │
+# ╰──────────────────────────────────────────────────────────╯
+[mode.move.binding]
+esc = ['reload-config', 'mode main']
+# See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace
+1 = ['move-node-to-workspace 1 --focus-follows-window']
+2 = ['move-node-to-workspace 2 --focus-follows-window']
+# See: https://nikitabobko.github.io/AeroSpace/commands#move
+h = 'move left'
+j = 'move down'
+k = 'move up'
+l = 'move right'
+# See: https://nikitabobko.github.io/AeroSpace/commands#join-with
+shift-h = 'join-with left'
+shift-j = 'join-with down'
+shift-k = 'join-with up'
+shift-l = 'join-with right'
+# https://nikitabobko.github.io/AeroSpace/commands#resize
+ctrl-h = 'resize smart -70'
+ctrl-l = 'resize smart +70'
+shift-left = 'resize smart +70'
+shift-right = 'resize smart -70'
+# https://nikitabobko.github.io/AeroSpace/commands#flatten-workspace-tree
+r = ['flatten-workspace-tree', 'mode main'] # reset layout
+
+# ╭──────────────────────────────────────────────────────────╮
+# │                          alt-a                           │
+# ╰──────────────────────────────────────────────────────────╯
+[mode.apps.binding]
+esc = ['reload-config', 'mode main']
+b = ['exec-and-forget open -a /Applications/Brave Browser.app', 'mode main'] # Browser
+c = ['exec-and-forget open -a /Applications/Ferdium.app', 'mode main'] # Chat
+g = ['exec-and-forget open -a /Applications/Ghostty.app', 'mode main'] # Ghostty
+o = ['exec-and-forget open -a /Applications/Obsidian.app', 'mode main'] # Obsidian
+s = ['exec-and-forget open -a /Applications/Slack.app', 'mode main'] # Slack
+t = ['exec-and-forget open -a /Applications/TIDAL.app', 'mode main'] # Tidal
+w = ['exec-and-forget open -a /Applications/WezTerm.app', 'mode main'] # WezTerm
+
+# ╭──────────────────────────────────────────────────────────╮
+# │                          alt-s                           │
+# ╰──────────────────────────────────────────────────────────╯
+[mode.service.binding]
+esc = ['reload-config', 'mode main'] # reload config
+r = ['flatten-workspace-tree', 'mode main'] # reset layout
+# See: https://nikitabobko.github.io/AeroSpace/commands#layout
+f = ['layout floating tiling', 'mode main'] # Toggle between floating and tiling layout
+backspace = ['close-all-windows-but-current', 'mode main']

config/alias

@@ -12,16 +12,27 @@ alias ..="cd .."
 alias ...="cd ../.."
 alias ....="cd ../../.."
 
+# Get git repository root path
+get_git_root()
+{
+  # check that we are in a git repository
+  if git rev-parse --is-inside-work-tree &> /dev/null; then
+    git rev-parse --show-toplevel
+  else
+    >&2 msgr err "Not in a git repository"
+  fi
+}
+
 # cd to git root directory
-alias cdgr='cd "$(git root)"'
+alias cdgr='cd "$(get_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"
+alias .='cd $HOME'
+alias .b='cd $XDG_BIN_HOME'
+alias .c='cd $HOME/Code'
+alias .d='cd $DOTFILES'
+alias .l='cd $HOME/.local'
+alias .o='cd $HOME/Code/ivuorinen/obsidian/'
 
 # Shortcuts for listing
 alias ll="ls -la"
@@ -31,13 +42,10 @@ alias l="ls -a"
 alias cd..="cd .."
 alias sl="ls"
 
-# List only directories
-alias lsd="ls -lF | grep '^d'"
-
 # IP addresses
 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* //'"
+alias ips="ifconfig -a | grep -o 'inet6\? \(\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)\|[a-fA-F0-9:]\+\)' | sed -e 's/inet6* //' | sort"
 
 # Show/hide hidden files in Finder
 alias show="defaults write com.apple.finder AppleShowAllFiles -bool true; killall Finder"
@@ -57,14 +65,7 @@ alias isodate="date +'%Y-%m-%d'"
 alias x-datetime="date +'%Y-%m-%d %H:%M:%S'"
 alias x-timestamp="date +'%s'"
 
-# tmux: automatically attach or create session with name 'main'
-alias tm='command tmux new-session -A -s main'
-# tmux: attach or create new session
-alias ta='command tmux attach || command tmux'
-
-# nvim
-alias c='nvim'
-alias ks='nvim'
+# nvim aliases
 alias vi='nvim'
 alias vim='nvim'
 
@@ -79,8 +80,6 @@ alias zapds='find . -name ".DS_Store" -print -delete'
 alias zappyc="find . -type f -name '*.pyc' -ls -delete"
 # Run all zaps
 alias zapall="zapds && zappyc"
-# tail with follow flag on
-alias t='tail -f'
 # directory usage, return only the total
 alias dn='du -chd1'
 # Mirror site with wget
@@ -88,6 +87,7 @@ alias mirror_site='wget -m -k -K -E -e robots=off'
 # Mirror stdout to stderr, useful for seeing data going through a pipe
 alias peek='tee >(cat 1>&2)'
 
+# Runs Gitlab code quality scanner
 alias code_scanner='docker run
   --env SOURCE_CODE="$PWD"
   --volume "${PWD}":/code
@@ -95,20 +95,25 @@ alias code_scanner='docker run
   registry.gitlab.com/gitlab-org/ci-cd/codequality:"${CODEQUALITY_VERSION:-latest}"
   /code'
 
+# Runs trivy container image scanner
 alias trivy_scan='docker run -v /var/run/docker.sock:/var/run/docker.sock -v $HOME/Library/Caches:/root/.cache/ aquasec/trivy'
-
+# Opens dotfiles with $EDITOR
 alias zedit='$EDITOR ~/.dotfiles'
+# Open irssi with my configurations
+alias irssi='irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_CONFIG_HOME/irssi'
+# Configures wget to use correct wget-hsts file
+alias wget='wget --hsts-file=$XDG_DATA_HOME/wget-hsts'
+# Configures svn to use correct config directory
+alias svn='svn --config-dir $XDG_CONFIG_HOME/subversion'
 
-alias irssi="irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_CONFIG_HOME/irssi"
+# Laravel artisan shortcut
+alias art='[ -f artisan ] && php artisan || php vendor/bin/artisan'
 
-alias wget="wget --hsts-file=$XDG_DATA_HOME/wget-hsts"
-alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
+# Laravel Sail shortcut
+alias sail='[ -f sail ] && bash sail || bash vendor/bin/sail'
 
 if [[ $(uname) == 'Darwin' ]]; then
 
-  # 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"
 
@@ -130,6 +135,6 @@ X_ALIAS_FILES=(
 )
 for aliasFile in "${X_ALIAS_FILES[@]}"; do
   # shellcheck source=$HOME/.config/alias-secret
-  [ -f "$aliasFile" ] && source "$aliasFile" && msg "Sourced $aliasFile"
+  [ -f "$aliasFile" ] && source "$aliasFile" && msgr ok "Sourced $aliasFile"
 done
 unset X_ALIAS_FILES

config/asdf/cargo-packages

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

config/asdf/plugin-versions

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

config/asdf/python-packages

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

config/cheat/cheatsheets/personal/printf

@@ -0,0 +1,73 @@
+---
+tags: [printf, bash, zsh]
+---
+
+# printf
+
+The printf command accepts the following syntax:
+
+`printf [-v var] [format specifiers] [arguments]`
+
+- [-v var]
+  The optional -v flag assigns the output to the [var]
+  variable instead of printing it in standard output.
+
+- [format specifiers]
+  Format specifiers are strings that determine the methods of
+  formatting specifiers. The following section includes a
+  list of accepted specifiers.
+
+- [arguments]
+  Arguments can be any value or variable, and the [format specifiers]
+  point to the [arguments]. If there are more arguments than format
+  specifiers, the format string is reused until it interprets
+  the last argument.
+
+If there are fewer format specifiers than arguments, number formats
+are set to zero (0), while string formats are set to null (empty).
+
+## printf Specifiers
+
+Format      Description
+------      -----------
+%c          Treat the arguments as a single character.
+%d          Treat the input as a decimal (integer) number (base 10).
+%e          Treats the input as an exponential floating-point number.
+%f          Treat the input as a floating-point number.
+%i          Treat the input as an integer number (base 10).
+%o          Treats the input as an octal number (base 8).
+%s          Treat the input as a string of characters.
+%u          Treat the input as an unsigned decimal (integer) number.
+%x          Treats the input as a hexadecimal number (base 16).
+%%          Print a percent sign.
+%Wd         Print the W integer X digits wide.
+%(format)T  Outputs a date-time string resulting from using format as a
+            format string for strftime. The corresponding argument can
+            be the number of seconds since Epoch (January 1, 1970, 00:00),
+            -1 (the current time), or -2 (shell startup time).
+            Not specifying an argument uses the current time as the default value.
+\%          Print a percent sign.
+\n          Prints a newline character.
+\t          Print a tab character.
+
+Some format specifiers accept format modifiers that modify their actions.
+Enter the modifiers between the % character and the character that
+specifies the format.
+
+Available format modifiers are:
+
+<N>.        Enter a number that specifies a minimum field width.
+            If the output text is shorter, it's padded with spaces.
+            If the text is longer, the field expands.
+. (dot).    When used with a field width modifier, the field doesn't
+            expand for longer text. Instead, the text is truncated.
+-.          Left-aligns the printed text. The default alignment is right.
+0.          Pads the numbers with zeros instead of spaces.
+<space>.    Pads a positive number with a space, and a negative
+            number with a minus (-).
++.          Prints all numbers signed (+ for positive, - for negative).
+'.          For decimal conversions, applies the thousands grouping
+            separator to the integer portion of the output according
+            to the current LC_NUMERIC file.
+
+

config/cheat/conf.yml

@@ -61,12 +61,6 @@ cheatpaths:
     path: ~/.config/cheat/cheatsheets/community
     tags: [community]
     readonly: true
-  # If you have personalized cheatsheets, list them last. They will take
-  # precedence over the more global cheatsheets.
-  - name: personal
-    path: ~/.dotfiles/config/cheat/cheatsheets/personal
-    tags: [personal]
-    readonly: false
   - name: pure-bash-bible
     path: ~/.dotfiles/config/cheat/cheatsheets/pure-bash-bible
     tags: [pure-bash-bible]
@@ -75,6 +69,13 @@ cheatpaths:
     path: ~/.dotfiles/config/cheat/cheatsheets/tldr/tldr
     tags: [tldr]
     readonly: true
+  # If you have personalized cheatsheets, list them last. They will take
+  # precedence over the more global cheatsheets.
+  - name: personal
+    path: ~/.dotfiles/config/cheat/cheatsheets/personal
+    tags: [personal]
+    readonly: false
+
 # While it requires no configuration here, it's also worth noting that
 # cheat will automatically append directories named '.cheat' within the
 # current working directory to the 'cheatpath'. This can be very useful if

config/direnv/direnv.toml

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

config/exports

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

config/ghostty/config

@@ -0,0 +1,15 @@
+# vim: ft=ghostty
+theme = "light:tokyonight-day,dark:tokyonight-storm"
+font-family = "JetBrainsMono Nerd Font Mono"
+
+background-blur-radius = 15
+background-opacity = 0.95
+
+clipboard-read = allow
+clipboard-write = allow
+cursor-style = bar
+custom-shader-animation = true
+gtk-single-instance = true
+mouse-hide-while-typing = true
+shell-integration-features = true
+window-theme = system

config/git/config

@@ -11,3 +11,5 @@
 [include]
   path = ~/.config/git/overrides/config
 
+[advice]
+  detachedHead = false

config/git/gitignore

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

config/glow/glow.yml

@@ -0,0 +1,6 @@
+# mouse support (TUI-mode only)
+mouse: false
+# use pager to display markdown
+pager: true
+# word-wrap at width
+width: 80

config/homebrew/Brewfile

@@ -13,6 +13,8 @@ tap "jesseduffield/lazygit"
 tap "k8sgpt-ai/k8sgpt"
 tap "keith/formulae"
 tap "mongodb/brew"
+tap "nikitabobko/tap"
+tap "pantheon-systems/external"
 tap "reviewdog/tap"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
@@ -21,6 +23,22 @@ 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"
+# Mozilla CA bundle for Python
+brew "certifi"
+# Cryptography and SSL/TLS Toolkit
+brew "openssl@3"
+# Cryptographic recipes and primitives for Python
+brew "cryptography"
+# YAML Parser
+brew "libyaml"
+# Automate deployment, configuration, and upgrading
+brew "ansible"
+# Checks ansible playbooks for practices and behaviour
+brew "ansible-lint"
 # Generic-purpose lossless compression algorithm by Google
 brew "brotli"
 # Library and utilities for processing GIFs
@@ -39,10 +57,6 @@ brew "jpeg-xl"
 brew "aom"
 # Apache Portable Runtime library
 brew "apr"
-# Mozilla CA certificate store
-brew "ca-certificates"
-# Cryptography and SSL/TLS Toolkit
-brew "openssl@3"
 # Companion library to apr, the Apache Portable Runtime library
 brew "apr-util"
 # Password hashing library and CLI utility
@@ -53,14 +67,26 @@ brew "aspell"
 brew "autoconf"
 # Collection of over 500 reusable autoconf macros
 brew "autoconf-archive"
-# Bourne-Again SHell, a UNIX command interpreter
-brew "bash"
 # GNU multiple precision arithmetic library
 brew "gmp"
+# Package compiler and linker metadata toolkit
+brew "pkgconf"
+# Automated text file generator
+brew "autogen"
+# Tool for generating GNU Standards-compliant Makefiles
+brew "automake"
+# Official Amazon AWS command-line interface
+brew "awscli"
+# Bourne-Again SHell, a UNIX command interpreter
+brew "bash"
+# Clone of cat(1) with syntax highlighting and Git integration
+brew "bat"
 # GNU File, Shell, and Text utilities
 brew "coreutils"
 # Bash Automated Testing System
 brew "bats-core"
+# Parser generator
+brew "bison"
 # Software library to render fonts
 brew "freetype"
 # XML-based font configuration API for X Windows
@@ -69,46 +95,76 @@ brew "fontconfig"
 brew "gettext"
 # Core application library for C
 brew "glib"
-# Mozilla CA bundle for Python
-brew "certifi"
-# Cryptographic recipes and primitives for Python
-brew "cryptography"
+# Prevent cloud misconfigurations during build-time for IaC tools
+brew "checkov"
+# Human-friendly and fast alternative to cut and (sometimes) awk
+brew "choose-rust"
+# Cross-platform make
+brew "cmake"
 # Get a file from an HTTP, HTTPS or FTP server
 brew "curl"
 # Lightweight DNS forwarder and DHCP server
 brew "dnsmasq"
+# Spellchecker wrapping library
+brew "enchant"
+# Perl lib for reading and writing EXIF metadata
+brew "exiftool"
+# Banner-like program prints strings as ASCII art
+brew "figlet"
 # Lock file during command
 brew "flock"
 # Libraries to talk to Microsoft SQL Server and Sybase databases
 brew "freetds"
+# Monitor a directory for changes and run a shell command
+brew "fswatch"
+# Command-line fuzzy finder written in Go
+brew "fzf"
 # Graphics library to dynamically manipulate images
 brew "gd"
+# Disk usage analyzer with console interface written in Go
+brew "gdu"
 # GitHub command-line tool
 brew "gh"
+# OpenType text shaping engine
+brew "harfbuzz"
+# Secure hashing function
+brew "libb2"
+# Framework for layout and rendering of i18n text
+brew "pango"
 # Distributed revision control system
 brew "git"
+# Enable transparent encryption/decryption of files in a git repo
+brew "git-crypt"
+# Small git utilities
+brew "git-extras"
+# See your latest local git branches, formatted real fancy
+brew "git-recent"
 # Render markdown on the CLI
 brew "glow"
+# GNU implementation of the famous stream editor
+brew "gnu-sed"
 # Validating, recursive, caching DNS resolver
 brew "unbound"
 # GNU Transport Layer Security (TLS) Library
 brew "gnutls"
 # GNU Pretty Good Privacy (PGP) package
 brew "gnupg"
+# Library access to GnuPG
+brew "gpgme"
+# Manage your GnuPG keys with ease!
+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
 brew "librsvg"
 # Graph visualization software from AT&T and Bell Labs
 brew "graphviz"
+# GNU grep, egrep and fgrep
+brew "grep"
 # Popular GNU data compression program
 brew "gzip"
+# Text-based UI library
+brew "ncurses"
 # Improved top (interactive process viewer)
 brew "htop"
 # Portable abstraction of the hierarchical topology of modern architectures
@@ -119,6 +175,8 @@ brew "libheif"
 brew "imagemagick"
 # Modular IRC client
 brew "irssi"
+# Image manipulation library
+brew "jpeg"
 # Lightweight and flexible command-line JSON processor
 brew "jq"
 # JSON parser for C
@@ -127,38 +185,78 @@ brew "json-c"
 brew "krb5"
 # Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
 brew "legitify"
-# Secure hashing function
-brew "libb2"
+# BSD-style licensed readline alternative
+brew "libedit"
+# Conversion library
+brew "libiconv"
 # Postgres C API library
 brew "libpq"
+# Version of the SSL/TLS protocol forked from OpenSSL
+brew "libressl"
 # Multi-platform support library with a focus on asynchronous I/O
 brew "libuv"
-# YAML Parser
-brew "libyaml"
+# GNOME XML library
+brew "libxml2"
 # 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"
+# Collection of tools that nobody wrote when UNIX was young
+brew "moreutils"
+# 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"
+# Libraries for security-enabled client and server applications
+brew "nss"
 # Open source suite of directory software
 brew "openldap"
+# Cryptography and SSL/TLS Toolkit
+brew "openssl@1.1"
+# ISO-C API and CLI for generating UUIDs
+brew "ossp-uuid"
 # General-purpose scripting language
 brew "php"
-# Manage compile and link flags for libraries
-brew "pkg-config"
+# General-purpose scripting language
+brew "php@8.2"
+# General-purpose scripting language
+brew "php@8.3"
+# Python version management
+brew "pyenv"
+# Migrate pip packages from one Python version to another
+brew "pyenv-pip-migrate"
+# Pyenv plugin to manage virtualenv
+brew "pyenv-virtualenv"
+# Interpreted, interactive, object-oriented programming language
+brew "python@3.11"
+# Install various Ruby versions and implementations
+brew "ruby-build"
+# Ruby version manager
+brew "rbenv"
+# Generate C-based recognizers from regular expressions
+brew "re2c"
+# Static analysis and lint tool, for (ba)sh scripts
+brew "shellcheck"
 # Send macOS User Notifications from the command-line
 brew "terminal-notifier"
 # Tool which checks for the support of TLS/SSL ciphers and flaws
 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"
 # Terminal multiplexer
 brew "tmux"
 # Display directories as trees (with optional color/HTML output)
 brew "tree"
+# 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
@@ -167,8 +265,18 @@ brew "watch"
 brew "wget"
 # Check your $HOME for unwanted files and directories
 brew "xdg-ninja", args: ["HEAD"]
+# General-purpose lossless data-compression library
+brew "zlib"
 # 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"
+# Terminus is Pantheon's Command-line Interface (CLI)
+brew "pantheon-systems/external/terminus"
+# Automated code review tool integrated with any code analysis tools regardless of programming language.
+brew "reviewdog/tap/reviewdog"
 # Igbinary PHP extension
 brew "shivammathur/extensions/igbinary@8.3"
 # Imagick PHP extension
@@ -187,8 +295,14 @@ brew "shivammathur/extensions/uuid@8.3"
 brew "shivammathur/extensions/yaml@8.3"
 # General-purpose scripting language
 brew "shivammathur/php/php-debug"
+# General-purpose scripting language
+brew "shivammathur/php/php@7.4"
+# General-purpose scripting language
+brew "shivammathur/php/php@8.0", link: true
 # Find & fix known vulnerabilities in open-source dependencies
 brew "snyk/tap/snyk"
+# AeroSpace is an i3-like tiling window manager for macOS
+cask "aerospace"
 # Text editor
 cask "coda"
 # Universal database tool and SQL client
@@ -199,11 +313,7 @@ cask "dbngin"
 cask "docker"
 cask "font-jetbrains-mono"
 cask "font-jetbrains-mono-nerd-font"
-cask "font-lato"
 cask "font-open-sans"
-cask "font-roboto"
-cask "font-source-code-pro"
-cask "font-source-code-pro-for-powerline"
 # GIT client
 cask "fork"
 # HTTP and GraphQL Client

config/nvim/.editorconfig

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

config/nvim/init.lua

@@ -5,7 +5,7 @@
 -- ── Install lazylazy ────────────────────────────────────────────────
 -- https://github.com/folke/lazy.nvim
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
+if not vim.uv.fs_stat(lazypath) then
   local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
   local out = vim.fn.system {
     'git',
@@ -52,10 +52,20 @@ require('lazy').setup(
       -- No need to notify about changes
       notify = false,
     },
+    dev = {
+      path = '~/Code/nvim', -- Load wip plugins from this path
+    },
     install = {
       colorscheme = { vim.g.colors_theme },
     },
+    profiling = {
+      loader = true,
+    },
   }
 )
 
+require('nvm-default').setup()
+
+require 'keymaps'
+
 -- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/autogroups.lua

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

config/nvim/lua/keymaps.lua

@@ -0,0 +1,182 @@
+-- vim: set ft=lua ts=2 sw=2 tw=0 et cc=130 :
+
+require 'utils'
+
+-- ╭─────────────────────────────────────────────────────────╮
+-- │                         Keymaps                         │
+-- ╰─────────────────────────────────────────────────────────╯
+
+-- ── Disable arrow keys in normal mode ───────────────────────────────
+K.n('<left>', ':echo "Use h to move!!"<CR>')
+K.n('<right>', ':echo "Use l to move!!"<CR>')
+K.n('<up>', ':echo "Use k to move!!"<CR>')
+K.n('<down>', ':echo "Use j to move!!"<CR>')
+
+-- ── Splits ──────────────────────────────────────────────────────────
+K.n('<C-w>,', ':vertical resize -10<CR>', { desc = 'V Resize -' })
+K.n('<C-w>.', ':vertical resize +10<CR>', { desc = 'V Resize +' })
+K.n('<C-w>-', ':resize -10<CR>', { desc = 'H Resize -' })
+K.n('<C-w>+', ':resize +10<CR>', { desc = 'H Resize +' })
+K.n('<C-w>=', '<C-w>=', { desc = 'Equal Size Splits' })
+
+-- ── Deal with word wrap ─────────────────────────────────────────────
+K.n(
+  'k',
+  "v:count == 0 ? 'gk' : 'k'",
+  { desc = 'Move up', noremap = true, expr = true }
+)
+K.n(
+  'j',
+  "v:count == 0 ? 'gj' : 'j'",
+  { desc = 'Move down', noremap = true, expr = true }
+)
+
+-- ── Text manipulation ───────────────────────────────────────────────
+K.d('<', { 'n', 'v' }, '<gv', 'Indent Left')
+K.d('>', { 'n', 'v' }, '>gv', 'Indent Right')
+K.d('<C-k>', { 'n', 'v' }, ":m '<-2<CR>gv=gv", 'Move Block Up')
+K.d('<C-j>', { 'n', 'v' }, ":m '>+1<CR>gv=gv", 'Move Block Down')
+
+-- ── Other operations ────────────────────────────────────────────────
+K.nl('o', function() require('snacks').gitbrowse() end, 'Open repo in browser')
+K.n('<C-s>', ':w!<cr>', { desc = 'Save', noremap = true })
+K.n('<esc><esc>', ':nohlsearch<cr>', { desc = 'Clear Search Highlighting' })
+
+-- ── ToggleTerm ──────────────────────────────────────────────────────
+K.d('<F1>', 'n', ':FloatermToggle<CR>', 'Toggle Floaterm')
+K.d('<F1>', 'i', '<Esc>:FloatermToggle<CR>', 'Toggle Floaterm')
+K.d('<F1>', 't', '<C-\\><C-n>:FloatermToggle<CR>', 'Toggle Floaterm')
+
+-- ── Test operations ─────────────────────────────────────────────────
+K.nl('an', ':silent TestNearest<CR>', 'Test Nearest')
+K.nl('af', ':silent TestFile<CR>', 'Test File')
+K.nl('as', ':silent TestSuite<CR>', 'Test Suite')
+K.nl('al', ':silent TestLast<CR>', 'Test Last')
+K.nl('av', ':silent TestVisit<CR>', 'Test Visit')
+
+-- ── PHPActor Operations ─────────────────────────────────────────────
+K.nl('apm', ':PhpactorContextMenu<cr>', 'PHPactor: Context Menu')
+K.nl('apn', ':PhpactorClassNew<cr>', 'PHPactor: Class New')
+K.nl('aps', ':PhpactorClassSearch<cr>', 'PHPactor: Class Search')
+K.nl('apt', ':PhpactorTransform<cr>', 'PHPactor: Transform')
+
+-- ── Buffer operations ───────────────────────────────────────────────
+-- Mappings for buffer management operations like switching, deleting, etc.
+-- Convention: All mappings start with 'b' followed by the operation
+K.nl('ba', ':%bd|e#|bd#<cr>', 'Close all except current')
+K.nl('bd', ':lua MiniBufremove.delete()<CR>', 'Delete')
+K.nl('bh', ':bprev<cr>', 'Prev')
+K.nl('bj', ':bfirst<cr>', 'First')
+K.nl('bk', ':blast<cr>', 'Last')
+K.nl('bl', ':bnext<cr>', 'Next')
+K.nl('bw', ':lua MiniBufremove.wipeout()<CR>', 'Wipeout')
+
+-- ── Code & LSP operations ───────────────────────────────────────────
+-- Mappings for code and LSP operations like code actions, formatting, etc.
+-- Convention: All mappings start with 'c' followed by the operation
+-- unless it's a generic operation like signature help or hover
+
+local b = function() return require 'telescope.builtin' end
+local lws = function() return b().lsp_workspace_symbols() end
+local ldws = function() return b().lsp_dynamic_workspace_symbols() end
+
+K.n('<C-l>', ':lua vim.lsp.buf.signature_help()<CR>', { desc = 'Signature' })
+K.n('K', ':lua vim.lsp.buf.hover()<CR>', { desc = 'Hover Documentation' })
+K.ld('ca', 'n', ':lua vim.lsp.buf.code_action()<CR>', 'Code Action')
+K.ld('cci', 'n', function() b().lsp_incoming_calls() end, 'Incoming calls')
+K.ld('cco', 'n', function() b().lsp_outgoing_calls() end, 'Outgoing calls')
+K.ld('cd', 'n', function() b().lsp_definitions() end, 'Definitions')
+K.ld('cf', { 'n', 'x' }, ':lua vim.lsp.buf.format()<CR>', 'Format')
+K.ld('cg', 'n', ':lua require("neogen").generate()<CR>', 'Generate annotations')
+K.ld('ci', 'n', function() b().lsp_implementations() end, 'Implementations')
+K.ld('cp', 'n', function() b().lsp_type_definitions() end, 'Type Definition')
+K.ld('cr', 'n', vim.lsp.buf.rename, 'Rename')
+K.ld('cs', 'n', ':Telescope lsp_document_symbols<CR>', 'LSP Document Symbols')
+K.ld('ct', 'n', function() b().treesitter() end, 'treesitter')
+K.ld('cws', 'n', function() lws() end, 'Workspace Symbols')
+K.ld('cwd', 'n', function() ldws() end, 'Dynamic Workspace Symbols')
+
+-- ── CommentBox operations ───────────────────────────────────────────
+-- Mappings for creating and managing comment boxes
+-- Convention: All mappings start with 'cb' followed by the box type
+K.nl('cbb', '<Cmd>CBccbox<CR>', 'CB: Box Title')
+K.nl('cbd', '<Cmd>CBd<CR>', 'CB: Remove a box')
+K.nl('cbl', '<Cmd>CBline<CR>', 'CB: Simple Line')
+K.nl('cbm', '<Cmd>CBllbox14<CR>', 'CB: Marked')
+K.nl('cbt', '<Cmd>CBllline<CR>', 'CB: Titled Line')
+
+-- ── Telescope operations ────────────────────────────────────────────
+-- Mappings for Telescope operations like finding files, buffers, etc.
+-- Convention: All mappings start with 's' followed by the operation
+-- unless it's a generic operation like searching or finding buffers
+
+local fuzzy_search = function()
+  require('telescope.builtin').find_files(
+    require('telescope.themes').get_dropdown {
+      winblend = 20,
+      previewer = true,
+    }
+  )
+end
+
+local lazy_plugins = function()
+  return require('telescope').extensions.lazy_plugins.lazy_plugins()
+end
+
+K.nl('f', ':Telescope fd --hidden=true<cr>', 'Find Files')
+K.nl(',', ':Telescope buffers<cr>', 'Find existing buffers')
+K.nl('/', function() fuzzy_search() end, 'Fuzzily search in current buffer')
+
+K.nl('sc', ':Telescope commands<cr>', 'Commands')
+K.nl('sd', ':Telescope diagnostics<cr>', 'Search Diagnostics')
+K.nl('sg', ':Telescope live_grep<cr>', 'Search by Grep')
+K.nl('sh', ':Telescope help_tags<cr>', 'Help tags')
+K.nl('sk', ':Telescope keymaps<cr>', 'Search Keymaps')
+K.nl('sl', ':Telescope luasnip<CR>', 'Search LuaSnip')
+K.nl('so', ':Telescope oldfiles<CR>', 'Old Files')
+K.nl('sp', function() lazy_plugins() end, 'Lazy Plugins')
+K.nl('sq', ':Telescope quickfix<cr>', 'Quickfix')
+K.nl('ss', ':Telescope treesitter<cr>', 'Treesitter')
+K.nl('sw', ':Telescope grep_string<cr>', 'Grep String')
+K.nl('sx', ':Telescope import<cr>', 'Telescope: Import')
+
+-- ── Trouble operations ──────────────────────────────────────────────
+-- Convention is 'x' followed by the operation
+K.nl('xd', ':Trouble diagnostics<cr>', 'Document Diagnostics')
+K.nl('xl', ':Trouble loclist<cr>', 'Location List')
+K.nl('xq', ':Trouble quickfix<cr>', 'Quickfix')
+K.nl('xw', ':Trouble workspace_diagnostics<cr>', 'Workspace Diagnostics')
+K.nl('xx', ':Trouble diagnostics<cr>', 'Diagnostic')
+
+-- ── Toggle settings ─────────────────────────────────────────────────
+-- Convention is 't' followed by the operation
+K.nl('tc', ':CloakToggle<cr>', 'Cloak: Toggle')
+K.nl('te', ':Neotree toggle<cr>', 'Toggle Neotree')
+K.nl('tl', ToggleBackground, 'Toggle Light/Dark Mode')
+K.nl('tn', ':Noice dismiss<cr>', 'Noice: Dismiss Notification')
+
+-- ── Quit operations ─────────────────────────────────────────────────
+-- Convention is 'q' followed by the operation
+K.nl('qf', ':q<CR>', 'Quicker close split')
+K.nl('qq', function()
+  if vim.fn.confirm('Force save and quit?', '&Yes\n&No', 2) == 1 then
+    vim.cmd 'wq!'
+  end
+end, 'Quit with force saving')
+K.nl('qw', ':wq<CR>', 'Write and quit')
+K.nl('qQ', function()
+  if vim.fn.confirm('Force quit without saving?', '&Yes\n&No', 2) == 1 then
+    vim.cmd 'q!'
+  end
+end, 'Force quit without saving')
+
+-- ── Flash.nvim keymaps ──────────────────────────────────────────────
+local nxo = { 'n', 'x', 'o' }
+local fj = function() return require('flash').jump() end
+local ft = function() return require('flash').treesitter() end
+local fx = function() return require('flash').toggle() end
+K.d('zk', nxo, fj, { desc = 'Flash' })
+K.d('Zk', nxo, ft, { desc = 'Flash Treesitter' })
+K.d('<m-s>', 'c', fx, { desc = 'Toggle Flash Search' })
+
+-- That concludes the keymaps section of the config.

config/nvim/lua/nvm-default/init.lua

@@ -0,0 +1,122 @@
+-- Get nvm default version and use it in node_host_prog
+-- and g.copilot_node_command.
+--
+-- This module automatically configures Neovim to use the default Node.js version
+-- from NVM. It requires a working NVM installation and 'default' alias to be set,
+-- and also neovim npm package to be installed.
+--
+-- You can install the neovim package by running:
+-- npm i --global neovim
+--
+-- Usage:
+--   require('nvm-default').setup({
+--     add_to_path = true,        -- optional: add NVM bin directory to PATH
+--     nvm_path = "~/.nvm",      -- optional: custom NVM installation path
+--     notify_level = "info"     -- optional: notification level
+--   })
+
+local M = {}
+
+M.name = 'nvm-default.nvim'
+M.version = '0.1.0' -- x-release-please-version
+
+-- Helper function to run a shell command
+---@param cmd string Run a shell command
+---@return string? Return the result of the command
+local function run_command(cmd)
+  local result = vim.fn.system(cmd)
+  return vim.v.shell_error == 0 and result:gsub('%s+$', '') or nil
+end
+
+-- Helper function to show a notification
+---@param msg string Show a message
+---@param level "info"|"warn"|"error"|"trace" Notification level
+local function n(msg, level)
+  if msg == nil then msg = M.name .. ': No message provided' end
+  if level == nil then level = 'trace' end
+
+  local log_level = vim.log.levels.INFO
+
+  if level == 'info' then
+    log_level = vim.log.levels.INFO
+  elseif level == 'warn' then
+    log_level = vim.log.levels.WARN
+  elseif level == 'error' then
+    log_level = vim.log.levels.ERROR
+  elseif level == 'trace' then
+    log_level = vim.log.levels.TRACE
+  end
+
+  vim.notify(M.name .. ': ' .. msg, log_level)
+end
+
+---@class NvmDefaultOptions
+---@field add_to_path boolean Add found NVM bin directory to PATH
+---@field nvm_path string Where nvm installation is located
+---@field notify_level number|"info"|"warn"|"error"|"trace" Notification level filter
+
+-- Default options
+---@type NvmDefaultOptions
+M.defaults = {
+  add_to_path = vim.g.nvm_default_add_to_path or true,
+  nvm_path = vim.fn.expand(os.getenv 'NVM_DIR' or '~/.nvm'),
+  notify_level = vim.g.nvm_default_notify_level or 'info',
+}
+
+-- Fetch the NVM default version or fallback to node version
+---@param opts? NvmDefaultOptions Plugin options
+function M.setup(opts)
+  local options = vim.tbl_deep_extend('force', M.defaults, opts or {})
+
+  local nvm_path = options.nvm_path
+  local node_version = run_command(
+    string.format('. %s/nvm.sh && nvm version default', nvm_path)
+  ) or run_command(string.format('. %s/nvm.sh && nvm version node', nvm_path))
+
+  if node_version and node_version:match '^v' then
+    -- Set vim.g.node_host_prog and vim.g.copilot_node_command
+    local current_nvm_version_path =
+      string.format('%s/versions/node/%s', nvm_path, node_version)
+    local current_nvm_node_bin_path =
+      string.format('%s/bin', current_nvm_version_path)
+    local current_nvm_node_bin =
+      string.format('%s/node', current_nvm_node_bin_path)
+    local neovim_node_host_bin_path =
+      string.format('%s/neovim-node-host', current_nvm_node_bin_path)
+
+    -- Collect missing files and directories errors for error output
+    local missing = {}
+
+    -- If node_dir isn't there, stop and show error
+    if not vim.fn.isdirectory(current_nvm_version_path) then
+      table.insert(missing, 'Node.js directory: ' .. current_nvm_version_path)
+    end
+
+    -- If node_bin isn't there, stop and show error
+    if not vim.fn.filereadable(current_nvm_node_bin) then
+      table.insert(missing, 'Node.js binary: ' .. current_nvm_node_bin)
+    end
+
+    if not vim.fn.filereadable(neovim_node_host_bin_path) then
+      table.insert(missing, 'Neovim host binary: ' .. neovim_node_host_bin_path)
+    end
+
+    if #missing > 0 then
+      n('Missing required files:\n- ' .. table.concat(missing, '\n- '), 'error')
+      return
+    end
+
+    -- Add to PATH if requested. Can be turned off by setting if it messes with
+    -- other tools.
+    if options.add_to_path then
+      vim.env.PATH = current_nvm_node_bin_path .. ':' .. vim.env.PATH
+    end
+
+    vim.g.node_host_prog = neovim_node_host_bin_path
+    vim.g.copilot_node_command = current_nvm_node_bin
+  else
+    n('Unable to determine the Node.js version from nvm.', 'error')
+  end
+end
+
+return M

config/nvim/lua/options.lua

@@ -2,130 +2,65 @@
 -- │              neovim configuration options               │
 -- ╰─────────────────────────────────────────────────────────╯
 -- See `:help vim.opt`
+--     `:help vim.g`
 -- For more options, you can see `:help option-list`
 
--- Enables the experimental nvim 0.5 features
-vim.loader.enable()
+local g = vim.g -- A table to store global variables
+local o = vim.opt -- A table to store global options
+local a = vim.api -- A table to store API functions
 
--- Map leader and local leader
-vim.g.mapleader = ' '
-vim.g.maplocalleader = ' '
+-- vim.global
+g.mapleader = ' ' -- Space as the leader key
+g.maplocalleader = ' ' -- Space as the local leader key
 
--- Set the colorscheme and variants
-vim.g.colors_theme = 'tokyonight'
-vim.g.colors_variant_light = 'tokyonight-day'
-vim.g.colors_variant_dark = 'tokyonight-storm'
+g.colors_theme = 'tokyonight' -- Set the colorscheme
+g.colors_variant_light = 'tokyonight-day' -- Set the light variant
+g.colors_variant_dark = 'tokyonight-storm' -- Set the dark variant
 
--- Make sure editorconfig support is enabled
-vim.g.editorconfig = true
+g.editorconfig = true -- Make sure editorconfig support is enabled
+g.loaded_perl_provider = 0 -- Disable perl provider
+g.loaded_ruby_provider = 0 -- Disable ruby provider
+g.loaded_java_provider = 0 -- Disable java provider
 
--- Enable line numbers and relative line numbers
-vim.opt.number = true
-vim.opt.relativenumber = true
+-- vim.options
+-- Most of the good defaults are provided by `mini.basics`
+-- See: lua/plugins/mini.lua
+o.confirm = true -- Confirm before closing unsaved buffers
+o.ignorecase = true -- Ignore case in search patterns
+o.inccommand = 'split' -- Preview substitutions live, as you type!
+o.list = true -- Show invisible characters
+o.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
+o.number = true -- Show line numbers
+o.numberwidth = 3 -- Set the width of the number column
+o.relativenumber = true -- Show relative line numbers
+o.scrolloff = 8 -- Show context around cursor
+o.sidescrolloff = 8 -- Show context around cursor
+o.signcolumn = 'yes' -- Keep signcolumn on by default
+o.spell = true -- Enable spell checking
+o.spelllang = 'en_us' -- Set the spell checking language
+o.splitbelow = true -- split to the bottom
+o.splitright = true -- vsplit to the right
+o.termguicolors = true -- Enable GUI colors
+o.timeoutlen = 250 -- Decrease mapped sequence wait time
+o.updatetime = 250 -- 250 ms = 2,5 seconds
 
--- Enable mouse mode, can be useful for resizing splits for example!
-vim.opt.mouse = 'a'
+-- Session options
+-- This is a comma separated list of options that will be
+-- saved when a session ends.
+local so = 'buffers,curdir,folds,tabpages,winsize,winpos,terminal,localoptions'
+o.sessionoptions = so
 
--- Don't show the mode, since it's already in the status line
-vim.opt.showmode = false
+o.wildmode = 'longest:full,full' -- Command-line completion mode
+
+-- Enable the colorcolumn
+a.nvim_set_option_value('colorcolumn', '+1', { scope = 'global' })
 
 -- Sync clipboard between OS and Neovim.
 --  Schedule the setting after `UiEnter` because it can increase startup-time.
 --  See `:help 'clipboard'`
 vim.schedule(function()
   local c = vim.env.SSH_TTY and '' or 'unnamedplus'
-  vim.opt.clipboard = c
+  o.clipboard = c
 end)
 
-vim.opt.breakindent = true -- Enable break indent
-vim.opt.smartindent = true -- Insert indents automatically
-
--- Save undo history
-vim.opt.undofile = true
-
--- Case-insensitive searching UNLESS \C or one or
--- more capital letters in the search term
-vim.opt.ignorecase = true
-vim.opt.smartcase = true
-
--- Keep signcolumn on by default
-vim.opt.signcolumn = 'yes'
-
--- Decrease update time
-vim.opt.updatetime = 250
-vim.wo.signcolumn = 'yes'
-
--- Decrease mapped sequence wait time
--- Displays which-key popup sooner
-vim.opt.timeoutlen = 250
-
--- Configure how new splits should be opened
-vim.opt.splitright = true
-vim.opt.splitbelow = true
-
--- Sets how neovim will display certain whitespace characters in the editor.
---  See `:help 'list'`
---  and `:help 'listchars'`
-vim.opt.list = true
-vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
-
--- Preview substitutions live, as you type!
-vim.opt.inccommand = 'split'
-
--- Show which line your cursor is on
-vim.opt.cursorline = true
-
--- Minimal number of screen lines to keep above and below the cursor.
-vim.opt.scrolloff = 15
-
--- Set completeopt to have a better completion experience
-vim.o.completeopt = 'menuone,noselect'
-
--- Fixes Notify opacity issues
-vim.o.termguicolors = true
-
--- Set spell checking
-vim.o.spell = true
-vim.o.spelllang = 'en_us'
-
--- Tree-sitter settings
-vim.g.loaded_perl_provider = 0
-vim.g.loaded_ruby_provider = 0
-
--- kevinhwang91/nvim-ufo settings
-vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
-vim.o.foldcolumn = '1' -- '0' is not bad
--- Using ufo provider need a large value, feel free to decrease the value
-vim.o.foldlevel = 99
-vim.o.foldlevelstart = 99
-vim.o.foldenable = true
-
--- anuvyklack/windows.nvim settings
-vim.o.winwidth = 15
-vim.o.winminwidth = 10
-vim.o.equalalways = false
-
--- folke/noice.nvim settings
-vim.g.noice_ignored_filetypes = {
-  'fugitiveblame',
-  'fugitive',
-  'gitcommit',
-  'noice',
-}
-
--- ── Deal with word wrap ───────────────────────────────────────────────────────
-local m = vim.api.nvim_set_keymap
-m(
-  'n',
-  'k',
-  "v:count == 0 ? 'gk' : 'k'",
-  { desc = 'Move up', noremap = true, expr = true }
-)
-m(
-  'n',
-  'j',
-  "v:count == 0 ? 'gj' : 'j'",
-  { desc = 'Move down', noremap = true, expr = true }
-)
-
 -- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/plugins/blink.lua

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

config/nvim/lua/plugins/cmp.lua

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

config/nvim/lua/plugins/code.lua

@@ -0,0 +1,211 @@
+return {
+  -- A better annotation generator.
+  -- Supports multiple languages and annotation conventions.
+  -- https://github.com/danymat/neogen
+  {
+    'danymat/neogen',
+    version = '*',
+    opts = { enabled = true, snippet_engine = 'luasnip' },
+  },
+
+  -- Terminal manager for (neo)vim
+  -- https://github.com/voldikss/vim-floaterm
+  {
+    'voldikss/vim-floaterm',
+    cmd = { 'FloatermToggle' },
+    init = function()
+      vim.g.floaterm_width = 0.8
+      vim.g.floaterm_height = 0.8
+    end,
+  },
+
+  -- Run your tests at the speed of thought
+  -- https://github.com/vim-test/vim-test
+  {
+    'vim-test/vim-test',
+    dependencies = { 'voldikss/vim-floaterm' },
+    config = function()
+      vim.cmd [[
+      function! PhpUnitTransform(cmd) abort
+        return join(map(split(a:cmd), 'v:val == "--colors" ? "--colors=always" : v:val'))
+      endfunction
+
+      let g:test#custom_transformations = {'phpunit': function('PhpUnitTransform')}
+      let g:test#transformation = 'phpunit'
+
+      " let test#php#phpunit#options = '--colors=always'
+      let test#php#pest#options = '-v'
+      let test#javascript#jest#options = '--color'
+
+      function! FloatermStrategy(cmd)
+        execute 'silent FloatermSend q'
+        execute 'silent FloatermKill'
+        execute 'FloatermNew! '.a:cmd.' | less -X'
+      endfunction
+
+      let g:test#custom_strategies = {'floaterm': function('FloatermStrategy')}
+      let g:test#strategy = 'floaterm'
+    ]]
+    end,
+  },
+
+  -- Cloak allows you to overlay *'s over defined patterns in defined files.
+  -- https://github.com/laytan/cloak.nvim
+  {
+    'laytan/cloak.nvim',
+    version = '*',
+    opts = {
+      enabled = true,
+      cloak_character = '*',
+      -- The applied highlight group (colors) on the cloaking, see `:h highlight`.
+      highlight_group = 'Comment',
+      patterns = {
+        {
+          -- Match any file starting with ".env".
+          -- This can be a table to match multiple file patterns.
+          file_pattern = {
+            '.env*',
+            'wrangler.toml',
+            '.dev.vars',
+          },
+          -- Match an equals sign and any character after it.
+          -- This can also be a table of patterns to cloak,
+          -- example: cloak_pattern = { ":.+", "-.+" } for yaml files.
+          cloak_pattern = '=.+',
+        },
+      },
+    },
+  },
+
+  -- projectionist.vim: Granular project configuration
+  -- https://github.com/tpope/vim-projectionist
+  {
+    'tpope/vim-projectionist',
+    dependencies = 'tpope/vim-dispatch',
+    config = function()
+      vim.g.projectionist_heuristics = {
+        artisan = {
+          ['*'] = {
+            start = 'php artisan serve',
+            console = 'php artisan tinker',
+          },
+          ['app/*.php'] = {
+            type = 'source',
+            alternate = {
+              'tests/Unit/{}Test.php',
+              'tests/Feature/{}Test.php',
+            },
+          },
+          ['tests/Feature/*Test.php'] = {
+            type = 'test',
+            alternate = 'app/{}.php',
+          },
+          ['tests/Unit/*Test.php'] = {
+            type = 'test',
+            alternate = 'app/{}.php',
+          },
+          ['app/Models/*.php'] = {
+            type = 'model',
+          },
+          ['app/Http/Controllers/*.php'] = {
+            type = 'controller',
+          },
+          ['routes/*.php'] = {
+            type = 'route',
+          },
+          ['database/migrations/*.php'] = {
+            type = 'migration',
+          },
+        },
+        ['src/&composer.json'] = {
+          ['src/*.php'] = {
+            type = 'source',
+            alternate = {
+              'tests/{}Test.php',
+            },
+          },
+          ['tests/*Test.php'] = {
+            type = 'test',
+            alternate = 'src/{}.php',
+          },
+        },
+        ['app/&composer.json'] = {
+          ['app/*.php'] = {
+            type = 'source',
+            alternate = {
+              'tests/{}Test.php',
+            },
+          },
+          ['tests/*Test.php'] = {
+            type = 'test',
+            alternate = 'app/{}.php',
+          },
+        },
+      }
+    end,
+  },
+
+  -- A vim text object for XML/HTML attributes.
+  -- https://github.com/whatyouhide/vim-textobj-xmlattr
+  {
+    'whatyouhide/vim-textobj-xmlattr',
+    dependencies = { 'kana/vim-textobj-user' },
+  },
+
+  -- Describe the regexp under the cursor
+  -- https://github.com/bennypowers/nvim-regexplainer
+  {
+    'bennypowers/nvim-regexplainer',
+    event = 'BufEnter',
+    dependencies = {
+      'nvim-treesitter/nvim-treesitter',
+      'MunifTanjim/nui.nvim',
+    },
+    opts = {
+      -- automatically show the explainer when the cursor enters a regexp
+      auto = true,
+    },
+  },
+
+  -- Clarify and beautify your comments using boxes and lines.
+  -- https://github.com/LudoPinelli/comment-box.nvim
+  {
+    'LudoPinelli/comment-box.nvim',
+    event = 'BufEnter',
+    opts = {},
+  },
+
+  -- Plugin to improve viewing Markdown files in Neovim
+  -- https://github.com/MeanderingProgrammer/render-markdown.nvim
+  {
+    'MeanderingProgrammer/render-markdown.nvim',
+    event = 'BufEnter',
+    dependencies = {
+      'nvim-treesitter/nvim-treesitter',
+      'nvim-tree/nvim-web-devicons',
+    },
+    ft = 'markdown',
+    opts = {},
+  },
+
+  {
+    'ray-x/go.nvim',
+    dependencies = { -- optional packages
+      'ray-x/guihua.lua',
+      'neovim/nvim-lspconfig',
+      'nvim-treesitter/nvim-treesitter',
+    },
+    config = function() require('go').setup() end,
+    event = { 'CmdlineEnter' },
+    ft = { 'go', 'gomod' },
+    build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries
+  },
+
+  -- Mainly a PHP Language Server with more features than you can shake a stick at
+  -- https://github.com/phpactor/phpactor
+  {
+    'phpactor/phpactor',
+    build = 'composer install --no-dev --optimize-autoloader',
+    ft = 'php',
+  },
+}

config/nvim/lua/plugins/comment.lua

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

config/nvim/lua/plugins/conform.lua

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

config/nvim/lua/plugins/dap.lua

@@ -1,25 +0,0 @@
-return {
-  {
-    'rcarriga/nvim-dap-ui',
-    dependencies = {
-      'mfussenegger/nvim-dap',
-      'nvim-neotest/nvim-nio',
-      'theHamsta/nvim-dap-virtual-text',
-      'ray-x/go.nvim',
-      'ray-x/guihua.lua',
-      'leoluz/nvim-dap-go',
-    },
-    setup = function()
-      require('dapui').setup()
-      require('dap-go').setup()
-      require('nvim-dap-virtual-text').setup {}
-
-      vim.fn.sign_define('DapBreakpoint', {
-        text = '🔴',
-        texthl = 'DapBreakpoint',
-        linehl = 'DapBreakpoint',
-        numhl = 'DapBreakpoint',
-      })
-    end,
-  },
-}

config/nvim/lua/plugins/flash.lua

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

config/nvim/lua/plugins/folke.lua

@@ -0,0 +1,170 @@
+return {
+  -- A collection of small QoL plugins for Neovim
+  -- https://github.com/folke/snacks.nvim
+  {
+    'folke/snacks.nvim',
+    priority = 1000,
+    lazy = false,
+    opts = {
+      bigfile = { enabled = true },
+      gitbrowse = { enabled = true },
+      quickfile = { enabled = true },
+      statuscolumn = {
+        enabled = true,
+        left = { 'mark', 'sign' }, -- priority of signs on the left (high to low)
+        right = { 'fold', 'git' }, -- priority of signs on the right (high to low)
+        folds = {
+          open = true, -- show open fold icons
+          git_hl = false, -- use Git Signs hl for fold icons
+        },
+        git = {
+          -- patterns to match Git signs
+          patterns = { 'GitSign', 'MiniDiffSign' },
+        },
+        refresh = 50, -- refresh at most every 50ms
+      },
+      words = { enabled = true },
+      styles = {
+        notification = {
+          wo = { wrap = true }, -- Wrap notifications
+        },
+      },
+    },
+  },
+
+  -- Highly experimental plugin that completely
+  -- replaces the UI for messages, cmdline and the popupmenu.
+  -- https://github.com/folke/noice.nvim
+  {
+    'folke/noice.nvim',
+    event = 'VeryLazy',
+    opts = {
+      lsp = {
+        -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
+        override = {
+          ['vim.lsp.util.convert_input_to_markdown_lines'] = true,
+          ['vim.lsp.util.stylize_markdown'] = true,
+          ['cmp.entry.get_documentation'] = true, -- requires hrsh7th/nvim-cmp
+        },
+      },
+      -- you can enable a preset for easier configuration
+      presets = {
+        bottom_search = true, -- use a classic bottom cmdline for search
+        command_palette = true, -- position the cmdline and popupmenu together
+        long_message_to_split = true, -- long messages will be sent to a split
+        inc_rename = false, -- enables an input dialog for inc-rename.nvim
+        lsp_doc_border = false, -- add a border to hover docs and signature help
+      },
+      routes = {
+        {
+          filter = {
+            event = 'msg_show',
+            kind = '',
+            find = 'written',
+          },
+          opts = { skip = true },
+        },
+        {
+          filter = {
+            event = 'msg_show',
+            any = {
+              { find = '%d+L, %d+B' },
+              { find = '; after #%d+' },
+              { find = '; before #%d+' },
+              { find = "' added to" },
+            },
+          },
+          view = 'mini',
+        },
+        {
+          filter = {
+            event = 'lsp',
+            kind = 'progress',
+            cond = function(message)
+              local client = vim.tbl_get(message.opts, 'progress', 'client')
+              return client == 'lua_ls'
+            end,
+          },
+          opts = { skip = true },
+        },
+      },
+      views = {
+        cmdline_popup = {
+          border = {
+            style = 'none',
+            padding = { 1, 2 },
+          },
+          filter_options = {},
+          win_options = {
+            winhighlight = 'NormalFloat:NormalFloat,FloatBorder:FloatBorder',
+          },
+        },
+      },
+    },
+    dependencies = {
+      -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
+      'MunifTanjim/nui.nvim',
+      -- OPTIONAL:
+      --   `nvim-notify` is only needed, if you want to use the notification view.
+      --   If not available, we use `mini` as the fallback
+      'rcarriga/nvim-notify',
+    },
+  },
+
+  -- A pretty diagnostics, references, telescope results,
+  -- quickfix and location list to help you solve all the
+  -- trouble your code is causing.
+  -- https://github.com/folke/trouble.nvim
+  {
+    'folke/trouble.nvim',
+    lazy = false,
+    cmd = 'Trouble',
+    dependencies = { 'nvim-tree/nvim-web-devicons' },
+    opts = {
+      auto_preview = true,
+      auto_fold = true,
+      auto_close = true,
+      use_lsp_diagnostic_signs = true,
+      keys = {
+        j = 'next',
+        k = 'prev',
+      },
+      modes = {
+        diagnostics = {
+          auto_open = true,
+        },
+        test = {
+          mode = 'diagnostics',
+          preview = {
+            type = 'split',
+            relative = 'win',
+            position = 'right',
+            size = 0.3,
+          },
+        },
+        cascade = {
+          mode = 'diagnostics', -- inherit from diagnostics mode
+          filter = function(items)
+            local severity = vim.diagnostic.severity.HINT
+            for _, item in ipairs(items) do
+              severity = math.min(severity, item.severity)
+            end
+            return vim.tbl_filter(
+              function(item) return item.severity == severity end,
+              items
+            )
+          end,
+        },
+      },
+    },
+  },
+
+  -- Navigate your code with search labels, enhanced
+  -- character motions and Treesitter integration
+  -- https://github.com/folke/flash.nvim
+  {
+    'folke/flash.nvim',
+    event = 'VeryLazy',
+    opts = {},
+  },
+}

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

@@ -1,30 +0,0 @@
--- A small Neovim plugin for previewing definitions using floating windows.
--- https://github.com/rmagatti/goto-preview
-return {
-  'rmagatti/goto-preview',
-  dependencies = {
-    { 'nvim-telescope/telescope.nvim' },
-  },
-  opts = {
-    width = 120, -- Width of the floating window
-    height = 15, -- Height of the floating window
-    border = { '↖', '─', '┐', '│', '┘', '─', '└', '│' }, -- Border characters of the floating window
-    default_mappings = true,
-    debug = false, -- Print debug information
-    opacity = nil, -- 0-100 opacity level of the floating window where 100 is fully transparent.
-    resizing_mappings = false, -- Binds arrow keys to resizing the floating window.
-    post_open_hook = nil, -- A function taking two arguments, a buffer and a window to be ran as a hook.
-    references = { -- Configure the telescope UI for slowing the references cycling window.
-      telescope = require('telescope.themes').get_dropdown {
-        hide_preview = false,
-      },
-    },
-    -- These two configs can also be passed down to the goto-preview definition and implementation calls for one off "peak" functionality.
-    focus_on_open = true, -- Focus the floating window when opening it.
-    dismiss_on_move = false, -- Dismiss the floating window when moving the cursor.
-    force_close = true, -- passed into vim.api.nvim_win_close's second argument. See :h nvim_win_close
-    bufhidden = 'wipe', -- the bufhidden option to set on the floating window. See :h bufhidden
-    stack_floating_preview_windows = true, -- Whether to nest floating windows
-    preview_window_title = { enable = true, position = 'left' },
-  },
-}

config/nvim/lua/plugins/harpoon.lua

@@ -1,47 +0,0 @@
--- Getting you where you want with the fewest keystrokes.
--- https://github.com/ThePrimeagen/harpoon
-return {
-  'ThePrimeagen/harpoon',
-  branch = 'harpoon2',
-  dependencies = {
-    'nvim-lua/plenary.nvim',
-    'nvim-telescope/telescope.nvim',
-  },
-  config = function()
-    local harpoon = require 'harpoon'
-    harpoon:setup {}
-
-    -- basic telescope configuration
-    local conf = require('telescope.config').values
-    local function toggle_telescope(harpoon_files)
-      local file_paths = {}
-      for _, item in ipairs(harpoon_files.items) do
-        table.insert(file_paths, item.value)
-      end
-
-      require('telescope.pickers')
-          .new({}, {
-            prompt_title = 'Harpoon',
-            finder = require('telescope.finders').new_table {
-              results = file_paths,
-            },
-            previewer = conf.file_previewer {},
-            sorter = conf.generic_sorter {},
-          })
-          :find()
-    end
-
-    vim.keymap.set(
-      'n',
-      '<leader>hw',
-      function() toggle_telescope(harpoon:list()) end,
-      { desc = 'Open harpoon window with telescope' }
-    )
-    vim.keymap.set(
-      'n',
-      '<leader>ht',
-      function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
-      { desc = 'Open Harpoon Quick menu' }
-    )
-  end,
-}

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

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

config/nvim/lua/plugins/lsp.lua

@@ -1,216 +1,353 @@
--- ── Mason and LSPConfig integration ────────────────────────────────────
+-- ╭─────────────────────────────────────────────────────────╮
+-- │               LSP Setup and configuration               │
+-- ╰─────────────────────────────────────────────────────────╯
 
--- ── LSP settings. ───────────────────────────────────────────────
---  This function gets run when an LSP connects to a particular buffer.
+require 'utils'
 
--- Make runtime files discoverable to the server
-local runtime_path = vim.split(package.path, ';')
-table.insert(runtime_path, 'lua/?.lua')
-table.insert(runtime_path, 'lua/?/init.lua')
+-- LSP Servers are installed and configured by lsp-setup.nvim
+-- Mason formatters Conform uses to format files
+-- These are automatically configured by zapling/mason-conform.nvim
+local lsp_servers = {
+  bashls = {},
+  -- csharp_ls = {},
+  diagnosticls = {},
+  gopls = {
+    settings = {
+      gopls = {
+        hints = {
+          rangeVariableTypes = true,
+          parameterNames = true,
+          constantValues = true,
+          assignVariableTypes = true,
+          compositeLiteralFields = true,
+          compositeLiteralTypes = true,
+          functionTypeParameters = true,
+        },
+      },
+    },
+  },
+  html = {},
+  intelephense = {
+    init_options = {
+      licenceKey = GetIntelephenseLicense(),
+    },
+  },
+  jsonls = {},
+  lua_ls = {
+    settings = {
+      Lua = {
+        completion = {
+          callSnippet = 'Replace',
+        },
+        diagnostics = {
+          globals = {
+            'vim',
+          },
+          disable = {
+            -- Ignore lua_ls noisy `missing-fields` warnings
+            'missing-fields',
+          },
+        },
+        hint = {
+          enable = true,
+          arrayIndex = 'Auto',
+          await = true,
+          paramName = 'All',
+          paramType = true,
+          semicolon = 'SameLine',
+          setType = false,
+        },
+      },
+    },
+  },
+  tailwindcss = {},
+  ts_ls = {
+    settings = {
+      typescript = {
+        inlayHints = {
+          includeInlayParameterNameHints = 'all',
+          includeInlayParameterNameHintsWhenArgumentMatchesName = false,
+          includeInlayFunctionParameterTypeHints = true,
+          includeInlayVariableTypeHints = true,
+          includeInlayVariableTypeHintsWhenTypeMatchesName = false,
+          includeInlayPropertyDeclarationTypeHints = true,
+          includeInlayFunctionLikeReturnTypeHints = true,
+          includeInlayEnumMemberValueHints = true,
+        },
+      },
+    },
+  },
+  vimls = {},
+  volar = {
+    settings = {
+      typescript = {
+        inlayHints = {
+          enumMemberValues = {
+            enabled = true,
+          },
+          functionLikeReturnTypes = {
+            enabled = true,
+          },
+          propertyDeclarationTypes = {
+            enabled = true,
+          },
+          parameterTypes = {
+            enabled = true,
+            suppressWhenArgumentMatchesName = true,
+          },
+          variableTypes = {
+            enabled = true,
+          },
+        },
+      },
+    },
+  },
+}
 
--- nvim-cmp supports additional completion capabilities
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
--- Tell the server the capability of foldingRange,
--- Neovim hasn't added foldingRange to default capabilities, users must add it manually
-capabilities.textDocument.foldingRange = {
-  dynamicRegistration = true,
-  lineFoldingOnly = true,
+-- Mason tools to automatically install and configure.
+-- These are automatically configured by WhoIsSethDaniel/mason-tool-installer.nvim
+local mason_tools = {
+  'actionlint',
+  'editorconfig-checker',
+  'goimports',
+  'gotests',
+  'phpcbf',
+  'phpmd',
+  'phpstan',
+  'pint',
+  'prettierd',
+  'semgrep',
+  'shellcheck',
+  'shfmt',
+  'staticcheck',
+  'stylua',
+  'trivy',
+  'vint',
+  'yamlfmt',
 }
 
 return {
+  -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
+  -- used for completion, annotations and signatures of Neovim apis
+  -- https://github.com/folke/lazydev.nvim
+  {
+    'folke/lazydev.nvim',
+    ft = 'lua',
+    opts = {
+      library = {
+        -- Load luvit types when the `vim.uv` word is found
+        { path = 'luvit-meta/library', words = { 'vim%.uv' } },
+        -- load assert and describe paths
+        { path = 'luassert/library', words = { 'assert' } },
+        { path = 'busted/library', words = { 'describe' } },
+      },
+    },
+  },
+
+  -- Meta type definitions for the Lua platform Luvit.
+  -- https://github.com/Bilal2453/luvit-meta
+  { 'Bilal2453/luvit-meta', lazy = true },
+
+  -- Quickstart configs for Nvim LSP
+  -- https://github.com/neovim/nvim-lspconfig
+  { 'neovim/nvim-lspconfig' },
+
   -- Portable package manager for Neovim that runs everywhere Neovim runs.
   -- Easily install and manage LSP servers, DAP servers, linters, and formatters.
   -- https://github.com/williamboman/mason.nvim
   {
     'williamboman/mason.nvim',
+    version = '*',
     cmd = 'Mason',
     run = ':MasonUpdate',
-    opts = {
-      PATH = 'prepend',
-      -- Mason servers to install
-      -- See: https://mason-registry.dev/registry/list
-      ensure_installed = {
-        'bash-language-server',
-        'clang-format',
-        'codespell',
-        'commitlint',
-        'diagnostic-languageserver',
-        'editorconfig-checker',
-        'fixjson',
-        'jsonlint',
-        'lua-language-server',
-        'luacheck',
-        'phpcbf',
-        'phpcs',
-        'phpmd',
-        'prettier',
-        'shellcheck',
-        'shfmt',
-        'stylua',
-        'vim-language-server',
-        'vue-language-server',
-        'yamllint',
-      },
-    },
+    opts = {},
   },
+
+  -- Extensible UI for Neovim notifications and LSP progress messages.
+  -- https://github.com/j-hui/fidget.nvim
+  {
+    'j-hui/fidget.nvim',
+    version = '*',
+    opts = {},
+  },
+
   -- Extension to mason.nvim that makes it easier to use lspconfig with mason.nvim.
   -- https://github.com/williamboman/mason-lspconfig.nvim
-  {
-    'williamboman/mason-lspconfig.nvim',
-    opts = {
-      -- ── Enable the following language servers ───────────────────────────
-      -- :help lspconfig-all for all pre-configured LSPs
-      ensure_installed = {
-        'bashls',
-        -- 'csharp_ls',
-        'gopls',
-        'html',
-        'intelephense',
-        'tailwindcss',
-        'ts_ls',
-        'lua_ls',
-        'jsonls',
-      },
-      automatic_installation = true,
-      handlers = {
-        -- The first entry (without a key) will be the default handler
-        -- and will be called for each installed server that doesn't have
-        -- a dedicated handler.
-        function(server_name) -- default handler (optional)
-          require('lspconfig')[server_name].setup {
-            on_attach = function(_, bufnr)
-              -- Create a command `:Format` local to the LSP buffer
-              vim.api.nvim_buf_create_user_command(
-                bufnr,
-                'Format',
-                function(_)
-                  require('conform').format {
-                    formatters = { 'injected' },
-                    async = true,
-                    lsp_fallback = true,
-                  }
-                end,
-                { desc = 'Format current buffer with LSP' }
-              )
-            end,
-            capabilities = capabilities,
-          }
-        end,
-        -- Next, you can provide targeted overrides for specific servers.
-        ['lua_ls'] = function()
-          require('lspconfig')['lua_ls'].setup {
-            on_attach = function(_, bufnr)
-              -- Create a command `:Format` local to the LSP buffer
-              vim.api.nvim_buf_create_user_command(
-                bufnr,
-                'Format',
-                function(_)
-                  require('conform').format {
-                    formatters = { 'injected' },
-                    async = true,
-                    lsp_fallback = true,
-                  }
-                end,
-                { desc = 'Format current buffer with LSP' }
-              )
-            end,
-            capabilities = capabilities,
-            settings = {
-              Lua = {
-                runtime = {
-                  -- Tell the language server which version of Lua you're
-                  -- using (most likely LuaJIT)
-                  version = 'LuaJIT',
-                  -- Setup your lua path
-                  path = runtime_path,
-                },
-                diagnostics = {
-                  globals = { 'vim' },
-                  disable = {
-                    -- Ignore lua_ls noisy `missing-fields` warnings
-                    'missing-fields',
-                  },
-                },
-                workspace = {
-                  library = vim.api.nvim_get_runtime_file('', true),
-                  checkThirdParty = false,
-                },
-                -- Do not send telemetry data containing a randomized
-                -- but unique identifier
-                telemetry = { enable = false },
+  { 'williamboman/mason-lspconfig.nvim' },
 
-                completion = {
-                  callSnippet = 'Replace',
-                },
-              },
-            },
-          }
-        end,
-        ['jsonls'] = function()
-          require('lspconfig')['jsonls'].setup {
-            on_attach = function(_, bufnr)
-              -- Create a command `:Format` local to the LSP buffer
-              vim.api.nvim_buf_create_user_command(
-                bufnr,
-                'Format',
-                function(_)
-                  require('conform').format {
-                    formatters = { 'injected' },
-                    async = true,
-                    lsp_fallback = true,
-                  }
-                end,
-                { desc = 'Format current buffer with LSP' }
-              )
-            end,
-            capabilities = capabilities,
-            settings = {
-              json = {
-                schemas = require('schemastore').json.schemas(),
-                validate = { enable = true },
-              },
-              yaml = {
-                schemaStore = {
-                  -- You must disable built-in SchemaStore support if you want to use
-                  -- this plugin and its advanced options like `ignore`.
-                  enable = false,
-                  -- Avoid TypeError: Cannot read properties of undefined (reading 'length')
-                  url = '',
-                },
-                schemas = require('schemastore').yaml.schemas(),
-                validate = { enable = true },
-              },
-            },
-          }
-        end,
-      },
+  -- Install and upgrade third party tools automatically
+  -- https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim
+  {
+    'WhoIsSethDaniel/mason-tool-installer.nvim',
+    version = '*',
+    opts = {
+      auto_install = true,
+      auto_update = true,
+      ensure_installed = mason_tools,
     },
   },
 
-  -- Automatically install formatters registered with conform.nvim via mason.nvim
-  -- https://github.com/zapling/mason-conform.nvim
-  -- { 'zapling/mason-conform.nvim', opts = {} },
-
-  -- ── Misc ───────────────────────────────────────────────────
-  -- vscode-like pictograms for neovim lsp completion items
-  -- https://github.com/onsails/lspkind-nvim
-  { 'onsails/lspkind.nvim', opts = {} },
   -- JSON schemas for Neovim
   -- https://github.com/b0o/SchemaStore.nvim
   { 'b0o/schemastore.nvim' },
 
-  -- ── LSP ────────────────────────────────────────────────────
-  -- Quick start configs for Nvim LSP
-  -- https://github.com/neovim/nvim-lspconfig
-  { 'neovim/nvim-lspconfig' },
+  -- Performant, batteries-included completion plugin for Neovim
+  -- https://github.com/saghen/blink.cmp
+  -- See lua/plugins/blink.lua for configs
+  { 'saghen/blink.cmp' },
 
-  -- Garbage collector that stops inactive LSP clients to free RAM
-  -- https://github.com/Zeioth/garbage-day.nvim
+  -- A simple wrapper for nvim-lspconfig and mason-lspconfig
+  -- to easily setup LSP servers.
+  -- https://github.com/junnplus/lsp-setup.nvim
   {
-    'zeioth/garbage-day.nvim',
-    dependencies = 'neovim/nvim-lspconfig',
-    event = 'VeryLazy',
-    opts = {},
+    'junnplus/lsp-setup.nvim',
+    opts = {
+      default_mappings = false,
+      servers = lsp_servers,
+    },
+    config = function(_, opts)
+      require('lazydev').setup()
+      require('lsp-setup').setup(opts)
+      local cmp = require 'blink.cmp'
+      local lspconfig = require 'lspconfig'
+      for server, config in pairs(opts.servers) do
+        -- passing config.capabilities to blink.cmp merges with the capabilities in your
+        -- `opts[server].capabilities, if you've defined it
+        config.capabilities = cmp.get_lsp_capabilities(config.capabilities)
+        lspconfig[server].setup(config)
+      end
+
+      lspconfig.lua_ls.on_init = function(client)
+        if client.workspace_folders then
+          local path = client.workspace_folders[1].name
+          if
+            vim.loop.fs_stat(path .. '/.luarc.json')
+            or vim.loop.fs_stat(path .. '/.luarc.jsonc')
+          then
+            return
+          end
+        end
+        client.config.settings.Lua =
+          vim.tbl_deep_extend('force', client.config.settings.Lua, {
+            runtime = {
+              -- Tell the language server which version of Lua you're using
+              -- (most likely LuaJIT in the case of Neovim)
+              version = 'LuaJIT',
+            },
+            -- Make the server aware of Neovim runtime files
+            workspace = {
+              checkThirdParty = false,
+              library = {
+                vim.env.VIMRUNTIME,
+              },
+            },
+          })
+      end
+      lspconfig.jsonls.settings = {
+        json = {
+          schemas = require('schemastore').json.schemas(),
+          validate = { enable = true },
+        },
+        yaml = {
+          schemaStore = {
+            -- You must disable built-in SchemaStore support if you want to use
+            -- this plugin and its advanced options like `ignore`.
+            enable = false,
+            -- Avoid TypeError: Cannot read properties of undefined (reading 'length')
+            url = '',
+          },
+          schemas = require('schemastore').yaml.schemas(),
+          validate = { enable = true },
+        },
+      }
+
+      -- Diagnostic configuration
+      local signs = {
+        { name = 'DiagnosticSignError', text = '' }, -- Error icon
+        { name = 'DiagnosticSignWarn', text = '' }, -- Warning icon
+        { name = 'DiagnosticSignHint', text = '' }, -- Hint icon
+        { name = 'DiagnosticSignInfo', text = '' }, -- Information icon
+      }
+
+      local function ensure_sign_defined(name, sign_opts)
+        if vim.tbl_isempty(vim.fn.sign_getdefined(name)) then
+          vim.fn.sign_define(name, sign_opts)
+        end
+      end
+
+      for _, sign in ipairs(signs) do
+        ensure_sign_defined(sign.name, {
+          text = sign.text,
+          texthl = sign.texthl or sign.name,
+          numhl = sign.numhl or sign.name,
+        })
+      end
+
+      ---@type vim.diagnostic.Opts
+      local diagnostics_config = {
+        signs = {
+          active = signs, -- show signs
+        },
+        update_in_insert = false,
+        underline = true,
+        severity_sort = true,
+        virtual_text = true,
+      }
+
+      vim.diagnostic.config(diagnostics_config)
+
+      -- end of junnplus/lsp-setup config
+    end,
   },
+
+  -- Lightweight yet powerful formatter plugin for Neovim
+  -- https://github.com/stevearc/conform.nvim
+  {
+    'stevearc/conform.nvim',
+    event = { 'BufWritePre' },
+    cmd = { 'ConformInfo' },
+    opts = {
+      notify_on_error = false,
+      ---@type nil|conform.FormatOpts|fun(bufnr: integer): nil|conform.FormatOpts
+      format_on_save = function(bufnr)
+        -- Disable "format_on_save lsp_fallback" for languages that don't
+        -- have a well standardized coding style. You can add additional
+        -- languages here or re-enable it for the disabled ones.
+        local disable_filetypes = { c = true, cpp = true }
+        local lsp_format_opt
+        if disable_filetypes[vim.bo[bufnr].filetype] then
+          lsp_format_opt = 'never'
+        else
+          lsp_format_opt = 'fallback'
+        end
+
+        -- Disable autoformat for files in a certain paths
+        local bufname = vim.api.nvim_buf_get_name(bufnr)
+        if bufname:match '/node_modules|vendor/' then return end
+
+        return {
+          timeout_ms = 500,
+          lsp_format = lsp_format_opt,
+        }
+      end,
+      formatters_by_ft = {
+        lua = { 'stylua' },
+        sh = { 'shfmt' },
+        bash = { 'shfmt' },
+        php = { 'phpcbf' },
+        -- Conform can also run multiple formatters sequentially
+        -- python = { "isort", "black" },
+        --
+        -- You can use 'stop_after_first' to run the first available formatter from the list
+        -- javascript = { "prettierd", "prettier", stop_after_first = true },
+      },
+    },
+    init = function()
+      -- If you want the formatexpr, here is the place to set it
+      vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
+    end,
+  },
+  -- Automatically install formatters registered with conform.nvim via mason.nvim
+  -- https://github.com/zapling/mason-conform.nvim
+  { 'zapling/mason-conform.nvim', opts = {} },
 }

config/nvim/lua/plugins/lualine.lua

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

config/nvim/lua/plugins/mini.lua

@@ -0,0 +1,241 @@
+return {
+  -- Library of 40+ independent Lua modules improving overall Neovim
+  -- (version 0.8 and higher) experience with minimal effort
+  --
+  -- https://github.com/echasnovski/mini.nvim
+  -- https://github.com/echasnovski/mini.nvim/tree/main?tab=readme-ov-file#modules
+  --
+  -- YouTube: Text editing with 'mini.nvim' - Neovimconf 2024 - Evgeni Chasnovski
+  -- https://www.youtube.com/watch?v=cNK5kYJ7mrs
+  {
+    'echasnovski/mini.nvim',
+    version = '*',
+    priority = 1001,
+    config = function()
+      -- Presets for common options and mappings
+      -- h: MiniBasics.config
+      require('mini.basics').setup {
+        options = {
+          basics = true,
+          extra_ui = true,
+        },
+        mappings = {
+          basic = true,
+          option_toggle_prefix = [[<leader>tm]],
+        },
+      }
+
+      -- Animate common Neovim actions
+      -- Replaced anuvyklack/windows.nvim
+      require('mini.animate').setup()
+
+      -- Buffer removing (unshow, delete, wipeout), which saves window layout
+      -- Replaced famiu/bufdelete.nvim
+      require('mini.bufremove').setup()
+
+      -- Show next key clues
+      -- Replaced folke/which-key.nvim
+      local miniclue = require 'mini.clue'
+      miniclue.setup {
+        window = {
+          config = {
+            width = 'auto',
+          },
+        },
+        triggers = {
+          -- Leader triggers
+          { mode = 'n', keys = '<Leader>' },
+          { mode = 'x', keys = '<Leader>' },
+
+          -- Built-in completion
+          { mode = 'i', keys = '<C-x>' },
+
+          -- `g` key
+          { mode = 'n', keys = 'g' },
+          { mode = 'x', keys = 'g' },
+
+          -- Marks
+          { mode = 'n', keys = "'" },
+          { mode = 'n', keys = '`' },
+          { mode = 'x', keys = "'" },
+          { mode = 'x', keys = '`' },
+
+          -- Registers
+          { mode = 'n', keys = '"' },
+          { mode = 'x', keys = '"' },
+          { mode = 'i', keys = '<C-r>' },
+          { mode = 'c', keys = '<C-r>' },
+
+          -- Window commands
+          { mode = 'n', keys = '<C-w>' },
+
+          -- `z` key
+          { mode = 'n', keys = 'z' },
+          { mode = 'x', keys = 'z' },
+        },
+
+        -- These mark the sections in the popup
+        clues = {
+          miniclue.gen_clues.builtin_completion(),
+          miniclue.gen_clues.g(),
+          miniclue.gen_clues.marks(),
+          miniclue.gen_clues.registers(),
+          miniclue.gen_clues.windows(),
+          miniclue.gen_clues.z(),
+          { mode = 'n', keys = '<Leader>a', desc = '+Automation' },
+          { mode = 'n', keys = '<Leader>b', desc = '+Buffers' },
+          { mode = 'n', keys = '<Leader>c', desc = '+Code' },
+          { mode = 'n', keys = '<Leader>cb', desc = '+CommentBox' },
+          { mode = 'n', keys = '<Leader>cc', desc = '+Calls' },
+          { mode = 'n', keys = '<Leader>q', desc = '+Quit' },
+          { mode = 'n', keys = '<Leader>s', desc = '+Telescope' },
+          { mode = 'n', keys = '<Leader>t', desc = '+Toggle' },
+          { mode = 'n', keys = '<Leader>tm', desc = '+Mini' },
+          { mode = 'n', keys = '<Leader>x', desc = '+Trouble' },
+          { mode = 'n', keys = '<leader>z', desc = '+TreeSitter' },
+          { mode = 'n', keys = '<leader>zg', desc = '+Goto' },
+          { mode = 'n', keys = '<Leader>?', desc = '+Help' },
+          { mode = 'n', keys = 'd', desc = '+Diagnostics' },
+          { mode = 'n', keys = 'y', desc = '+Yank' },
+        },
+      }
+
+      -- Comment lines
+      -- Replaced numToStr/Comment.nvim
+      require('mini.comment').setup()
+
+      -- Highlight cursor word and its matches
+      require('mini.cursorword').setup()
+
+      -- Work with diff hunks
+      -- Replaced lewis6991/gitsigns.nvim
+      require('mini.diff').setup()
+
+      -- Git integration
+      require('mini.git').setup()
+
+      -- Highlight patterns in text
+      -- Replaced folke/todo-comments.nvim
+      local hp = require 'mini.hipatterns'
+      hp.setup {
+        highlighters = {
+          -- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE', 'BUG', 'PERF' words
+          fixme = {
+            pattern = '%f[%w]()FIXME:?%s*()%f[%W]',
+            group = 'MiniHipatternsFixme',
+          },
+          hack = {
+            pattern = '%f[%w]()HACK:?%s*()%f[%W]',
+            group = 'MiniHipatternsHack',
+          },
+          todo = {
+            pattern = '%f[%w]()TODO:?%s*()%f[%W]',
+            group = 'MiniHipatternsNote',
+          },
+          note = {
+            pattern = '%f[%w]()NOTE()%f[%W]',
+            group = 'MiniHipatternsNote',
+          },
+          bug = {
+            pattern = '%f[%w]()BUG:?%s*()%f[%W]',
+            group = 'MiniHipatternsHack',
+          },
+          perf = {
+            pattern = '%f[%w]()PERF:?%s*()%f[%W]',
+            group = 'MiniHipatternsNote',
+          },
+        },
+
+        -- Highlight hex color strings (`#rrggbb`) using that color
+        hex_color = hp.gen_highlighter.hex_color(),
+      }
+
+      -- Icons
+      require('mini.icons').setup {
+        file = {
+          ['.keep'] = { glyph = '󰊢', hl = 'MiniIconsGrey' },
+          ['devcontainer.json'] = { glyph = '', hl = 'MiniIconsAzure' },
+        },
+        filetype = {
+          dotenv = { glyph = '', hl = 'MiniIconsYellow' },
+        },
+      }
+
+      -- Visualize and work with indent scope
+      -- Replaced lukas-reineke/indent-blankline.nvim
+      require('mini.indentscope').setup()
+
+      -- Text edit operators
+      -- g= - Evaluate text and replace with output
+      -- gx - Exchange text regions
+      -- gm - Multiply (duplicate) text
+      -- gr - Replace text with register
+      -- gs - Sort text
+      require('mini.operators').setup()
+
+      -- Session management (read, write, delete)
+      require('mini.sessions').setup {
+        autowrite = true,
+        directory = vim.g.sessions_dir or vim.fn.stdpath 'data' .. '/sessions',
+        file = '',
+      }
+
+      -- Split and join arguments, lists, and other sequences
+      -- Replaced Wansmer/treesj
+      require('mini.splitjoin').setup()
+
+      -- Fast and flexible start screen
+      -- Replaced glepnir/dashboard-nvim
+      local starter = require 'mini.starter'
+      starter.setup {
+        items = {
+          starter.sections.telescope(),
+          starter.sections.builtin_actions(),
+          starter.sections.sessions(5, true),
+        },
+        content_hooks = {
+          starter.gen_hook.adding_bullet(),
+          starter.gen_hook.indexing('all', { 'Builtin actions' }),
+          starter.gen_hook.aligning('center', 'center'),
+        },
+      }
+
+      -- Minimal and fast statusline module with opinionated default look
+      -- Replaced nvim-lualine/lualine.nvim
+      local sl = require 'mini.statusline'
+      sl.setup {
+        use_icons = true,
+        set_vim_settings = true,
+        content = {
+          active = function()
+            local mode, mode_hl = sl.section_mode { trunc_width = 120 }
+            local git = sl.section_git { trunc_width = 9999 }
+            local diagnostics = sl.section_diagnostics { trunc_width = 9999 }
+            local filename = sl.section_filename { trunc_width = 9999 }
+            local fileinfo = sl.section_fileinfo { trunc_width = 9999 }
+            local location = sl.section_location { trunc_width = 9999 }
+            return sl.combine_groups {
+              { hl = mode_hl, strings = { mode } },
+              { hl = 'statuslineDevinfo', strings = { git, diagnostics } },
+              '%<', -- Mark general truncate point
+              { hl = 'statuslineFilename', strings = { filename } },
+              '%=', -- End left alignment
+              { hl = 'statuslineFileinfo', strings = { fileinfo } },
+              { hl = mode_hl, strings = { location } },
+            }
+          end,
+        },
+      }
+
+      -- Fast and feature-rich surround actions
+      -- Replaced kylechui/nvim-surround
+      -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
+      -- - sd'   - [S]urround [D]elete [']quotes
+      -- - sr)'  - [S]urround [R]eplace [)] [']
+      require('mini.surround').setup()
+
+      -- Work with trailing whitespace
+      require('mini.trailspace').setup()
+    end,
+  },
+}

config/nvim/lua/plugins/neogen.lua

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

config/nvim/lua/plugins/neotree.lua

@@ -31,60 +31,75 @@ return {
   cmd = 'Neotree',
   opts = {
     close_if_last_window = true,
+    hide_root_node = true,
+    popup_border_style = 'rounded',
+    enable_git_status = true,
+    enable_diagnostics = true,
+    sources = {
+      'filesystem',
+      'buffers',
+      'document_symbols',
+    },
+    source_selector = {
+      winbar = true,
+      statusline = false,
+      separator = { left = '', right = '' },
+      show_separator_on_edge = true,
+      highlight_tab = 'SidebarTabInactive',
+      highlight_tab_active = 'SidebarTabActive',
+      highlight_background = 'StatusLine',
+      highlight_separator = 'SidebarTabInactiveSeparator',
+      highlight_separator_active = 'SidebarTabActiveSeparator',
+    },
+    event_handlers = {
+      {
+        event = 'file_opened',
+        handler = function(file_path)
+          require('neo-tree.command').execute { action = 'close' }
+        end,
+      },
+    },
+    default_component_configs = {
+      indent = {
+        padding = 0,
+      },
+      name = {
+        use_git_status_colors = true,
+        highlight_opened_files = true,
+      },
+    },
+    git_status = {
+      symbols = {
+        -- Change type
+        added = '',
+        modified = '',
+        deleted = '✖',
+        renamed = '󰁕',
+        -- Status type
+        untracked = '',
+        ignored = '',
+        unstaged = '󰄱',
+        staged = '',
+        conflict = '',
+      },
+    },
     filesystem = {
       window = {
         mappings = {
           ['<Esc>'] = 'close_window',
+          ['q'] = 'close_window',
+          ['<cr>'] = 'open_with_window_picker',
         },
       },
       filtered_items = {
-        hide_dotfiles = true,
-        hide_gitignored = true,
+        hide_dotfiles = false,
         hide_hidden = true, -- only works on Windows for hidden files/directories
-        hide_by_name = {
+        never_show = {
           '.DS_Store',
+        },
+        hide_by_name = {
           'node_modules',
-        },
-        always_show = {
-          '.actrc',
-          '.browserslistrc',
-          '.commitlintrc.json',
-          '.editorconfig',
-          '.env',
-          '.env.example',
-          '.envrc',
-          '.eslintrc.json',
-          '.github',
-          '.gitignore',
-          '.gitkeep',
-          '.ignore',
-          '.markdownlint.json',
-          '.markdownlint.yaml',
-          '.markdownlintignore',
-          '.nvmrc',
-          '.prettierignore',
-          '.prettierrc.js',
-          '.prettierrc.json',
-          '.prettierrc.yaml',
-          '.python-version',
-          '.releaserc.json',
-          '.shellcheckrc',
-          '.simple-git-hooks.json',
-          '.stylelintrc.json',
-          '.stylua.toml',
-          '.yamlignore',
-          '.yamllint.yaml',
-        },
-        always_show_by_pattern = {
-          '.*.json',
-          '.*.toml',
-          '.*.yaml',
-          '.*.yml',
-          '.*rc',
-          '.*rc.*',
-          '.env*',
-          '.prettierrc*',
-          '.stylua.*',
+          '.git',
         },
       },
     },

config/nvim/lua/plugins/noice.lua

@@ -1,85 +0,0 @@
--- Highly experimental plugin that completely replaces the UI
--- for messages, cmdline and the popupmenu.
--- https://github.com/folke/noice.nvim
-return {
-  'folke/noice.nvim',
-  lazy = false,
-  enabled = true,
-  dependencies = {
-    'MunifTanjim/nui.nvim',
-    -- A fancy, configurable, notification manager for NeoVim
-    -- https://github.com/rcarriga/nvim-notify
-    'rcarriga/nvim-notify',
-    'hrsh7th/nvim-cmp',
-  },
-  opts = {
-    lsp = {
-      -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
-      override = {
-        ['vim.lsp.util.convert_input_to_markdown_lines'] = true,
-        ['vim.lsp.util.stylize_markdown'] = true,
-        ['cmp.entry.get_documentation'] = true, -- requires hrsh7th/nvim-cmp
-      },
-    },
-    -- you can enable a preset for easier configuration
-    presets = {
-      bottom_search = false, -- use a classic bottom cmdline for search
-      command_palette = true, -- position the cmdline and popupmenu together
-      long_message_to_split = true, -- long messages will be sent to a split
-      inc_rename = false, -- enables an input dialog for inc-rename.nvim
-      lsp_doc_border = false, -- add a border to hover docs and signature help
-    },
-    routes = {
-      {
-        filter = {
-          event = 'msg_show',
-          any = {
-            { find = '%d+L, %d+B' },
-            { find = '; after #%d+' },
-            { find = '; before #%d+' },
-            { find = '%d fewer lines' },
-            { find = '%d more lines' },
-          },
-        },
-        opts = { skip = true },
-      },
-      {
-        filter = {
-          event = 'notify',
-          find = 'No information available',
-        },
-        opts = { skip = true },
-      },
-    },
-    views = {
-      cmdline_popup = {
-        position = {
-          row = 5,
-          col = '50%',
-        },
-        size = {
-          width = 60,
-          height = 'auto',
-        },
-      },
-      popupmenu = {
-        relative = 'editor',
-        position = {
-          row = 8,
-          col = '50%',
-        },
-        size = {
-          width = 60,
-          height = 10,
-        },
-        border = {
-          style = 'rounded',
-          padding = { 0, 1 },
-        },
-        win_options = {
-          winhighlight = { Normal = 'Normal', FloatBorder = 'DiagnosticInfo' },
-        },
-      },
-    },
-  },
-}

config/nvim/lua/plugins/other.lua

@@ -0,0 +1,44 @@
+return {
+  {
+    'rmagatti/auto-session',
+    lazy = false,
+    version = '*',
+    opts = {
+      suppressed_dirs = {
+        '/',
+        '~/',
+        '~/Downloads',
+        '~/Library',
+      },
+      bypass_save_filetypes = {
+        'PlenaryTestPopup',
+        'alpha',
+        'checkhealth',
+        'dashboard',
+        'dbout',
+        'gitsigns.blame',
+        'grug-far',
+        'help',
+        'lspinfo',
+        'man',
+        'neo-tree',
+        'neotest-output',
+        'neotest-output-panel',
+        'neotest-summary',
+        'notify',
+        'qf',
+        'spectre_panel',
+        'startuptime',
+        'trouble',
+        'tsplayground',
+      },
+      -- log_level = 'debug',
+    },
+  },
+
+  {
+    'nvim-lua/plenary.nvim',
+    version = '*',
+    lazy = false,
+  },
+}

config/nvim/lua/plugins/refactoring.lua

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

config/nvim/lua/plugins/surround.lua

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

config/nvim/lua/plugins/telescope.lua

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

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

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

config/nvim/lua/plugins/treesitter.lua

@@ -8,105 +8,60 @@ return {
   end,
   dependencies = {
     'nvim-treesitter/nvim-treesitter-textobjects',
+    'nvim-treesitter/nvim-treesitter-refactor',
+    'nvim-treesitter/nvim-treesitter-context',
+    'JoosepAlviste/nvim-ts-context-commentstring',
   },
-  config = function()
-    require('nvim-treesitter.configs').setup {
-      auto_install = true,
-      ignore_install = {},
-      sync_install = true,
-      modules = {},
+  opts = {
+    auto_install = true, -- Auto install the parser generators
+    sync_install = false, -- Sync install the parser generators, install async
 
-      -- Add languages to be installed here that you want installed for treesitter
-      ensure_installed = {
-        'bash',
-        'c',
-        'css',
-        'diff',
-        'go',
-        'html',
-        'javascript',
-        'jsdoc',
-        'json',
-        'jsonc',
-        'lua',
-        'luadoc',
-        'markdown',
-        'markdown_inline',
-        'python',
-        'query',
-        'regex',
-        'rust',
-        'sql',
-        'terraform',
-        'toml',
-        'tsx',
-        'typescript',
-        'vim',
-        'vimdoc',
-        'xml',
-        'yaml',
-      },
+    -- Add languages to be installed here that you want installed for treesitter
+    ensure_installed = {
+      'bash',
+      'json',
+      'jsonc',
+      'lua',
+      'luadoc',
+      'markdown',
+      'markdown_inline',
+      'query',
+      'regex',
+      'vim',
+      'vimdoc',
+      'yaml',
+    },
 
-      highlight = { enable = true },
-      indent = { enable = true },
-      incremental_selection = {
+    highlight = { enable = true },
+    indent = { enable = true },
+    textobjects = {
+      select = {
         enable = true,
-        keymaps = {
-          init_selection = '<a-space>',
-          node_incremental = '<a-space>',
-          scope_incremental = '<c-s>',
-          node_decremental = '<c-backspace>',
-        },
+        lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
       },
-      textobjects = {
-        select = {
-          enable = true,
-          lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
-          keymaps = {
-            -- You can use the capture groups defined in textobjects.scm
-            ['aa'] = '@parameter.outer',
-            ['ia'] = '@parameter.inner',
-            ['af'] = '@function.outer',
-            ['if'] = '@function.inner',
-            ['ac'] = '@class.outer',
-            ['ic'] = '@class.inner',
-            ['ii'] = '@conditional.inner',
-            ['ai'] = '@conditional.outer',
-            ['il'] = '@loop.inner',
-            ['al'] = '@loop.outer',
-            ['at'] = '@comment.outer',
-          },
-        },
-        move = {
-          enable = true,
-          set_jumps = true, -- whether to set jumps in the jumplist
-          goto_next_start = {
-            [']f'] = '@function.outer',
-            [']]'] = '@class.outer',
-          },
-          goto_next_end = {
-            [']F'] = '@function.outer',
-            [']['] = '@class.outer',
-          },
-          goto_previous_start = {
-            ['[f'] = '@function.outer',
-            ['[['] = '@class.outer',
-          },
-          goto_previous_end = {
-            ['[F'] = '@function.outer',
-            ['[]'] = '@class.outer',
-          },
-        },
-        swap = {
-          enable = true,
-          swap_next = {
-            ['<leader>cn'] = '@parameter.inner',
-          },
-          swap_previous = {
-            ['<leader>cP'] = '@parameter.inner',
-          },
-        },
+      move = {
+        enable = true,
+        set_jumps = true, -- whether to set jumps in the jumplist
       },
-    }
+    },
+  },
+  config = function(_, opts)
+    require('nvim-treesitter.configs').setup(opts)
+
+    vim.api.nvim_create_autocmd({ 'FileType' }, {
+      callback = function()
+        -- Set foldmethod to treesitter if available
+        if require('nvim-treesitter.parsers').has_parser() then
+          vim.opt.foldmethod = 'expr'
+          vim.opt.foldexpr = 'nvim_treesitter#foldexpr()'
+        else
+          -- Otherwise, set foldmethod to syntax
+          vim.opt.foldmethod = 'syntax'
+        end
+
+        vim.opt.foldlevel = 9 -- Open all folds by default
+        vim.opt.foldnestmax = 99 -- Maximum fold nesting
+      end,
+    })
   end,
 }

config/nvim/lua/plugins/treesj.lua

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

config/nvim/lua/plugins/trouble.lua

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

config/nvim/lua/plugins/ufo.lua

@@ -1,116 +0,0 @@
--- Not UFO in the sky, but an ultra fold in Neovim.
--- https://github.com/kevinhwang91/nvim-ufo/
-return {
-  'kevinhwang91/nvim-ufo',
-  version = '*',
-  dependencies = {
-    { 'neovim/nvim-lspconfig' },
-    { 'kevinhwang91/promise-async' },
-    { 'nvim-treesitter/nvim-treesitter' },
-    {
-      -- Status column plugin that provides a configurable
-      -- 'statuscolumn' and click handlers.
-      -- https://github.com/luukvbaal/statuscol.nvim
-      'luukvbaal/statuscol.nvim',
-      config = function()
-        local builtin = require 'statuscol.builtin'
-        require('statuscol').setup {
-          relculright = true,
-          segments = {
-            {
-              text = { builtin.foldfunc },
-              click = 'v:lua.ScFa',
-            },
-            {
-              sign = {
-                namespace = { 'diagnostic/signs' },
-                maxwidth = 2,
-                -- auto = true,
-              },
-              click = 'v:lua.ScSa',
-            },
-            {
-              text = { builtin.lnumfunc, ' ' },
-              click = 'v:lua.ScLa',
-            },
-          },
-        }
-      end,
-    },
-  },
-  config = function()
-    local capabilities = vim.lsp.protocol.make_client_capabilities()
-    capabilities.textDocument.foldingRange = {
-      dynamicRegistration = false,
-      lineFoldingOnly = true,
-    }
-    local language_servers = require('lspconfig').util.available_servers() -- or list servers manually like {'gopls', 'clangd'}
-    for _, ls in ipairs(language_servers) do
-      require('lspconfig')[ls].setup {
-        capabilities = capabilities,
-        -- you can add other fields for setting up lsp server in this table
-      }
-    end
-
-    require('ufo').setup {
-      open_fold_hl_timeout = 150,
-      close_fold_kinds_for_ft = { 'imports', 'comment' },
-      preview = {
-        win_config = {
-          border = { '', '─', '', '', '', '─', '', '' },
-          winhighlight = 'Normal:Folded',
-          winblend = 0,
-        },
-        mappings = {
-          scrollU = '<C-u>',
-          scrollD = '<C-d>',
-          jumpTop = '[',
-          jumpBot = ']',
-        },
-      },
-
-      provider_selector = function(_, _, _) -- bufnr, filetype, buftype
-        return { 'treesitter', 'indent' }
-      end,
-
-      -- fold_virt_text_handler
-      --
-      -- This handler is called when the fold text is too long to fit in the window.
-      -- It is expected to truncate the text and return a new list of virtual text.
-      --
-      ---@param virtText table The current virtual text list.
-      ---@param lnum number The line number of the first line in the fold.
-      ---@param endLnum number The line number of the last line in the fold.
-      ---@param width number The width of the window.
-      ---@param truncate function Truncate function
-      ---@return table
-      fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
-        local newVirtText = {}
-        local suffix = (' 󰁂 %d '):format(endLnum - lnum)
-        local sufWidth = vim.fn.strdisplaywidth(suffix)
-        local targetWidth = width - sufWidth
-        local curWidth = 0
-        for _, chunk in ipairs(virtText) do
-          local chunkText = chunk[1]
-          local chunkWidth = vim.fn.strdisplaywidth(chunkText)
-          if targetWidth > curWidth + chunkWidth then
-            table.insert(newVirtText, chunk)
-          else
-            chunkText = truncate(chunkText, targetWidth - curWidth)
-            local hlGroup = chunk[2]
-            table.insert(newVirtText, { chunkText, hlGroup })
-            chunkWidth = vim.fn.strdisplaywidth(chunkText)
-            -- str width returned from truncate() may less than 2nd argument, need padding
-            if curWidth + chunkWidth < targetWidth then
-              suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth)
-            end
-            break
-          end
-          curWidth = curWidth + chunkWidth
-        end
-        table.insert(newVirtText, { suffix, 'MoreMsg' })
-        return newVirtText
-      end,
-    }
-  end,
-}

config/nvim/lua/plugins/ui.lua

@@ -27,223 +27,30 @@ return {
     },
   },
 
-  -- Extensible Neovim Scrollbar
-  -- https://github.com/petertriho/nvim-scrollbar
-  { 'petertriho/nvim-scrollbar', opts = {} },
-
-  -- vim dashboard
-  -- https://github.com/nvimdev/dashboard-nvim
+  -- The fastest Neovim colorizer
+  -- https://github.com/catgoose/nvim-colorizer.lua
   {
-    'nvimdev/dashboard-nvim',
-    event = 'VimEnter',
-    config = function()
-      require('dashboard').setup {
-        theme = 'doom',
-        config = {
-          disable_move = true,
-          week_header = {
-            enable = true,
-          },
-          shortcut = {},
-          center = {
-            {
-              icon = ' ',
-              icon_hl = '@variable',
-              desc = 'Files',
-              group = 'Label',
-              action = 'Telescope find_files',
-              key = 'f',
-            },
-            {
-              icon = ' ',
-              desc = 'Marks',
-              group = 'DiagnosticHint',
-              action = 'Telescope harpoon marks',
-              key = 'a',
-            },
-            {
-              icon = '⚑ ',
-              desc = 'TODO',
-              group = 'DiagnosticOptions',
-              action = 'TodoTelescope',
-              key = 't',
-            },
-            {
-              icon = ' ',
-              desc = 'Search',
-              group = 'Number',
-              action = 'Telescope live_grep',
-              key = 's',
-            },
-            {
-              icon = '󰊳 ',
-              desc = 'Lazy Update',
-              group = '@property',
-              action = 'Lazy update',
-              key = 'u',
-            },
-          },
-        },
-      }
-    end,
-    dependencies = { { 'nvim-tree/nvim-web-devicons' } },
+    'catgoose/nvim-colorizer.lua',
+    opts = {
+      user_default_options = {
+        names = false,
+      },
+    },
   },
 
+  -- A neovim plugin that shows colorcolumn dynamically
+  -- https://github.com/Bekaboo/deadcolumn.nvim
+  { 'Bekaboo/deadcolumn.nvim' },
+
   -- Remove all background colors to make nvim transparent
   -- https://github.com/xiyaowong/nvim-transparent
   { 'xiyaowong/nvim-transparent', opts = {} },
 
-  -- Twilight is a Lua plugin for Neovim 0.5 that dims inactive
-  -- portions of the code you're editing using TreeSitter.
-  -- https://github.com/folke/twilight.nvim
-  { 'folke/twilight.nvim', opts = {} },
-
-  -- Indent guides for Neovim
-  -- https://github.com/lukas-reineke/indent-blankline.nvim
-  {
-    'lukas-reineke/indent-blankline.nvim',
-    main = 'ibl',
-    config = function()
-      require('ibl').setup {
-        indent = {
-          char = '│',
-        },
-        exclude = {
-          filetypes = { 'terminal', 'dashboard' },
-          buftypes = { 'dashboard' },
-        },
-      }
-    end,
-  },
-
-  -- Git integration for buffers
-  -- https://github.com/lewis6991/gitsigns.nvim
-  {
-    'lewis6991/gitsigns.nvim',
-    version = false,
-    lazy = false,
-    opts = {
-      signs = {
-        add = { text = '+' },
-        change = { text = '~' },
-        delete = { text = '_' },
-        topdelete = { text = '‾' },
-        changedelete = { text = '~' },
-      },
-      current_line_blame = false,
-      on_attach = function(bufnr)
-        local gs = require 'gitsigns'
-
-        local function map(mode, l, r, opts)
-          opts = opts or {}
-          opts.buffer = bufnr
-          vim.keymap.set(mode, l, r, opts)
-        end
-
-        -- Navigation
-        map('n', 'gn', function()
-          if vim.wo.diff then return ']c' end
-          vim.schedule(function() gs.next_hunk() end)
-          return '<Ignore>'
-        end, { expr = true })
-
-        map('n', 'gp', function()
-          if vim.wo.diff then return '[c' end
-          vim.schedule(function() gs.prev_hunk() end)
-          return '<Ignore>'
-        end, { expr = true })
-      end,
-    },
-  },
-
-  -- Seamless navigation between tmux panes and vim splits
-  -- https://github.com/christoomey/vim-tmux-navigator
-  {
-    'christoomey/vim-tmux-navigator',
-    cmd = {
-      'TmuxNavigateLeft',
-      'TmuxNavigateDown',
-      'TmuxNavigateUp',
-      'TmuxNavigateRight',
-      'TmuxNavigatePrevious',
-    },
-  },
-
-  -- Cloak allows you to overlay *'s over defined patterns in defined files.
-  -- https://github.com/laytan/cloak.nvim
-  {
-    'laytan/cloak.nvim',
-    version = '*',
-    opts = {
-      enabled = true,
-      cloak_character = '*',
-      -- The applied highlight group (colors) on the cloaking, see `:h highlight`.
-      highlight_group = 'Comment',
-      patterns = {
-        {
-          -- Match any file starting with ".env".
-          -- This can be a table to match multiple file patterns.
-          file_pattern = {
-            '.env*',
-            'wrangler.toml',
-            '.dev.vars',
-          },
-          -- Match an equals sign and any character after it.
-          -- This can also be a table of patterns to cloak,
-          -- example: cloak_pattern = { ":.+", "-.+" } for yaml files.
-          cloak_pattern = '=.+',
-        },
-      },
-    },
-  },
-  -- Close buffer without messing up with the window.
-  -- https://github.com/famiu/bufdelete.nvim
-  { 'famiu/bufdelete.nvim' },
+  -- Display a character as the colorcolumn
+  -- https://github.com/lukas-reineke/virt-column.nvim
+  { 'lukas-reineke/virt-column.nvim', opts = {} },
 
   -- Neovim plugin for locking a buffer to a window
   -- https://github.com/stevearc/stickybuf.nvim
   { 'stevearc/stickybuf.nvim', opts = {} },
-
-  -- Describe the regexp under the cursor
-  -- https://github.com/bennypowers/nvim-regexplainer
-  {
-    'bennypowers/nvim-regexplainer',
-    event = 'BufEnter',
-    dependencies = {
-      'nvim-treesitter/nvim-treesitter',
-      'MunifTanjim/nui.nvim',
-    },
-    opts = {
-      -- automatically show the explainer when the cursor enters a regexp
-      auto = true,
-    },
-  },
-
-  -- Clarify and beautify your comments using boxes and lines.
-  -- https://github.com/LudoPinelli/comment-box.nvim
-  { 'LudoPinelli/comment-box.nvim', opts = {} },
-
-  -- Automatically expand width of the current window.
-  -- Maximizes and restore it. And all this with nice animations!
-  -- https://github.com/anuvyklack/windows.nvim
-  {
-    'anuvyklack/windows.nvim',
-    dependencies = {
-      'anuvyklack/middleclass',
-      'anuvyklack/animation.nvim',
-    },
-    opts = {},
-  },
-
-  -- Plugin to improve viewing Markdown files in Neovim
-  -- https://github.com/MeanderingProgrammer/render-markdown.nvim
-  {
-    'MeanderingProgrammer/render-markdown.nvim',
-    dependencies = {
-      'nvim-treesitter/nvim-treesitter',
-      'nvim-tree/nvim-web-devicons',
-    },
-    ft = 'markdown',
-    opts = {},
-  },
 }

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

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

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

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

config/nvim/lua/utils.lua

@@ -0,0 +1,104 @@
+-- These are my utility functions
+-- I use to make my life bit easier
+
+local function file_exists(name)
+  if type(name) ~= 'string' then return false end
+  return os.rename(name, name) and true or false
+end
+
+-- ╭─────────────────────────────────────────────────────────╮
+-- │            Function shortcuts for keymap set            │
+-- ╰─────────────────────────────────────────────────────────╯
+
+-- Keymap set shortcut
+--@type vim.keymap.set
+local s = vim.keymap.set
+
+-- Keymap shortcut functions
+K = {}
+
+-- Handle description
+---@param desc string|table? Optional description. Can be a string or a table.
+---@return table -- The description as a table.
+local function handleDesc(desc)
+  if type(desc) == 'string' then
+    -- Convert string to table with `desc` as a key
+    -- If the string is empty, just return as an empty description
+    return { desc = desc }
+  elseif type(desc) == 'table' then
+    -- If desc doesn't have 'desc' key, combine it with
+    -- others with empty description
+    if not desc.desc then
+      desc.desc = '?'
+      return desc
+    end
+    -- Use the table as is
+    return desc
+  else
+    -- Default to an empty table if `desc` is nil or an unsupported type
+    return { desc = '?' }
+  end
+end
+
+-- Normal mode keymaps
+---@param key string rhs, required
+---@param cmd string|function lhs, required
+---@param opts table? Options, optional
+K.n = function(key, cmd, opts)
+  opts = handleDesc(opts or {})
+  s('n', key, cmd, opts)
+end
+
+-- Leader keymap shortcut function
+-- It prepends '<leader>' to the key
+---@param key string rhs, required, but will be prepended with '<leader>'
+---@param cmd string|function lhs, required
+---@param opts table|string? Options (or just description), optional
+K.nl = function(key, cmd, opts)
+  opts = handleDesc(opts)
+  K.n('<leader>' .. key, cmd, opts)
+end
+
+-- Keymap shortcut function with mode defined, good for sorting by rhs
+---@param key string rhs, required
+---@param mode string|string[] one of n, v, x, or table of modes { 'n', 'v' }
+---@param cmd string|function lhs, required
+---@param opts string|table description, required
+K.d = function(key, mode, cmd, opts)
+  opts = handleDesc(opts or {})
+  s(mode, key, cmd, opts)
+end
+
+-- Leader based keymap shortcut function with mode defined
+---@param key string rhs, required, but will be prepended with '<leader>'
+---@param mode string|string[] one of n, v, x, or table of modes { 'n', 'v' }
+---@param cmd string|function lhs, required
+---@param opts string|table description (or opts), required
+K.ld = function(key, mode, cmd, opts)
+  opts = handleDesc(opts or {})
+  s(mode, '<leader>' .. key, cmd, opts)
+end
+
+-- ╭─────────────────────────────────────────────────────────╮
+-- │            Options related helper functions             │
+-- ╰─────────────────────────────────────────────────────────╯
+
+-- Toggle background between light and dark
+function ToggleBackground() vim.o.bg = vim.o.bg == 'light' and 'dark' or 'light' end
+
+-- ╭─────────────────────────────────────────────────────────╮
+-- │              LSP Related helper functions               │
+-- ╰─────────────────────────────────────────────────────────╯
+
+-- Get the license key for intelephense
+---@return string|nil -- The license key for intelephense
+function GetIntelephenseLicense()
+  local p = os.getenv 'HOME' .. '/intelephense/license.txt'
+
+  if not file_exists(p) then return nil end
+
+  local f = assert(io.open(p, 'rb'))
+  local content = f:read '*a'
+  f:close()
+  return string.gsub(content, '%s+', '')[1] or nil
+end

config/nvm/default-packages

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

config/omp/own.json

@@ -16,7 +16,7 @@
         {
           "type": "session",
           "style": "plain",
-          "template": " {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}"
+          "template": " {{ if .SSHSession }}\ueba9 {{ .UserName }}@{{ end }}{{ .HostName }}"
         },
         {
           "foreground": "cyan",
@@ -27,14 +27,14 @@
           "template": " {{ .Path }} ",
           "type": "path",
           "mapped_locations": {
-            "~/Code/*": "\uF09B"
+            "~/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 }}",
+          "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 }}\uf044 {{ .Working.String }}{{ end }}){{ end }}",
           "properties": {
             "fetch_status": true,
             "fetch_upstream_icon": true,
@@ -100,7 +100,7 @@
         {
           "type": "php",
           "style": "plain",
-          "template": "  {{ .Full }} "
+          "template": " \ue73d {{ .Full }} "
         }
       ],
       "type": "prompt"

config/omp/own.toml

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

config/shared.sh

@@ -42,7 +42,7 @@ if ! declare -f msg > /dev/null; then
   # $1 - message (string)
   msg()
   {
-    [ "$VERBOSE" -eq 1 ] && echo "$1"
+    [ "$VERBOSE" -eq 1 ] && msgr msg "$1"
     return 0
   }
   msg "msg was not defined, defined it now"
@@ -54,7 +54,7 @@ if ! declare -f msg_err > /dev/null; then
   # $1 - error message (string)
   msg_err()
   {
-    echo "(!) ERROR: $1" >&2
+    msgr err "$1" >&2
     exit 1
   }
 fi
@@ -65,7 +65,7 @@ if ! declare -f msg_done > /dev/null; then
   # $1 - message (string)
   msg_done()
   {
-    echo "✓ $1"
+    msgr done "$1"
     return 0
   }
 fi
@@ -76,7 +76,7 @@ if ! declare -f msg_run > /dev/null; then
   # $1 - message (string)
   msg_run()
   {
-    echo "→ $1"
+    msgr run "$1"
     return 0
   }
 fi
@@ -87,10 +87,29 @@ if ! declare -f msg_ok > /dev/null; then
   # $1 - message (string)
   msg_ok()
   {
-    echo "✓ $1"
+    msgr ok "$1"
     return 0
   }
 fi
 
+if ! declare -f array_diff > /dev/null; then
+  # Function to compare two arrays and return the difference
+  # Example: array_diff DIFFERENCE ARRAY1 ARRAY2
+  # $1 - variable to store the difference
+  # $2 - first array
+  # $3 - second array
+  # Output to $1 the difference between $2 and $3
+  # Source: https://stackoverflow.com/a/42399479/594940
+  array_diff()
+  {
+    # shellcheck disable=SC1083,SC2086
+    eval local ARR1=\(\"\${$2[@]}\"\)
+    # shellcheck disable=SC1083,SC2086
+    eval local ARR2=\(\"\${$3[@]}\"\)
+    local IFS=$'\n'
+    mapfile -t "$1" < <(comm -23 <(echo "${ARR1[*]}" | sort) <(echo "${ARR2[*]}" | sort))
+  }
+fi
+
 source "$DOTFILES/config/exports"
 source "$DOTFILES/config/alias"

config/tms/config.toml

@@ -0,0 +1,10 @@
+default_session = "main"
+
+[[search_dirs]]
+path = "~/Code"
+depth = 3
+
+[picker_colors]
+highlight_color = "#21202e"
+highlight_text_color = "#86e1fc"
+border_color = "#524f67"

config/tmux/.ignore

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

config/tmux/config-keybinds.conf

@@ -0,0 +1,37 @@
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Bindings                                                 │
+#  ╰──────────────────────────────────────────────────────────╯
+# bind flags
+# -r = repeatable, only needs prefix once
+# -n = doesn't need prefix
+# -t = binds to a certain key-table (root, copy-mode, prefix, etc.)
+
+# Set <prefix> to Control + Space, keeping the default of C-b intact.
+# C-Space send-prefix line doubles the prefix when in nested tmux session.
+set -g prefix C-Space
+bind C-Space send-prefix
+
+# Use Alt-arrow keys without prefix key to switch panes
+bind -n M-Left  select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up    select-pane -U
+bind -n M-Down  select-pane -D
+
+# Easier switching between window
+bind C-n next-window
+bind C-p previous-window
+bind C-a last-window
+
+# Reload tmux config with <prefix> + r
+unbind r
+bind r "source-file ~/.dotfiles/config/tmux/tmux.conf; display 'tmux cfg reloaded!'"
+
+# copy mode using 'Esc'
+unbind [
+bind Escape copy-mode
+
+# paste using 'p'
+unbind p
+bind p paste-buffer
+
+# vim: ft=tmux ts=2 sw=2 et

config/tmux/config-plugins.conf

@@ -0,0 +1,50 @@
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Plugins                                                  │
+#  ╰──────────────────────────────────────────────────────────╯
+
+# ── Plugins related configurations ────────────────────────────────────
+
+# Plugin that lets you suspend local tmux session,
+# so that you can work with nested remote tmux session painlessly.
+# https://github.com/MunifTanjim/tmux-suspend
+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 "20"
+### Replace $HOME with ~ in window names
+set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
+set -g @tmux_window_name_ignored_programs "['sqlite3', 'antidote', 'direnv', 'md5']" # Default is []
+set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']"
+set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local'), ('.+asdf', 'asdf')]"
+set -g @tmux_window_name_use_tilde "True"
+
+# https://github.com/erikw/tmux-dark-notify
+set -g @dark-notify-theme-path-light "$TMUX_CONF_DIR/theme-light.conf"
+set -g @dark-notify-theme-path-dark  "$TMUX_CONF_DIR/theme-dark.conf"
+
+## https://github.com/MunifTanjim/tmux-mode-indicator
+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_prefix_mode_style 'bg=default,fg=#7aa2f7'
+set -g @mode_indicator_sync_mode_style 'bg=default,fg=red'
+
+# https://github.com/wfxr/tmux-fzf-url
+set -g @fzf-url-bind 'u'
+set -g @fzf-url-history-limit '2000'
+
+# ── Sourcing the plugins ──────────────────────────────────────────────
+
+run-shell "$TMUX_PLUGINS/tmux-sensible/sensible.tmux"
+run-shell "$TMUX_PLUGINS/tmux-window-name/tmux_window_name.tmux"
+run-shell "$TMUX_PLUGINS/tmux-mode-indicator/mode_indicator.tmux"
+run-shell "$TMUX_PLUGINS/tmux-suspend/suspend.tmux"
+run-shell "$TMUX_PLUGINS/tmux-continuum/continuum.tmux"
+run-shell "$TMUX_PLUGINS/tmux-sessionist/sessionist.tmux"
+run-shell "$TMUX_PLUGINS/tmux-yank/yank.tmux"
+run-shell "$TMUX_PLUGINS/tmux-current-pane-hostname/current_pane_hostname.tmux"
+run-shell "$TMUX_PLUGINS/tmux-dark-notify/main.tmux"
+run-shell "$TMUX_PLUGINS/tmux-fzf-url/fzf-url.tmux"
+
+# vim: ft=tmux ts=2 sw=2 et

config/tmux/config-settings.conf

@@ -0,0 +1,40 @@
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Settings                                                 │
+#  ╰──────────────────────────────────────────────────────────╯
+# set [flags] [command] [value]
+# Flags can be combined, e.g. -as
+# -a : Append the value to the existing setting.
+# -s : Apply the setting to the current session.
+# -g : Apply the setting globally to all sessions.
+# -o : Set the option only if it is not already set.
+# -u : Unset the specified option.
+
+set -g default-terminal "tmux-256color" # Set default terminal to 256 colors
+set -g detach-on-destroy off # don't detach tmux when killing a session
+set -g display-time 0 # Hide clock
+set -g focus-events on # Focus events enabled for terminals that support them
+set -g mouse on # Mouse support
+set -g set-titles on # Allow tmux to set the terminal title
+set -g status on # Setting status on
+set -g status-keys vi # vi keys to move between panes
+
+# Activity Monitoring (for when something happens in another pain)
+set -g monitor-activity on
+set -g visual-activity off
+set -g visual-bell off
+
+# A bell in another window should cause a bell in the current window
+set -g bell-action any
+
+# Keep Tmux alive when the initial command is finished
+set -g remain-on-exit off
+
+# Start windows and panes at 1, not 0
+set -g base-index 1
+set -g pane-base-index 1
+set -g renumber-windows on
+
+# Activate with `DEBUG=1 tmux -vv`
+if-shell '[ "$DEBUG" = "1" ]' 'set -g debug-file ~/.cache/tmux-debug.log'
+
+# vim: ft=tmux ts=2 sw=2 et

config/tmux/config-themes.conf

@@ -0,0 +1,16 @@
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Theme                                                    │
+#  ╰──────────────────────────────────────────────────────────╯
+
+set -g pane-active-border-style "fg=#7aa2f7"
+set -g pane-border-style "fg=#3b4261"
+set -g status-justify "left"
+set -g status-left ''
+set -g status-left-length "0"
+set -g status-position "bottom"
+set -g status-right "#S@#{hostname_short} #{tmux_mode_indicator}"
+set -g status-right-length "30"
+set -g window-status-current-format ' #I:#W#{?window_zoomed_flag, ◈ ,} '
+set -g window-status-format ' #I:#W '
+
+# vim: ft=tmux ts=2 sw=2 et

config/tmux/plugins/tmux-fzf-url/LICENSE.txt

@@ -0,0 +1 @@
+https://wfxr.mit-license.org/2018

config/tmux/plugins/tmux-fzf-url/fzf-url.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+#===============================================================================
+#   Author: Wenxuan
+#    Email: wenxuangm@gmail.com
+#  Created: 2018-04-06 12:12
+#===============================================================================
+get_fzf_options()
+{
+  local fzf_options
+  local fzf_default_options='-w 100% -h 50% --multi -0 --no-preview'
+  fzf_options="$(tmux show -gqv '@fzf-url-fzf-options')"
+  [ -n "$fzf_options" ] && echo "$fzf_options" || echo "$fzf_default_options"
+}
+
+fzf_filter()
+{
+  eval "fzf-tmux $(get_fzf_options)"
+}
+
+custom_open=$3
+open_url()
+{
+  if [[ -n $custom_open ]]; then
+    $custom_open "$@"
+  elif hash xdg-open &> /dev/null; then
+    nohup xdg-open "$@"
+  elif hash open &> /dev/null; then
+    nohup open "$@"
+  elif [[ -n $BROWSER ]]; then
+    nohup "$BROWSER" "$@"
+  fi
+}
+
+limit='screen'
+[[ $# -ge 2 ]] && limit=$2
+
+if [[ $limit == 'screen' ]]; then
+  content="$(tmux capture-pane -J -p -e | sed -r 's/\x1B\[[0-9;]*[mK]//g'))"
+else
+  content="$(tmux capture-pane -J -p -e -S -"$limit" | sed -r 's/\x1B\[[0-9;]*[mK]//g'))"
+fi
+
+urls=$(echo "$content" | grep -oE '(https?|ftp|file):/?//[-A-Za-z0-9+&@#/%?=~_|!:,.;]*[-A-Za-z0-9+&@#/%=~_|]')
+wwws=$(echo "$content" | grep -oE '(http?s://)?www\.[a-zA-Z](-?[a-zA-Z0-9])+\.[a-zA-Z]{2,}(/\S+)*' | grep -vE '^https?://' | sed 's/^\(.*\)$/http:\/\/\1/')
+ips=$(echo "$content" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(:[0-9]{1,5})?(/\S+)*' | sed 's/^\(.*\)$/http:\/\/\1/')
+gits=$(echo "$content" | grep -oE '(ssh://)?git@\S*' | sed 's/:/\//g' | sed 's/^\(ssh\/\/\/\)\{0,1\}git@\(.*\)$/https:\/\/\2/')
+gh=$(echo "$content" | grep -oE "['\"]([_A-Za-z0-9-]*/[_.A-Za-z0-9-]*)['\"]" | sed "s/['\"]//g" | sed 's#.#https://github.com/&#')
+
+if [[ $# -ge 1 && $1 != '' ]]; then
+  extras=$(echo "$content" | eval "$1")
+fi
+
+items=$(
+  printf '%s\n' "${urls[@]}" "${wwws[@]}" "${gh[@]}" "${ips[@]}" "${gits[@]}" "${extras[@]}" \
+    | grep -v '^$' \
+    | sort -u \
+    | nl -w3 -s '  '
+)
+[ -z "$items" ] && tmux display 'tmux-fzf-url: no URLs found' && exit
+
+fzf_filter <<< "$items" | awk '{print $2}' \
+  | while read -r chosen; do
+    open_url "$chosen" &> "/tmp/tmux-$(id -u)-fzf-url.log"
+  done

config/tmux/plugins/tmux-fzf-url/fzf-url.tmux

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#===============================================================================
+#   Author: Wenxuan
+#    Email: wenxuangm@gmail.com
+#  Created: 2018-04-06 09:30
+#===============================================================================
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+
+# $1: option
+# $2: default value
+tmux_get() {
+  local value
+  value="$(tmux show -gqv "$1")"
+  [ -n "$value" ] && echo "$value" || echo "$2"
+}
+
+key="$(tmux_get '@fzf-url-bind' 'u')"
+history_limit="$(tmux_get '@fzf-url-history-limit' 'screen')"
+extra_filter="$(tmux_get '@fzf-url-extra-filter' '')"
+custom_open="$(tmux_get '@fzf-url-open' '')"
+echo "$extra_filter" >/tmp/filter
+
+tmux bind-key "$key" run -b "$SCRIPT_DIR/fzf-url.sh '$extra_filter' $history_limit '$custom_open'"

config/tmux/rename-session.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# Default session name
+DEFAULT_NAME="main"
+
+# Current session
+CURRENT_SESSION=$(tmux display-message -p "#{session_name}")
+
+# Check that the session has a name
+if [ "$CURRENT_SESSION" = "#{session_name}" ] || [ "$CURRENT_SESSION" = "0" ]; then
+  # Check if the default name is already in use
+  if tmux has-session -t "$DEFAULT_NAME" 2> /dev/null; then
+    # Query the user for a new name
+    echo "Session name '$DEFAULT_NAME' is already in use. Enter a new name:"
+    read -r NEW_NAME
+    while tmux has-session -t "$NEW_NAME" 2> /dev/null || [ -z "$NEW_NAME" ]; do
+      echo "Name '$NEW_NAME' is invalid or already in use. Enter a new name:"
+      read -r NEW_NAME
+    done
+    # Rename the session with the new name
+    tmux rename-session -t "$(tmux display-message -p "#{session_id}")" "$NEW_NAME"
+    exit 0
+  else
+    # Rename the session with the default name
+    tmux rename-session -t "$(tmux display-message -p "#{session_id}")" "$DEFAULT_NAME"
+    exit 0
+  fi
+fi

config/tmux/theme-activate.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+#
+# If our dark/light theme switching theme file can be found,
+# source it in tmux. This is a separate file to keep the
+# current theme settings separate from the main tmux configuration.
+#
+# This script requires the following in your tmux.conf:
+# `run-shell "./theme-activate.sh"`
+# and having the tmux-dark-notify plugin installed.
+#
+# Author: Ismo Vuorinen <https://github.com/ivuorinen> 2025
+# License: MIT
+
+THEME_FILE="$HOME/.local/state/tmux/tmux-dark-notify-theme.conf"
+
+[[ -e $THEME_FILE ]] && tmux source-file "$THEME_FILE"

config/tmux/tmux.conf

@@ -4,171 +4,22 @@
 # - https://tmuxguide.readthedocs.io/en/latest/tmux/tmux.html
 # - https://github.com/dreamsofcode-io/tmux/blob/main/tmux.conf
 
-#  ╭──────────────────────────────────────────────────────────╮
-#  │ Bindings                                                 │
-#  ╰──────────────────────────────────────────────────────────╯
+# Load the configuration settings
+source-file "$TMUX_CONF_DIR/config-settings.conf"
 
-# 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
+# Load the theme settings
+source-file "$TMUX_CONF_DIR/config-themes.conf"
 
-# Vim style pane selection
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
+# Load the keybindings
+source-file "$TMUX_CONF_DIR/config-keybinds.conf"
 
-# Use Alt-arrow keys without prefix key to switch panes
-bind -n M-Left  select-pane -L
-bind -n M-Right select-pane -R
-bind -n M-Up    select-pane -U
-bind -n M-Down  select-pane -D
+# Load the plugins and plugin settings
+source-file "$TMUX_CONF_DIR/config-plugins.conf"
 
-# Reload tmux config with <prefix> + r
-bind r source-file ~/.dotfiles/config/tmux/tmux.conf \; display "tmux cfg reloaded!"
-
-# Open a new window with <prefix> + N
-bind N new-window
-
-# Set default directory for new windows in this session to current directory:
-bind M-c attach-session -c "#{pane_current_path}"
-
-# Open a new window in the current directory
-bind C new-window -c "#{pane_current_path}"
-
-# keybindings
-bind-key -T copy-mode-vi v send-keys -X begin-selection
-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
-
-#### copy mode : vim ####
-# copy mode using 'Esc'
-unbind [
-bind Escape copy-mode
-
-# paste using 'p'
-unbind p
-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
-
-# Make delay shorter
-set -sg escape-time 0
-
-# Start windows and panes at 1, not 0
-set -g base-index 1
-set -g pane-base-index 1
-set-window-option -g pane-base-index 1
-set-option -g renumber-windows on
-
-# set vi-mode
-set-window-option -g mode-keys vi
-
-#  ╭──────────────────────────────────────────────────────────╮
-#  │ 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                           │
-#  ╰──────────────────────────────────────────────────────────╯
-
-# Plugin that lets you suspend local tmux session,
-# so that you can work with nested remote tmux session painlessly.
-# https://github.com/MunifTanjim/tmux-suspend
-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 "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'
-
-## https://github.com/tmux-plugins/tmux-resurrect
-set -g @resurrect-strategy-nvim 'session'
-set -g @resurrect-dir '~/.local/state/tmux/tmux-resurrect'
-
-## https://github.com/MunifTanjim/tmux-mode-indicator
-set -g @mode_indicator_prefix_mode_style 'bg=default,fg=#7aa2f7'
-set -g @mode_indicator_copy_mode_style 'bg=default,fg=yellow'
-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-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"
+# Load theme based on tmux-dark-notify state.
+# This script helps states where dark-notify is not available,
+# and we want to have light or dark state constantly available.
+run-shell "$TMUX_CONF_DIR/theme-activate.sh"
 
+# If we started tmux with a session name, rename it.
+run-shell "$TMUX_CONF_DIR/rename-session.sh"

config/wezterm/wezterm.lua

@@ -1,30 +1,36 @@
-local wezterm = require("wezterm")
+local wezterm = require 'wezterm'
 local config = wezterm.config_builder()
 
 -- Font and font size
 config.font_size = 14.0
-config.font = wezterm.font("JetBrainsMonoNL Nerd Font Mono")
+config.font = wezterm.font_with_fallback {
+  'JetBrainsMonoNL NFM Light',
+  'JetBrains Mono',
+  'Symbols Nerd Font Mono',
+}
+config.harfbuzz_features = { 'zero', 'ss01', 'cv05' }
 
 -- Make the window a bit transparent
-config.window_background_opacity = 0.97
+config.window_background_opacity = 0.98
 
 -- Don't show tab bar
 config.enable_tab_bar = false
 
+-- Fix alt on macOS
 config.send_composed_key_when_left_alt_is_pressed = true
 
 -- Function to detect the theme based on appearance
 function Scheme_for_appearance(appearance)
-  if appearance:find("Dark") then
-    return "Tokyo Night Storm"
+  if appearance:find 'Dark' then
+    return 'Tokyo Night Storm'
   else
-    return "Tokyo Night Day"
+    return 'Tokyo Night Day'
   end
 end
 
 -- Set the color scheme based on appearance
 ---@diagnostic disable-next-line: unused-local
-wezterm.on("window-config-reloaded", function(window, pane)
+wezterm.on('window-config-reloaded', function(window, pane)
   local overrides = window:get_config_overrides() or {}
   local appearance = window:get_appearance()
   local scheme = Scheme_for_appearance(appearance)

config/zed/settings.json

@@ -0,0 +1,78 @@
+{
+  "telemetry": {
+    "metrics": false
+  },
+  "assistant": {
+    "default_model": {
+      "provider": "copilot_chat",
+      "model": "claude-3-5-sonnet"
+    },
+    "version": "2"
+  },
+  "formatter": {
+    "external": {
+      "command": "node_modules/.bin/prettier",
+      "arguments": [
+        "--stdin-filepath",
+        "{buffer_path}"
+      ]
+    }
+  },
+  "languages": {
+    "JavaScript": {
+      "enable_language_server": true,
+      "code_actions_on_format": {
+        "source.fixAll.eslint": true
+      }
+    },
+    "Lua": {
+      "enable_language_server": true,
+      "tab_size": 2
+    }
+  },
+  "lsp": {
+    "eslint": {
+      "settings": {
+        "nodePath": "./node_modules/.bin"
+      }
+    },
+    "gopls": {
+      "initialization_options": {
+        "hints": {
+          "assignVariableTypes": true,
+          "compositeLiteralFields": true,
+          "compositeLiteralTypes": true,
+          "constantValues": true,
+          "functionTypeParameters": true,
+          "parameterNames": true,
+          "rangeVariableTypes": true
+        }
+      }
+    }
+  },
+  "preferred_line_length": 100,
+  "format_on_save": "on",
+  "vim_mode": true,
+  "theme": {
+    "mode": "system",
+    "light": "Tokyo Night Light",
+    "dark": "Tokyo Night Storm"
+  },
+  "inlay_hints": {
+    "enabled": true,
+    "show_type_hints": true,
+    "show_parameter_hints": true,
+    "show_other_hints": true
+  },
+  "ui_font_size": 16,
+  "buffer_font_size": 16,
+  "buffer_font_fallbacks": [
+    "JetBrainsMono Nerd Font"
+  ],
+  "inline_completions": {
+    "disabled_globs": [
+      ".env"
+    ]
+  },
+  "hour_format": "hour24"
+}

config/zsh/antidote.zsh

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

config/zsh/antidote_plugins.txt

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

config/zsh/completion/_dfm

@@ -0,0 +1,170 @@
+#compdef dfm
+# Completion for dfm, the dotfiles manager
+
+_dfm_get_script_description() {
+  local file="$1"
+  sed -n '/@description/s/.*@description *\(.*\)/\1/p' "$file" | head -1
+}
+
+_dfm_get_available_scripts() {
+  local scripts=()
+  local dotfiles="${HOME}/.dotfiles"
+
+  for script in "${dotfiles}/scripts/install-"*.sh; do
+    if [ -f "$script" ]; then
+      local name=$(basename "$script" .sh | sed 's/install-//')
+      local desc=$(_dfm_get_script_description "$script")
+      [ -z "$desc" ] && desc="No description available"
+      scripts+=("${name}:${desc}")
+    fi
+  done
+
+  echo ${(F)scripts}
+}
+
+_dfm()
+{
+  local -a commands sections
+
+  sections=(
+    'install:Installation commands'
+    'asdf:ASDF version manager commands'
+    'brew:Homebrew package manager commands'
+    'check:System check commands'
+    'dotfiles:Dotfiles management commands'
+    'docs:Documentation commands'
+    'helpers:Helper utilities'
+    'scripts:Installation scripts'
+    'tests:Test commands'
+  )
+
+  _arguments -C \
+    "1: :->sections" \
+    "*::arg:->args"
+
+  case "$state" in
+    sections)
+      _describe 'sections' sections
+      ;;
+    args)
+      case $line[1] in
+        install)
+          local -a install_cmds
+          install_cmds=(
+            'all:Install everything in correct order'
+            'cargo:Install rust/cargo packages'
+            'cheat-databases:Install cheat external cheatsheet databases'
+            'composer:Install composer'
+            'fonts:Install programming fonts'
+            'gh:Install GitHub CLI Extensions'
+            'go:Install Go Packages'
+            'imagick:Install ImageMagick CLI'
+            'macos:Setup nice macOS defaults'
+            'nvm:Install Node Version Manager'
+            'nvm-latest:Install latest LTS node'
+            'npm-packages:Install NPM Packages'
+            'ntfy:Install ntfy'
+            'z:Install z'
+          )
+          _describe 'install commands' install_cmds
+          ;;
+
+        asdf)
+          local -a asdf_cmds
+          asdf_cmds=(
+            'current:Show current versions'
+            'global:Show global versions'
+            'installed:Show installed versions'
+            'plugins-update:Update all plugins'
+            'plugins-install:Install plugins from configuration'
+            'plugins-remove:Remove installed plugins'
+            'reset:Reset plugins'
+            'fix-tool-versions:Remove uninstalled plugins from .tool-versions'
+            'versions:Show versions'
+            'where:Show where'
+            'which:Show which'
+          )
+          _describe 'asdf commands' asdf_cmds
+          ;;
+
+        brew)
+          local -a brew_cmds
+          brew_cmds=(
+            'install:Install items from Brewfile'
+            'update:Update and upgrade packages'
+            'updatebundle:Update Brewfile with descriptions'
+            'autoupdate:Setup brew auto-update'
+            'leaves:List brew leaves'
+            'clean:Clean up packages'
+            'untracked:List untracked packages'
+          )
+          _describe 'brew commands' brew_cmds
+          ;;
+
+        check)
+          local -a check_cmds
+          check_cmds=(
+            'arch:Check architecture'
+            'host:Check hostname'
+          )
+          _describe 'check commands' check_cmds
+          ;;
+
+        dotfiles)
+          local -a dotfiles_cmds
+          dotfiles_cmds=(
+            'fmt:Run all formatters'
+            'yamlfmt:Run yamlfmt'
+            'shfmt:Run shfmt'
+            'reset_all:Reset everything'
+            'reset_nvim:Reset neovim'
+          )
+          _describe 'dotfiles commands' dotfiles_cmds
+          ;;
+
+        docs)
+          local -a docs_cmds
+          docs_cmds=(
+            'all:Update all documentation'
+            'tmux:Update tmux documentation'
+            'nvim:Update nvim documentation'
+            'wezterm:Update wezterm documentation'
+          )
+          _describe 'docs commands' docs_cmds
+          ;;
+
+        helpers)
+          local -a helpers_cmds
+          helpers_cmds=(
+            'aliases:Show aliases'
+            'colors:Show colors'
+            'env:Show environment variables'
+            'functions:Show functions'
+            'nvim:Show nvim keybindings'
+            'path:Show PATH'
+            'tmux:Show tmux keybindings'
+            'wezterm:Show wezterm keybindings'
+          )
+          _describe 'helper commands' helpers_cmds
+          ;;
+
+        scripts)
+            local -a script_cmds
+            script_cmds=("${(@f)$(_dfm_get_available_scripts)}")
+            _describe 'available scripts' script_cmds
+          ;;
+
+        tests)
+          local -a test_cmds
+          test_cmds=(
+            'msg:List log functions'
+            'params:List parameters'
+          )
+          _describe 'test commands' test_cmds
+          ;;
+      esac
+      ;;
+  esac
+}
+
+_dfm "$@"

config/zsh/completion/_oh-my-posh

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

config/zsh/p10k.zsh

@@ -0,0 +1,221 @@
+# shellcheck disable=SC1073,SC1072
+#
+# Generated by Powerlevel10k configuration wizard on 2024-12-10 at 10:05 EET.
+# Based on romkatv/powerlevel10k/config/p10k-pure.zsh, checksum 7533.
+# Wizard options: nerdfont-v3 + powerline, small icons, pure, original, 2 lines, sparse,
+# transient_prompt, instant_prompt=verbose.
+# Type `p10k configure` to generate another config.
+#
+# Config file for Powerlevel10k with the style of Pure
+# (https://github.com/sindresorhus/pure).
+#
+# Differences from Pure:
+#
+#   - Git:
+#     - `@c4d3ec2c` instead of something like `v1.4.0~11` when in detached HEAD state.
+#     - No automatic `git fetch` (the same as in Pure with `PURE_GIT_PULL=0`).
+#
+# Apart from the differences listed above, the replication of Pure
+# prompt is exact. This includes even the questionable parts.
+# For example, just like in Pure, there is no indication of Git status
+# being stale; prompt symbol is the same in command, visual and overwrite
+# vi modes; when prompt doesn't fit on one line, it wraps around with
+# no attempt to shorten it.
+#
+# If you like the general style of Pure but not particularly attached
+# to all its quirks, type `p10k configure` and pick "Lean" style.
+# This will give you slick minimalist prompt while taking
+# advantage of Powerlevel10k features that aren't present in Pure.
+
+# Temporarily change options.
+'builtin' 'local' '-a' 'p10k_config_opts'
+[[ ! -o 'aliases'         ]] || p10k_config_opts+=('aliases')
+[[ ! -o 'sh_glob'         ]] || p10k_config_opts+=('sh_glob')
+[[ ! -o 'no_brace_expand' ]] || p10k_config_opts+=('no_brace_expand')
+'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand'
+
+() {
+  emulate -L zsh -o extended_glob
+
+  # Unset all configuration options.
+  unset -m '(POWERLEVEL9K_*|DEFAULT_USER)~POWERLEVEL9K_GITSTATUS_DIR'
+
+  # Zsh >= 5.1 is required.
+  [[ $ZSH_VERSION == (5.<1->*|<6->.*) ]] || return
+
+  # Prompt colors.
+  local grey='242'
+  local red='1'
+  local yellow='3'
+  local blue='33'
+  local magenta='5'
+  local cyan='6'
+  local white='7'
+  local green='2'
+
+  # Left prompt segments.
+  typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(
+    # =========================[ Line #1 ]=========================
+    context                   # user@host
+    dir                       # current directory
+    vcs                       # git status
+    # command_execution_time    # previous command duration
+    go
+    nvm
+    aws
+    # =========================[ Line #2 ]=========================
+    newline                   # \n
+    virtualenv                # python virtual environment
+    prompt_char               # prompt symbol
+  )
+
+  # Right prompt segments.
+  typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(
+    # =========================[ Line #1 ]=========================
+    # command_execution_time  # previous command duration
+    # virtualenv              # python virtual environment
+    # context                 # user@host
+    # time                    # current time
+    # =========================[ Line #2 ]=========================
+    newline                   # \n
+  )
+
+  # Basic style options that define the overall prompt look.
+  typeset -g POWERLEVEL9K_BACKGROUND=                            # transparent background
+  typeset -g POWERLEVEL9K_{LEFT,RIGHT}_{LEFT,RIGHT}_WHITESPACE=  # no surrounding whitespace
+  typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SUBSEGMENT_SEPARATOR=' '  # separate segments with a space
+  typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SEGMENT_SEPARATOR=        # no end-of-line symbol
+  typeset -g POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION=           # no segment icons
+
+  # Add an empty line before each prompt except the first. This doesn't
+  # emulate the bug in Pure that makes prompt drift down whenever you use
+  # the Alt-C binding from fzf or similar.
+  typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=true
+
+  # Magenta prompt symbol if the last command succeeded.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS}_FOREGROUND=$green
+  # Red prompt symbol if the last command failed.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS}_FOREGROUND=$red
+  # Default prompt symbol.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='➜'
+  # Prompt symbol in command vi mode.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='←'
+  # Prompt symbol in visual vi mode is the same as in command mode.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='←'
+  # Prompt symbol in overwrite vi mode is the same as in command mode.
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=false
+
+  # Grey Python Virtual Environment.
+  typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=$grey
+  # Don't show Python version.
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false
+  typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
+
+  # Blue current directory.
+  typeset -g POWERLEVEL9K_DIR_FOREGROUND=$blue
+
+  # Context format when root: user@host. The first part red, the rest green.
+  typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE="%F{$red}%n%f%F{$green}@%m%f"
+  # Context format when not root: host. The host is green.
+  typeset -g POWERLEVEL9K_CONTEXT_TEMPLATE="%F{$green}%m%f"
+  # Don't show context unless root or in SSH.
+  # typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_CONTENT_EXPANSION=
+
+  # aws, go and nvm versions colors.
+  typeset -g POWERLEVEL9K_{AWS,GO,NVM}_FOREGROUND=$grey
+
+  # Show previous command duration only if it's >= 86400s = 24h.
+  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=86400
+  # Don't show fractional seconds. Thus, 7s rather than 7.3s.
+  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0
+  # Duration format: 1d 2h 3m 4s.
+  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s'
+  # Yellow previous command duration.
+  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=$yellow
+
+  # Grey Git prompt. This makes stale prompts indistinguishable
+  # from up-to-date ones.
+  typeset -g POWERLEVEL9K_VCS_FOREGROUND=$grey
+
+  # Disable async loading indicator to make directories that aren't
+  # Git repositories indistinguishable from large Git repositories
+  # without known state.
+  typeset -g POWERLEVEL9K_VCS_LOADING_TEXT=
+
+  # Don't wait for Git status even for a millisecond, so that
+  # prompt always updates asynchronously when Git state changes.
+  typeset -g POWERLEVEL9K_VCS_MAX_SYNC_LATENCY_SECONDS=0
+
+  # Cyan ahead/behind arrows.
+  typeset -g POWERLEVEL9K_VCS_{INCOMING,OUTGOING}_CHANGESFORMAT_FOREGROUND=$cyan
+  # Don't show remote branch, current tag or stashes.
+  typeset -g POWERLEVEL9K_VCS_GIT_HOOKS=(vcs-detect-changes git-untracked git-aheadbehind)
+  # Don't show the branch icon.
+  typeset -g POWERLEVEL9K_VCS_BRANCH_ICON=
+  # When in detached HEAD state, show @commit where branch normally goes.
+  typeset -g POWERLEVEL9K_VCS_COMMIT_ICON='@'
+  # Don't show staged, unstaged, untracked indicators.
+  typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED}_ICON=
+  # Show '*' when there are staged, unstaged or untracked files.
+  typeset -g POWERLEVEL9K_VCS_DIRTY_ICON=':'
+  # Show '⇣' if local branch is behind remote.
+  typeset -g POWERLEVEL9K_VCS_INCOMING_CHANGES_ICON=':⇣'
+  # Show '⇡' if local branch is ahead of remote.
+  typeset -g POWERLEVEL9K_VCS_OUTGOING_CHANGES_ICON=':⇡'
+  # Don't show the number of commits next to the ahead/behind arrows.
+  typeset -g POWERLEVEL9K_VCS_{COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=1
+  # Remove space between '⇣' and '⇡' and all trailing spaces.
+  typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${${${P9K_CONTENT/⇣* :⇡/⇣⇡}// }//:/ }'
+
+  # Grey current time.
+  typeset -g POWERLEVEL9K_TIME_FOREGROUND=$grey
+  # Format for the current time: 09:51:02. See `man 3 strftime`.
+  typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}'
+
+  # If set to true, time will update when you hit enter. This way prompts
+  # for the past commands will contain the start times of their commands
+  # rather than the end times of their preceding commands.
+  typeset -g POWERLEVEL9K_TIME_UPDATE_ON_COMMAND=false
+
+  # Transient prompt works similarly to the builtin transient_rprompt option.
+  # It trims down prompt when accepting a command line. Supported values:
+  #
+  #   - off:      Don't change prompt when accepting a command line.
+  #   - always:   Trim down prompt when accepting a command line.
+  #   - same-dir: Trim down prompt when accepting a command line
+  #               unless this is the first command typed after
+  #               changing current working directory.
+  typeset -g POWERLEVEL9K_TRANSIENT_PROMPT=always
+
+  # Instant prompt mode.
+  #
+  #   - off:     Disable instant prompt. Choose this if you've tried
+  #              instant prompt and found it incompatible with your
+  #              zsh configuration files.
+  #   - quiet:   Enable instant prompt and don't print warnings when
+  #              detecting console output during zsh initialization.
+  #              Choose this if you've read and understood
+  #              https://github.com/romkatv/powerlevel10k#instant-prompt.
+  #   - verbose: Enable instant prompt and print a warning when detecting
+  #              console output during zsh initialization. Choose this
+  #              if you've never tried instant prompt, haven't seen the
+  #              warning, or if you are unsure what this all means.
+  typeset -g POWERLEVEL9K_INSTANT_PROMPT=off
+
+  # Hot reload allows you to change POWERLEVEL9K options after
+  # Powerlevel10k has been initialized. For example, you can type
+  # POWERLEVEL9K_BACKGROUND=red and see your prompt turn red.
+  # Hot reload can slow down prompt by 1-2 milliseconds, so it's
+  # better to keep it turned off unless you really need it.
+  typeset -g POWERLEVEL9K_DISABLE_HOT_RELOAD=true
+
+  # If p10k is already loaded, reload configuration.
+  # This works even with POWERLEVEL9K_DISABLE_HOT_RELOAD=true.
+  (( ! $+functions[p10k] )) || p10k reload
+}
+
+# Tell `p10k configure` which file it should overwrite.
+typeset -g POWERLEVEL9K_CONFIG_FILE=${${(%):-%x}:a}
+
+(( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]}
+'builtin' 'unset' 'p10k_config_opts'

config/zsh/prompt.zsh

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

docs/aerospace-keybindings.md

@@ -0,0 +1,66 @@
+# aerospace keybindings
+
+## main
+
+| Key             | Command(s) and actions                        |
+|-----------------|-----------------------------------------------|
+| alt-a           | mode apps                                     |
+| alt-h           | focus left                                    |
+| alt-j           | focus down                                    |
+| alt-k           | focus up                                      |
+| alt-l           | focus right                                   |
+| alt-m           | mode move                                     |
+| alt-s           | mode service                                  |
+| alt-shift-1     | workspace 1                                   |
+| alt-shift-2     | workspace 2                                   |
+| alt-shift-tab   | workspace-back-and-forth                      |
+| ctrl-shift-1    | move-node-to-workspace 1                      |
+| ctrl-shift-2    | move-node-to-workspace 2                      |
+| ctrl-shift-tab  | move-workspace-to-monitor --wrap-around prev  |
+
+## apps
+
+| Key  | Command(s) and actions                                               |
+|------|----------------------------------------------------------------------|
+| b    | exec-and-forget  open -a /Applications/Brave Browser.app; mode main  |
+| c    | exec-and-forget  open -a /Applications/Ferdium.app; mode main        |
+| esc  | reload-config; mode main                                             |
+| g    | exec-and-forget  open -a /Applications/Ghostty.app; mode main        |
+| o    | exec-and-forget  open -a /Applications/Obsidian.app; mode main       |
+| s    | exec-and-forget  open -a /Applications/Slack.app; mode main          |
+| t    | exec-and-forget  open -a /Applications/TIDAL.app; mode main          |
+| w    | exec-and-forget  open -a /Applications/WezTerm.app; mode main        |
+
+## move
+
+| Key          | Command(s) and actions                           |
+|--------------|--------------------------------------------------|
+| 1            | move-node-to-workspace 1 --focus-follows-window  |
+| 2            | move-node-to-workspace 2 --focus-follows-window  |
+| ctrl-h       | resize smart -70                                 |
+| ctrl-l       | resize smart +70                                 |
+| esc          | reload-config; mode main                         |
+| h            | move left                                        |
+| j            | move down                                        |
+| k            | move up                                          |
+| l            | move right                                       |
+| r            | flatten-workspace-tree; mode main                |
+| shift-h      | join-with left                                   |
+| shift-j      | join-with down                                   |
+| shift-k      | join-with up                                     |
+| shift-l      | join-with right                                  |
+| shift-left   | resize smart +70                                 |
+| shift-right  | resize smart -70                                 |
+
+## service
+
+| Key        | Command(s) and actions                    |
+|------------|-------------------------------------------|
+| backspace  | close-all-windows-but-current; mode main  |
+| esc        | reload-config; mode main                  |
+| f          | layout floating tiling; mode main         |
+| r          | flatten-workspace-tree; mode main         |
+
+File generated: 2025-01-15 13:32:41
+
+Config file: [config/aerospace/aerospace.toml](./../config/aerospace/aerospace.toml)