chore: update pre-commit hooks (#57)

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

.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:

.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:

.pre-commit-config.yaml

@@ -46,3 +46,13 @@ repos:
     rev: v1.7.4
     hooks:
       - id: actionlint
+
+  - repo: https://github.com/renovatebot/pre-commit-hooks
+    rev: 39.82.7
+    hooks:
+      - id: renovate-config-validator
+
+  - repo: https://github.com/JohnnyMorganz/StyLua
+    rev: v2.0.2
+    hooks:
+      - id: stylua # or stylua-system / stylua-github

base/tool-versions

@@ -1,27 +1,21 @@
 asdf-plugin-manager 1.4.0
-golang 1.23.3
-ruby 3.3.4
+golang 1.23.4
 rust 1.82.0
 direnv 2.35.0
 fd 10.2.0
 1password-cli 2.30.3
-age 1.2.0
+age 1.2.1
 bottom 0.10.2
 dotenv-linter 3.3.0
 editorconfig-checker 2.8.0
-github-cli 2.61.0
+github-cli 2.64.0
 hadolint 2.12.0
-kubectl 1.31.2
+kubectl 1.32.0
 pre-commit 4.0.1
 ripgrep 14.1.1
 shellcheck 0.10.0
 shfmt 3.10.0
 terragrunt 0.68.8
-tf-summarize 0.3.13
+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
-eza 0.20.8
-sops 3.9.1
+yq 4.44.6

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,183 @@
+# 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-id = 'org.ferdium.ferdium-app' # Ferdium, has WhatsApp etc.
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-name-regex-substring = 'finder'
+run = 'layout floating'
+
+[[on-window-detected]]
+if.app-id = 'com.apple.finder' # Finder
+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'
+run = ['layout floating', 'move-node-to-workspace 2']
+
+# 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 =        0
+outer.top = [{ monitor.'^built-in retina display$' = 20 }, 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]
+
+# 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-cmd-f = 'layout floating'
+
+alt-cmd-left = 'join-with left'
+alt-cmd-down = 'join-with down'
+alt-cmd-up = 'join-with up'
+alt-cmd-right = 'join-with right'
+
+# 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#move
+alt-shift-h = 'move left'
+alt-shift-j = 'move down'
+alt-shift-k = 'move up'
+alt-shift-l = 'move right'
+
+# See: https://nikitabobko.github.io/AeroSpace/commands#workspace
+cmd-shift-1 = 'workspace 1' # Main
+cmd-shift-2 = 'workspace 2' # Music
+
+# See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace
+alt-cmd-1 = 'move-node-to-workspace 1 --focus-follows-window'
+alt-cmd-2 = 'move-node-to-workspace 2 --focus-follows-window'
+
+shift-tab = 'workspace-back-and-forth'
+# alt-shift-tab = 'move-workspace-to-monitor --wrap-around next'
+
+# 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-d = 'mode resize'
+
+[mode.apps.binding]
+esc = ['reload-config', 'mode main']
+alt-b = ['exec-and-forget open -a /Applications/Brave Browser.app', 'mode main']
+alt-c = ['exec-and-forget open -a /Applications/Ferdium.app', 'mode main']
+alt-o = ['exec-and-forget open -a /Applications/Obsidian.app', 'mode main']
+alt-s = ['exec-and-forget open -a /Applications/Slack.app', 'mode main']
+alt-t = ['exec-and-forget open -a /Applications/TIDAL.app', 'mode main']
+alt-w = ['exec-and-forget open -a /Applications/WezTerm.app', 'mode main']
+
+[mode.service.binding]
+esc = ['reload-config', 'mode main']
+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']
+
+[mode.resize.binding]
+# See: https://nikitabobko.github.io/AeroSpace/commands#resize
+r = ['flatten-workspace-tree', 'mode main'] # reset layout
+h = 'resize smart -70'
+l = 'resize smart +70'
+esc = ['reload-config', 'mode main']

config/asdf/plugin-versions

@@ -1,27 +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   b5862c1
-bats                  https://github.com/timgluz/asdf-bats.git                    299551f
-bottom                https://github.com/carbonteq/asdf-btm.git                   fd8a55a
-delta                 https://github.com/andweeb/asdf-delta.git                   501318b
 direnv                https://github.com/asdf-community/asdf-direnv.git           6ff3dbe
 dotenv-linter         https://github.com/wesleimp/asdf-dotenv-linter.git          1369f53
 editorconfig-checker  https://github.com/gabitchov/asdf-editorconfig-checker.git  585c1d5
-eza                   https://github.com/lwiechec/asdf-eza.git                    11f578d
 fd                    https://gitlab.com/wt0f/asdf-fd.git                         17d56e0
 github-cli            https://github.com/bartlomiejdanek/asdf-github-cli.git      e0605b7
-gitleaks              https://github.com/jmcvetta/asdf-gitleaks.git               0cc0d7e
 golang                https://github.com/asdf-community/asdf-golang.git           e2527a3
-hadolint              https://github.com/devlincashman/asdf-hadolint.git          335e230
+hadolint              https://github.com/devlincashman/asdf-hadolint.git          c8eb88b
 kubectl               https://github.com/asdf-community/asdf-kubectl.git          2fb3b57
 pre-commit            https://github.com/jonathanmorley/asdf-pre-commit.git       26bfc42
 ripgrep               https://gitlab.com/wt0f/asdf-ripgrep.git                    e836665
-ruby                  https://github.com/asdf-vm/asdf-ruby.git                    194fe45
 rust                  https://github.com/code-lever/asdf-rust.git                 95acf4f
 shellcheck            https://github.com/luizm/asdf-shellcheck.git                66200ff
 shfmt                 https://github.com/luizm/asdf-shfmt.git                     a42c5ff
-sops                  https://github.com/feniix/asdf-sops.git                     5c7a2fb
-terragrunt            https://github.com/ohmer/asdf-terragrunt.git                4a6651a
+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        bc2813e
+yamllint              https://github.com/ericcornelissen/asdf-yamllint.git        e4cfb17
 yq                    https://github.com/sudermanjr/asdf-yq.git                   772992f

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/git/config

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

config/homebrew/Brewfile

@@ -13,6 +13,7 @@ tap "jesseduffield/lazygit"
 tap "k8sgpt-ai/k8sgpt"
 tap "keith/formulae"
 tap "mongodb/brew"
+tap "nikitabobko/tap"
 tap "reviewdog/tap"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
@@ -21,6 +22,20 @@ 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"
+# 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
@@ -31,6 +46,8 @@ brew "highway"
 brew "imath"
 # JPEG image codec that aids compression and decompression
 brew "jpeg-turbo"
+# Library for manipulating PNG images
+brew "libpng"
 # Zstandard is a real-time compression algorithm
 brew "zstd"
 # New file format for still image compression
@@ -39,32 +56,38 @@ 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
 brew "argon2"
-# Spell checker with better logic than ispell
-brew "aspell"
 # Automatic configure script builder
 brew "autoconf"
-# Collection of over 500 reusable autoconf macros
-brew "autoconf-archive"
-# Cryptographic recipes and primitives for Python
-brew "cryptography"
-# Official Amazon AWS command-line interface
-brew "awscli"
-# Bourne-Again SHell, a UNIX command interpreter
-brew "bash"
+# Tool for generating GNU Standards-compliant Makefiles
+brew "automake"
 # GNU multiple precision arithmetic library
 brew "gmp"
 # GNU File, Shell, and Text utilities
 brew "coreutils"
+# Extendable version manager with support for Ruby, Node.js, Erlang & more
+brew "asdf"
+# Spell checker with better logic than ispell
+brew "aspell"
+# Collection of over 500 reusable autoconf macros
+brew "autoconf-archive"
+# Package compiler and linker metadata toolkit
+brew "pkgconf"
+# Automated text file generator
+brew "autogen"
+# 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"
 # 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
@@ -73,18 +96,32 @@ brew "fontconfig"
 brew "gettext"
 # Core application library for C
 brew "glib"
-# Mozilla CA bundle for Python
-brew "certifi"
+# 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
@@ -95,22 +132,40 @@ brew "libb2"
 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"
+# Open source suite of directory software
+brew "openldap"
+# Manage your GnuPG keys with ease!
+brew "gpg-tui"
 # Image manipulation
 brew "netpbm"
 # 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
@@ -121,6 +176,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
@@ -129,40 +186,76 @@ brew "json-c"
 brew "krb5"
 # Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
 brew "legitify"
+# 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"
+# C library for reading, creating, and modifying zip archives
+brew "libzip"
 # 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"
-# General-purpose scripting language
-brew "php"
+# 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@8.2"
-# Manage compile and link flags for libraries
-brew "pkg-config"
+# General-purpose scripting language
+brew "php@8.3", link: true
+# 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
@@ -171,10 +264,16 @@ 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"
-# Igbinary PHP extension
-brew "shivammathur/extensions/igbinary@8.3"
+# 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"
+# Automated code review tool integrated with any code analysis tools regardless of programming language.
+brew "reviewdog/tap/reviewdog"
 # Imagick PHP extension
 brew "shivammathur/extensions/imagick@8.3"
 # Mcrypt PHP extension
@@ -190,9 +289,15 @@ brew "shivammathur/extensions/uuid@8.3"
 # Yaml PHP extension
 brew "shivammathur/extensions/yaml@8.3"
 # General-purpose scripting language
+brew "shivammathur/php/php", link: false
+# General-purpose scripting language
 brew "shivammathur/php/php-debug"
 # Find & fix known vulnerabilities in open-source dependencies
 brew "snyk/tap/snyk"
+# Command-line interface for 1Password
+cask "1password-cli"
+# AeroSpace is an i3-like tiling window manager for macOS
+cask "aerospace"
 # Text editor
 cask "coda"
 # Universal database tool and SQL client
@@ -206,10 +311,7 @@ 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"
-cask "font-source-sans-pro"
-cask "font-source-serif-pro"
 # GIT client
 cask "fork"
 # HTTP and GraphQL Client

config/nvim/init.lua

@@ -18,7 +18,7 @@ if not vim.loop.fs_stat(lazypath) then
   if vim.v.shell_error ~= 0 then
     vim.api.nvim_echo({
       { 'Failed to clone lazy.nvim:\n', 'ErrorMsg' },
-      { out,                            'WarningMsg' },
+      { out, 'WarningMsg' },
       { '\nPress any key to exit...' },
     }, true, {})
     vim.fn.getchar()
@@ -38,7 +38,7 @@ require 'autogroups'
 
 -- ── Load plugins ────────────────────────────────────────────────────
 require('lazy').setup(
--- Automatically load plugins from lua/plugins
+  -- Automatically load plugins from lua/plugins
   'plugins',
   -- Lazy Configuration
   {

config/nvim/lua/autogroups.lua

@@ -17,9 +17,9 @@ autocmd('TextYankPost', {
 --
 -- This fixes the issue where the line numbers jump
 -- around when moving between lines relative line numbers enabled.
-autocmd({ "BufEnter", "BufWinEnter", "TabEnter" }, {
+autocmd({ 'BufEnter', 'BufWinEnter', 'TabEnter' }, {
   callback = function()
-    local max_line_count = vim.fn.line("$")
+    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
@@ -68,7 +68,16 @@ autocmd('FileType', {
 -- 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' },
+  pattern = {
+    'text',
+    'plaintex',
+    'typst',
+    'gitcommit',
+    'markdown',
+    'asciidoc',
+    'rst',
+    'tex',
+  },
   callback = function()
     vim.opt_local.wrap = true
     vim.opt_local.spell = true
@@ -87,19 +96,12 @@ autocmd({ 'FileType' }, {
 -- .dotfiles/ssh/config.d/*, .ssh/config.local, .ssh/config.work
 autocmd({ 'BufRead', 'BufNewFile' }, {
   desc = 'Set filetype for SSH config directory',
-  pattern = { '*/?.ssh/{config|shared}.d/*', '*/?.ssh/config.local', '*/?.ssh/config.work' },
+  pattern = {
+    '*/?.ssh/{config|shared}.d/*',
+    '*/?.ssh/config.local',
+    '*/?.ssh/config.work',
+  },
   command = 'set filetype=sshconfig',
 })
 
--- Format on save, unless disabled
-autocmd('BufWritePre', {
-  group = augroup('Format', { clear = true }),
-  pattern = '*', -- All files
-  callback = function()
-    if not vim.g.disable_autoformat then
-      vim.lsp.buf.format({ async = false })
-    end
-  end,
-})
-
 -- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/keymaps.lua

@@ -1,6 +1,6 @@
 -- vim: set ft=lua ts=2 sw=2 tw=0 et cc=120 :
 
-require('utils')
+require 'utils'
 
 -- ╭─────────────────────────────────────────────────────────╮
 -- │                         Keymaps                         │
@@ -20,8 +20,16 @@ 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 })
+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')
@@ -55,7 +63,7 @@ K.ld('ca', 'n', ':Lspsaga code_action<cr>', 'Code Action')
 K.ld('cci', 'n', ':Lspsaga incoming_calls<cr>', 'Incoming Calls')
 K.ld('cco', 'n', ':Lspsaga outgoing_calls<cr>', 'Outgoing Calls')
 K.ld('cd', 'n', ':Lspsaga show_line_diagnostics<cr>', 'Line Diagnostics')
-K.ld('cf', { 'n', 'x' }, ':lua vim.lsp.buf.format()<CR>', 'Format')
+-- 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', ':Lspsaga implement<cr>', 'Implementations')
 K.ld('cl', 'n', ':Lspsaga show_cursor_diagnostics<cr>', 'Cursor Diagnostics')
@@ -78,21 +86,24 @@ 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
 K.nl('f', ':Telescope find_files<cr>', 'Find Files')
 K.nl(',', ':Telescope buffers<cr>', 'Find existing buffers')
-K.nl('/', function()
-  require('telescope.builtin').current_buffer_fuzzy_find(
-    require('telescope.themes').get_dropdown {
-      winblend = 20,
-      previewer = true,
-    }
-  )
-end, 'Fuzzily search in current buffer')
+K.nl(
+  '/',
+  function()
+    require('telescope.builtin').current_buffer_fuzzy_find(
+      require('telescope.themes').get_dropdown {
+        winblend = 20,
+        previewer = true,
+      }
+    )
+  end,
+  'Fuzzily search in current buffer'
+)
 
 K.nl('sc', ':Telescope commands<cr>', 'Commands')
 K.nl('sd', ':Telescope diagnostics<cr>', 'Search Diagnostics')
@@ -101,7 +112,11 @@ 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', ':lua require("telescope").extensions.lazy_plugins.lazy_plugins()<cr>', 'Lazy Plugins')
+K.nl(
+  'sp',
+  ':lua require("telescope").extensions.lazy_plugins.lazy_plugins()<cr>',
+  'Lazy Plugins'
+)
 K.nl('sq', ':Telescope quickfix<cr>', 'Quickfix')
 K.nl('ss', ':Telescope treesitter<cr>', 'Treesitter')
 K.nl('st', ':TodoTelescope<cr>', 'Search Todos')
@@ -127,14 +142,14 @@ K.nl('tn', ':Noice dismiss<cr>', 'Noice: Dismiss Notification')
 -- 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!')
+  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!')
+  if vim.fn.confirm('Force quit without saving?', '&Yes\n&No', 2) == 1 then
+    vim.cmd 'q!'
   end
 end, 'Force quit without saving')
 

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

@@ -25,22 +25,29 @@ M.version = '0.1.0' -- x-release-please-version
 ---@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
+  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 number|"info"|"warn"|"error"|"trace" Notification level
+---@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"
+  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, level)
+  vim.notify(M.name .. ': ' .. msg, log_level)
 end
 
 ---@class NvmDefaultOptions
@@ -52,59 +59,63 @@ end
 ---@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",
+  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 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))
+  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
+  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)
+    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)
+      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)
+      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)
+      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")
+      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
+      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")
+    n('Unable to determine the Node.js version from nvm.', 'error')
   end
 end
 

config/nvim/lua/options.lua

@@ -5,50 +5,41 @@
 --     `:help vim.g`
 -- For more options, you can see `:help option-list`
 
-local g = vim.g     -- A table to store global variables
-local o = vim.opt   -- A table to store global options
-
-vim.loader.enable() -- Enable the plugin loader
+local g = vim.g -- A table to store global variables
+local o = vim.opt -- A table to store global options
 
 -- vim.global
-g.mapleader = ' '                          -- Space as the leader key
-g.maplocalleader = ' '                     -- Space as the local leader key
+g.mapleader = ' ' -- Space as the leader key
+g.maplocalleader = ' ' -- Space as the local leader key
 
-g.colors_theme = 'tokyonight'              -- Set the colorscheme
-g.colors_variant_light = 'tokyonight-day'  -- Set the light variant
+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
 
-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.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
 
 -- vim.options
-o.breakindent = true               -- Enable break indent
-o.completeopt = 'menuone,noselect' -- Popup menu when typing
-o.cursorline = true                -- Show which line your cursor is on
-o.inccommand = 'split'             -- Preview substitutions live, as you type!
-o.mouse = 'a'                      -- Enable mouse support
-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 = 15                   -- Show context around cursor
-o.showmode = false                 -- Don't show mode
-o.signcolumn = 'yes:3'             -- Keep signcolumn on by default
-o.smartindent = true               -- Insert indents automatically
-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             -- Fixes Notify opacity issues
-o.timeoutlen = 250                 -- Decrease mapped sequence wait time
-o.undofile = true                  -- Save undo history
-o.updatetime = 250                 -- 250 ms = 2,5 seconds
-o.ignorecase = true                -- Ignore case in search patterns
-o.smartcase = true                 -- Override 'ignorecase' if pattern contains upper case chars
-
--- List options
-o.list = true -- Show some invisible characters
-o.listchars = { tab = '» ', trail = '·', nbsp = '␣' } -- Which invisible chars to show
+-- Most of the good defaults are provided by `mini.basics`
+-- See: lua/plugins/mini.lua
+o.ignorecase = true -- Ignore case in search patterns
+o.inccommand = 'split' -- Preview substitutions live, as you type!
+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 = 15 -- Show context around cursor
+o.signcolumn = 'yes:3' -- 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
+o.sessionoptions =
+  'blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions'
 
 -- Enable the colorcolumn
 vim.api.nvim_set_option_value('colorcolumn', '+1', { scope = 'global' })

config/nvim/lua/plugins/blink.lua

@@ -12,7 +12,6 @@ return {
         'saghen/blink.compat',
         version = '*',
         -- lazy.nvim will automatically load the plugin when it's required by blink.cmp
-        lazy = true,
         opts = {
           -- make sure to set opts so that lazy.nvim calls blink.compat's setup
           impersonate_nvim_cmp = true,
@@ -26,7 +25,7 @@ return {
       -- Lua plugin to turn github copilot into a cmp source
       -- https://github.com/giuxtaposition/blink-cmp-copilot
       {
-        "giuxtaposition/blink-cmp-copilot",
+        'giuxtaposition/blink-cmp-copilot',
         dependencies = {
           -- Fully featured & enhanced replacement for copilot.vim complete
           -- with API for interacting with Github Copilot
@@ -76,13 +75,13 @@ return {
         menu = {
           draw = {
             columns = {
-              { "label",     "label_description", gap = 1 },
-              { "kind_icon", "kind",              gap = 1 }
+              { 'label', 'label_description', gap = 1 },
+              { 'kind_icon', 'kind', gap = 1 },
             },
           },
         },
         documentation = {
-          auto_show = true
+          auto_show = true,
         },
         ghost_text = {
           enabled = false,
@@ -92,19 +91,17 @@ return {
       -- default list of enabled providers defined so that you can extend it
       -- elsewhere in your config, without redefining it, via `opts_extend`
       sources = {
+        default = {
+          'lsp',
+          'copilot',
+          'path',
+          'snippets',
+          'buffer',
+        },
         providers = {
           copilot = {
             name = 'copilot',
-            module = 'blink-cmp-copilot'
-          },
-        },
-        completion = {
-          enabled_providers = {
-            'lsp',
-            'copilot',
-            'path',
-            'snippets',
-            'buffer',
+            module = 'blink-cmp-copilot',
           },
         },
       },
@@ -113,10 +110,10 @@ return {
       -- completion = { accept = { auto_brackets = { enabled = true } } }
 
       -- experimental signature help support
-      signature = { enabled = true }
+      signature = { enabled = true },
     },
     -- allows extending the enabled_providers array elsewhere in your config
     -- without having to redefine it
-    opts_extend = { "sources.completion.enabled_providers" },
+    opts_extend = { 'sources.completion.enabled_providers' },
   },
 }

config/nvim/lua/plugins/code.lua

@@ -0,0 +1,87 @@
+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' },
+  },
+
+  -- 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 = '=.+',
+        },
+      },
+    },
+  },
+
+  -- 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
+  },
+}

