fix(cargo): change cargo-clean to cargo-cache

.nvmrc

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

base/bashrc

@@ -3,9 +3,6 @@
 
 # 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"
 
 # Explicitly set XDG folders
 # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
@@ -18,83 +15,24 @@ export XDG_BIN_HOME="$HOME/.local/bin"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_RUNTIME_DIR="$HOME/.local/run"
 
+# Paths
+export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/cargo/bin:$PATH"
+
+source "$DOTFILES/config/exports"
+source "$DOTFILES/config/functions"
+source "$DOTFILES/config/alias"
+x-load-configs
+
+# shellcheck source=../config/fzf/fzf.bash
+[ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&
+  source "${DOTFILES}/config/fzf/fzf.bash"
+
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null
 
-# Enable the subsequent settings only in interactive sessions
+x-have rbenv && {
-case $- in
+  eval "$(rbenv init - bash)"
-*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
 }
 
-
+eval "$(starship init bash)"
+source "$DOTFILES/config/alias"

base/zshenv

@@ -16,3 +16,4 @@ export XDG_BIN_HOME="$HOME/.local/bin"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_RUNTIME_DIR="$HOME/.local/run"
 
+source "$DOTFILES/config/exports"

base/zshrc

@@ -1,27 +1,30 @@
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-source "$DOTFILES/scripts/shared.sh"
+export DOTFILES="$HOME/.dotfiles"
+
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
+
+export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
+
+x-load-configs
 
 export COMPLETION_WAITING_DOTS=true
 
-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"
 
@@ -58,9 +61,9 @@ antigen bundle jreese/zsh-titles
 antigen bundle zsh-users/zsh-completions
 
 # these should be available if there's need
-have brew && antigen bundle brew
+x-have brew && antigen bundle brew
-have php && antigen bundle php
+x-have php && antigen bundle php
-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
+x-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
 
 # nvm is a strange beast
 zstyle ':omz:plugins:nvm' autoload yes
@@ -78,5 +81,24 @@ antigen apply
 [ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
   && source "${DOTFILES}/config/fzf/fzf.zsh"
 
-# Start starship
+x-have op && {
+  eval "$(op completion zsh)"
+  compdef _op op
+}
+
+x-have rbenv && {
+  eval "$(rbenv init - zsh)"
+}
+
+# Autoupdate tmux window name
+TMUX_WINDOW_NAME_PLUGIN="$DOTFILES/config/tmux/plugins/tmux-window-name/scripts/rename_session_windows.py"
+[ -f "$TMUX_WINDOW_NAME_PLUGIN" ] && {
+  tmux-window-name()
+  {
+    ($TMUX_WINDOW_NAME_PLUGIN &)
+  }
+  add-zsh-hook chpwd tmux-window-name
+}
+
 eval "$(starship init zsh)"
+source "$DOTFILES/config/alias"

config/alacritty/alacritty.yml

@@ -19,8 +19,8 @@ env:
 window:
   dynamic_title: true
   dimensions:
-    columns: 130
+    columns: 200
-    lines: 40
+    lines: 100
 
   # Adds this many blank pixels of padding around the window
   # Units are physical pixels; this is not DPI aware.
@@ -31,7 +31,7 @@ window:
 
   decorations: buttonless
 
-  opacity: 0.97
+  opacity: 0.98
 
 # When true, bold text is drawn using the bright variant of colors.
 draw_bold_text_with_bright_colors: true
@@ -104,9 +104,9 @@ colors:
     cyan: '0x7dcfff'
     white: '0xc0caf5'
 
-  indexed_colors:
+  # indexed_colors:
-    - { index: 16, color: '0xff9e64' }
+  # - { index: 16, color: '0xff9e64' }
-    - { index: 17, color: '0xdb4b4b' }
+  # - { index: 17, color: '0xdb4b4b' }
 
 key_bindings:
   - { key: V, mods: Command, action: Paste }

config/alias

@@ -1,69 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck source="../scripts/shared.sh"
 # shellcheck disable=1091,2139
-DOTFILES="$HOME/.dotfiles"
-
-# Get installed php versions from brew and setup aliases
-function x-set-php-aliases
-{
-  have brew && {
-    local php_versions=()
-    while IFS="" read -r line; do php_versions+=("$line"); done < <(brew_installed | grep '^php')
-
-    php_error_reporting='-d error_reporting=22527'
-
-    for version in "${php_versions[@]}"; do
-      # drop the dot from version (8.0 -> 80)
-      local php_abbr="${version//\./}"
-      # replace "php@" with "p" so "php@80" becomes "p80"
-      local php_alias="${php_abbr//php@/p}"
-
-      # Fetch the exec path once
-      php_exec="$(brew --prefix "$version")/bin/php"
-
-      # Raw PHP without error_reporting flag.
-      # shellcheck disable=SC2139
-      alias "${php_alias}"r="$php_exec"
-      # PHP with error_reporting flag.
-      # shellcheck disable=SC2139,SC2140
-      alias "$php_alias"="$php_exec $php_error_reporting"
-      # Local PHP Server.
-      # shellcheck disable=SC2139,SC2140
-      alias "${php_alias}s"="$php_exec -S localhost:9000"
-      # Use composer with specific PHP and error_reporting flag on.
-      # shellcheck disable=SC2139,SC2140
-      alias "${php_alias}c"="$php_exec $php_error_reporting $(which composer)"
-    done
-  }
-}
-
-if [[ $(uname) == 'Darwin' ]]; then
-
-  x-set-php-aliases
-
-  # Laravel Sail shortcut
-  alias sail='[ -f sail ] && bash sail || bash vendor/bin/sail'
-
-  # Flush Directory Service cache
-  alias flushdns="sudo dscacheutil -flushcache; sudo killall -HUP mDNSResponder"
-
-  # Lock the screen
-  alias afk="osascript -e 'tell application \"System Events\" to keystroke \"q\" using {command down,control down}'"
-
-  # Empty the Trash on all mounted volumes and the main HDD
-  # Also, clear Apple’s System Logs to improve shell startup speed
-  alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
-fi
-
-# Be nice
-alias please="sudo "
 
 # Color the grep output
-alias grep='grep --color'
+alias grep="grep --color"
 
-! have eza && alias ls='ls --color=auto'
+x-have eza && {
-have eza && {
+  alias ls="eza -h -s=type --git --icons --group-directories-first"
-  alias ls='eza -h -s=type --git --icons --group-directories-first'
 }
 
 # Easier navigation: .., ..., ....
@@ -86,7 +29,7 @@ alias sl="ls"
 alias lsd="ls -lF | grep '^d'"
 
 # IP addresses
-alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
+alias x-ip="dig +short myip.opendns.com @resolver1.opendns.com"
 alias localip="ipconfig getifaddr en1"
 alias ips="ifconfig -a | grep -o 'inet6\? \(\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)\|[a-fA-F0-9:]\+\)' | sed -e 's/inet6* //'"
 
@@ -103,9 +46,6 @@ alias flush="dscacheutil -flushcache"
 # Update locatedb
 alias updatedb="sudo /usr/libexec/locate.updatedb"
 
-# Always return full history
-alias history="history 1"
-
 # tmux: automatically attach or create session with name 'main'
 alias tmux='tmux new-session -A -s main'
 # tmux: attach or create new session
@@ -139,14 +79,27 @@ alias zedit='$EDITOR ~/.dotfiles'
 
 alias irssi="irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_CONFIG_HOME/irssi"
 
-if [[ -f "$HOME/.aliases.local" ]]; then
+alias wget="wget --hsts-file=$XDG_DATA_HOME/wget-hsts"
-  # shellcheck disable=SC1091
-  source "$HOME/.aliases.local"
-fi
-
-alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
 alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
 
+if [[ $(uname) == 'Darwin' ]]; then
+
+  # Laravel Sail shortcut
+  alias sail='[ -f sail ] && bash sail || bash vendor/bin/sail'
+
+  # Flush Directory Service cache
+  alias flushdns="sudo dscacheutil -flushcache; sudo killall -HUP mDNSResponder"
+
+  # Lock the screen
+  alias afk="osascript -e 'tell application \"System Events\" to keystroke \"q\" using {command down,control down}'"
+
+  # Empty the Trash on all mounted volumes and the main HDD
+  # Also, clear Apple's System Logs to improve shell startup speed
+  alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
+
+  x-set-php-aliases
+fi
+
 # Alacritty preexec hook to update dynamic title
 preexec()
 {
@@ -175,12 +128,6 @@ 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()
 {

config/amethyst/amethyst.yml

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

config/amethyst/layouts/almost-maximize.js

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

config/exports

@@ -2,7 +2,55 @@
 # shellcheck shell=bash
 # vim: filetype=zsh
 
+# Cache commands using bkt if installed
+if command -v bkt >&/dev/null; then
+  bkt()
+  {
+    command bkt --cache-dir="$XDG_CACHE_HOME/bkt" "$@"
+  }
+else
+  # If bkt isn't installed skip its arguments and just execute directly.
+  # Optionally write a msg to stderr suggesting users install bkt.
+  bkt()
+  {
+    while [[ "$1" == --* ]]; do shift; done
+    "$@"
+  }
+fi
+
+# shorthand for checking if the system has the bin in path,
+# this version does not use caching
+# usage: have_command php && php -v
+have_command()
+{
+  command -v "$1" >&/dev/null
+}
+
+# shorthand for checking if the system has the bin in path,
+# this version uses caching
+# usage: have php && php -v
+have()
+{
+  bkt -- which "$1" >&/dev/null
+}
+
+brew_installed()
+{
+  bkt -- brew list
+}
+
+# shorthand for checking if brew package is installed
+# usage: have_brew php && php -v
+have_brew()
+{
+  ! x-have brew && return 125
+
+  if bkt -- brew list "$1" &> /dev/null; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 source "$DOTFILES/config/exports-shell"
 source "$DOTFILES/config/exports-apps"
-
-have nvim && export EDITOR="nvim"

config/exports-apps

@@ -7,6 +7,7 @@
 # Antigen configuration
 # https://github.com/zsh-users/antigen/wiki/Configuration
 export ADOTDIR="$XDG_DATA_HOME/antigen"
+export ANTIGEN_CACHE="$XDG_CACHE_HOME/antigen"
 export ANTIGEN_SYSTEM_RECEIPT_F=".local/share/antigen/antigen_system_lastupdate"
 export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
 
@@ -21,15 +22,14 @@ x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
 export ANDROID_HOME="$XDG_DATA_HOME/android"
 
 # bob manages nvim versions
-path_prepend "$XDG_DATA_HOME/bob/nvim-bin"
+export PATH="$XDG_DATA_HOME/bob/nvim-bin:$PATH"
-have nvim && export EDITOR="nvim"
 
 export HOMEBREW_NO_ENV_HINTS=true
 
 # composer, https://getcomposer.org/
 export COMPOSER_HOME="$XDG_STATE_HOME/composer"
 export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
-path_append "$COMPOSER_BIN"
+export PATH="$COMPOSER_BIN:$PATH"
 
 # docker, https://docs.docker.com/engine/reference/commandline/cli/
 export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
@@ -39,7 +39,7 @@ export DOCKER_SCAN_SUGGEST=false
 
 # ffmpeg
 export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
-have ffmpeg && x-dc "$FFMPEG_DATADIR"
+x-have ffmpeg && x-dc "$FFMPEG_DATADIR"
 
 # GnuPG
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
@@ -53,27 +53,21 @@ export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
 export NB_DIR="$XDG_STATE_HOME/nb"
 
 # NPM: Add npm packages to path
-have node && {
+x-have node && {
   NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
-  path_append "$NVM_NODE_BIN_DIR"
+  export PATH="$NVM_NODE_BIN_DIR:$PATH"
 }
 
 # op (1Password cli) is present
 export OP_CACHE="$XDG_STATE_HOME/1password"
-have op && {
-  [ "$DOTFILES_CURRENT_SHELL" = "zsh" ] && {
-    eval "$(op completion zsh)"
-    compdef _op op
-  }
-}
 
 # Python
 #
 # pyenv, python environments
 export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
 export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
-have pyenv && {
+x-have pyenv && {
-  path_append "$PYENV_ROOT/shims"
+  export PATH="$PYENV_ROOT/shims:$PATH"
   eval "$(pyenv init -)"
 }
 
@@ -87,16 +81,12 @@ export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
 export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle
 export RBENV_ROOT="$XDG_STATE_HOME/rbenv"
 x-dc "$RBENV_ROOT"
-have gem && path_append "${GEM_HOME}/bin"
+x-have gem && export PATH="${GEM_HOME}/bin:$PATH"
-have rbenv && {
-  [ "$DOTFILES_CURRENT_SHELL" = "zsh" ] && eval "$(rbenv init - zsh)"
-  [ "$DOTFILES_CURRENT_SHELL" = "bash" ] && eval "$(rbenv init - bash)"
-}
 
 # Rust / cargo
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
-path_append "$CARGO_HOME/bin"
+export PATH="$CARGO_HOME/bin:$PATH"
 
 # screen
 export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
@@ -104,6 +94,13 @@ export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
 # sonarlint
 export SONARLINT_USER_HOME="$XDG_DATA_HOME/sonarlint"
 
+# terraform
+# https://www.terraform.io/docs/cli/config/config-file.html
+# https://www.terraform.io/docs/cli/config/environment-variables.html
+export TF_DATA_DIR="$XDG_STATE_HOME/terraform"
+export TF_CLI_CONFIG_FILE="$XDG_CONFIG_HOME/terraform/terraformrc"
+export TF_PLUGIN_CACHE_DIR="$XDG_CACHE_HOME/terraform/plugin-cache"
+
 # tldr / tealdeer
 export TEALDEER_CONFIG_DIR="$XDG_CONFIG_HOME/tealdeer/"
 

config/exports-lakka

@@ -1,9 +1,9 @@
 # lakka exports
 
 ## LUA
-have luarocks && $(luarocks path --bin)
+x-have luarocks && $(luarocks path --bin)
 
-path_prepend "$HOME/.local/go/bin"
+export PATH="$HOME/.local/go/bin:$PATH"
 
 alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state'
 alias nano='nano -wS -$'
@@ -17,4 +17,3 @@ export RVM_PATH="$HOME/.rvm"
 export PATH="$RVM_PATH/bin:$PATH"
 # shellcheck source=$HOME/.rvm/scripts/rvm
 [[ -s "$RVM_PATH/scripts/rvm" ]] && source "$RVM_PATH/scripts/rvm" # Load RVM into a shell session *as a function*
-

config/exports-shell

@@ -3,21 +3,6 @@
 # shellcheck disable=1091,2046
 # vim: filetype=bash
 
-export DOTFILES="$HOME/.dotfiles"
-
-# Explicitly set XDG folders
-# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
-
-# custom variables
-export XDG_BIN_HOME="$HOME/.local/bin"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_RUNTIME_DIR="$HOME/.local/run"
-
-export LC_ALL=fi_FI.UTF-8
-
 # Bash completion file location
 export BASH_COMPLETION_USER_FILE="${XDG_CONFIG_HOME}/bash-completion/bash_completion"
 
@@ -38,13 +23,13 @@ export HISTORY_IGNORE="(ls|cd|cd -|pwd|exit|date|* --help)"
 export LESSHISTFILE="$XDG_STATE_HOME"/less/history
 
 # Highlight section titles in manual pages
-export LESS_TERMCAP_md="$ORANGE"
+# export LESS_TERMCAP_md="$ORANGE"
 
 # zsh autoloaded terminfo
-export TERMINFO="$XDG_DATA_HOME"/terminfo
+export TERMINFO="${XDG_DATA_HOME}/terminfo"
-export TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo:/usr/share/terminfo
+export TERMINFO_DIRS="${XDG_DATA_HOME}/terminfo":/usr/share/terminfo
 
-# Don’t clear the screen after quitting a manual page
+# Don't clear the screen after quitting a manual page
 export MANPAGER="less -X"
 
 # Always enable colored `grep` output
@@ -53,33 +38,3 @@ export GREP_OPTIONS="--color=auto"
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
 hash shopt 2> /dev/null && shopt -s checkwinsize
-
-# Set dircolors based on the file, if it exists
-have dircolors && eval $(dircolors "$XDG_CONFIG_HOME/dircolors")
-
-# If we are using zsh, color our dir lists and such
-if [ "$DOTFILES_CURRENT_SHELL" = "-zsh" ]; then
-  [[ $ZSH_VERSION != "" ]] && {
-    autoload -U colors zsh/terminfo compinit
-    colors
-    compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
-
-    x-dc "$XDG_CACHE_HOME/zsh"
-    x-dc "$XDG_STATE_HOME/zsh"
-    export HISTFILE="$XDG_STATE_HOME/zsh/history"
-    zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
-    zstyle ':completion:*' list-colors "$LS_COLORS"
-
-    # Load iterm2 shell integration
-    # https://iterm2.com/documentation-shell-integration.html
-    [[ -f "$XDG_BIN_HOME/iterm2_shell_integration.zsh" ]] \
-      && source "$XDG_BIN_HOME/iterm2_shell_integration.zsh"
-  }
-fi
-
-# If we are using bash
-if [ "$DOTFILES_CURRENT_SHELL" = "bash" ]; then
-  # shellcheck source=../config/fzf/fzf.bash
-  [ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&
-    source "${DOTFILES}/config/fzf/fzf.bash"
-fi

config/homebrew/Brewfile

@@ -20,8 +20,8 @@ brew "act"
 brew "ca-certificates"
 # YAML Parser
 brew "libyaml"
-# Interpreted, interactive, object-oriented programming language
+# Cryptography and SSL/TLS Toolkit
-brew "python@3.11"
+brew "openssl@3"
 # Automate deployment, configuration, and upgrading
 brew "ansible"
 # Checks ansible playbooks for practices and behaviour
@@ -60,6 +60,8 @@ brew "coreutils"
 brew "asdf"
 # Spell checker with better logic than ispell
 brew "aspell"
+# Interpreted, interactive, object-oriented programming language
+brew "python@3.11"
 # Official Amazon AWS command-line interface
 brew "awscli"
 # Bourne-Again SHell, a UNIX command interpreter
@@ -103,13 +105,11 @@ brew "dog"
 # Lightning-fast linter for .env files written in Rust
 brew "dotenv-linter"
 # Tool to verify that your files are in harmony with your .editorconfig
-brew "editorconfig-checker"
+brew "editorconfig-checker", link: false
 # Useful examples at the command-line
 brew "eg-examples"
-# OpenType text shaping engine
+# Spellchecker wrapping library
-brew "harfbuzz"
+brew "enchant"
-# Development kit for the Java programming language
-brew "openjdk"
 # Run arbitrary commands when files change
 brew "entr"
 # Perl lib for reading and writing EXIF metadata
@@ -158,6 +158,8 @@ brew "gpgme"
 brew "gpg-tui"
 # Image manipulation
 brew "netpbm"
+# OpenType text shaping engine
+brew "harfbuzz"
 # Framework for layout and rendering of i18n text
 brew "pango"
 # Library to render SVG files using Cairo
@@ -180,6 +182,8 @@ brew "hugo"
 brew "libheif"
 # Tools and libraries to manipulate images in many formats
 brew "imagemagick"
+# Modular IRC client
+brew "irssi"
 # Lightweight and flexible command-line JSON processor
 brew "jq"
 # Network authentication protocol
@@ -194,6 +198,8 @@ brew "libvoikko"
 brew "lolcat"
 # Package manager for the Lua programming language
 brew "luarocks"
+# LZMA-based compression program similar to gzip or bzip2
+brew "lzip"
 # Swiss Army Knife for macOS
 brew "m-cli"
 # Mac App Store command-line interface
@@ -212,6 +218,8 @@ brew "nvm"
 brew "openjdk@11"
 # Generate clients, server & docs from an OpenAPI spec (v2, v3)
 brew "openapi-generator"
+# Development kit for the Java programming language
+brew "openjdk"
 # Swiss-army knife of markup format conversion
 brew "pandoc"
 # Highly capable, feature-rich programming language
@@ -236,8 +244,6 @@ brew "rbenv"
 brew "rcm"
 # Search tool like grep and The Silver Searcher
 brew "ripgrep"
-# Safe, concurrent, practical language
-brew "rust"
 # Static analysis and lint tool, for (ba)sh scripts
 brew "shellcheck"
 # Autoformat shell script source code
@@ -260,6 +266,8 @@ brew "terragrunt"
 brew "testssl"
 # Terraform version manager inspired by rbenv
 brew "tfenv"
+# Linter for Terraform files
+brew "tflint"
 # Static analysis security scanner for your terraform code
 brew "tfsec"
 # Programmatically correct mistyped console commands
@@ -320,6 +328,8 @@ brew "teamookla/speedtest/speedtest"
 cask "1password-cli"
 # GPU-accelerated terminal emulator
 cask "alacritty"
+# Automatic tiling window manager similar to xmonad
+cask "amethyst"
 # Turn audio CDs and files into audiobooks
 cask "audiobook-builder"
 # Text editor
@@ -356,6 +366,8 @@ cask "google-cloud-sdk"
 cask "insomnia"
 # JetBrains tools manager
 cask "jetbrains-toolbox"
+# End-to-end encryption software
+cask "keybase"
 # Kubernetes IDE
 cask "lens"
 # Keep all tasks from your todo apps on your menu bar
@@ -392,6 +404,8 @@ cask "rsyncosx"
 cask "rsyncui"
 # MySQL/MariaDB database management
 cask "sequel-ace"
+# Plugin for AWS CLI to start and end sessions that connect to managed instances
+cask "session-manager-plugin"
 # Collection of apps available by subscription
 cask "setapp"
 # Team communication and collaboration software
@@ -419,8 +433,11 @@ mas "LastPass", id: 926036361
 mas "Numbers", id: 409203825
 mas "Pages", id: 409201541
 mas "Pixelmator Pro", id: 1289583905
+mas "Final Cut Pro", id: 424389933
 mas "Tailscale", id: 1475387142
 mas "Xcode", id: 497799835
+vscode "4ops.terraform"
+vscode "adamiBs.terraform-live-graph"
 vscode "akamud.vscode-theme-onelight"
 vscode "amiralizadeh9480.laravel-extra-intellisense"
 vscode "andrewleedham.vscode-css-modules"
@@ -442,11 +459,14 @@ vscode "formulahendry.auto-rename-tag"
 vscode "formulahendry.code-runner"
 vscode "foxundermoon.shell-format"
 vscode "gencer.html-slim-scss-css-class-completion"
+vscode "GitHub.copilot"
+vscode "GitHub.copilot-chat"
 vscode "github.vscode-github-actions"
 vscode "GitHub.vscode-pull-request-github"
 vscode "GraphQL.vscode-graphql"
 vscode "GraphQL.vscode-graphql-execution"
 vscode "GraphQL.vscode-graphql-syntax"
+vscode "hashicorp.terraform"
 vscode "heybourn.headwind"
 vscode "JohnnyMorganz.stylua"
 vscode "jumpinjackie.vscode-map-preview"
@@ -458,6 +478,7 @@ vscode "mikestead.dotenv"
 vscode "MisterJ.vue-volar-extention-pack"
 vscode "MrChetan.phpstorm-parameter-hints-in-vscode"
 vscode "mrorz.language-gettext"
+vscode "ms-azuretools.vscode-azureterraform"
 vscode "ms-azuretools.vscode-docker"
 vscode "ms-python.python"
 vscode "ms-python.vscode-pylance"
@@ -467,6 +488,7 @@ vscode "ms-toolsai.vscode-jupyter-cell-tags"
 vscode "ms-toolsai.vscode-jupyter-slideshow"
 vscode "ms-vscode-remote.remote-containers"
 vscode "ms-vscode-remote.remote-wsl"
+vscode "ms-vscode.azure-account"
 vscode "ms-vscode.cpptools"
 vscode "msjsdiag.vscode-react-native"
 vscode "mtxr.sqltools"

config/nvim/lua/config/lazy.lua

@@ -12,9 +12,14 @@ require("lazy").setup({
     {
       "LazyVim/LazyVim",
       import = "lazyvim.plugins",
+      opts = {
+        colorscheme = "tokyonight",
+      },
     },
     {
       "folke/tokyonight.nvim",
+      lazy = false,
+      priority = 1000,
       opts = {
         style = "night",
         transparent = true,
@@ -23,6 +28,8 @@ require("lazy").setup({
           sidebars = "transparent",
           floats = "transparent",
         },
+        dim_inactive = true,
+        lualine_bold = true,
       },
     },
     { import = "plugins" },

config/nvim/lua/plugins/coding.lua

@@ -15,6 +15,10 @@ return {
       },
     },
     keys = {
+      {
+        "<leader>ba",
+        desc = "Annotations / Comments",
+      },
       {
         "<leader>baa",
         function()
@@ -68,10 +72,12 @@ return {
   -- Clarify and beautify your comments using boxes and lines.
   -- https://github.com/LudoPinelli/comment-box.nvim
   { "LudoPinelli/comment-box.nvim", opts = {} },
+  -- Mason
+  -- https://github.com/williamboman/mason.nvim
   {
     "williamboman/mason.nvim",
-    opts = {
+    opts = function(_, opts)
-      ensure_installed = {
+      vim.list_extend(opts.ensure_installed, {
         "actionlint",
         "ansible-language-server",
         "ansible-lint",
@@ -86,18 +92,24 @@ return {
         "dockerfile-language-server",
         "editorconfig-checker",
         "fixjson",
+        "flake8",
         "html-lsp",
         "jq",
+        "jsonlint",
+        "luacheck",
         "nginx-language-server",
         "php-cs-fixer",
+        "phpcs",
+        "phpmd",
         "semgrep",
-        "sonarlint-language-server",
-        "stylua",
         "shellcheck",
         "shfmt",
-        "flake8",
+        "sonarlint-language-server",
-      },
+        "stylelint",
-    },
+        "stylua",
+        "yamllint",
+      })
+    end,
   },
   -- Vim plugin for automatic time tracking and metrics generated from your programming activity.
   -- https://github.com/wakatime/vim-wakatime

config/nvim/lua/plugins/tools.lua

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

config/terraform/terraformrc

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

config/tmux/tmux.conf

@@ -67,6 +67,9 @@ bind p paste-buffer
 #  │ Settings                                                 │
 #  ╰──────────────────────────────────────────────────────────╯
 
+# Setting status on
+set -g status "on"
+
 # Expose window title
 set-option -g set-titles on
 
@@ -85,8 +88,25 @@ set-option -g renumber-windows on
 # set vi-mode
 set-window-option -g mode-keys vi
 
-# Set theme to tokyonight
+#  ╭──────────────────────────────────────────────────────────╮
-source-file ~/.dotfiles/config/tmux/tokyonight_storm.tmux
+#  │ Theme                                                    │
+#  ╰──────────────────────────────────────────────────────────╯
+
+# Make sure status sides are long enough and centered is in the middle
+set -g status-left-length "30"
+set -g status-right-length "30"
+
+set-option -g status-position "bottom"
+set-option -g status-style 'bg=default,fg=#ffffff'
+set-option -g status-justify centre
+set-option -g status-left '#h '
+set-window-option -g window-status-style 'fg=#ffffff,bg=default'
+set-option -g window-status-format ' #I:#W '
+set-window-option -g window-status-current-style 'fg=#111111,bg=#7aa2f7'
+set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag,  , } '
+
+set-option -g status-left "#S"
+set-option -g status-right "%H:%M #{tmux_mode_indicator}"
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Plugins related configurations                           │
@@ -103,6 +123,9 @@ set -g @suspend_key 'F12'
 set -g @tmux_window_name_max_name_len "30"
 ### Replace $HOME with ~ in window names
 set -g @tmux_window_name_use_tilde "True"
+set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']"
+set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
+set -g @tmux_window_name_ignored_programs "['sqlite3']" # Default is []
 
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'
@@ -111,8 +134,11 @@ set -g @continuum-restore 'on'
 set -g @resurrect-strategy-nvim 'session'
 set -g @resurrect-dir '$HOME/.local/state/tmux/tmux-resurrect'
 
-# Modified from tokyonight_storm to include tmux_mode_indicator
+## https://github.com/MunifTanjim/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}"
+set -g @mode_indicator_prefix_mode_style 'bg=default,fg=#7aa2f7'
+set -g @mode_indicator_copy_mode_style 'bg=default,fg=yellow'
+set -g @mode_indicator_empty_mode_style 'bg=default,fg=#7aa2f7'
+set -g @mode_indicator_sync_mode_style 'bg=default,fg=red'
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Plugins                                                  │

config/tmux/tokyonight_storm.tmux

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

docs/tmux-keybindings.md

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

install

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

local/bin/dfm

@@ -19,6 +19,9 @@ VERSION_NVM="v0.39.5"
 export DOTFILES="$HOME/.dotfiles"
 # shellcheck source=./../../scripts/shared.sh
 source "$HOME/.dotfiles/scripts/shared.sh"
+source "$DOTFILES/config/exports"
+source "$DOTFILES/config/alias"
+source "$DOTFILES/config/functions"
 
 # Loads configs for better installation experience
 x-load-configs
@@ -42,6 +45,7 @@ function section_install
     "macos:Setup nice macOS defaults"
     "neofetch:Install neofetch"
     "nvm:Install Node Version Manager (nvm)"
+    "nvm-latest:Install latest lts node using nvm"
     "npm:Install NPM Packages"
     "ntfy:Install ntfy"
     "ohmybash:Install oh-my-bash"
@@ -150,11 +154,22 @@ function section_install
       ;;
     nvm)
       msg "Installing nvm..."
-      curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash \
+      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"
+      git checkout "$DOTFILES/base/bashrc"
+      $0 install nvm-latest
       msg_yay "nvm installed!"
       ;;
+    nvm-latest)
+      msg "Installing latest lts node..."
+      if [ -n "$NVM_DIR" ]; then
+        [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+      fi
+      nvm install --lts --latest-npm --default
+      git checkout "$DOTFILES/base/zshrc"
+      git checkout "$DOTFILES/base/bashrc"
+      msg_yay "latest lts node installed!"
+      ;;
     npm)
       msg "NPM Packages install started..."
       bash "$DOTFILES/scripts/install-npm-packages.sh" \
@@ -194,7 +209,7 @@ function section_brew
     "autoupdate:Setups brew auto-update and runs it immediately"
   )
 
-  have brew && {
+  x-have brew && {
     case "$1" in
       install)
         brew bundle install --file="$BREWFILE" --force --quiet && msg_yay "Done!"
@@ -220,7 +235,7 @@ function section_brew
     esac
   }
 
-  ! have brew && menu_section "$USAGE_PREFIX" "brew not available on this system"
+  ! x-have brew && menu_section "$USAGE_PREFIX" "brew not available on this system"
 }
 
 function section_helpers
@@ -285,14 +300,14 @@ function section_dotfiles
       msg_ok "Deleted old nvim files (share, state and cache + config)"
       ln -s "$DOTFILES/config/nvim" ~/.config/nvim
       msg_ok "Linked nvim and astronvim"
-      have npm && $0 install npm
+      x-have npm && $0 install npm
       msg_ok "Installed packages"
       msg_done "nvim reset!"
       ;;
     yamlfmt)
       # format yaml files
-      have yamlfmt && yamlfmt -conf "$DOTFILES/.yamlfmt"
+      x-have yamlfmt && yamlfmt -conf "$DOTFILES/.yamlfmt"
-      ! have yamlfmt && msg_err "yamlfmt not found"
+      ! x-have yamlfmt && msg_err "yamlfmt not found"
       ;;
     shfmt)
       # Format shell scripts according to following rules.

local/bin/git-fsck-dirs

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# FSCK subfolders git projects.
+#
+# Actions taken: git fsck --no-dangling --full
+#
+# Copyright 2023 Ismo Vuorinen. All Rights Reserved.
+# License: MIT <https://opensource.org/license/mit/>
+
+STARTING_PATH=${1:-$(pwd)}
+
+DIRS=$(find "$STARTING_PATH" -mindepth 1 -maxdepth 1 -type d)
+
+for DIR in $DIRS; do
+  echo "-> Processing dir: $DIR"
+  cd "$DIR" || exit 1
+  if [ -d "$DIR/.git" ]; then
+    git fsck --no-dangling --full --no-progress
+    echo ""
+  fi
+done
+
+echo ""
+echo "Done."

local/bin/x-backup-folder

@@ -1,4 +1,12 @@
 #!/usr/bin/env bash
+#
+# Backup a folder with a timestamp
+# Usage: x-backup-folder folder_to_backup [filename]
+# If filename is not provided, folder_to_backup will be used
+# Example: x-backup-folder ~/Documents/MyFolder
+#
+# Copyright (c) 2022 Ismo Vuorinen. All Rights Reserved.
+# Licensed under the MIT license.
 
 DIRECTORY=$1
 FILENAME=$2

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

@@ -2,7 +2,7 @@
 #
 # Backup local MySQL Database tables with certain prefix.
 # Ismo Vuorinen <https://github.com/ivuorinen> 2018
-#
+# License: MIT
 
 SCRIPT=$(basename "$0")
 PREFIX=$1

local/bin/x-dfm-docs-xterm-keybindings

@@ -4,17 +4,16 @@
 # Updates $HOME/.dotfiles/docs/tmux.md with my keybindings.
 
 # shellcheck source=./../../scripts/shared.sh
-DOTFILES_SHARED_LOADED=""
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-have tmux || {
+x-have tmux || {
   msg_err "tmux not found" && exit 0
 }
 
 TMUX_KEYBINDINGS_DOCS="$DOTFILES/docs/tmux-keybindings.md"
 
 CB="\n\`\`\`\n"
-KB=$(tmux list-keys)
+KB=$(tmux lsk -Tprefix -N | sed -e 's/^/    /;')
 H="# tmux keybindings\n"
 L="\nLeader: \`<ctrl><space>\`\n"
 

local/bin/x-have

@@ -3,7 +3,7 @@
 which "$1" >&/dev/null
 
 if [ $? -eq 0 ]; then
-  echo 0
+  exit 0
 else
-  echo 1
+  exit 1
 fi

local/bin/x-load-configs

@@ -2,30 +2,76 @@
 # Load our configuration files
 # Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
 
-DOTFILES="$HOME/.dotfiles"
+set -euo pipefail
-source "$HOME/.dotfiles/scripts/shared.sh"
+
+# Set verbosity with VERBOSE=1 x-load-configs
+VERBOSE="${VERBOSE:=0}"
+
+[ "$VERBOSE" = "1" ] && {
+  set -x
+}
 
 CONFIG_PATH="$DOTFILES/config"
 
 # Load the shell dotfiles, and then some:
-function x-load-config-fn()
+HOST="$(hostname -s)"
-{
+[ "$VERBOSE" = "1" ] && {
-  for FILE in $CONFIG_PATH/{exports,alias,functions}; do
+  echo "x-load-configs: VERBOSE=1"
-    FILENAME="$FILE"
+  echo "x-load-configs: HOST: $HOST"
-    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
+configFile()
+{
+  echo "$CONFIG_PATH/$1"
+}
+
+configMsg()
+{
+  printf 'x-load-configs: %s %s\n' "$1" "$2"
+}
+
+loadConfigFiles()
+{
+  CONFIG_FILE=$1
+  SECRET_FILE=$CONFIG_FILE-secret
+  HOST_FILE=$CONFIG_FILE-$HOST
+  SECRET_HOST=$HOST_FILE-secret
+
+  [ "$VERBOSE" = "1" ] && configMsg "?" "$CONFIG_FILE"
+
+  # global (exports|alias|functions) FILENAME for all hosts
+  # shellcheck source=../config/exports
+  [ -r "$CONFIG_FILE" ] && {
+    source "$CONFIG_FILE" && [ "$VERBOSE" = "1" ] && configMsg "Found" "$CONFIG_FILE"
+  }
+
+  # global secret FILENAME, git ignored
+  # shellcheck source=../config/exports-secret
+  [ "$VERBOSE" = "1" ] && configMsg "?" "$SECRET_FILE"
+  [ -r "$SECRET_FILE" ] && {
+    source "$SECRET_FILE" && [ "$VERBOSE" = "1" ] && configMsg "Found" "$SECRET_FILE"
+  }
+  # host specific (exports|alias|functions) FILENAME
+  # shellcheck source=../config/exports
+  [ "$VERBOSE" = "1" ] && configMsg "?" "$HOST_FILE"
+  [ -r "$HOST_FILE" ] && {
+    source "$HOST_FILE" && [ "$VERBOSE" = "1" ] && configMsg "Found" "$HOST_FILE"
+  }
+  # host specific (exports|alias|functions) FILENAME, git ignored
+  # shellcheck source=../config/exports
+  [ "$VERBOSE" = "1" ] && configMsg "?" "$SECRET_HOST"
+  [ -r "$SECRET_HOST" ] && {
+    source "$SECRET_HOST" \
+      && [ "$VERBOSE" = "1" ] && configMsg "Found" "$SECRET_HOST"
+  }
+}
+
+FILE_EXPORTS=$(configFile "exports")
+FILE_FUNCTIONS=$(configFile "functions")
+FILE_ALIAS=$(configFile "alias")
+
+loadConfigFiles "$FILE_EXPORTS"
+loadConfigFiles "$FILE_FUNCTIONS"
+loadConfigFiles "$FILE_ALIAS"
+
+exit 0

local/bin/x-mkd

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Create a directory and cd into it
+
+mkdir -p "$@" && cd "$@" || exit

local/bin/x-path-append

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+#
+# Add a directory to the beginning of the PATH if it's not already there.
+# Usage: x-path-append <dir>
+
+x-path-remove "$1"
+export PATH="${PATH:+"$PATH:"}$1"

local/bin/x-path-prepend

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#
+# Add a directory to the front of the PATH if it exists and is not already there
+# Usage: x-path-prepend <dir>
+
+export PATH="$1${PATH:+":$PATH"}"

local/bin/x-path-remove

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#
+# Remove a directory from the PATH
+# Usage: x-path-remove <dir>
+
+export PATH=$(echo -n "$PATH" | awk -v RS=: -v ORS=: "\$0 != \"$1\"" | sed 's/:$//')

local/bin/x-set-php-aliases

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+# Check which php versions are installed with brew, and create aliases for each installation.
+# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
+
+set -euo pipefail
+
+# Set verbosity with VERBOSE=1 x-load-configs
+VERBOSE="${VERBOSE:=0}"
+
+[ "$VERBOSE" = "2" ] && {
+  set -x
+}
+
+! x-have brew && {
+  exit 0
+}
+
+# Get installed php versions from brew and setup aliases
+php_versions=()
+while IFS="" read -r line; do php_versions+=("$line"); done < <(bkt -- brew list | grep '^php')
+
+php_error_reporting='-d error_reporting=22527'
+
+for version in "${php_versions[@]}"; do
+  [ "$VERBOSE" = "1" ] && echo "Setting aliases for $version"
+  # drop the dot from version (8.0 -> 80)
+  php_abbr="${version//\./}"
+  # replace "php@" with "p" so "php@80" becomes "p80"
+  php_alias="${php_abbr//php@/p}"
+
+  # Fetch the exec path once
+  php_exec="$HOMEBREW_PREFIX/opt/$version/bin/php"
+
+  [ -f "$php_exec" ] && {
+    [ "$VERBOSE" = "1" ] && echo "-> php_exec $php_exec"
+
+    # Raw PHP without error_reporting flag.
+    # shellcheck disable=SC2139
+    alias "${php_alias}"r="$php_exec"
+    # PHP with error_reporting flag.
+    # shellcheck disable=SC2139,SC2140
+    alias "$php_alias"="$php_exec $php_error_reporting"
+    # Local PHP Server.
+    # shellcheck disable=SC2139,SC2140
+    alias "${php_alias}s"="$php_exec -S localhost:9000"
+    # Use composer with specific PHP and error_reporting flag on.
+    # shellcheck disable=SC2139,SC2140
+    alias "${php_alias}c"="$php_exec $php_error_reporting $(which composer)"
+  }
+done

scripts/install-cargo-packages.sh

@@ -2,18 +2,29 @@
 # Install cargo/rust packages.
 #
 # shellcheck source=shared.sh
+source "$HOME/.dotfiles/config/exports"
+source "$HOME/.dotfiles/config/alias"
+source "$HOME/.dotfiles/config/functions"
 source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg "Starting to install rust/cargo packages"
 
-[[ $(x-have "cargo") == "1" ]] && {
+! x-have cargo && {
   msg "cargo could not be found. installing cargo with rustup.rs"
-  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path -y
 }
 
 source "$CARGO_HOME/env"
 
+! x-have rustup && {
+  msg_err "rustup could not be found. Aborting..."
+  exit 1
+}
+
+rustup default system
+
 packages=(
+  "cargo-cache"
   # starship.rs
   "starship"
   # An incremental parsing system for programming tools
@@ -34,6 +45,7 @@ packages=(
   "ripgrep"
   # A version manager for neovim
   "bob-nvim"
+  "bottom"
 )
 
 for pkg in "${packages[@]}"; do
@@ -53,8 +65,9 @@ msg_done "Installed cargo packages!"
 msg_run "Now doing the next steps for cargo packages"
 
 # use bob to install nvim
-have bob && {
+x-have bob && {
-  bob use stable && path_append "$XDG_DATA_HOME/bob/nvim-bin"
+  bob use stable && x-path-append "$XDG_DATA_HOME/bob/nvim-bin"
 }
 
-msg_done "All next steps done!"
+msg_run "Removing cargo cache"
+cargo cache --autoclean

scripts/install-cheat-purebashbible.sh

@@ -5,7 +5,7 @@ source "$HOME/.dotfiles/scripts/shared.sh"
 
 PBB_REQUIRED_TOOLS=(git cheat)
 for t in ${PBB_REQUIRED_TOOLS[@]}; do
-  [[ $(x-have "$t") == "1" ]] && echo "(!) $t is missing, can't continue..." && exit 1
+  ! x-have "$t" && echo "(!) $t is missing, can't continue..." && exit 1
 done
 
 PBB_GIT="https://github.com/dylanaraps/pure-bash-bible.git"

scripts/install-cheat-tldr.sh

@@ -5,7 +5,7 @@ source "$HOME/.dotfiles/scripts/shared.sh"
 
 TLDR_REQUIRED_TOOLS=(git cheat)
 for t in ${TLDR_REQUIRED_TOOLS[@]}; do
-  [[ $(x-have "$t") == "1" ]] && echo "(!) $t is missing, can't continue..." && exit 1
+  ! x-have "$t" && echo "(!) $t is missing, can't continue..." && exit 1
 done
 
 TLDR_GIT="https://github.com/tldr-pages/tldr.git"
@@ -24,10 +24,13 @@ 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 \
+  git -C "$TLDR_TEMP_DIR" pull -q --depth 2 \
     && msg_done "Updated $TLDR_GIT"
 fi
 
+msg_run "Removing non-english translation files"
+rm -rf "$TLDR_TEMP_DIR/pages.*"
+
 # Fetch the destination directory from cheat defined directories.
 TLDR_CHEAT_DEST="$(cheat -d | grep tldr | head -1 | awk '{print $2}')"
 

scripts/install-composer.sh

@@ -4,7 +4,7 @@
 # shellcheck source="shared.sh"
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-[[ $(x-have "php") == "1" ]] && msg_err "PHP Not Available, cannot install composer" && exit 0
+! x-have "php" && msg_err "PHP Not Available, cannot install composer" && exit 0
 
 EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
 php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"

scripts/install-gh-extensions.sh

@@ -6,7 +6,7 @@ source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg_run "Installing gh (GitHub Client) extensions"
 
-[[ $(x-have "gh") == "1" ]] \
+! x-have "gh" \
   && msg_err "gh (GitHub Client) could not be found, please install it first" \
   && exit 0
 

scripts/install-git-crypt.sh

@@ -8,7 +8,7 @@ source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg_run "Installing git-crypt"
 
-[[ $(x-have "git-crypt") == "1" ]] && {
+x-have "git-crypt" || {
 
   REPO_URL="https://github.com/AGWA/git-crypt.git"
   CHECK_PATH="${XDG_BIN_HOME}/git-crypt"

scripts/install-go-packages.sh

@@ -6,7 +6,7 @@ source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg_run "Installing go packages"
 
-[[ $(x-have "go") == "1" ]] && msg "go hasn't been installed yet." && exit 0
+! x-have "go" && msg "go hasn't been installed yet." && exit 0
 
 packages=(
   # A shell parser, formatter, and interpreter with bash support; includes shfmt
@@ -44,10 +44,14 @@ done
 
 msg_run "Installing completions for selected packages"
 
-have git-profile && {
+x-have git-profile && {
   git-profile completion zsh > "$ZSH_CUSTOM_COMPLETION_PATH/_git-profile" \
     && msg_ok "Installed completions for git-profile"
 }
 
 echo ""
+
+msg_run "Clearing go cache"
+go clean -cache -modcache
+
 msg_ok "Done"

scripts/install-neofetch.sh

@@ -11,7 +11,7 @@ NEOFETCH_URL="${NEOFETCH_REPO}/archive/refs/tags/${NEOFETCH_VERSION}.tar.gz"
 NEOFETCH_TEMP="/tmp/neofetch"
 NEOFETCH_INSTALL_PREFIX="$HOME/.local"
 
-[[ $(x-have "neofetch") == "1" ]] && {
+x-have "neofetch" || {
   LC_ALL=C
 
   mkdir -p "$NEOFETCH_TEMP" "$NEOFETCH_INSTALL_PREFIX"

scripts/install-npm-packages.sh

@@ -6,7 +6,7 @@ source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg "Starting to install npm packages"
 
-[[ $(x-have "npm") == "1" ]] && msg_err "npm could not be found." && exit 0
+! x-have "npm" && msg_err "npm could not be found." && exit 0
 
 packages=(
   # This is a tool to check if your files consider your .editorconfig rules.
@@ -37,3 +37,8 @@ done
 msg_run "Upgrading all global packages"
 npm -g --no-progress --no-timing --no-fund outdated
 npm -g --no-timing --no-fund upgrade
+
+msg_run "Cleaning up npm cache"
+npm cache verify
+npm cache clean --force
+npm cache verify

scripts/install-ntfy.sh

@@ -6,7 +6,7 @@
 source "$HOME/.dotfiles/scripts/shared.sh"
 set -e
 
-[[ $(x-have "ntfy") == "0" ]] && msg "ntfy already installed" && exit 0
+x-have "ntfy" && msg "ntfy already installed" && exit 0
 
 case $(dfm check arch) in
   Linux)

scripts/install-pip-packages.sh

@@ -6,14 +6,16 @@ source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg "Starting to install pip packages"
 
-[[ $(x-have "python3") == "1" ]] && {
+x-have "python3" || {
   msg_err "Could not find python3, something really weird is going on." && exit 1
 }
 
+msg_nested "Upgrading pip"
+python3 -m pip install --user --upgrade pip
+
 packages=(
   "pipx"
   "libtmux"
-  "ensurepath"
 )
 
 for pkg in "${packages[@]}"; do
@@ -23,7 +25,7 @@ for pkg in "${packages[@]}"; do
   if [[ ${pkg:0:1} == "#" ]]; then continue; fi
 
   msg_nested "Installing pip package: $pkg"
-  python3 -m pip install --user "$pkg"
+  python3 -m pip install --user --upgrade "$pkg"
 
   echo ""
 done

scripts/install-xcode-cli-tools.sh

@@ -6,7 +6,7 @@
 
 [ "$(uname)" != "Darwin" ] && echo "Not a macOS system" && exit 0
 
-! have xcode-select \
+! x-have xcode-select \
   && msg_err "xcode-select could not be found, skipping" \
   && exit 0
 

scripts/shared.sh

@@ -31,44 +31,23 @@ export XDG_RUNTIME_DIR="$HOME/.local/run"
 # usage: path_remove ~/.local/bin
 function path_remove
 {
-  PATH=$(echo -n "$PATH" | awk -v RS=: -v ORS=: "\$0 != \"$1\"" | sed 's/:$//')
+  x-path-remove "$1"
 }
 
 # Append directory to the PATH
 # usage: path_append ~/.local/bin
 function path_append
 {
-  path_remove "$1"
+  x-path-remove "$1"
-  PATH="${PATH:+"$PATH:"}$1"
+  x-path-prepend "$1"
 }
 
 # Prepend directory to the PATH
 # usage: path_prepend ~/.local/bin
 function path_prepend
 {
-  path_remove "$1"
+  x-path-remove "$1"
-  PATH="$1${PATH:+":$PATH"}"
+  x-path-prepend "$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
@@ -84,81 +63,6 @@ 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 -- #