chore(deps): update nvim packages

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

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+ismo@ivuorinen.net.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

.github/SECURITY.md

@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+Usually only the latest daily tag is supported at all,
+because that's the current I'm using.
+
+## Reporting a Vulnerability
+
+Please send me email directly to the email in my profile.
+I'd appreciate link to the release the vulnerability was
+found in, and what is the vulnerable code/dependency.

.github/workflows/changelog.yml

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

.github/workflows/linters.yml

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

.github/workflows/new-release.yml

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

.github/workflows/update-submodules.yml

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

.gitignore

@@ -15,4 +15,9 @@ ssh/local.d/*
 .env
 local/share/fonts/*
 node_modules
+.nfs*
+*.socket
+iTermServer-*
+lock
+config/iterm2/AppSupport
 

.gitmodules

@@ -19,37 +19,36 @@
 	url = https://github.com/cheat/cheatsheets.git
 	ignore = dirty
 
-[submodule "tmux/tpm"]
-	path = config/tmux/plugins/tpm
-	url = https://github.com/tmux-plugins/tpm.git
-	ignore = dirty
-[submodule "tmux/catppuccin"]
-	path = config/tmux/plugins/tmux
-	url = https://github.com/catppuccin/tmux.git
 [submodule "tmux/tmux-continuum"]
 	path = config/tmux/plugins/tmux-continuum
 	url = https://github.com/tmux-plugins/tmux-continuum
-[submodule "tmux/tmux-menus"]
-	path = config/tmux/plugins/tmux-menus
-	url = https://github.com/jaclu/tmux-menus.git
+	ignore = dirty
 [submodule "tmux/tmux-resurrect"]
 	path = config/tmux/plugins/tmux-resurrect
 	url = https://github.com/tmux-plugins/tmux-resurrect
+	ignore = dirty
 [submodule "tmux/tmux-sensible"]
 	path = config/tmux/plugins/tmux-sensible
 	url = https://github.com/tmux-plugins/tmux-sensible.git
+	ignore = dirty
 [submodule "tmux/tmux-sessionist"]
 	path = config/tmux/plugins/tmux-sessionist
 	url = https://github.com/tmux-plugins/tmux-sessionist.git
+	ignore = dirty
 [submodule "tmux/tmux-yank"]
 	path = config/tmux/plugins/tmux-yank
 	url = https://github.com/tmux-plugins/tmux-yank.git
+	ignore = dirty
 [submodule "tmux/tmux-window-name"]
 	path = config/tmux/plugins/tmux-window-name
 	url = https://github.com/ofirgall/tmux-window-name.git
-[submodule "dotbot-snap"]
-	path = tools/dotbot-snap
-	url = https://github.com/DrDynamic/dotbot-snap.git
+	ignore = dirty
 [submodule "dotbot-pip"]
 	path = tools/dotbot-pip
 	url = https://github.com/sobolevn/dotbot-pip.git
+[submodule "tmux/tmux-suspend"]
+	path = config/tmux/plugins/tmux-suspend
+	url = https://github.com/MunifTanjim/tmux-suspend.git
+[submodule "tmux/tmux-mode-indicator"]
+	path = config/tmux/plugins/tmux-mode-indicator
+	url = https://github.com/MunifTanjim/tmux-mode-indicator.git

.prettierrc.json

@@ -0,0 +1 @@
+"@ivuorinen/prettier-config"

.python-version

@@ -1 +1 @@
-3.11
+3.12

add-submodules.sh

@@ -7,10 +7,6 @@ git submodule add --name dotbot-brew \
   -f https://github.com/wren/dotbot-brew.git tools/dotbot-brew
 git submodule add --name dotbot-include \
   -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include
-git submodule add --name dotbot-crontab \
-  -f https://github.com/codekansas/dotbot-crontab.git tools/dotbot-crontab
-git submodule add --name dotbot-snap \
-  -f https://github.com/DrDynamic/dotbot-snap.git tools/dotbot-snap
 git submodule add --name dotbot-pip \
   -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip
 
@@ -19,21 +15,31 @@ git submodule add --name cheat-community \
   -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
 
 # tmux plugin manager and plugins
-git submodule add --name tmux/tpm \
-  -f https://github.com/tmux-plugins/tpm.git config/tmux/plugins/tpm
-git submodule add --name tmux/catppuccin \
-  -f https://github.com/catppuccin/tmux.git config/tmux/plugins/tmux
 git submodule add --name tmux/tmux-continuum \
   -f https://github.com/tmux-plugins/tmux-continuum config/tmux/plugins/tmux-continuum
-git submodule add --name tmux/tmux-menus \
-  -f https://github.com/jaclu/tmux-menus.git config/tmux/plugins/tmux-menus
+git submodule add --name tmux/tmux-mode-indicator \
+  -f https://github.com/MunifTanjim/tmux-mode-indicator.git config/tmux/plugins/tmux-mode-indicator
 git submodule add --name tmux/tmux-resurrect \
   -f https://github.com/tmux-plugins/tmux-resurrect config/tmux/plugins/tmux-resurrect
 git submodule add --name tmux/tmux-sensible \
   -f https://github.com/tmux-plugins/tmux-sensible.git config/tmux/plugins/tmux-sensible
 git submodule add --name tmux/tmux-sessionist \
   -f https://github.com/tmux-plugins/tmux-sessionist.git config/tmux/plugins/tmux-sessionist
+git submodule add --name tmux/tmux-suspend \
+  -f https://github.com/MunifTanjim/tmux-suspend.git config/tmux/plugins/tmux-suspend
 git submodule add --name tmux/tmux-window-name \
   -f https://github.com/ofirgall/tmux-window-name.git config/tmux/plugins/tmux-window-name
 git submodule add --name tmux/tmux-yank \
   -f https://github.com/tmux-plugins/tmux-yank.git config/tmux/plugins/tmux-yank
+
+# Takes submodules and sets them to ignore all changes
+for MODULE in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }'); do
+  git config "submodule.${MODULE}.ignore" all
+done
+
+# remove old submodules
+[ -d "config/tmux/plugins/tpm" ] && rm -rf config/tmux/plugins/tpm
+[ -d "config/tmux/plugins/tmux" ] && rm -rf config/tmux/plugins/tmux
+[ -d "config/tmux/plugins/tmux-menus" ] && rm -rf config/tmux/plugins/tmux-menus
+[ -d "tools/dotbot-crontab" ] && rm -rf tools/dotbot-crontab
+[ -d "tools/dotbot-snap" ] && rm -rf tools/dotbot-snap

base/bashrc

@@ -3,11 +3,98 @@
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
+export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
 # shellcheck source=scripts/shared.sh
-source "$DOTFILES/scripts/shared.sh"
-path_prepend "$DOTFILES/local/bin"
+# source "$DOTFILES/scripts/shared.sh"
 
-$DOTFILES/local/bin/x-load-configs
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
 
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null
+
+# Enable the subsequent settings only in interactive sessions
+case $- in
+*i*) ;;
+*) return ;;
+esac
+
+# Path to your oh-my-bash installation.
+export OSH="$HOME/.local/share/oh-my-bash"
+
+[ -d "$OSH" ] && {
+  export OSH_THEME="powerline-multiline"
+
+  # PowerLine theme config
+  export POWERLINE_LEFT_PROMPT="cwd scm"
+  export POWERLINE_RIGHT_PROMPT="python_venv ruby in_vim battery user_info"
+
+  # Display red dots whilst waiting for completion.
+  export COMPLETION_WAITING_DOTS="true"
+
+  # Uncomment the following line if you want to disable marking untracked files
+  # under VCS as dirty. This makes repository status check for large repositories
+  # much, much faster.
+  export DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+  # To disable the uses of "sudo" by oh-my-bash, please set "false" to
+  # this variable.  The default behavior for the empty value is "true".
+  export OMB_USE_SUDO=true
+
+  # To enable/disable display of Python virtualenv and condaenv
+  export OMB_PROMPT_SHOW_PYTHON_VENV=true # enable
+  # OMB_PROMPT_SHOW_PYTHON_VENV=false # disable
+
+  # Which completions would you like to load? (completions can be found in ~/.oh-my-bash/completions/*)
+  # Custom completions may be added to ~/.oh-my-bash/custom/completions/
+  # Example format: completions=(ssh git bundler gem pip pip3)
+  # Add wisely, as too many completions slow down shell startup.
+  export completions=(
+    git
+    composer
+    ssh
+  )
+
+  # Which aliases would you like to load? (aliases can be found in ~/.oh-my-bash/aliases/*)
+  # Custom aliases may be added to ~/.oh-my-bash/custom/aliases/
+  # Example format: aliases=(vagrant composer git-avh)
+  # Add wisely, as too many aliases slow down shell startup.
+  export aliases=(
+    general
+  )
+
+  # Which plugins would you like to load? (plugins can be found in ~/.oh-my-bash/plugins/*)
+  # Custom plugins may be added to ~/.oh-my-bash/custom/plugins/
+  # Example format: plugins=(rails git textmate ruby lighthouse)
+  # Add wisely, as too many plugins slow down shell startup.
+  export plugins=(
+    git
+    bashmarks
+  )
+
+  # Which plugins would you like to conditionally load? (plugins can be found in ~/.oh-my-bash/plugins/*)
+  # Custom plugins may be added to ~/.oh-my-bash/custom/plugins/
+  # Example format:
+  #  if [ "$DISPLAY" ] || [ "$SSH" ]; then
+  #      plugins+=(tmux-autoattach)
+  #  fi
+
+  source "$OSH/oh-my-bash.sh"
+
+  # Preferred editor for local and remote sessions
+  # if [[ -n $SSH_CONNECTION ]]; then
+  #   export EDITOR='vim'
+  # else
+  #   export EDITOR='mvim'
+  # fi
+}
+
+

base/zshenv

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

base/zshrc

@@ -1,15 +1,26 @@
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-# Defaults
-export DOTFILES="$HOME/.dotfiles"
-# shellcheck source=scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
-path_prepend "$DOTFILES/local/bin"
 
 export COMPLETION_WAITING_DOTS=true
 
-$DOTFILES/local/bin/x-load-configs
+path_append "/opt/homebrew/bin"
+if type brew &> /dev/null; then
+  eval "$(brew shellenv)"
+  FPATH="$HOMEBREW_PREFIX/share/zsh/site-functions:${FPATH}"
+fi
+
+path_append "/usr/local/bin"
+path_prepend "$XDG_DATA_HOME/cargo/bin"
+path_prepend "$XDG_BIN_HOME"
+path_prepend "$HOME/.local/go/bin"
+path_prepend "$XDG_DATA_HOME/bob/nvim-bin"
+
+source "$DOTFILES/config/exports-shell"
+source "$DOTFILES/config/exports-apps"
+source "$DOTFILES/config/alias"
+source "$DOTFILES/config/functions"
 
 export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
 x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
@@ -17,10 +28,6 @@ x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
 # Add completion scripts to zsh path
 FPATH="$ZSH_CUSTOM_COMPLETION_PATH:$FPATH"
 
-if type brew &> /dev/null; then
-  FPATH="$HOMEBREW_PREFIX/share/zsh/site-functions:${FPATH}"
-fi
-
 # Try to load antigen, if present
 ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
 # shellcheck source=../../.local/bin/antigen.zsh
@@ -29,7 +36,7 @@ ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
 # antigen is present
 antigen use oh-my-zsh
 
-export ZSH_TMUX_AUTOSTART=false
+export ZSH_TMUX_AUTOSTART=true
 export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
 export ZSH_TMUX_UNICODE=true
 export ZSH_TMUX_AUTOQUIT=false
@@ -48,7 +55,6 @@ antigen bundle colored-man-pages
 antigen bundle command-not-found
 antigen bundle ssh-agent
 antigen bundle jreese/zsh-titles
-antigen bundle unixorn/autoupdate-antigen.zshplugin
 antigen bundle zsh-users/zsh-completions
 
 # these should be available if there's need

config/alacritty/alacritty.yml

@@ -75,144 +75,39 @@ font:
 # Should display the render timer
 debug.render_timer: false
 
-# https://github.com/catppuccin/alacritty
+# TokyoNight Alacritty Colors (storm)
 colors:
+  # Default colors
   primary:
-    background: '#1E1E2E' # base
-    foreground: '#CDD6F4' # text
-    # Bright and dim foreground colors
-    dim_foreground: '#CDD6F4' # text
-    bright_foreground: '#CDD6F4' # text
-
-  # Cursor colors
-  cursor:
-    text: '#1E1E2E' # base
-    cursor: '#F5E0DC' # rosewater
-  vi_mode_cursor:
-    text: '#1E1E2E' # base
-    cursor: '#B4BEFE' # lavender
-
-  # Search colors
-  search:
-    matches:
-      foreground: '#1E1E2E' # base
-      background: '#A6ADC8' # subtext0
-    focused_match:
-      foreground: '#1E1E2E' # base
-      background: '#A6E3A1' # green
-    footer_bar:
-      foreground: '#1E1E2E' # base
-      background: '#A6ADC8' # subtext0
-
-  # Keyboard regex hints
-  hints:
-    start:
-      foreground: '#1E1E2E' # base
-      background: '#F9E2AF' # yellow
-    end:
-      foreground: '#1E1E2E' # base
-      background: '#A6ADC8' # subtext0
-
-  # Selection colors
-  selection:
-    text: '#1E1E2E' # base
-    background: '#F5E0DC' # rosewater
+    background: '0x24283b'
+    foreground: '0xc0caf5'
 
   # Normal colors
   normal:
-    black: '#45475A' # surface1
-    red: '#F38BA8' # red
-    green: '#A6E3A1' # green
-    yellow: '#F9E2AF' # yellow
-    blue: '#89B4FA' # blue
-    magenta: '#F5C2E7' # pink
-    cyan: '#94E2D5' # teal
-    white: '#BAC2DE' # subtext1
+    black: '0x1d202f'
+    red: '0xf7768e'
+    green: '0x9ece6a'
+    yellow: '0xe0af68'
+    blue: '0x7aa2f7'
+    magenta: '0xbb9af7'
+    cyan: '0x7dcfff'
+    white: '0xa9b1d6'
 
   # Bright colors
   bright:
-    black: '#585B70' # surface2
-    red: '#F38BA8' # red
-    green: '#A6E3A1' # green
-    yellow: '#F9E2AF' # yellow
-    blue: '#89B4FA' # blue
-    magenta: '#F5C2E7' # pink
-    cyan: '#94E2D5' # teal
-    white: '#A6ADC8' # subtext0
-
-  # Dim colors
-  dim:
-    black: '#45475A' # surface1
-    red: '#F38BA8' # red
-    green: '#A6E3A1' # green
-    yellow: '#F9E2AF' # yellow
-    blue: '#89B4FA' # blue
-    magenta: '#F5C2E7' # pink
-    cyan: '#94E2D5' # teal
-    white: '#BAC2DE' # subtext1
+    black: '0x414868'
+    red: '0xf7768e'
+    green: '0x9ece6a'
+    yellow: '0xe0af68'
+    blue: '0x7aa2f7'
+    magenta: '0xbb9af7'
+    cyan: '0x7dcfff'
+    white: '0xc0caf5'
 
   indexed_colors:
-    - { index: 16, color: '#FAB387' }
-    - { index: 17, color: '#F5E0DC' }
+    - { index: 16, color: '0xff9e64' }
+    - { index: 17, color: '0xdb4b4b' }
 
-# Visual Bell
-#
-# Any time the BEL code is received, Alacritty "rings" the visual bell. Once
-# rung, the terminal background will be set to white and transition back to the
-# default background color. You can control the rate of this transition by
-# setting the `duration` property (represented in milliseconds). You can also
-# configure the transition function by setting the `animation` property.
-#
-# Possible values for `animation`
-# `Ease`
-# `EaseOut`
-# `EaseOutSine`
-# `EaseOutQuad`
-# `EaseOutCubic`
-# `EaseOutQuart`
-# `EaseOutQuint`
-# `EaseOutExpo`
-# `EaseOutCirc`
-# `Linear`
-#
-# To completely disable the visual bell, set its duration to 0.
-#
-# visual_bell:
-#   animation: EaseOutExpo
-#   duration: 0
-
-# Key bindings
-#
-# Each binding is defined as an object with some properties. Most of the
-# properties are optional. All of the alphabetical keys should have a letter for
-# the `key` value such as `V`. Function keys are probably what you would expect
-# as well (F1, F2, ..). The number keys above the main keyboard are encoded as
-# `Key1`, `Key2`, etc. Keys on the number pad are encoded `Number1`, `Number2`,
-# etc.  These all match the glutin::VirtualKeyCode variants.
-#
-# Possible values for `mods`
-# `Command`, `Super` refer to the super/command/windows key
-# `Control` for the control key
-# `Shift` for the Shift key
-# `Alt` and `Option` refer to alt/option
-#
-# mods may be combined with a `|`. For example, requiring control and shift
-# looks like:
-#
-# mods: Control|Shift
-#
-# The parser is currently quite sensitive to whitespace and capitalization -
-# capitalization must match exactly, and piped items must not have whitespace
-# around them.
-#
-# Either an `action`, `chars`, or `command` field must be present.
-#   `action` must be one of `Paste`, `PasteSelection`, `Copy`, or `Quit`.
-#   `chars` writes the specified string every time that binding is activated.
-#     These should generally be escape sequences, but they can be configured to
-#     send arbitrary strings of bytes.
-#   `command` must be a map containing a `program` string, and `args` array of
-#     strings. For example:
-#     - { ... , command: { program: "alacritty", args: ["-e", "vttest"] } }
 key_bindings:
   - { key: V, mods: Command, action: Paste }
   - { key: C, mods: Command, action: Copy }

config/alias

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck source="../scripts/shared.sh"
 # shellcheck disable=1091,2139
-source "$DOTFILES/scripts/shared.sh"
+DOTFILES="$HOME/.dotfiles"
 
 # Get installed php versions from brew and setup aliases
 function x-set-php-aliases
@@ -106,9 +106,6 @@ alias updatedb="sudo /usr/libexec/locate.updatedb"
 # Always return full history
 alias history="history 1"
 
-alias pip="pip3 "
-alias python="python3 "
-
 # tmux: automatically attach or create session with name 'main'
 alias tmux='tmux new-session -A -s main'
 # tmux: attach or create new session
@@ -149,3 +146,69 @@ fi
 
 alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
 alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
+
+# Alacritty preexec hook to update dynamic title
+preexec()
+{
+  print -Pn "\e]0;$1%~\a"
+}
+
+# Update dotfiles
+dfu()
+{
+  (
+    cd "$DOTFILES" && git pull --ff-only && ./install -q
+  )
+}
+
+# Weather in Tampere, or other city
+weather()
+{
+  # https://github.com/chubin/wttr.in#usage
+  local city="${1:-Tampere}"
+  curl "http://wttr.in/${city// /+}?2nFQM&lang=fi"
+}
+
+# Docker
+ssh-docker()
+{
+  docker exec -it "$@" bash
+}
+
+# All the dig info
+digga()
+{
+  dig +nocmd "$1" any +multiline +noall +answer
+}
+
+# Rector project to php version 8.2 by default.
+rector()
+{
+  local php="${1:-82}"
+  docker run -v "$(pwd)":/project rector/rector:latest process \
+    "/project/$1" \
+    --set "php${php}" \
+    --autoload-file /project/vendor/autoload.php
+}
+
+# Commit everything
+commit()
+{
+  commitMessage="$*"
+
+  if [ "$commitMessage" = "" ]; then
+    commitMessage="Automated commit"
+  fi
+
+  git add .
+  eval "git commit -a -m '${commitMessage}'"
+}
+
+scheduler()
+{
+  while :; do
+    php artisan schedule:run
+    echo "Sleeping 60 seconds..."
+    sleep 60
+  done
+}

config/alias-tunkki

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Setting aliases for tunkki
-
-alias nvim="/snap/nvim/current/usr/bin/nvim"

config/exports

@@ -2,27 +2,6 @@
 # shellcheck shell=bash
 # vim: filetype=zsh
 
-export DOTFILES="$HOME/.dotfiles"
-source "$DOTFILES/scripts/shared.sh"
-path_prepend "$DOTFILES/local/bin"
-
-# Explicitly set XDG folders
-# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
-
-# custom variables
-export XDG_BIN_HOME="$HOME/.local/bin"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_RUNTIME_DIR="$HOME/.local/run"
-
-path_append "/opt/homebrew/bin"
-have brew && eval "$(brew shellenv)"
-
-path_append "/usr/local/bin"
-path_prepend "$XDG_BIN_HOME"
-
 source "$DOTFILES/config/exports-shell"
 source "$DOTFILES/config/exports-apps"
 

config/exports-apps

@@ -4,9 +4,6 @@
 # shellcheck disable=1091,2139
 # vim: filetype=bash
 
-: "${DOTFILES:=$HOME/.dotfiles}"
-source "$DOTFILES/scripts/shared.sh"
-
 # Antigen configuration
 # https://github.com/zsh-users/antigen/wiki/Configuration
 export ADOTDIR="$XDG_DATA_HOME/antigen"
@@ -24,10 +21,8 @@ x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
 export ANDROID_HOME="$XDG_DATA_HOME/android"
 
 # bob manages nvim versions
-have bob && {
-  path_prepend "$XDG_DATA_HOME/bob/nvim-bin"
-  have nvim && export EDITOR="nvim"
-}
+path_prepend "$XDG_DATA_HOME/bob/nvim-bin"
+have nvim && export EDITOR="nvim"
 
 export HOMEBREW_NO_ENV_HINTS=true
 

config/exports-lakka

@@ -3,7 +3,7 @@
 ## LUA
 have luarocks && $(luarocks path --bin)
 
-path_append "$HOME/.local/go/bin"
+path_prepend "$HOME/.local/go/bin"
 
 alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state'
 alias nano='nano -wS -$'

config/exports-shell

@@ -4,7 +4,17 @@
 # vim: filetype=bash
 
 export DOTFILES="$HOME/.dotfiles"
-source "$DOTFILES/scripts/shared.sh"
+
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
 
 export LC_ALL=fi_FI.UTF-8
 
@@ -60,10 +70,6 @@ if [ "$DOTFILES_CURRENT_SHELL" = "-zsh" ]; then
     zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
     zstyle ':completion:*' list-colors "$LS_COLORS"
 
-    # fzf
-    [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
-      && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
-
     # Load iterm2 shell integration
     # https://iterm2.com/documentation-shell-integration.html
     [[ -f "$XDG_BIN_HOME/iterm2_shell_integration.zsh" ]] \

config/functions

@@ -1,73 +1,3 @@
 #!/usr/bin/env bash
 #
 # shell functions
-#
-# shellcheck source="../scripts/shared.sh"
-export DOTFILES="$HOME/.dotfiles"
-source "$DOTFILES/scripts/shared.sh"
-
-# Alacritty preexec hook to update dynamic title
-preexec()
-{
-  print -Pn "\e]0;$1%~\a"
-}
-
-# Update dotfiles
-dfu()
-{
-  (
-    cd "$DOTFILES" && git pull --ff-only && ./install -q
-  )
-}
-
-# Weather in Tampere, or other city
-weather()
-{
-  # https://github.com/chubin/wttr.in#usage
-  local city="${1:-Tampere}"
-  curl "http://wttr.in/${city// /+}?2nFQM&lang=fi"
-}
-
-# Docker
-ssh-docker()
-{
-  docker exec -it "$@" bash
-}
-
-# All the dig info
-digga()
-{
-  dig +nocmd "$1" any +multiline +noall +answer
-}
-
-# Rector project to php version 8.2 by default.
-rector()
-{
-  local php="${1:-82}"
-  docker run -v "$(pwd)":/project rector/rector:latest process \
-    "/project/$1" \
-    --set "php${php}" \
-    --autoload-file /project/vendor/autoload.php
-}
-
-# Commit everything
-commit()
-{
-  commitMessage="$*"
-
-  if [ "$commitMessage" = "" ]; then
-    commitMessage="Automated commit"
-  fi
-
-  git add .
-  eval "git commit -a -m '${commitMessage}'"
-}
-
-scheduler()
-{
-  while :; do
-    php artisan schedule:run
-    echo "Sleeping 60 seconds..."
-    sleep 60
-  done
-}

config/homebrew/Brewfile

@@ -18,10 +18,10 @@ tap "xwmx/taps"
 brew "act"
 # Mozilla CA certificate store
 brew "ca-certificates"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.11"
 # YAML Parser
 brew "libyaml"
+# Interpreted, interactive, object-oriented programming language
+brew "python@3.11"
 # Automate deployment, configuration, and upgrading
 brew "ansible"
 # Checks ansible playbooks for practices and behaviour
@@ -198,6 +198,8 @@ brew "luarocks"
 brew "m-cli"
 # Mac App Store command-line interface
 brew "mas"
+# Mongrel of mail user agents (part elm, pine, mush, mh, etc.)
+brew "mutt"
 # NCurses Disk Usage
 brew "ncdu"
 # HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server

config/irssi/config

@@ -1,4 +1,13 @@
+# vim:noext ft=conf;
 servers = (
+  {
+    address = "irc.cc.tut.fi";
+    chatnet = "IRCNet";
+    port = "6667";
+    own_host = "kapsi.fi";
+    family = "inet";
+    autoconnect = "no";
+  },
   { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
   {
     address = "ssl.efnet.org";
@@ -315,4 +324,5 @@ settings = {
     nick = "ivuorinen";
   };
   "fe-common/core" = { theme = "lyynx"; };
+  "fe-text" = { actlist_sort = "refnum"; };
 };

config/nvim/lazy-lock.json

@@ -1,69 +1,78 @@
 {
-  "LazyVim": { "branch": "main", "commit": "6f9adbd4fba4132bd4f12404bd2b90c4a28ff136" },
-  "LuaSnip": { "branch": "master", "commit": "480b032f6708573334f4437d3f83307d143f1a72" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "9a4e2f8da367ab671a6d7bf8b5b82e125c71a645" },
-  "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" },
+  "LazyVim": { "branch": "main", "commit": "ae77bfda89067c36291365c0e2b4d4db7bbc3aac" },
+  "LuaSnip": { "branch": "master", "commit": "80a8528f084a97b624ae443a6f50ff8074ba486b" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "f4915aef564f695a2c1e6e65e3c41f8f8ee16af4" },
+  "aerial.nvim": { "branch": "master", "commit": "b5d5f480a72ce08cb5c769f32f08bab29932de87" },
   "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
   "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" },
-  "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
-  "catppuccin": { "branch": "main", "commit": "3d9a5ed556e289bce6c1fb0af89ec838360641b2" },
+  "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" },
+  "catppuccin": { "branch": "main", "commit": "dcef0a062de380885193fb0f919217d58b979753" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "comment-box.nvim": { "branch": "main", "commit": "dd1a48f8d06102e9b87ae1e0069bc365c006979b" },
-  "dressing.nvim": { "branch": "master", "commit": "73a7d54b5289000108c7f52402a36cf380fced67" },
-  "edgy.nvim": { "branch": "main", "commit": "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4" },
-  "flash.nvim": { "branch": "main", "commit": "0256d8ecab33a9aa69fdaaf885db22e1103e2a3a" },
-  "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" },
-  "gitsigns.nvim": { "branch": "main", "commit": "bdeba1cec3faddd89146690c10b9a87949c0ee66" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "2ec42d26c933e7a129fe056dfc11a207afff252d" },
-  "lazy.nvim": { "branch": "main", "commit": "753c391b44daadafb0e821d4a4dfd72c4fac6f43" },
-  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "81e30dd629de24cbb26d08073ee938ab40006695" },
-  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
+  "conform.nvim": { "branch": "master", "commit": "2e8b826cb4af5cf36b5febc5e7a71d3284f161f2" },
+  "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
+  "copilot.lua": { "branch": "master", "commit": "1a8032ae496916ccc7a7a52ee79194fbef29f462" },
+  "dashboard-nvim": { "branch": "master", "commit": "c71cab740e2add248c54c458b5ca9d6e77c30fa6" },
+  "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" },
+  "edgy.nvim": { "branch": "main", "commit": "8355be45610afdf79a0bab32b91ee297997455b4" },
+  "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
+  "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" },
+  "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" },
+  "headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "8a7b48f5823cc924f815129192288ec2e2b9288f" },
+  "lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" },
+  "lualine.nvim": { "branch": "master", "commit": "7533b0ead663d80452210c0c089e5105089697e5" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" },
+  "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
   "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
-  "mini.ai": { "branch": "main", "commit": "7ae226f331885e6f30e9a8229e113debc59308ae" },
-  "mini.animate": { "branch": "main", "commit": "989ac014933ab5cd14ab83f2fce4b9a08ca6d81e" },
-  "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" },
-  "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
-  "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" },
-  "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" },
-  "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" },
-  "neoconf.nvim": { "branch": "main", "commit": "86ed5b91927b65352e3d8f315f8256a180805377" },
-  "neodev.nvim": { "branch": "main", "commit": "58b1c0740e8ad79ce71e2649a449bb90536435cf" },
+  "mini.ai": { "branch": "main", "commit": "10ad2ed049fb681a829b44aeb23443c0a9c910ae" },
+  "mini.animate": { "branch": "main", "commit": "6e6f2ee99fec91985d3817bfc74fbb4a0aff1c44" },
+  "mini.bufremove": { "branch": "main", "commit": "75be0b153b0cd2499c031e57d44cde8dad4766e4" },
+  "mini.comment": { "branch": "main", "commit": "a27b9115e40519ef23991af9564f43ec14a41fe2" },
+  "mini.indentscope": { "branch": "main", "commit": "cbc07203ca8faae952ca373c1f6cc5881ce97af0" },
+  "mini.pairs": { "branch": "main", "commit": "6f6bd7ed5757b40bc29c73dac0d743e4e6978124" },
+  "mini.surround": { "branch": "main", "commit": "68ce058ef9716d7d955b79363845d2dd003d6500" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "63ebe879ad4798b66d29c0b2c8d04942389d438e" },
+  "neoconf.nvim": { "branch": "main", "commit": "a043beb8ad94b2c8db2e9b7085d20f7bcdcb6adf" },
+  "neodev.nvim": { "branch": "main", "commit": "b094a663ccb71733543d8254b988e6bebdbdaca4" },
   "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" },
-  "noice.nvim": { "branch": "main", "commit": "396f9146529130904e07c45e90ecdbfa607534f3" },
-  "none-ls.nvim": { "branch": "main", "commit": "68645e56d10b5120a3fdc7467601f1ea497635e6" },
-  "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
-  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
-  "nvim-lspconfig": { "branch": "master", "commit": "61b40df9c17943e43e7e698873caab0e7dbcdadc" },
-  "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" },
+  "noice.nvim": { "branch": "main", "commit": "e50fc6de68333633fa9eaaa54cb4cdfe7de5f25a" },
+  "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" },
+  "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" },
+  "nvim-lint": { "branch": "master", "commit": "8a8836328425ab53dca10d557523b12075bf6949" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" },
   "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
-  "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" },
-  "nvim-spectre": { "branch": "master", "commit": "97cfd1b0f5a6ab35979ce1bee6c17f54745fd1e5" },
-  "nvim-treesitter": { "branch": "master", "commit": "16ea2969ea0a5ba902fceece9b2db10c7c9ba2d6" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "95e9ba9de4289d221666b66fd930d157c7ca08c6" },
-  "nvim-ufo": { "branch": "main", "commit": "6f2ccdf2da390d62f8f9e15fc5ddbcbd312e1e66" },
-  "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" },
-  "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
-  "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
+  "nvim-regexplainer": { "branch": "main", "commit": "187f8666c2ba0fcba4ddb991e48d7229b0a58d96" },
+  "nvim-spectre": { "branch": "master", "commit": "696cff781a4a7ecc91549736835e2acbd00fe859" },
+  "nvim-treesitter": { "branch": "master", "commit": "eb3faef3a44641e5875581e901b0a8df8da2bde4" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "7227dca17316384e9b62bd6fc6b4d892572d6d4e" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "78c49ca7d2f7ccba2115c11422c037713c978ad1" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" },
+  "nvim-ufo": { "branch": "main", "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" },
+  "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" },
+  "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
   "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" },
-  "stickybuf.nvim": { "branch": "master", "commit": "e3db41f2c1bb2df3ee6ff964ee74fe991f6f9566" },
+  "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" },
+  "stickybuf.nvim": { "branch": "master", "commit": "ae746b982f9c3b6880d62f221c56ec4d7bb239f6" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
-  "tabnine": { "branch": "master", "commit": "2c06b4865415701dc638549032824664e114ee23" },
   "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" },
-  "telescope.nvim": { "branch": "master", "commit": "ffe90fac32122f401429b14d383137bd92a685d0" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" },
   "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
-  "tokyonight.nvim": { "branch": "main", "commit": "e89caa3ad6d8da9d0dd981ec74a82c55adc61ffd" },
-  "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
-  "venv-selector.nvim": { "branch": "main", "commit": "14d6e866070f759e9014a8053954f835294f56f9" },
-  "vim-illuminate": { "branch": "master", "commit": "1b5d70332a51a1de05f281069851865a2bb1e6d7" },
+  "tokyonight.nvim": { "branch": "main", "commit": "531b04704fc9ff994d8b9c0720428fdc3c7d49d1" },
+  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
+  "venv-selector.nvim": { "branch": "main", "commit": "ff3342d4ae8723fab38fed8969b0a1e2c8b6281a" },
+  "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" },
   "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
-  "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" },
-  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
+  "vim-wakatime": { "branch": "master", "commit": "945a441b83e48c7bafdd227ef8e2eb826f72ab90" },
+  "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" },
   "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" }
 }

config/nvim/lazyvim.json

@@ -0,0 +1,26 @@
+{
+  "extras": [
+    "lazyvim.plugins.extras.coding.copilot",
+    "lazyvim.plugins.extras.editor.aerial",
+    "lazyvim.plugins.extras.editor.symbols-outline",
+    "lazyvim.plugins.extras.formatting.black",
+    "lazyvim.plugins.extras.formatting.prettier",
+    "lazyvim.plugins.extras.lang.docker",
+    "lazyvim.plugins.extras.lang.go",
+    "lazyvim.plugins.extras.lang.json",
+    "lazyvim.plugins.extras.lang.markdown",
+    "lazyvim.plugins.extras.lang.python",
+    "lazyvim.plugins.extras.lang.tailwind",
+    "lazyvim.plugins.extras.lang.terraform",
+    "lazyvim.plugins.extras.lang.typescript",
+    "lazyvim.plugins.extras.lang.yaml",
+    "lazyvim.plugins.extras.linting.eslint",
+    "lazyvim.plugins.extras.ui.edgy",
+    "lazyvim.plugins.extras.ui.mini-animate",
+    "lazyvim.plugins.extras.vscode"
+  ],
+  "news": {
+    "NEWS.md": "2123"
+  },
+  "version": 2
+}

config/nvim/lua/config/lazy.lua

@@ -13,20 +13,18 @@ require("lazy").setup({
       "LazyVim/LazyVim",
       import = "lazyvim.plugins",
     },
-    -- import any extras modules here
-    { import = "lazyvim.plugins.extras.formatting.prettier" },
-    { import = "lazyvim.plugins.extras.lang.docker" },
-    { import = "lazyvim.plugins.extras.lang.go" },
-    { import = "lazyvim.plugins.extras.lang.json" },
-    { import = "lazyvim.plugins.extras.lang.python" },
-    { import = "lazyvim.plugins.extras.lang.tailwind" },
-    { import = "lazyvim.plugins.extras.lang.terraform" },
-    { import = "lazyvim.plugins.extras.lang.typescript" },
-    { import = "lazyvim.plugins.extras.lang.yaml" },
-    { import = "lazyvim.plugins.extras.linting.eslint" },
-    { import = "lazyvim.plugins.extras.ui.edgy" },
-    { import = "lazyvim.plugins.extras.ui.mini-animate" },
-    -- import/override with your plugins
+    {
+      "folke/tokyonight.nvim",
+      opts = {
+        style = "night",
+        transparent = true,
+        sidebars = { "qf", "vista_kind", "terminal", "packer" },
+        styles = {
+          sidebars = "transparent",
+          floats = "transparent",
+        },
+      },
+    },
     { import = "plugins" },
   },
   defaults = {

config/nvim/lua/config/options.lua

@@ -7,6 +7,7 @@ local opt = vim.opt
 opt.number = true
 opt.relativenumber = true
 opt.modeline = true
+vim.g.root_spec = { "lsp", { ".git", "lua" }, "cwd" }
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/plugins/coding.lua

@@ -72,6 +72,26 @@ return {
     "williamboman/mason.nvim",
     opts = {
       ensure_installed = {
+        "actionlint",
+        "ansible-language-server",
+        "ansible-lint",
+        "bash-language-server",
+        "blade-formatter",
+        "cfn-lint",
+        "codeql",
+        "codespell",
+        "commitlint",
+        "diagnostic-languageserver",
+        "docker-compose-language-service",
+        "dockerfile-language-server",
+        "editorconfig-checker",
+        "fixjson",
+        "html-lsp",
+        "jq",
+        "nginx-language-server",
+        "php-cs-fixer",
+        "semgrep",
+        "sonarlint-language-server",
         "stylua",
         "shellcheck",
         "shfmt",
@@ -79,20 +99,6 @@ return {
       },
     },
   },
-  -- Tabnine Client for Neovim
-  -- https://github.com/codota/tabnine-nvim
-  {
-    "codota/tabnine-nvim",
-    name = "tabnine",
-    -- enabled = false,
-    build = vim.loop.os_uname().sysname == "Windows_NT" and "pwsh.exe -file .\\dl_binaries.ps1" or "./dl_binaries.sh",
-    cmd = { "TabnineStatus", "TabnineDisable", "TabnineEnable", "TabnineToggle" },
-    event = "User",
-    opts = {
-      accept_keymap = "<C-e>",
-      dismiss_keymap = "<C-Esc>",
-    },
-  },
   -- Vim plugin for automatic time tracking and metrics generated from your programming activity.
   -- https://github.com/wakatime/vim-wakatime
   { "wakatime/vim-wakatime", lazy = false, enabled = true },

config/nvim/lua/plugins/example.lua

@@ -103,7 +103,7 @@ return {
     dependencies = {
       "jose-elias-alvarez/typescript.nvim",
       init = function()
-        require("lazyvim.util").on_attach(function(_, buffer)
+        require("lazyvim.util.lsp").on_attach(function(_, buffer)
           -- stylua: ignore
           vim.keymap.set("n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
           vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })

config/nvim/lua/plugins/nvim-lspconfig.lua

@@ -7,7 +7,7 @@ return {
     },
     setup = {
       eslint = function()
-        require("lazyvim.util").on_attach(function(client)
+        require("lazyvim.util.lsp").on_attach(function(client)
           if client.name == "eslint" then
             client.server_capabilities.documentFormattingProvider = true
           elseif client.name == "tsserver" then

config/nvim/lua/plugins/treesitter.lua

@@ -1,8 +1,8 @@
 return {
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = {
-      ensure_installed = {
+    opts = function(_, opts)
+      vim.list_extend(opts.ensure_installed, {
         "bash",
         "html",
         "javascript",
@@ -17,7 +17,7 @@ return {
         "typescript",
         "vim",
         "yaml",
-      },
-    },
+      })
+    end,
   },
 }

config/nvim/lua/plugins/ui.lua

@@ -1,15 +1,5 @@
 -- luacheck: globals vim
 return {
-  {
-    "folke/tokyonight.nvim",
-    opts = {
-      transparent = true,
-      styles = {
-        sidebars = "transparent",
-        floats = "transparent",
-      },
-    },
-  },
   -- Not UFO in the sky, but an ultra fold in Neovim.
   -- https://github.com/kevinhwang91/nvim-ufo/
   {
@@ -19,6 +9,20 @@ return {
     dependencies = {
       "kevinhwang91/promise-async",
       { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" },
+      {
+        "luukvbaal/statuscol.nvim",
+        config = function()
+          local builtin = require("statuscol.builtin")
+          require("statuscol").setup({
+            relculright = true,
+            segments = {
+              { text = { builtin.foldfunc }, click = "v:lua.ScFa" },
+              { text = { "%s" }, click = "v:lua.ScSa" },
+              { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
+            },
+          })
+        end,
+      },
     },
     init = function()
       vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
@@ -75,12 +79,6 @@ return {
       end,
     },
   },
-  {
-    "simrat39/symbols-outline.nvim",
-    cmd = "SymbolsOutline",
-    keys = { { "<leader>cs", "<cmd>SymbolsOutline<cr>", desc = "Symbols Outline" } },
-    config = true,
-  },
   -- Indent guides for Neovim
   -- https://github.com/lukas-reineke/indent-blankline.nvim
   { "lukas-reineke/indent-blankline.nvim" },
@@ -93,6 +91,9 @@ return {
   -- Neovim plugin for locking a buffer to a window
   -- https://github.com/stevearc/stickybuf.nvim
   { "stevearc/stickybuf.nvim", opts = {} },
+  -- A pretty window for previewing, navigating and editing your LSP locations
+  -- https://github.com/DNLHC/glance.nvim
+  { "dnlhc/glance.nvim" },
   -- Automatically expand width of the current window.
   -- Maximizes and restore it. And all this with nice animations!
   -- https://github.com/anuvyklack/windows.nvim

config/tmux/tmux.conf

@@ -85,62 +85,45 @@ set-option -g renumber-windows on
 # set vi-mode
 set-window-option -g mode-keys vi
 
-#  ╭──────────────────────────────────────────────────────────╮
-#  │ Plugins                                                  │
-#  ╰──────────────────────────────────────────────────────────╯
-
-# Set plugins install dir
-set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.dotfiles/config/tmux/plugins'
-
-## Install plugins, starting with plugin manager
-set -g @tpm_plugins '            \
-  catppuccin/tmux                \
-  tmux-plugins/tmux-continuum    \
-  jaclu/tmux-menus               \
-  ofirgall/tmux-window-name      \
-  tmux-plugins/tmux-resurrect    \
-  tmux-plugins/tmux-sensible     \
-  tmux-plugins/tmux-sessionist   \
-  tmux-plugins/tmux-yank         \
-  tmux-plugins/tpm               \
-'
+# Set theme to tokyonight
+source-file ~/.dotfiles/config/tmux/tokyonight_storm.tmux
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Plugins related configurations                           │
 #  ╰──────────────────────────────────────────────────────────╯
 
-## https://github.com/jaclu/tmux-menus
-set -g @menus_trigger 'm'
+# Plugin that lets you suspend local tmux session,
+# so that you can work with nested remote tmux session painlessly.
+# https://github.com/MunifTanjim/tmux-suspend
+set -g @suspend_key 'F12'
 
 ##  A plugin to name your tmux windows smartly.
 ## https://github.com/ofirgall/tmux-window-name
 ### Maximum name length of a window
-set -g @tmux_window_name_max_name_len "20"
+set -g @tmux_window_name_max_name_len "30"
 ### Replace $HOME with ~ in window names
 set -g @tmux_window_name_use_tilde "True"
 
-## https://github.com/catppuccin/tmux
-set -g @catppuccin_flavour "mocha" # latte/frappe/macchiato/mocha
-set -g @catppuccin_window_tabs_enabled on # or off to disable window_tabs
-set -g @catppuccin_window_status_enable "yes"
-
-## set -g @catppuccin_window_right_separator "█"
-set -g @catppuccin_window_number_position "left"
-set -g @catppuccin_window_middle_separator ": "
-set -g @catppuccin_window_default_fill "none"
-set -g @catppuccin_window_current_fill "all"
-set -g @catppuccin_status_modules "application session date_time"
-set -g @catppuccin_status_left_separator "█"
-set -g @catppuccin_status_right_separator "█"
-set -g @catppuccin_date_time_text "%Y-%m-%d %H:%M"
-
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'
-set -g @continuum-boot 'on'
 
 ## https://github.com/tmux-plugins/tmux-resurrect
 set -g @resurrect-strategy-nvim 'session'
 set -g @resurrect-dir '$HOME/.local/state/tmux/tmux-resurrect'
 
-# Finally run the tmux plugin manager
-run '~/.dotfiles/config/tmux/plugins/tpm/tpm'
+# Modified from tokyonight_storm to include tmux_mode_indicator
+set -g status-right "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#1f2335] #{prefix_highlight} #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %H:%M #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1d202f,bg=#7aa2f7,bold] #h #{tmux_mode_indicator}"
+
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Plugins                                                  │
+#  ╰──────────────────────────────────────────────────────────╯
+
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-sensible/sensible.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-window-name/tmux_window_name.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-resurrect/resurrect.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-continuum/continuum.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-sessionist/sessionist.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-mode-indicator/mode_indicator.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-suspend/suspend.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-yank/yank.tmux
+

config/tmux/tokyonight_storm.tmux

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

hosts/lakka/irssi/default.theme

@@ -1,294 +0,0 @@
-# When testing changes, the easiest way to reload the theme is with /RELOAD.
-# This reloads the configuration file too, so if you did any changes remember
-# to /SAVE it first. Remember also that /SAVE overwrites the theme file with
-# old data so keep backups :)
-
-# TEMPLATES:
-
-# The real text formats that irssi uses are the ones you can find with
-# /FORMAT command. Back in the old days all the colors and texts were mixed
-# up in those formats, and it was really hard to change the colors since you
-# might have had to change them in tens of different places. So, then came
-# this templating system.
-
-# Now the /FORMATs don't have any colors in them, and they also have very
-# little other styling. Most of the stuff you need to change is in this
-# theme file. If you can't change something here, you can always go back
-# to change the /FORMATs directly, they're also saved in these .theme files.
-
-# So .. the templates. They're those {blahblah} parts you see all over the
-# /FORMATs and here. Their usage is simply {name parameter1 parameter2}.
-# When irssi sees this kind of text, it goes to find "name" from abstracts
-# block below and sets "parameter1" into $0 and "parameter2" into $1 (you
-# can have more parameters of course). Templates can have subtemplates.
-# Here's a small example:
-#   /FORMAT format hello {colorify {underline world}}
-#   abstracts = { colorify = "%G$0-%n"; underline = "%U$0-%U"; }
-# When irssi expands the templates in "format", the final string would be:
-#   hello %G%Uworld%U%n
-# ie. underlined bright green "world" text.
-# and why "$0-", why not "$0"? $0 would only mean the first parameter,
-# $0- means all the parameters. With {underline hello world} you'd really
-# want to underline both of the words, not just the hello (and world would
-# actually be removed entirely).
-
-# COLORS:
-
-# You can find definitions for the color format codes in docs/formats.txt.
-
-# There's one difference here though. %n format. Normally it means the
-# default color of the terminal (white mostly), but here it means the
-# "reset color back to the one it was in higher template". For example
-# if there was /FORMAT test %g{foo}bar, and foo = "%Y$0%n", irssi would
-# print yellow "foo" (as set with %Y) but "bar" would be green, which was
-# set at the beginning before the {foo} template. If there wasn't the %g
-# at start, the normal behaviour of %n would occur. If you _really_ want
-# to use the terminal's default color, use %N.
-
-#############################################################################
-
-# default foreground color (%N) - -1 is the "default terminal color"
-default_color = "-1";
-
-# print timestamp/servertag at the end of line, not at beginning
-info_eol = "false";
-
-# these characters are automatically replaced with specified color
-# (dark grey by default)
-replaces = { "[]=" = "%K$*%n"; };
-
-abstracts = {
-  ##
-  ## generic
-  ##
-
-  # text to insert at the beginning of each non-message line
-  line_start = "%B-%n!%B-%n ";
-
-  # timestamp styling, nothing by default
-  timestamp = "$*";
-
-  # any kind of text that needs hilighting, default is to bold
-  hilight = "%_$*%_";
-
-  # any kind of error message, default is bright red
-  error = "%R$*%n";
-
-  # channel name is printed
-  channel = "%_$*%_";
-
-  # nick is printed
-  nick = "%_$*%_";
-
-  # nick host is printed
-  nickhost = "[$*]";
-
-  # server name is printed
-  server = "%_$*%_";
-
-  # some kind of comment is printed
-  comment = "[$*]";
-
-  # reason for something is printed (part, quit, kick, ..)
-  reason = "{comment $*}";
-
-  # mode change is printed ([+o nick])
-  mode = "{comment $*}";
-
-  ##
-  ## channel specific messages
-  ##
-
-  # highlighted nick/host is printed (joins)
-  channick_hilight = "%C$*%n";
-  chanhost_hilight = "{nickhost %c$*%n}";
-
-  # nick/host is printed (parts, quits, etc.)
-  channick = "%c$*%n";
-  chanhost = "{nickhost $*}";
-
-  # highlighted channel name is printed
-  channelhilight = "%c$*%n";
-
-  # ban/ban exception/invite list mask is printed
-  ban = "%c$*%n";
-
-  ##
-  ## messages
-  ##
-
-  # the basic styling of how to print message, $0 = nick mode, $1 = nick
-  msgnick = "%K<%n$0$1-%K>%n %|";
-
-  # message from you is printed. "msgownnick" specifies the styling of the
-  # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the
-  # whole line.
-
-  # Example1: You want the message text to be green:
-  #  ownmsgnick = "{msgnick $0 $1-}%g";
-  # Example2.1: You want < and > chars to be yellow:
-  #  ownmsgnick = "%Y{msgnick $0 $1-%Y}%n";
-  #  (you'll also have to remove <> from replaces list above)
-  # Example2.2: But you still want to keep <> grey for other messages:
-  #  pubmsgnick = "%K{msgnick $0 $1-%K}%n";
-  #  pubmsgmenick = "%K{msgnick $0 $1-%K}%n";
-  #  pubmsghinick = "%K{msgnick $1 $0$2-%n%K}%n";
-  #  ownprivmsgnick = "%K{msgnick  $*%K}%n";
-  #  privmsgnick = "%K{msgnick  %R$*%K}%n";
-
-  # $0 = nick mode, $1 = nick
-  ownmsgnick = "{msgnick $0 $1-}";
-  ownnick = "%_$*%n";
-
-  # public message in channel, $0 = nick mode, $1 = nick
-  pubmsgnick = "{msgnick $0 $1-}";
-  pubnick = "%N$*%n";
-
-  # public message in channel meant for me, $0 = nick mode, $1 = nick
-  pubmsgmenick = "{msgnick $0 $1-}";
-  menick = "%Y$*%n";
-
-  # public highlighted message in channel
-  # $0 = highlight color, $1 = nick mode, $2 = nick
-  pubmsghinick = "{msgnick $1 $0$2-%n}";
-
-  # channel name is printed with message
-  msgchannel = "%K:%c$*%n";
-
-  # private message, $0 = nick, $1 = host
-  privmsg = "[%R$0%K(%r$1-%K)%n] ";
-
-  # private message from you, $0 = "msg", $1 = target nick
-  ownprivmsg = "[%r$0%K(%R$1-%K)%n] ";
-
-  # own private message in query
-  ownprivmsgnick = "{msgnick  $*}";
-  ownprivnick = "%_$*%n";
-
-  # private message in query
-  privmsgnick = "{msgnick  %R$*%n}";
-
-  ##
-  ## Actions (/ME stuff)
-  ##
-
-  # used internally by this theme
-  action_core = "%_ * $*%n";
-
-  # generic one that's used by most actions
-  action = "{action_core $*} ";
-
-  # own action, both private/public
-  ownaction = "{action $*}";
-
-  # own action with target, both private/public
-  ownaction_target = "{action_core $0}%K:%c$1%n ";
-
-  # private action sent by others
-  pvtaction = "%_ (*) $*%n ";
-  pvtaction_query = "{action $*}";
-
-  # public action sent by others
-  pubaction = "{action $*}";
-
-
-  ##
-  ## other IRC events
-  ##
-
-  # whois
-  whois = "%# $[8]0 : $1-";
-
-  # notices
-  ownnotice = "[%r$0%K(%R$1-%K)]%n ";
-  notice = "%K-%M$*%K-%n ";
-  pubnotice_channel = "%K:%m$*";
-  pvtnotice_host = "%K(%m$*%K)";
-  servernotice = "%g!$*%n ";
-
-  # CTCPs
-  ownctcp = "[%r$0%K(%R$1-%K)] ";
-  ctcp = "%g$*%n";
-
-  # wallops
-  wallop = "%_$*%n: ";
-  wallop_nick = "%n$*";
-  wallop_action = "%_ * $*%n ";
-
-  # netsplits
-  netsplit = "%R$*%n";
-  netjoin = "%C$*%n";
-
-  # /names list
-  names_prefix = "";
-  names_nick = "[%_$0%_$1-] ";
-  names_nick_op = "{names_nick $*}";
-  names_nick_halfop = "{names_nick $*}";
-  names_nick_voice = "{names_nick $*}";
-  names_users = "[%g$*%n]";
-  names_channel = "%G$*%n";
-
-  # DCC
-  dcc = "%g$*%n";
-  dccfile = "%_$*%_";
-
-  # DCC chat, own msg/action
-  dccownmsg = "[%r$0%K($1-%K)%n] ";
-  dccownnick = "%R$*%n";
-  dccownquerynick = "%_$*%n";
-  dccownaction = "{action $*}";
-  dccownaction_target = "{action_core $0}%K:%c$1%n ";
-
-  # DCC chat, others
-  dccmsg = "[%G$1-%K(%g$0%K)%n] ";
-  dccquerynick = "%G$*%n";
-  dccaction = "%_ (*dcc*) $*%n %|";
-
-  ##
-  ## statusbar
-  ##
-
-  # default background for all statusbars. You can also give
-  # the default foreground color for statusbar items.
-  sb_background = "%4%w";
-
-  # default backround for "default" statusbar group
-  #sb_default_bg = "%4";
-  # background for prompt / input line
-  sb_prompt_bg = "%n";
-  # background for info statusbar
-  sb_info_bg = "%8";
-  # background for topicbar (same default)
-  #sb_topic_bg = "%4";
-
-  # text at the beginning of statusbars. sb-item already puts
-  # space there,so we don't use anything by default.
-  sbstart = "";
-  # text at the end of statusbars. Use space so that it's never
-  # used for anything.
-  sbend = " ";
-
-  topicsbstart = "{sbstart $*}";
-  topicsbend = "{sbend $*}";
-
-  prompt = "[$*] ";
-
-  sb = " %c[%n$*%c]%n";
-  sbmode = "(%c+%n$*)";
-  sbaway = " (%GzZzZ%n)";
-  sbservertag = ":$0 (change with ^X)";
-  sbnickmode = "$0";
-
-  # activity in statusbar
-
-  # ',' separator
-  sb_act_sep = "%c$*";
-  # normal text
-  sb_act_text = "%c$*";
-  # public message
-  sb_act_msg = "%W$*";
-  # hilight
-  sb_act_hilight = "%M$*";
-  # hilight with specified color, $0 = color, $1 = text
-  sb_act_hilight_color = "$0$1-%n";
-};

install

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

local/bin/dfm

@@ -9,7 +9,6 @@
 # Helper variables, override with ENVs like `VERBOSE=1 dfm help`
 : "${VERBOSE:=0}"
 : "${DOTFILES:=$HOME/.dotfiles}"
-: "${SHARED_SCRIPT:=$DOTFILES/scripts/shared.sh}"
 : "${BREWFILE:=$DOTFILES/config/homebrew/Brewfile}"
 : "${HOSTFILES:=$DOTFILES/hosts}"
 
@@ -17,9 +16,9 @@ SCRIPT=$(basename "$0")
 
 VERSION_NVM="v0.39.5"
 
-export DOTFILES_SHARED_LOADED=""
+export DOTFILES="$HOME/.dotfiles"
 # shellcheck source=./../../scripts/shared.sh
-source "$SHARED_SCRIPT"
+source "$HOME/.dotfiles/scripts/shared.sh"
 
 # Loads configs for better installation experience
 x-load-configs
@@ -45,6 +44,7 @@ function section_install
     "nvm:Install Node Version Manager (nvm)"
     "npm:Install NPM Packages"
     "ntfy:Install ntfy"
+    "ohmybash:Install oh-my-bash"
     "pip:Install pip/python packages"
     "z:Install z"
   )
@@ -57,6 +57,7 @@ function section_install
       $0 install fonts
       $0 install antigen
       $0 brew install
+      $0 install ohmybash
       $0 install pip
       $0 install cargo
       $0 install composer
@@ -76,80 +77,105 @@ function section_install
       msgr yay "All done!"
       ;;
     antigen)
+      msg "Installing antigen..."
       curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
         && msg_yay "New antigen installed!"
       ;;
     cargo)
+      msg "Installing cargo packages..."
       bash "$DOTFILES/scripts/install-cargo-packages.sh" \
         && msg_yay "cargo packages installed!"
       ;;
     cheat-databases)
+      msg "Installing cheat databases..."
       for database in "$DOTFILES"/scripts/install-cheat-*; do
         bash "$database" \
           && msg_yay "Cheat: $database run"
       done
       ;;
     composer)
+      msg "Installing composer..."
       bash "$DOTFILES/scripts/install-composer.sh" \
         && msg_yay "composer installed!"
       ;;
     dotenv)
+      msg "Installing dotenv-linter..."
       curl -sSfL \
         https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh \
         | sh -s -- -b "$XDG_BIN_HOME" \
         && msg_yay "dotenv-linter installed!"
       ;;
     fonts)
+      msg "Installing fonts..."
       bash "$DOTFILES/scripts/install-fonts.sh" \
         && msg_yay "Installed fonts!"
       ;;
     fzf)
+      msg "Installing fzf..."
       bash "$DOTFILES/scripts/install-fzf.sh" \
         && msg_yay "fzf installed!"
       ;;
     gh)
+      msg "Installing GitHub CLI Extensions..."
       bash "$DOTFILES/scripts/install-gh-extensions.sh" \
         && msg_yay "github cli extensions installed!"
       ;;
     go)
+      msg "Installing Go Packages..."
       bash "$DOTFILES/scripts/install-go-packages.sh" \
         && msg_yay "go packages installed!"
       ;;
     imagick)
+      msg "Installing ImageMagick CLI..."
       curl -L https://imagemagick.org/archive/binaries/magick > "$XDG_BIN_HOME/magick" \
         && chmod +x "$XDG_BIN_HOME/magick" \
         && msg_yay "imagick installed!"
       ;;
     starship)
+      msg "Installing starship.rs..."
       curl -sS https://starship.rs/install.sh | sh -s -- \
         --bin-dir ~/.local/bin \
         --yes \
         && msg_yay "starship installed!"
       ;;
     macos)
+      msg "Setting up macOS defaults..."
       bash "$DOTFILES/scripts/set-macos-defaults.sh" \
         && msg_yay "Brewfile defined apps has been installed!"
       ;;
     neofetch)
+      msg "Installing neofetch..."
       bash "$DOTFILES/scripts/install-neofetch.sh" \
         && msg_yay "neofetch installed!"
       ;;
     nvm)
+      msg "Installing nvm..."
       curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash \
         && nvm install --lts --latest-npm --default
       git checkout "$DOTFILES/base/zshrc"
       msg_yay "nvm installed!"
       ;;
     npm)
+      msg "NPM Packages install started..."
       bash "$DOTFILES/scripts/install-npm-packages.sh" \
         && msg_yay "NPM Packages have been installed!"
       ;;
     ntfy)
+      msg "ntfy install started..."
       bash "$DOTFILES/scripts/install-ntfy.sh" \
         && msg_yay "ntfy installed!"
       ;;
-    pip) bash "$DOTFILES/scripts/install-pip-packages.sh" ;;
+    ohmybash)
+      msg "oh-my-bash install started..."
+      bash "$DOTFILES/scripts/install-ohmybash.sh" \
+        && msg_yay "oh-my-bash installed!"
+      ;;
+    pip)
+      msg "pip install started..."
+      bash "$DOTFILES/scripts/install-pip-packages.sh"
+      ;;
     z)
+      msg "Installing z..."
       bash "$DOTFILES/scripts/install-z.sh" \
         && msg_yay "z has been installed!"
       ;;

local/bin/x-dc

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Create directory if it doesn't exist already
+#
+# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
+# Licensed under MIT License. http://www.opensource.org/licenses/mit-license.
+
+dir="$1"
+
+[ $# -eq 0 ] && {
+  echo "Usage: $0 full/path/to/dir/to/create"
+  exit 1
+}
+
+if [ ! -d "$dir" ]; then
+  mkdir -p "$dir" && exit 0
+fi

local/bin/x-load-configs

@@ -2,13 +2,13 @@
 # Load our configuration files
 # Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
 
-: "${DOTFILES:=$HOME/.dotfiles}"
-source "$DOTFILES/scripts/shared.sh"
+DOTFILES="$HOME/.dotfiles"
+source "$HOME/.dotfiles/scripts/shared.sh"
 
 CONFIG_PATH="$DOTFILES/config"
 
 # Load the shell dotfiles, and then some:
-function load()
+function x-load-config-fn()
 {
   for FILE in $CONFIG_PATH/{exports,alias,functions}; do
     FILENAME="$FILE"
@@ -28,4 +28,4 @@ function load()
   done
 }
 
-load
+x-load-config-fn

scripts/install-cargo-packages.sh

@@ -22,7 +22,7 @@ packages=(
   "bkt"
   # a structural diff that understands syntax
   "difftastic"
-  # a modern replacement for ‘ls’.
+  # a modern replacement for ls.
   "eza"
   # A simple, fast and user-friendly alternative to 'find'
   "fd-find"

scripts/install-cheat-purebashbible.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2231,SC2034,SC2181,SC2068
 # shellcheck source=shared.sh
-DOTFILES_SHARED_LOADED=""
 source "$HOME/.dotfiles/scripts/shared.sh"
 
 PBB_REQUIRED_TOOLS=(git cheat)
@@ -15,13 +14,19 @@ PBB_SYNTAX="syntax: bash"
 PBB_TAGS="tags: [bash]"
 
 PBB_TEMP_PREFIX=$(basename "$0")
-PBB_TEMP_DIR="/tmp/pbb-$(rnd)"
+PBB_TEMP_DIR="$XDG_CACHE_HOME/cheat/pbb"
 
 # If there's no .git, clone the folder
 if [ ! -d "$PBB_TEMP_DIR/.git" ]; then
   msg_run "Starting to clone $PBB_GIT"
   git clone --depth 1 --single-branch -q "$PBB_GIT" "$PBB_TEMP_DIR" \
     && msg_yay "Cloned $PBB_GIT"
+else
+  # Update the repo
+  msg_run "Starting to update $PBB_GIT"
+  git -C "$PBB_TEMP_DIR" reset --hard origin/master
+  git -C "$PBB_TEMP_DIR" pull -q \
+    && msg_yay "Updated $PBB_GIT"
 fi
 
 PBB_CHAPTERS=$(ls -1v "$PBB_TEMP_DIR"/manuscript/chapter*)
@@ -51,8 +56,3 @@ for f in ${PBB_CHAPTERS[@]}; do
     echo -e "---\n$T---\n$(cat "$CHEAT_FILE")" > "$CHEAT_FILE"
   fi
 done
-
-# Cleanup
-if [ -d "$PBB_TEMP_DIR" ]; then
-  rm -rf "$PBB_TEMP_DIR"
-fi

scripts/install-cheat-tldr.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2231,SC2034,SC2181,SC2068
 # shellcheck source=shared.sh
-DOTFILES_SHARED_LOADED=""
 source "$HOME/.dotfiles/scripts/shared.sh"
 
 TLDR_REQUIRED_TOOLS=(git cheat)
@@ -14,13 +13,19 @@ TLDR_SOURCE="source: $TLDR_GIT"
 TLDR_SYNTAX="syntax: markdown"
 
 TLDR_TEMP_PREFIX=$(basename "$0")
-TLDR_TEMP_DIR="/tmp/cheat-tldr-$(rnd)"
+TLDR_TEMP_DIR="$XDG_CACHE_HOME/cheat/tldr"
 
 # If there's no .git, clone the folder
 if [ ! -d "$TLDR_TEMP_DIR/.git" ]; then
   msg_run "Starting to clone $TLDR_GIT"
   git clone --depth 1 --single-branch -q "$TLDR_GIT" "$TLDR_TEMP_DIR" \
     && msg_done "Cloned $TLDR_GIT"
+else
+  # Update the repo
+  msg_run "Starting to update $TLDR_GIT"
+  git -C "$TLDR_TEMP_DIR" reset --hard origin/main
+  git -C "$TLDR_TEMP_DIR" pull -q \
+    && msg_done "Updated $TLDR_GIT"
 fi
 
 # Fetch the destination directory from cheat defined directories.
@@ -68,8 +73,3 @@ for d in "$TLDR_TEMP_DIR"/pages/*; do
 
   done
 done
-
-# Cleanup
-if [ -d "$TLDR_TEMP_DIR" ]; then
-  rm -rf "$TLDR_TEMP_DIR"
-fi

scripts/install-ohmybash.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+#
+# Install oh-my-bash
+#
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+export OSH="$HOME/.local/share/oh-my-bash"
+
+if [ ! -d "$OSH" ]; then
+  [ -f "$HOME/.bashrc" ] && mv "$HOME/.bashrc" "$HOME/.bashrc.temp"
+  bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)" --unattended
+  [ -f "$HOME/.bashrc.temp" ] && mv "$HOME/.bashrc.temp" "$HOME/.bashrc"
+else
+  msg_done "oh-my-bash ($OSH) already installed"
+fi

scripts/shared.sh

@@ -5,11 +5,160 @@
 
 # Helper env variables. Use like this: VERBOSE=1 ./script.sh
 : "${VERBOSE:=0}"
-: "${DOTFILES:=$HOME/.dotfiles}"
 
+# Modified from https://stackoverflow.com/a/28776166
+(
+  [[ -n $ZSH_VERSION && $ZSH_EVAL_CONTEXT =~ :file$ ]] \
+    || [[ -n $BASH_VERSION ]] && (return 0 2> /dev/null)
+) && sourced=1 || sourced=0
+
+export DOTFILES="$HOME/.dotfiles"
 DOTFILES_CURRENT_SHELL=$(ps -p $$ -oargs=)
 export DOTFILES_CURRENT_SHELL
 
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
+
+# Remove directory from the PATH variable
+# usage: path_remove ~/.local/bin
+function path_remove
+{
+  PATH=$(echo -n "$PATH" | awk -v RS=: -v ORS=: "\$0 != \"$1\"" | sed 's/:$//')
+}
+
+# Append directory to the PATH
+# usage: path_append ~/.local/bin
+function path_append
+{
+  path_remove "$1"
+  PATH="${PATH:+"$PATH:"}$1"
+}
+
+# Prepend directory to the PATH
+# usage: path_prepend ~/.local/bin
+function path_prepend
+{
+  path_remove "$1"
+  PATH="$1${PATH:+":$PATH"}"
+}
+
+# Create directory if it doesn't exist already
+x-dc()
+{
+  dir="$1"
+
+  [ $# -eq 0 ] && {
+    echo "Usage: $0 full/path/to/dir/to/create"
+    exit 1
+  }
+
+  if [ ! -d "$dir" ]; then
+    mkdir -p "$dir" && exit 0
+  fi
+}
+
+# Create a new directory and enter it
+mkd()
+{
+  mkdir -p "$@" && cd "$@" || exit
+}
+
+# Run command silently
+# Usage: silent uptime
+silent()
+{
+  "$@" >&/dev/null
+}
+
+# Check if a file contains non-ascii characters
+nonascii()
+{
+  LC_ALL=C grep -n '[^[:print:][:space:]]' "${@}"
+}
+
+# Cache commands using bkt if installed
+if command -v bkt >&/dev/null; then
+  bkt()
+  {
+    command bkt --cache-dir="$XDG_CACHE_HOME/bkt" "$@"
+  }
+else
+  # If bkt isn't installed skip its arguments and just execute directly.
+  # Optionally write a msg to stderr suggesting users install bkt.
+  bkt()
+  {
+    while [[ "$1" == --* ]]; do shift; done
+    "$@"
+  }
+fi
+
+# shorthand for checking if the system has the bin in path,
+# this version does not use caching
+# usage: have_command php && php -v
+function have_command
+{
+  command -v "$1" >&/dev/null
+}
+
+# shorthand for checking if the system has the bin in path,
+# this version uses caching
+# usage: have php && php -v
+function have
+{
+  bkt -- which "$1" >&/dev/null
+}
+
+function brew_installed
+{
+  bkt -- brew list
+}
+
+# shorthand for checking if brew package is installed
+# usage: have_brew php && php -v
+function have_brew
+{
+  ! have brew && return 125
+
+  if bkt -- brew list "$1" &> /dev/null; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+CONFIG_PATH="$DOTFILES/config"
+
+# Load the shell dotfiles, and then some:
+function x-load-config-fn()
+{
+  for FILE in $CONFIG_PATH/{exports,alias,functions}; do
+    FILENAME="$FILE"
+    HOST="$(hostname -s)"
+    # global (exports|alias|functions) FILENAME for all hosts
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME" ] && source "$FILENAME"
+    # global secret FILENAME, git ignored
+    # shellcheck source=../config/exports-secret
+    [ -r "$FILENAME-secret" ] && source "$FILENAME-secret"
+    # host specific (exports|alias|functions) FILENAME
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME-$HOST" ] && source "$FILENAME-$HOST"
+    # host specific (exports|alias|functions) FILENAME, git ignored
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME-$HOST-secret" ] && source "$FILENAME-$HOST-secret"
+  done
+}
+
+x-load-config-fn
+
 source "$DOTFILES/local/bin/msgr"
 
 # -- Menu builder -- #
@@ -67,79 +216,6 @@ function menu_usage()
   done
 }
 
-# Cache commands using bkt if installed
-if command -v bkt >&/dev/null; then
-  bkt()
-  {
-    command bkt --cache-dir="$XDG_CACHE_HOME/bkt" "$@"
-  }
-else
-  # If bkt isn't installed skip its arguments and just execute directly.
-  # Optionally write a msg to stderr suggesting users install bkt.
-  bkt()
-  {
-    while [[ "$1" == --* ]]; do shift; done
-    "$@"
-  }
-fi
-
-# shorthand for checking if the system has the bin in path,
-# this version does not use caching
-# usage: have_command php && php -v
-function have_command
-{
-  command -v "$1" >&/dev/null
-}
-
-# shorthand for checking if the system has the bin in path,
-# this version uses caching
-# usage: have php && php -v
-function have
-{
-  bkt -- which "$1" >&/dev/null
-}
-
-function brew_installed
-{
-  bkt -- brew list
-}
-
-# shorthand for checking if brew package is installed
-# usage: have_brew php && php -v
-function have_brew
-{
-  ! have brew && return 125
-
-  if bkt -- brew list "$1" &> /dev/null; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# Remove directory from the PATH variable
-# usage: path_remove ~/.local/bin
-function path_remove
-{
-  PATH=$(echo -n "$PATH" | awk -v RS=: -v ORS=: "\$0 != \"$1\"" | sed 's/:$//')
-}
-
-# Append directory to the PATH
-# usage: path_append ~/.local/bin
-function path_append
-{
-  path_remove "$1"
-  PATH="${PATH:+"$PATH:"}$1"
-}
-
-# Prepend directory to the PATH
-# usage: path_prepend ~/.local/bin
-function path_prepend
-{
-  path_remove "$1"
-  PATH="$1${PATH:+":$PATH"}"
-}
-
 # Creates a random string
 rnd()
 {
@@ -194,37 +270,3 @@ function replacable()
 
   return 1
 }
-
-# Create directory if it doesn't exist already
-x-dc()
-{
-  dir="$1"
-
-  [ $# -eq 0 ] && {
-    echo "Usage: $0 full/path/to/dir/to/create"
-    exit 1
-  }
-
-  if [ ! -d "$dir" ]; then
-    mkdir -p "$dir" && exit 0
-  fi
-}
-
-# Create a new directory and enter it
-mkd()
-{
-  mkdir -p "$@" && cd "$@" || exit
-}
-
-# Run command silently
-# Usage: silent uptime
-silent()
-{
-  "$@" >&/dev/null
-}
-
-# Check if a file contains non-ascii characters
-nonascii()
-{
-  LC_ALL=C grep -n '[^[:print:][:space:]]' "${@}"
-}

yarn.lock

@@ -29,14 +29,14 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@commitlint/cli@17.7.1":
-  version "17.7.1"
-  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.7.1.tgz#f3ab35bd38d82fcd4ab03ec5a1e9db26d57fe1b0"
-  integrity sha512-BCm/AT06SNCQtvFv921iNhudOHuY16LswT0R3OeolVGLk8oP+Rk9TfQfgjH7QPMjhvp76bNqGFEcpKojxUNW1g==
+"@commitlint/cli@17.7.2":
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.7.2.tgz#3a0287373224db14968ab160b2b4988c693d3400"
+  integrity sha512-t3N7TZq7lOeqTOyEgfGcaltHqEJf7YDlPg75MldeVPPyz14jZq/+mbGF9tueDLFX8R6RwdymrN6D+U5XwZ8Iwg==
   dependencies:
     "@commitlint/format" "^17.4.4"
     "@commitlint/lint" "^17.7.0"
-    "@commitlint/load" "^17.7.1"
+    "@commitlint/load" "^17.7.2"
     "@commitlint/read" "^17.5.1"
     "@commitlint/types" "^17.4.4"
     execa "^5.0.0"
@@ -85,34 +85,34 @@
     "@commitlint/types" "^17.4.4"
     chalk "^4.1.0"
 
-"@commitlint/is-ignored@^17.7.0":
-  version "17.7.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.7.0.tgz#df9b284420bdb1aed5fdb2be44f4e98cc4826014"
-  integrity sha512-043rA7m45tyEfW7Zv2vZHF++176MLHH9h70fnPoYlB1slKBeKl8BwNIlnPg4xBdRBVNPaCqvXxWswx2GR4c9Hw==
+"@commitlint/is-ignored@^17.8.0":
+  version "17.8.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.8.0.tgz#429a050cebe8dc56dd4fe4f4c23ea9e1a679dfc6"
+  integrity sha512-8bR6rxNcWaNprPBdE4ePIOwbxutTQGOsRPYWssX+zjGxnEljzaZSGzFUOMxapYILlf8Tts/O1wPQgG549Rdvdg==
   dependencies:
     "@commitlint/types" "^17.4.4"
     semver "7.5.4"
 
 "@commitlint/lint@^17.7.0":
-  version "17.7.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.7.0.tgz#33f831298dc43679e4de6b088aea63d1f884c7e7"
-  integrity sha512-TCQihm7/uszA5z1Ux1vw+Nf3yHTgicus/+9HiUQk+kRSQawByxZNESeQoX9ujfVd3r4Sa+3fn0JQAguG4xvvbA==
+  version "17.8.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.8.0.tgz#d3a7fafe810db060aea15322e30384896da887f9"
+  integrity sha512-4ihwnqOY4TcJN6iz5Jv1LeYavvBllONwFyGxOIWmCT5s4PNMb43cws2TUdbXTZL1Vq59etGKd5LWYDFPVbs5EA==
   dependencies:
-    "@commitlint/is-ignored" "^17.7.0"
+    "@commitlint/is-ignored" "^17.8.0"
     "@commitlint/parse" "^17.7.0"
     "@commitlint/rules" "^17.7.0"
     "@commitlint/types" "^17.4.4"
 
-"@commitlint/load@^17.7.1":
-  version "17.7.1"
-  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.7.1.tgz#0723b11723a20043a304a74960602dead89b5cdd"
-  integrity sha512-S/QSOjE1ztdogYj61p6n3UbkUvweR17FQ0zDbNtoTLc+Hz7vvfS7ehoTMQ27hPSjVBpp7SzEcOQu081RLjKHJQ==
+"@commitlint/load@^17.7.2":
+  version "17.8.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.8.0.tgz#82f6c7555daecb4ce4b8a6282fcecc3665747578"
+  integrity sha512-9VnGXYJCP4tXmR4YrwP8n5oX6T5ZsHfPQq6WuUQOvAI+QsDQMaTGgTRXr7us+xsjz+b+mMBSagogqfUx2aixyw==
   dependencies:
     "@commitlint/config-validator" "^17.6.7"
     "@commitlint/execute-rule" "^17.4.0"
     "@commitlint/resolve-extends" "^17.6.7"
     "@commitlint/types" "^17.4.4"
-    "@types/node" "20.4.7"
+    "@types/node" "20.5.1"
     chalk "^4.1.0"
     cosmiconfig "^8.0.0"
     cosmiconfig-typescript-loader "^4.0.0"
@@ -205,9 +205,9 @@
     eslint-visitor-keys "^3.3.0"
 
 "@eslint-community/regexpp@^4.6.0", "@eslint-community/regexpp@^4.6.1":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.0.tgz#7ccb5f58703fa61ffdcbf39e2c604a109e781162"
-  integrity sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.1.tgz#449dfa81a57a1d755b09aa58d826c1262e4283b4"
+  integrity sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==
 
 "@eslint/eslintrc@^2.1.2":
   version "2.1.2"
@@ -224,10 +224,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.50.0":
-  version "8.50.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.50.0.tgz#9e93b850f0f3fa35f5fa59adfd03adae8488e484"
-  integrity sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==
+"@eslint/js@8.51.0":
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.51.0.tgz#6d419c240cfb2b66da37df230f7e7eef801c32fa"
+  integrity sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==
 
 "@humanwhocodes/config-array@^0.11.11":
   version "0.11.11"
@@ -261,23 +261,23 @@
     wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
 "@ivuorinen/commitlint-config@^0.1.10":
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/@ivuorinen/commitlint-config/-/commitlint-config-0.1.10.tgz#7218e39de5628242508413f2ad87a614081916a4"
-  integrity sha512-ONGUxrmUG5vd/Oyzy5jp+fQzpK5ftsxqrWLN/7TxEBRNSj3ab6vF9tSLdMg+RzbTubfPxOkGD9hrPVP0vXRDYw==
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@ivuorinen/commitlint-config/-/commitlint-config-0.1.11.tgz#bfb360a37feafc91b13c2e6c11f70558d0c1e9d4"
+  integrity sha512-/pGcqZofzTx8stVDGSszOj9VA+vwTdqeGx7oTF5KIkvAN2IBq1l/n4mv3E158LP6j4xIzV6Dth2z+IeKBMcFTA==
   dependencies:
-    "@commitlint/cli" "17.7.1"
+    "@commitlint/cli" "17.7.2"
     "@commitlint/config-conventional" "17.7.0"
 
 "@ivuorinen/eslint-config@^0.2.13":
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/@ivuorinen/eslint-config/-/eslint-config-0.2.13.tgz#9b555c70615da6c78677a9e73bd992070c90dd27"
-  integrity sha512-xPgV4+70c1/y8G/0eoCNPyQKetdPxQlc9p5b0nzi9fVJrdKBQfUGFrOi+Z8COTp9wNW7kBxkZeIzWO41PwlzmQ==
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/@ivuorinen/eslint-config/-/eslint-config-0.2.17.tgz#ccf6aa9d7d1770679454e9c5e15b3c67ab7fb5ef"
+  integrity sha512-RCtkRcHf1M1ifQqxOFbXNVRKT2PagZXX1gjrhQNIrrpWAnHdBY86qsqXj3aOMr/kDoDTQXzPKG6G1lINlHgUMw==
   dependencies:
-    eslint "8.50.0"
+    eslint "8.51.0"
     eslint-config-standard "17.1.0"
     eslint-plugin-import "2.28.1"
-    eslint-plugin-jest "27.4.0"
-    eslint-plugin-n "16.1.0"
+    eslint-plugin-jest "27.4.2"
+    eslint-plugin-n "16.2.0"
     eslint-plugin-promise "6.1.1"
     eslint-plugin-sonarjs "0.21.0"
 
@@ -370,14 +370,14 @@
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/minimist@^1.2.0":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
-  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.3.tgz#dd249cef80c6fff2ba6a0d4e5beca913e04e25f8"
+  integrity sha512-ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A==
 
-"@types/node@20.4.7":
-  version "20.4.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.7.tgz#74d323a93f1391a63477b27b9aec56669c98b2ab"
-  integrity sha512-bUBrPjEry2QUTsnuEjzjbS7voGWCc30W0qzgMf90GPeDGFRakvrz47ju+oqDAKCXLUCe39u57/ORMl/O/04/9g==
+"@types/node@20.5.1":
+  version "20.5.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.1.tgz#178d58ee7e4834152b0e8b4d30cbfab578b9bb30"
+  integrity sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.2"
@@ -827,9 +827,9 @@ deep-is@^0.1.3:
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 define-data-property@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.0.tgz#0db13540704e1d8d479a0656cf781267531b9451"
-  integrity sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
   dependencies:
     get-intrinsic "^1.2.1"
     gopd "^1.0.1"
@@ -1041,17 +1041,17 @@ eslint-plugin-import@2.28.1:
     semver "^6.3.1"
     tsconfig-paths "^3.14.2"
 
-eslint-plugin-jest@27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.4.0.tgz#3926cca723c40c3d7a3fe0e1fd911eff5e681f50"
-  integrity sha512-ukVeKmMPAUA5SWjHenvyyXnirKfHKMdOsTZdn5tZx5EW05HGVQwBohigjFZGGj3zuv1cV6hc82FvWv6LdIbkgg==
+eslint-plugin-jest@27.4.2:
+  version "27.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.4.2.tgz#181d999ac67a9b6040db1d27935887cf5a2882ed"
+  integrity sha512-3Nfvv3wbq2+PZlRTf2oaAWXWwbdBejFRBR2O8tAO67o+P8zno+QGbcDYaAXODlreXVg+9gvWhKKmG2rgfb8GEg==
   dependencies:
     "@typescript-eslint/utils" "^5.10.0"
 
-eslint-plugin-n@16.1.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-16.1.0.tgz#73d24fe3e37d04519c1f9230bdbd3aa567c66799"
-  integrity sha512-3wv/TooBst0N4ND+pnvffHuz9gNPmk/NkLwAxOt2JykTl/hcuECe6yhTtLJcZjIxtZwN+GX92ACp/QTLpHA3Hg==
+eslint-plugin-n@16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-16.2.0.tgz#3f98ca9fadd9f7bdaaf60068533118ecb685bfb5"
+  integrity sha512-AQER2jEyQOt1LG6JkGJCCIFotzmlcCZFur2wdKrp1JX2cNotC7Ae0BcD/4lLv3lUAArM9uNS8z/fsvXTd0L71g==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     builtins "^5.0.1"
@@ -1094,15 +1094,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@8.50.0:
-  version "8.50.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.50.0.tgz#2ae6015fee0240fcd3f83e1e25df0287f487d6b2"
-  integrity sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==
+eslint@8.51.0:
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.51.0.tgz#4a82dae60d209ac89a5cff1604fea978ba4950f3"
+  integrity sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
     "@eslint/eslintrc" "^2.1.2"
-    "@eslint/js" "8.50.0"
+    "@eslint/js" "8.51.0"
     "@humanwhocodes/config-array" "^0.11.11"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
@@ -1254,15 +1254,15 @@ find-up@^5.0.0:
     path-exists "^4.0.0"
 
 flat-cache@^3.0.4:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.0.tgz#0e54ab4a1a60fe87e2946b6b00657f1c99e1af3f"
-  integrity sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b"
+  integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==
   dependencies:
-    flatted "^3.2.7"
+    flatted "^3.2.9"
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flatted@^3.2.7:
+flatted@^3.2.9:
   version "3.2.9"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
   integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
@@ -1297,9 +1297,9 @@ fs.realpath@^1.0.0:
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
 function.prototype.name@^1.1.6:
   version "1.1.6"
@@ -1412,9 +1412,9 @@ global-dirs@^0.1.1:
     ini "^1.3.4"
 
 globals@^13.19.0:
-  version "13.22.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.22.0.tgz#0c9fcb9c48a2494fbb5edbfee644285543eba9d8"
-  integrity sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==
+  version "13.23.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02"
+  integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==
   dependencies:
     type-fest "^0.20.2"
 
@@ -1499,11 +1499,9 @@ has-tostringtag@^1.0.0:
     has-symbols "^1.0.2"
 
 has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
+  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
@@ -1740,9 +1738,9 @@ isexe@^2.0.0:
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 jackspeak@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.5.tgz#443f237f9eeeb0d7c6ec34835ef5289bb4acb068"
-  integrity sha512-Ratx+B8WeXLAtRJn26hrhY8S1+Jz6pxPMrkrdkgb/NstTNiqMhX0/oFVu5wX+g5n6JlEu2LPsDJmY8nRP4+alw==
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
   dependencies:
     "@isaacs/cliui" "^8.0.2"
   optionalDependencies:
@@ -1812,9 +1810,9 @@ jsonparse@^1.2.0:
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
 keyv@^4.5.3:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25"
-  integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
     json-buffer "3.0.1"
 
@@ -2057,9 +2055,9 @@ minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.3.tgz#05ea638da44e475037ed94d1c7efcc76a25e1974"
-  integrity sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
 
 ms@2.1.2:
   version "2.1.2"
@@ -2104,9 +2102,9 @@ npm-run-path@^4.0.1:
     path-key "^3.0.0"
 
 object-inspect@^1.12.3, object-inspect@^1.9.0:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.0.tgz#42695d3879e1cd5bda6df5062164d80c996e23e2"
+  integrity sha512-HQ4J+ic8hKrgIt3mqk6cVOVrW2ozL4KdvHlqpBv9vDYWx9ysAgENAdvy4FoGF+KFdhR7nQTNm5J0ctAeOwn+3g==
 
 object-keys@^1.1.1:
   version "1.1.1"
@@ -2368,9 +2366,9 @@ resolve-pkg-maps@^1.0.0:
   integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
 
 resolve@^1.10.0, resolve@^1.22.2, resolve@^1.22.4:
-  version "1.22.6"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.6.tgz#dd209739eca3aef739c626fea1b4f3c506195362"
-  integrity sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
     is-core-module "^2.13.0"
     path-parse "^1.0.7"
@@ -2513,9 +2511,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz#142460aabaca062bc7cd4cc87b7d50725ed6a4ba"
-  integrity sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ==
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f"
+  integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==
 
 split2@^3.0.0, split2@^3.2.2:
   version "3.2.2"
@@ -2577,7 +2575,6 @@ string_decoder@^1.1.1:
     safe-buffer "~5.2.0"
 
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  name strip-ansi-cjs
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==