config/nvim/lua/plugins/folke.lua

@@ -2,7 +2,7 @@ return {
   -- A collection of small QoL plugins for Neovim
   -- https://github.com/folke/snacks.nvim
   {
-    "folke/snacks.nvim",
+    'folke/snacks.nvim',
     priority = 1000,
     lazy = false,
     ---@type snacks.Config
@@ -17,24 +17,24 @@ return {
       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)
+        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
+          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" },
+          patterns = { 'GitSign', 'MiniDiffSign' },
         },
         refresh = 50, -- refresh at most every 50ms
       },
       words = { enabled = true },
       styles = {
         notification = {
-          wo = { wrap = true } -- Wrap notifications
-        }
-      }
+          wo = { wrap = true }, -- Wrap notifications
+        },
+      },
     },
   },
   -- A pretty diagnostics, references, telescope results,

config/nvim/lua/plugins/lsp.lua

@@ -1,4 +1,129 @@
+-- ╭─────────────────────────────────────────────────────────╮
+-- │               LSP Setup and configuration               │
+-- ╰─────────────────────────────────────────────────────────╯
+
+-- 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 = {},
+  jsonls = {},
+  lua_ls = {
+    settings = {
+      Lua = {
+        completion = {
+          callSnippet = 'Replace',
+        },
+        diagnostics = {
+          globals = {
+            'vim',
+            -- busted
+            'describe',
+            'it',
+            'before_each',
+            'after_each',
+            'assert',
+          },
+          disable = {
+            -- Ignore lua_ls noisy `missing-fields` warnings
+            'missing-fields',
+          },
+        },
+        hint = {
+          enable = false,
+          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,
+          },
+        },
+      },
+    },
+  },
+}
+
 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' } },
+      },
+    },
+  },
+
+  -- Meta type definitions for the Lua platform Luvit.
+  -- https://github.com/Bilal2453/luvit-meta
+  { 'Bilal2453/luvit-meta', lazy = true },
+
   -- improve neovim lsp experience
   -- https://github.com/nvimdev/lspsaga.nvim
   -- https://nvimdev.github.io/lspsaga/
@@ -9,7 +134,6 @@ return {
       'nvim-treesitter/nvim-treesitter',
       'nvim-tree/nvim-web-devicons',
     },
-    ---@type LspsagaConfig
     opts = {
       code_action = {
         show_server_name = true,
@@ -24,21 +148,73 @@ return {
       },
     },
   },
+
   -- A simple wrapper for nvim-lspconfig and mason-lspconfig
   -- to easily setup LSP servers.
   -- https://github.com/junnplus/lsp-setup.nvim
   {
     'junnplus/lsp-setup.nvim',
     dependencies = {
+      -- 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'
+        run = ':MasonUpdate',
+        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' },
-      { 'folke/neodev.nvim' },
+
+      -- 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 = {
+            'actionlint',
+            'editorconfig-checker',
+            'goimports',
+            'gotests',
+            'phpcbf',
+            'pint',
+            'prettierd',
+            'shellcheck',
+            'shfmt',
+            'staticcheck',
+            'stylua',
+            'vint',
+            'yamlfmt',
+          },
+        },
+      },
+
+      -- JSON schemas for Neovim
+      -- https://github.com/b0o/SchemaStore.nvim
       { 'b0o/schemastore.nvim' },
+
+      -- Performant, batteries-included completion plugin for Neovim
+      -- https://github.com/saghen/blink.cmp
+      -- See lua/plugins/blink.lua for configs
       { 'saghen/blink.cmp' },
     },
     opts = {
@@ -51,126 +227,45 @@ return {
       inlay_hints = {
         enabled = true,
       },
-      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 = {},
-        jsonls = {},
-        lua_ls = {
-          settings = {
-            Lua = {
-              diagnostics = {
-                globals = { 'vim' },
-                disable = {
-                  -- Ignore lua_ls noisy `missing-fields` warnings
-                  'missing-fields',
-                },
-              },
-              hint = {
-                enable = false,
-                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,
-                },
-              },
-            },
-          },
-        },
-      },
+      servers = lsp_servers,
     },
     config = function(_, opts)
-      require('neodev').setup()
+      require('lazydev').setup()
       require('lsp-setup').setup(opts)
-      local lspconfig = require('lspconfig')
+      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 = require('blink.cmp').get_lsp_capabilities(config.capabilities)
+        config.capabilities =
+          require('blink.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
+          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
-            }
-          }
-        })
+        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 = {
@@ -191,4 +286,53 @@ return {
       }
     end,
   },
+
+  -- Lightweight yet powerful formatter plugin for Neovim
+  -- https://github.com/stevearc/conform.nvim
+  {
+    'stevearc/conform.nvim',
+    event = { 'BufWritePre' },
+    cmd = { 'ConformInfo' },
+    keys = {
+      {
+        '<leader>cf',
+        function()
+          require('conform').format { async = true, lsp_format = 'fallback' }
+        end,
+        mode = '',
+        desc = 'Format buffer',
+      },
+    },
+    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
+        return {
+          timeout_ms = 500,
+          lsp_format = lsp_format_opt,
+        }
+      end,
+      formatters_by_ft = {
+        lua = { 'stylua' },
+        -- 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 },
+      },
+    },
+  },
+  -- 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/mini.lua

@@ -1,28 +1,41 @@
--- https://github.com/echasnovski/mini.nvim
--- https://github.com/echasnovski/mini.nvim/tree/main?tab=readme-ov-file#modules
 return {
-  -- Presets for common options and mappings
-  { 'echasnovski/mini.basics',    version = '*' },
-
-  -- Extend and create a/i textobjects
-  { 'echasnovski/mini.ai',        version = '*' },
-
-  -- Animate common Neovim actions
-  -- Replaced anuvyklack/windows.nvim
-  { 'echasnovski/mini.animate',   version = '*', opts = {} },
-
-  -- Buffer removing (unshow, delete, wipeout), which saves window layout
-  -- Replaced famiu/bufdelete.nvim
-  { 'echasnovski/mini.bufremove', version = '*', opts = {} },
-
-  -- Show next key clues
-  -- Replaced folke/which-key.nvim
+  -- 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.clue',
+    'echasnovski/mini.nvim',
     version = '*',
+    priority = 1001,
     config = function()
-      local miniclue = require 'mini.clue'
+      -- 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 = {
@@ -69,144 +82,125 @@ return {
           miniclue.gen_clues.registers(),
           miniclue.gen_clues.windows(),
           miniclue.gen_clues.z(),
-          { mode = 'n', keys = '<Leader>b',  desc = '+Buffers' },
-          { mode = 'n', keys = '<Leader>c',  desc = '+Code' },
+          { 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>x',  desc = '+Trouble' },
-          { mode = 'n', keys = '<leader>z',  desc = '+TreeSitter' },
+          { 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' },
+          { mode = 'n', keys = '<Leader>?', desc = '+Help' },
+          { mode = 'n', keys = 'd', desc = '+Diagnostics' },
+          { mode = 'n', keys = 'y', desc = '+Yank' },
         },
       }
-    end,
-  },
 
-  -- Comment lines
-  -- Replaced numToStr/Comment.nvim
-  { 'echasnovski/mini.comment',    version = '*', opts = {} },
+      -- Comment lines
+      -- Replaced numToStr/Comment.nvim
+      require('mini.comment').setup()
 
-  -- Highlight cursor word and its matches
-  { 'echasnovski/mini.cursorword', version = '*' },
+      -- Highlight cursor word and its matches
+      require('mini.cursorword').setup()
 
-  -- Work with diff hunks
-  -- Replaced lewis6991/gitsigns.nvim
-  { 'echasnovski/mini.diff',       version = '*', opts = {} },
+      -- Work with diff hunks
+      -- Replaced lewis6991/gitsigns.nvim
+      require('mini.diff').setup()
 
-  -- Git integration
-  { 'echasnovski/mini-git',        version = '*', opts = {}, main = 'mini.git' },
+      -- Git integration
+      require('mini.git').setup()
 
-  -- Highlight patterns in text
-  -- Replaced folke/todo-comments.nvim
-  {
-    'echasnovski/mini.hipatterns',
-    version = '*',
-    opts = {
-      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]()NOTE:?%s*()%f[%W]',
-          group = 'MiniHipatternsTodo',
-        },
-        note = {
-          pattern = '%f[%w]()NOTE()%f[%W]',
-          group = 'MiniHipatternsNote',
-        },
-        bug = {
-          pattern = '%f[%w]()BUG:?%s*()%f[%W]',
-          group = 'MiniHipatternsBug',
-        },
-        perf = {
-          pattern = '%f[%w]()PERF:?%s*()%f[%W]',
-          group = 'MiniHipatternsPerf',
-        },
-      },
-    },
-    config = function(opts)
+      -- Highlight patterns in text
+      -- Replaced folke/todo-comments.nvim
       local hp = require 'mini.hipatterns'
       hp.setup {
-        highlighters = opts.highlighters,
+        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(),
       }
-    end,
-  },
 
-  -- Icons
-  {
-    'echasnovski/mini.icons',
-    opts = {
-      file = {
-        ['.keep'] = { glyph = '󰊢', hl = 'MiniIconsGrey' },
-        ['devcontainer.json'] = { glyph = '', hl = 'MiniIconsAzure' },
-      },
-      filetype = {
-        dotenv = { glyph = '', hl = 'MiniIconsYellow' },
-      },
-    },
-  },
+      -- 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
-  { 'echasnovski/mini.indentscope', version = '*', opts = {} },
+      -- Visualize and work with indent scope
+      -- Replaced lukas-reineke/indent-blankline.nvim
+      require('mini.indentscope').setup()
 
-  -- Jump to next/previous single character
-  {
-    'echasnovski/mini.jump',
-    version = '*',
-    opts = {
-      mappings = {
-        forward = 'f',
-        backward = 'F',
-        forward_till = 't',
-        backward_till = 'T',
-        repeat_jump = ';',
-      },
-    },
-  },
+      -- Jump to next/previous single character
+      require('mini.jump').setup {
+        mappings = {
+          forward = 'f',
+          backward = 'F',
+          forward_till = 't',
+          backward_till = 'T',
+          repeat_jump = ';',
+        },
+      }
 
-  -- Move lines and blocks of text
-  { 'echasnovski/mini.move',        version = '*', opts = {} },
+      -- Move lines and blocks of text
+      require('mini.move').setup()
 
-  -- Text edit operators
-  { 'echasnovski/mini.operators',   version = '*', opts = {} },
+      -- 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)
-  {
-    'echasnovski/mini.sessions',
-    version = '*',
-    opts = {
-      autoread = true,
-      autowrite = true,
-    }
-  },
+      -- 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
-  { 'echasnovski/mini.splitjoin',  version = '*', opts = {} },
+      -- Split and join arguments, lists, and other sequences
+      -- Replaced Wansmer/treesj
+      require('mini.splitjoin').setup()
 
-  -- Fast and flexible start screen
-  -- Replaced glepnir/dashboard-nvim
-  {
-    'echasnovski/mini.starter',
-    version = '*',
-    config = function()
-      local starter = require('mini.starter')
-      starter.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(),
@@ -217,44 +211,44 @@ return {
           starter.gen_hook.indexing('all', { 'Builtin actions' }),
           starter.gen_hook.aligning('center', 'center'),
         },
-      })
-    end
+      }
+
+      -- 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 = 75 }
+            local diagnostics = sl.section_diagnostics { trunc_width = 75 }
+            local filename = sl.section_filename { trunc_width = 999 }
+            -- local fileinfo = statusline.section_fileinfo({ trunc_width = 120 })
+            local location = sl.section_location { trunc_width = 75 }
+            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,
   },
-
-  -- Minimal and fast statusline module with opinionated default look
-  -- Replaced nvim-lualine/lualine.nvim
-  {
-    'echasnovski/mini.statusline',
-    version = '*',
-    opts = {
-      use_icons = true,
-      set_vim_settings = true,
-      content = {
-        active = function()
-          local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 })
-          local git = MiniStatusline.section_git({ trunc_width = 75 })
-          local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 })
-          local filename = MiniStatusline.section_filename({ trunc_width = 50 })
-          -- local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 })
-          local location = MiniStatusline.section_location({ trunc_width = 75 })
-          return MiniStatusline.combine_groups({
-            { hl = mode_hl,                 strings = { mode } },
-            { hl = 'MiniStatuslineDevinfo', strings = { git, diagnostics } },
-            '%<', -- Mark general truncate point
-            { hl = 'MiniStatuslineFilename', strings = { filename } },
-            '%=', -- End left alignment
-            -- { hl = 'MiniStatuslineFileinfo', strings = { fileinfo } },
-            { hl = mode_hl,                  strings = { location } },
-          })
-        end,
-      },
-    }
-  },
-
-  -- Fast and feature-rich surround actions
-  -- Replaced kylechui/nvim-surround
-  { 'echasnovski/mini.surround',   version = '*', opts = {} },
-
-  -- Work with trailing whitespace
-  { 'echasnovski/mini.trailspace', version = '*', opts = {} },
 }

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,6 +31,24 @@ return {
   cmd = 'Neotree',
   opts = {
     close_if_last_window = true,
+    popup_border_style = 'rounded',
+    enable_git_status = true,
+    enable_diagnostics = true,
+    git_status = {
+      symbols = {
+        -- Change type
+        added = '',
+        modified = '',
+        deleted = '✖',
+        renamed = '󰁕',
+        -- Status type
+        untracked = '',
+        ignored = '',
+        unstaged = '󰄱',
+        staged = '',
+        conflict = '',
+      },
+    },
     filesystem = {
       window = {
         mappings = {
@@ -42,8 +60,10 @@ return {
         hide_dotfiles = true,
         hide_gitignored = true,
         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 = {
@@ -85,6 +105,7 @@ return {
           '.*rc.*',
           '.env*',
           '.prettierrc*',
+          '.markdownlint*',
           '.stylua.*',
         },
       },

config/nvim/lua/plugins/other.lua

@@ -0,0 +1,24 @@
+return {
+  {
+    'rmagatti/auto-session',
+    lazy = false,
+    version = '*',
+    ---@module "auto-session"
+    ---@type AutoSession.Config
+    opts = {
+      suppressed_dirs = {
+        '/',
+        '~/',
+        '~/Downloads',
+        '~/Library',
+      },
+      -- log_level = 'debug',
+    },
+  },
+
+  {
+    'nvim-lua/plenary.nvim',
+    version = '*',
+    lazy = false,
+  },
+}

config/nvim/lua/plugins/treesitter.lua

@@ -14,7 +14,7 @@ return {
   },
   ---@type TSConfig
   opts = {
-    auto_install = true,  -- Auto install the parser generators
+    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
@@ -49,18 +49,18 @@ return {
   config = function(_, opts)
     require('nvim-treesitter.configs').setup(opts)
 
-    vim.api.nvim_create_autocmd({ "FileType" }, {
+    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()"
+        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"
+          vim.opt.foldmethod = 'syntax'
         end
 
-        vim.opt.foldlevel = 9    -- Open all folds by default
+        vim.opt.foldlevel = 9 -- Open all folds by default
         vim.opt.foldnestmax = 99 -- Maximum fold nesting
       end,
     })

config/nvim/lua/plugins/ui.lua

@@ -33,77 +33,13 @@ return {
 
   -- Remove all background colors to make nvim transparent
   -- https://github.com/xiyaowong/nvim-transparent
-  { 'xiyaowong/nvim-transparent',     opts = {} },
+  { 'xiyaowong/nvim-transparent', opts = {} },
 
   -- Display a character as the colorcolumn
   -- https://github.com/lukas-reineke/virt-column.nvim
   { 'lukas-reineke/virt-column.nvim', opts = {} },
 
-  -- 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 = '=.+',
-        },
-      },
-    },
-  },
-
   -- 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',
-    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 = {},
-  },
 }

config/nvim/lua/utils.lua

@@ -16,11 +16,11 @@ K = {}
 ---@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
+  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
+  elseif type(desc) == 'table' then
     -- If desc doesn't have 'desc' key, combine it with
     -- others with empty description
     if not desc.desc then
@@ -79,6 +79,4 @@ end
 -- ╰─────────────────────────────────────────────────────────╯
 
 -- Toggle background between light and dark
-function ToggleBackground()
-  vim.o.bg = vim.o.bg == "light" and "dark" or "light"
-end
+function ToggleBackground() vim.o.bg = vim.o.bg == 'light' and 'dark' or 'light' end

install.conf.yaml

@@ -35,10 +35,14 @@
       glob: true
       relink: true
       path: config/*
-      exclude: [config/nvm]
+      exclude: [config/nvm, config/fzf]
     ~/.local/bin:
       glob: true
       path: local/bin/*
+      exclude: [local/bin/fzf]
+    ~/.local/fzf:
+      glob: true
+      path: config/fzf/*
     ~/.local/man:
       glob: true
       path: local/man/**
@@ -55,5 +59,5 @@
     - bash local/bin/dfm install all
 - pipx:
     file: tools/requirements-pipx.txt
-    stdout: false
+    stdout: true
     stderr: true

local/bin/a

@@ -0,0 +1,184 @@
+#!/usr/bin/env bash
+# A script for encrypting and decrypting files or directories with age and SSH keys
+
+VERSION="1.0.0"
+
+# Default ENV values
+KEYS_FILE="${AGE_KEYSFILE:-$HOME/.ssh/keys.txt}"
+KEYS_SOURCE="${AGE_KEYSSOURCE:-https://github.com/ivuorinen.keys}"
+LOG_FILE="${AGE_LOGFILE:-$HOME/.cache/a.log}"
+
+VERBOSE=false
+
+# Parse flags for verbosity
+for arg in "$@"; do
+  if [[ "$arg" == "-v" || "$arg" == "--verbose" ]]; then
+    VERBOSE=true
+    break
+  fi
+done
+
+# Ensure log directory and file exist with correct permissions
+prepare_log_file() {
+  local log_dir
+  log_dir=$(dirname "$LOG_FILE")
+
+  # Create log directory if it does not exist
+  if [[ ! -d "$log_dir" ]]; then
+    mkdir -p "$log_dir"
+  fi
+
+  # Create log file if it does not exist
+  if [[ ! -f "$LOG_FILE" ]]; then
+    touch "$LOG_FILE"
+  fi
+
+  # Set permissions to 0600
+  chmod 0600 "$LOG_FILE"
+}
+
+prepare_log_file
+
+# Logging function
+log_message() {
+  local message="$1"
+  echo "$(date +'%Y-%m-%d %H:%M:%S') - $message" >> "$LOG_FILE"
+
+  # Print to user if verbose flag is set
+  if [[ "$VERBOSE" == true ]]; then
+    echo "$message"
+  fi
+}
+
+# Function to print usage
+print_help() {
+  cat <<EOF
+Usage: a [command] [file_or_directory] [options]
+
+Commands:
+  e, enc, encrypt      Encrypt the specified file or directory
+  d, dec, decrypt      Decrypt the specified file or directory
+  help, --help         Show this help message
+  version, --version   Show version information
+
+Options:
+  -v, --verbose        Print log messages to console in addition to writing to log file
+
+Environment Variables:
+  AGE_KEYSFILE         Path to the SSH keys file (default: $HOME/.ssh/keys.txt)
+  AGE_KEYSSOURCE       URL to fetch SSH keys if keys file does not exist
+  AGE_LOGFILE          Path to the log file (default: $HOME/.cache/a.log)
+
+Examples:
+  Encrypt a file:
+    a e file.txt
+
+  Encrypt a directory:
+    a e /path/to/directory
+
+  Decrypt a file:
+    a d file.txt.age
+
+  Specify a custom keys file:
+    AGE_KEYSFILE=/path/to/keys.txt a e file.txt
+
+  Specify a custom keys source and log file:
+    AGE_KEYSSOURCE=https://example.com/keys.txt AGE_LOGFILE=/tmp/a.log a d file.txt.age
+EOF
+}
+
+# Function to print version
+print_version() {
+  echo "a version $VERSION"
+  echo "Created by Ismo Vuorinen <https://github.com/ivuorinen>"
+}
+
+# Function to fetch keys if missing
+fetch_keys_if_missing() {
+  if [[ ! -f "$KEYS_FILE" ]]; then
+    log_message "Keys file '$KEYS_FILE' not found. Attempting to fetch from $KEYS_SOURCE..."
+    mkdir -p "$(dirname "$KEYS_FILE")"
+    curl -s "$KEYS_SOURCE" -o "$KEYS_FILE"
+
+    if [[ $? -ne 0 || ! -s "$KEYS_FILE" ]]; then
+      log_message "Error: Failed to fetch keys from $KEYS_SOURCE"
+      exit 1
+    fi
+
+    chmod 0400 "$KEYS_FILE"
+    log_message "Keys file fetched and permissions set to 0400."
+  fi
+}
+
+# Function to encrypt files or directories
+encrypt_file_or_directory() {
+  local file="$1"
+  if [[ -d "$file" ]]; then
+    for f in "$file"/*; do
+      encrypt_file_or_directory "$f"
+    done
+  elif [[ -f "$file" ]]; then
+    fetch_keys_if_missing
+    local output_file="${file}.age"
+    age -R "$KEYS_FILE" "$file" >"$output_file"
+    if [[ $? -eq 0 ]]; then
+      log_message "File encrypted successfully: $output_file"
+    else
+      log_message "Error: Failed to encrypt file '$file'."
+      exit 1
+    fi
+  fi
+}
+
+# Function to decrypt files or directories
+decrypt_file_or_directory() {
+  local file="$1"
+  if [[ -d "$file" ]]; then
+    for f in "$file"/*.age; do
+      decrypt_file_or_directory "$f"
+    done
+  elif [[ -f "$file" ]]; then
+    fetch_keys_if_missing
+    local output_file="${file%.age}"
+    age -d -i "$KEYS_FILE" "$file" >"$output_file"
+    if [[ $? -eq 0 ]]; then
+      log_message "File decrypted successfully: $output_file"
+    else
+      log_message "Error: Failed to decrypt file '$file'."
+      exit 1
+    fi
+  fi
+}
+
+# Main logic
+case "$1" in
+  e|enc|encrypt)
+    if [[ $# -lt 2 ]]; then
+      log_message "Error: No file or directory specified for encryption."
+      print_help
+      exit 1
+    fi
+    encrypt_file_or_directory "$2"
+    ;;
+  d|dec|decrypt)
+    if [[ $# -lt 2 ]]; then
+      log_message "Error: No file or directory specified for decryption."
+      print_help
+      exit 1
+    fi
+    decrypt_file_or_directory "$2"
+    ;;
+  help|--help)
+    print_help
+    ;;
+  version|--version)
+    print_version
+    ;;
+  *)
+    log_message "Error: Unknown command '$1'"
+    print_help
+    exit 1
+    ;;
+esac
+
+# vim: ft=bash:syn=sh:ts=2:sw=2:et:ai:nowrap

local/bin/ad

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+# age decrypt file with github keys
+
+# Use ENV or default values for keys file and source
+KEYS_FILE="${AGE_KEYSFILE:-$HOME/.ssh/keys.txt}"
+KEYS_SOURCE="${AGE_KEYSSOURCE:-https://github.com/ivuorinen.keys}"
+
+# Check for required commands
+if ! command -v age &>/dev/null; then
+  echo "Error: age is not installed. Please install it to continue."
+  exit 1
+fi
+
+if ! command -v curl &>/dev/null; then
+  echo "Error: curl is not installed. Please install it to continue."
+  exit 1
+fi
+
+# Ensure a file is provided
+if [[ $# -lt 1 ]]; then
+  echo "Usage: $0 <file-to-decrypt>"
+  exit 1
+fi
+
+FILE="$1"
+if [[ ! -f "$FILE" ]]; then
+  echo "Error: File '$FILE' does not exist."
+  exit 1
+fi
+
+
+# Check if keys file exists, otherwise fetch it
+if [[ ! -f "$KEYS_FILE" ]]; then
+  echo "Keys file '$KEYS_FILE' not found. Attempting to fetch from $KEYS_SOURCE..."
+
+  # Create the directory if it doesn't exist
+  mkdir -p "$(dirname "$KEYS_FILE")"
+
+  # Fetch the keys and save to the file
+  curl -s "$KEYS_SOURCE" -o "$KEYS_FILE"
+
+  if [[ $? -ne 0 || ! -s "$KEYS_FILE" ]]; then
+    echo "Error: Failed to fetch keys from $KEYS_SOURCE"
+    exit 1
+  fi
+
+  # Set permissions to 0400
+  chmod 0400 "$KEYS_FILE"
+  echo "Keys file fetched and permissions set to 0400."
+fi
+
+# Decrypt the file
+OUTPUT_FILE="${FILE%.age}"
+age -d -i "$KEYS_FILE" "$FILE" >"$OUTPUT_FILE"
+
+if [[ $? -eq 0 ]]; then
+  echo "File decrypted successfully: $OUTPUT_FILE"
+else
+  echo "Error: Failed to decrypt file."
+  exit 1
+fi
+

local/bin/ae

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# age encrypt file with github keys
+
+# Use ENV or default values for keys file and source
+KEYS_FILE="${AGE_KEYSFILE:-$HOME/.ssh/keys.txt}"
+KEYS_SOURCE="${AGE_KEYSSOURCE:-https://github.com/ivuorinen.keys}"
+
+# Check for required commands
+if ! command -v age &>/dev/null; then
+  echo "Error: age is not installed. Please install it to continue."
+  exit 1
+fi
+
+if ! command -v curl &>/dev/null; then
+  echo "Error: curl is not installed. Please install it to continue."
+  exit 1
+fi
+
+# Ensure a file is provided
+if [[ $# -lt 1 ]]; then
+  echo "Usage: $0 <file-to-encrypt>"
+  exit 1
+fi
+
+FILE="$1"
+if [[ ! -f "$FILE" ]]; then
+  echo "Error: File '$FILE' does not exist."
+  exit 1
+fi
+
+# Check if keys file exists, otherwise fetch it
+if [[ ! -f "$KEYS_FILE" ]]; then
+  echo "Keys file '$KEYS_FILE' not found. Attempting to fetch from $KEYS_SOURCE..."
+
+  # Create the directory if it doesn't exist
+  mkdir -p "$(dirname "$KEYS_FILE")"
+
+  # Fetch the keys and save to the file
+  curl -s "$KEYS_SOURCE" -o "$KEYS_FILE"
+
+  if [[ $? -ne 0 || ! -s "$KEYS_FILE" ]]; then
+    echo "Error: Failed to fetch keys from $KEYS_SOURCE"
+    exit 1
+  fi
+
+  # Set permissions to 0400
+  chmod 0400 "$KEYS_FILE"
+  echo "Keys file fetched and permissions set to 0400."
+fi
+
+# Encrypt the file
+OUTPUT_FILE="${FILE}.age"
+age -R "$KEYS_FILE" "$FILE" >"$OUTPUT_FILE"
+
+if [[ $? -eq 0 ]]; then
+  echo "File encrypted successfully: $OUTPUT_FILE"
+else
+  echo "Error: Failed to encrypt file."
+  exit 1
+fi

local/bin/dfm

@@ -29,7 +29,9 @@ if ! declare -f msg_err > /dev/null; then
   # $1 - error message (string)
   msg_err()
   {
+    # shellcheck disable=SC2317
     echo "(!) ERROR: $1" >&2
+    # shellcheck disable=SC2317
     exit 1
   }
 fi
@@ -39,7 +41,9 @@ if ! declare -f msg_done > /dev/null; then
   # $1 - message (string)
   msg_done()
   {
+    # shellcheck disable=SC2317
     echo "✓ $1"
+    # shellcheck disable=SC2317
     return 0
   }
 fi
@@ -54,15 +58,15 @@ if ! declare -f array_diff > /dev/null; then
   # 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
 
-VERSION_NVM="v0.39.5"
-
 # Loads configs for better installation experience
 source "$DOTFILES/config/shared.sh"
 
@@ -148,13 +152,13 @@ section_install()
       $0 install macos
       $0 install fonts
       $0 brew install
-      $0 install ohmyposh
+      #$0 install ohmyposh
       $0 install asdf
       $0 install composer
       $0 install fzf
-      $0 install go
+      #$0 install go
       $0 install cheat-databases
-      $0 install imagick
+      #$0 install imagick
       $0 install nvm
       $0 install npm
       # $0 install ntfy
@@ -165,7 +169,7 @@ section_install()
       ;;
     asdf)
       msg "Installing asdf..."
-      bash "$DOTFILES/scripts/install-asdf.sh both" \
+      $0 asdf plugins-add \
         && msg_yay "asdf installed!"
       ;;
     cargo)
@@ -328,7 +332,8 @@ section_brew()
 
         declare -a BREW_LIST_TRACKED_WITHOUT_DEPS
         for f in "${BREW_LIST_ALL[@]}"; do
-          if [[ ! " ${BREW_LIST_DEPENDENCIES[@]} " =~ " ${f} " ]]; then
+          # shellcheck disable=SC2199
+          if [[ " ${BREW_LIST_DEPENDENCIES[@]} " != *" ${f} "* ]]; then
             BREW_LIST_TRACKED_WITHOUT_DEPS+=("$f")
           fi
         done
@@ -366,21 +371,111 @@ section_asdf()
 {
   USAGE_PREFIX="$SCRIPT asdf <command>"
   MENU=(
-    "install:Install asdf"
     "current:Show asdf current versions"
     "global:Show asdf global versions"
     "installed:Show asdf installed versions"
     "local:Show asdf local versions"
+    "plugins-add:Add and update direnv and asdf-plugin-manager, and all other plugins"
+    "plugins-update:Update all asdf plugins"
+    "reset:Reset asdf plugins"
     "versions:Show asdf versions"
     "where:Show asdf where"
     "which:Show asdf which"
   )
 
   case "$1" in
-    install)
-      msg "Installing asdf..."
-      bash "$DOTFILES/scripts/install-asdf.sh both" \
-        && msg_yay "asdf installed!"
+    plugins-update)
+      APM_BIN="$(asdf where asdf-plugin-manager)/bin/asdf-plugin-manager"
+
+      msgr run "Updating all asdf plugins"
+      $APM_BIN update-all
+      $APM_BIN export > "$ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME"
+      msgr run_done "Updated all plugins"
+      ;;
+    plugins-add)
+      X_GH_BIN="$DOTFILES/local/bin/x-gh-get-latest-version"
+      LATEST_APM="$($X_GH_BIN asdf-community/asdf-plugin-manager | sed 's/^v//')"
+      LATEST_DIRENV="$($X_GH_BIN asdf-community/asdf-direnv)"
+      PLUGIN_VERSIONS="$DOTFILES/config/asdf/plugin-versions"
+      APM_BIN="$HOME/.local/bin/asdf/shims/asdf-plugin-manager"
+
+      msgr run "Adding and updating direnv and asdf-plugin-manager"
+      asdf plugin add direnv https://github.com/asdf-community/asdf-direnv.git
+      asdf global direnv "$LATEST_DIRENV"
+      asdf install direnv "$LATEST_DIRENV"
+
+      asdf plugin add asdf-plugin-manager https://github.com/asdf-community/asdf-plugin-manager.git
+      asdf global asdf-plugin-manager "$LATEST_APM"
+      asdf install asdf-plugin-manager "$LATEST_APM"
+      asdf reshim
+      msgr run_done "direnv and asdf-plugin-manager added and updated"
+
+      msgr run "Reset plugin-versions file to the original using git"
+      if git ls-files --error-unmatch "$PLUGIN_VERSIONS" > /dev/null 2>&1; then
+        git checkout -- "$PLUGIN_VERSIONS"
+      fi
+      msgr run_done "Reset plugin-versions file"
+
+      msgr run "Adding all plugins with asdf-plugin-manager"
+      "$APM_BIN" add-all
+      msgr run_done "Added all plugins with asdf-plugin-manager"
+
+      msgr run "Install all plugins"
+      PLUGINS=$($APM_BIN list | awk -F ' ' '{print $1}' | sort)
+      for P in $PLUGINS; do
+        msgr run "Installing $P"
+        asdf install "$P" latest
+        asdf global "$P" latest
+      done
+
+
+      msgr run_done "Installed all plugins"
+
+      msgr run "Reshimming"
+      asdf reshim
+      msgr run_done "Reshimmed"
+      ;;
+    plugins-remove)
+      PLUGIN_VERSIONS="$DOTFILES/config/asdf/plugin-versions"
+
+      msgr run "Remove installed plugins"
+      INSTALLED_ASDF_PLUGINS=$(asdf list | grep -vE "direnv|asdf-plugin-manager" | grep -v "^ ")
+      for P in $INSTALLED_ASDF_PLUGINS; do
+        asdf plugin remove "$P"
+        msgr nested_done "Removed $P"
+      done
+
+      msgr run "Reset plugin-versions file to the original using git"
+      if git ls-files --error-unmatch "$PLUGIN_VERSIONS" > /dev/null 2>&1; then
+        git checkout -- "$PLUGIN_VERSIONS"
+      fi
+      msgr run_done "Reset plugin-versions file"
+
+      msgr run_done "Remove plugins done!"
+      ;;
+    reset)
+      APM_BIN="$(asdf where asdf-plugin-manager)/bin/asdf-plugin-manager"
+
+      msgr run "Get currently installed plugins, remove those that are not defined"
+      $0 asdf plugins-remove
+      $0 asdf plugins-add
+      $0 asdf fixtoolversions
+      asdf reshim
+      msgr yay "Reset asdf plugins done!"
+      ;;
+    fixtoolversions)
+      ASDF_TOOL_VERSIONS_FILE="$DOTFILES/base/tool-versions"
+      ASDF_TOOL_FILE_PLUGINS=$(awk '{print $1 " " $2}' "$ASDF_TOOL_VERSIONS_FILE")
+      APM_BIN="$(asdf where asdf-plugin-manager)/bin/asdf-plugin-manager"
+
+      msgr run "Loading $ASDF_TOOL_VERSIONS_FILE and collecting installed"
+      ASDF_PLUGINS_DEFINED=$($APM_BIN list | awk -F ' ' '{print $1}')
+
+      echo "$ASDF_TOOL_FILE_PLUGINS" | \
+        grep -Fxv -f <(echo "$ASDF_PLUGINS_DEFINED") > tmp && \
+        mv tmp "$ASDF_TOOL_VERSIONS_FILE"
+
+      msgr run_done "Fixed $ASDF_TOOL_VERSIONS_FILE"
       ;;
     current)
       asdf current
@@ -416,6 +511,7 @@ section_helpers()
     "env:Show environment variables"
     "functions:Show functions"
     "nvim:Show nvim keybindings"
+    # shellcheck disable=SC2016
     'path:Show $PATH dir by dir'
     "tmux:Show tmux keybindings"
     "wezterm:Show wezterm keybindings"
@@ -445,7 +541,29 @@ section_helpers()
       esac
       ;;
     "colors")
-      for i in {0..255}; do echo -en "\e[38;5;${i}m${i} "; done
+      max=255
+      start=0
+
+      while [ "$start" -le "$max" ]; do
+        for i in $(seq "$start" $((start + 9))); do
+          if [ "$i" -le "$max" ]; then
+            # Outputs colored number
+            # printf " \e[38;5;%sm%4s\e[0m" "$i" "$i"
+
+            # Outputs colored block with number inside
+            # printf " \e[48;5;%sm\e[38;5;15m%5s \e[0m" "$i" "$i"
+
+            # Outputs colored block and color number
+            # printf " \e[48;5;%sm   \e[0m %3d" "$i" "$i"
+
+            # Outputs color number and colored block
+            printf "%3d \e[48;5;%sm   \e[0m " "$i" "$i"
+          fi
+        done
+        printf "\n"
+        start=$((start + 10))
+      done
+
       ;;
     "env")
       env | sort

stylua.toml

@@ -4,7 +4,7 @@ indent_type = "Spaces"
 indent_width = 2
 quote_style = "AutoPreferSingle"
 call_parentheses = "None"
-collapse_simple_statement = "Always"
+collapse_simple_statement = "Never"
 
 [sort_requires]
 enabled = true