chore(config): Cleanup

tmux/tmux-continuum v3.1.0

.gitmodules

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

add-submodules.sh

@@ -13,6 +13,8 @@ git submodule add --name dotbot-pip \
 # other repos
 git submodule add --name cheat-community \
   -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
+git submodule add --name cheat-tldr \
+  -f https://github.com/ivuorinen/cheatsheet-tldr.git config/cheat/cheatsheets/tldr
 
 # tmux plugin manager and plugins
 git submodule add --name tmux/tmux-continuum \
@@ -28,9 +30,11 @@ git submodule add --name tmux/tmux-sessionist \
 git submodule add --name tmux/tmux-suspend \
   -f https://github.com/MunifTanjim/tmux-suspend.git config/tmux/plugins/tmux-suspend
 git submodule add --name tmux/tmux-window-name \
-  -f https://github.com/ofirgall/tmux-window-name.git config/tmux/plugins/tmux-window-name
+  -f https://github.com/ivuorinen/tmux-window-name.git config/tmux/plugins/tmux-window-name
 git submodule add --name tmux/tmux-yank \
   -f https://github.com/tmux-plugins/tmux-yank.git config/tmux/plugins/tmux-yank
+git submodule add --name tmux/tmux-current-pane-hostname \
+  -f https://github.com/soyuka/tmux-current-pane-hostname.git config/tmux/plugins/tmux-current-pane-hostname
 
 # Takes submodules and sets them to ignore all changes
 for MODULE in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }'); do

base/bashrc

@@ -18,6 +18,9 @@ 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
@@ -31,5 +34,8 @@ x-have rbenv && {
   eval "$(rbenv init - bash)"
 }
 
-eval "$(starship init bash)"
-source $DOTFILES/config/alias
+# eval "$(starship init bash)"
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init bash --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
+}
+source "$DOTFILES/config/alias"

base/zshrc

@@ -61,17 +61,11 @@ antigen bundle jreese/zsh-titles
 antigen bundle zsh-users/zsh-completions
 
 # these should be available if there's need
-x-have brew && antigen bundle brew
-x-have php && antigen bundle php
 x-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
 
 # nvm is a strange beast
 zstyle ':omz:plugins:nvm' autoload yes
 antigen bundle nvm
-# antigen bundle "$DOTFILES/config/zsh/plugins/nvm-auto-use"
-
-# nice to have stuff
-antigen bundle gcloud
 
 # this needs to be the last item
 antigen bundle zsh-users/zsh-syntax-highlighting
@@ -81,24 +75,40 @@ antigen apply
 [ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
   && source "${DOTFILES}/config/fzf/fzf.zsh"
 
-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
+x-have pyenv && {
+  [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+  eval "$(pyenv init -)"
+  eval "$(pyenv virtualenv-init -)"
 }
 
-eval "$(starship init zsh)"
-source $DOTFILES/config/alias
+# Run only if tmux is active
+[[ -n "$TMUX" ]] && {
+  # 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
+    tmux-window-name
+  }
+}
+
+# eval "$(starship init zsh)"
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
+}
+source "$DOTFILES/config/alias"
+
+# Herd checks for a few environment variables to inject PHP binaries and configurations.
+# Herd injected PHP binary.
+# export PATH="/Users/ivuorinen/Library/Application Support/Herd/bin/":$PATH
+# Herd injected PHP 8.3 configuration.
+# export HERD_PHP_83_INI_SCAN_DIR="/Users/ivuorinen/Library/Application Support/Herd/config/php/83/"
+# Herd injected PHP 7.4 configuration.
+# export HERD_PHP_74_INI_SCAN_DIR="/Users/ivuorinen/Library/Application Support/Herd/config/php/74/"

config/alacritty/alacritty.toml

@@ -0,0 +1,345 @@
+[colors]
+draw_bold_text_with_bright_colors = true
+
+[colors.bright]
+black = "0x414868"
+blue = "0x7aa2f7"
+cyan = "0x7dcfff"
+green = "0x9ece6a"
+magenta = "0xbb9af7"
+red = "0xf7768e"
+white = "0xc0caf5"
+yellow = "0xe0af68"
+
+[colors.normal]
+black = "0x1d202f"
+blue = "0x7aa2f7"
+cyan = "0x7dcfff"
+green = "0x9ece6a"
+magenta = "0xbb9af7"
+red = "0xf7768e"
+white = "0xa9b1d6"
+yellow = "0xe0af68"
+
+[colors.primary]
+background = "0x24283b"
+foreground = "0xc0caf5"
+
+[env]
+TERM = "xterm-256color"
+
+[font]
+size = 14.0
+
+[font.bold]
+family = "JetBrainsMonoNL Nerd Font Mono"
+style = "Bold"
+
+[font.glyph_offset]
+x = 0
+y = 0
+
+[font.italic]
+family = "JetBrainsMonoNL Nerd Font Mono"
+style = "Italic"
+
+[font.normal]
+family = "JetBrainsMonoNL Nerd Font Mono"
+style = "ExtraLight"
+
+[font.offset]
+x = 0
+y = 0
+
+[[keyboard.bindings]]
+action = "Paste"
+key = "V"
+mods = "Command"
+
+[[keyboard.bindings]]
+action = "Copy"
+key = "C"
+mods = "Command"
+
+[[keyboard.bindings]]
+action = "Quit"
+key = "Q"
+mods = "Command"
+
+[[keyboard.bindings]]
+action = "Quit"
+key = "W"
+mods = "Command"
+
+[[keyboard.bindings]]
+action = "SpawnNewInstance"
+key = "N"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u001BOH"
+key = "Home"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[1~"
+key = "Home"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001BOF"
+key = "End"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[4~"
+key = "End"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[5;2~"
+key = "PageUp"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[5;5~"
+key = "PageUp"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[5~"
+key = "PageUp"
+
+[[keyboard.bindings]]
+chars = "\u001B[6;2~"
+key = "PageDown"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[6;5~"
+key = "PageDown"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[6~"
+key = "PageDown"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;2D"
+key = "Left"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;5D"
+key = "Left"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;3D"
+key = "Left"
+mods = "Alt"
+
+[[keyboard.bindings]]
+chars = "\u001B[D"
+key = "Left"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001BOD"
+key = "Left"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;2C"
+key = "Right"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;5C"
+key = "Right"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;3C"
+key = "Right"
+mods = "Alt"
+
+[[keyboard.bindings]]
+chars = "\u001B[C"
+key = "Right"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001BOC"
+key = "Right"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;2A"
+key = "Up"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;5A"
+key = "Up"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;3A"
+key = "Up"
+mods = "Alt"
+
+[[keyboard.bindings]]
+chars = "\u001B[A"
+key = "Up"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001BOA"
+key = "Up"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;2B"
+key = "Down"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;5B"
+key = "Down"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;3B"
+key = "Down"
+mods = "Alt"
+
+[[keyboard.bindings]]
+chars = "\u001B[B"
+key = "Down"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001BOB"
+key = "Down"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[Z"
+key = "Tab"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001BOP"
+key = "F1"
+
+[[keyboard.bindings]]
+chars = "\u001BOQ"
+key = "F2"
+
+[[keyboard.bindings]]
+chars = "\u001BOR"
+key = "F3"
+
+[[keyboard.bindings]]
+chars = "\u001BOS"
+key = "F4"
+
+[[keyboard.bindings]]
+chars = "\u001B[15~"
+key = "F5"
+
+[[keyboard.bindings]]
+chars = "\u001B[17~"
+key = "F6"
+
+[[keyboard.bindings]]
+chars = "\u001B[18~"
+key = "F7"
+
+[[keyboard.bindings]]
+chars = "\u001B[19~"
+key = "F8"
+
+[[keyboard.bindings]]
+chars = "\u001B[20~"
+key = "F9"
+
+[[keyboard.bindings]]
+chars = "\u001B[21~"
+key = "F10"
+
+[[keyboard.bindings]]
+chars = "\u001B[23~"
+key = "F11"
+
+[[keyboard.bindings]]
+chars = "\u001B[24~"
+key = "F12"
+
+[[keyboard.bindings]]
+key = "Back"
+action = "ReceiveChar"
+
+[[keyboard.bindings]]
+chars = "\u001B[2~"
+key = "Insert"
+
+[[keyboard.bindings]]
+chars = "\u001B[3~"
+key = "Delete"
+
+[[keyboard.bindings]]
+chars = "\u0002&"
+key = "W"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u0002c"
+key = "T"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u0002n"
+key = "RBracket"
+mods = "Command|Shift"
+
+[[keyboard.bindings]]
+chars = "\u0002p"
+key = "LBracket"
+mods = "Command|Shift"
+
+[[keyboard.bindings]]
+chars = "\u0002o"
+key = "RBracket"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u0002;"
+key = "LBracket"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u0002/"
+key = "F"
+mods = "Command"
+
+[[mouse.bindings]]
+action = "PasteSelection"
+mouse = "Middle"
+
+[selection]
+semantic_escape_chars = ",│`|:\"' ()[]{}<>"
+
+[window]
+decorations = "none"
+dynamic_title = true
+opacity = 0.98
+
+[window.dimensions]
+columns = 200
+lines = 100
+
+[window.padding]
+x = 5
+y = 5

config/alacritty/alacritty.yml

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

config/alias

@@ -2,9 +2,6 @@
 # shellcheck source="../scripts/shared.sh"
 # shellcheck disable=1091,2139
 
-# Be nice
-alias please="sudo "
-
 # Color the grep output
 alias grep="grep --color"
 
@@ -32,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* //'"
 
@@ -49,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
@@ -81,6 +75,8 @@ alias code_scanner='docker run
   registry.gitlab.com/gitlab-org/ci-cd/codequality:"${CODEQUALITY_VERSION:-latest}"
   /code'
 
+alias trivy_scan='docker run -v /var/run/docker.sock:/var/run/docker.sock -v $HOME/Library/Caches:/root/.cache/ aquasec/trivy'
+
 alias zedit='$EDITOR ~/.dotfiles'
 
 alias irssi="irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_CONFIG_HOME/irssi"
@@ -103,7 +99,8 @@ if [[ $(uname) == 'Darwin' ]]; then
   # 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
+  # Using herd for php now, so this is not needed anymore
+  # x-set-php-aliases
 fi
 
 # Alacritty preexec hook to update dynamic title
@@ -134,12 +131,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

@@ -1,19 +1,23 @@
+---
 # 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
+# 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.
+# 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 - Ordered list of layouts to use by layout key
+# (default tall, wide, fullscreen, and column).
 layouts:
   - bsp
   - tall
@@ -71,39 +75,49 @@ 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 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 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 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 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.
+# 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.
+# 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.
+# 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.
+# General purpose command for custom layouts.
+# Functionality is layout-dependent.
 # command4:
 #   mod: <NONE>
 #   key: <NONE>
@@ -133,42 +147,51 @@ focus-screen-cw:
   mod: mod1
   key: n
 
-# Move the currently focused window onto the next screen in the list going counter-clockwise.
+# 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.
+# 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 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 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 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.
+# 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.
+# 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.
+# 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
@@ -203,7 +226,9 @@ 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 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
@@ -236,10 +261,13 @@ relaunch-amethyst:
 # 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).
+# Boolean flag for whether to add margins between
+# 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).
+# Boolean flag for whether to set window margins if there is
+# only one window on the screen, assuming window margins
+# are enabled (default false).
 smart-window-margins: true
 
 # # Add 10px margin between windows
@@ -248,39 +276,53 @@ smart-window-margins: true
 # 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.
+# 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).
+# 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)
+# 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 []).
+# 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).
+# 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).
+# 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)
+# 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.
+# 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
+# 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).
+# 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.
+# 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).
@@ -292,13 +334,15 @@ 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).
+# 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).
+# 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).

config/cheat/conf.yml

@@ -1,3 +1,4 @@
+---
 # The editor to use with 'cheat -e <sheet>'. Defaults to $EDITOR or $VISUAL.
 # editor: $EDITOR
 
@@ -37,7 +38,7 @@ pager: less -FRX
 #
 # This is very useful when you would like to maintain, for example, a
 # "pristine" repository of community cheatsheets on one cheatpath, and an
-# editable personal reponsity of cheatsheets on another cheatpath.
+# editable personal repository of cheatsheets on another cheatpath.
 #
 # Cheatpaths can be also configured to automatically apply tags to cheatsheets
 # on certain paths, which can be useful for querying purposes.
@@ -71,7 +72,7 @@ cheatpaths:
     tags: [pure-bash-bible]
     readonly: true
   - name: tldr
-    path: ~/.dotfiles/config/cheat/cheatsheets/tldr
+    path: ~/.dotfiles/config/cheat/cheatsheets/tldr/tldr
     tags: [tldr]
     readonly: true
 # While it requires no configuration here, it's also worth noting that

config/exports-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"
 
@@ -23,6 +24,10 @@ export ANDROID_HOME="$XDG_DATA_HOME/android"
 # bob manages nvim versions
 export PATH="$XDG_DATA_HOME/bob/nvim-bin:$PATH"
 
+# bkt (shell command caching tool) configuration
+export BKT_TTL=1m
+
+# brew, https://docs.brew.sh/Manpage
 export HOMEBREW_NO_ENV_HINTS=true
 
 # composer, https://getcomposer.org/
@@ -47,6 +52,17 @@ export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export GOPATH="$XDG_DATA_HOME/go"
 export GOBIN="$XDG_BIN_HOME"
 
+# Herd, herd.laravel.com
+# Herd injected PHP binary.
+export PATH="$HOME/Library/Application Support/Herd/bin/":$PATH
+
+x-have herd && {
+  # Herd injected PHP 8.3 configuration.
+  export HERD_PHP_83_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/83/"
+  # Herd injected PHP 7.4 configuration.
+  export HERD_PHP_74_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/74/"
+}
+
 # nb, https://xwmx.github.io/nb/
 export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
 export NB_DIR="$XDG_STATE_HOME/nb"

config/functions

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 #
 # shell functions
-
-set -euo pipefail

config/gh-changelog/config.yaml

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

config/gh/config.yml

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

config/gh/hosts.yml

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

config/git/gitignore

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

config/homebrew/Brewfile

@@ -6,26 +6,17 @@ tap "gesquive/tap"
 tap "github/gh"
 tap "homebrew/autoupdate"
 tap "homebrew/bundle"
+tap "homebrew/cask"
 tap "homebrew/cask-fonts"
+tap "homebrew/core"
 tap "homebrew/services"
 tap "jesseduffield/lazygit"
+tap "keith/formulae"
 tap "mongodb/brew"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
 tap "teamookla/speedtest"
 tap "xwmx/taps"
-# Run your GitHub Actions locally
-brew "act"
-# Mozilla CA certificate store
-brew "ca-certificates"
-# YAML Parser
-brew "libyaml"
-# Cryptography and SSL/TLS Toolkit
-brew "openssl@3"
-# Automate deployment, configuration, and upgrading
-brew "ansible"
-# Checks ansible playbooks for practices and behaviour
-brew "ansible-lint"
 # Generic-purpose lossless compression algorithm by Google
 brew "brotli"
 # Library and utilities for processing GIFs
@@ -44,26 +35,20 @@ brew "jpeg-xl"
 brew "aom"
 # Apache Portable Runtime library
 brew "apr"
+# Mozilla CA certificate store
+brew "ca-certificates"
+# Cryptography and SSL/TLS Toolkit
+brew "openssl@3"
 # Companion library to apr, the Apache Portable Runtime library
 brew "apr-util"
 # Password hashing library and CLI utility
 brew "argon2"
 # Open Source Kubernetes Marketplace
 brew "arkade"
-# Automatic configure script builder
-brew "autoconf"
-# GNU multiple precision arithmetic library
-brew "gmp"
-# GNU File, Shell, and Text utilities
-brew "coreutils"
-# Extendable version manager with support for Ruby, Node.js, Erlang & more
-brew "asdf"
 # Spell checker with better logic than ispell
 brew "aspell"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.11"
-# Official Amazon AWS command-line interface
-brew "awscli"
+# Automatic configure script builder
+brew "autoconf"
 # Bourne-Again SHell, a UNIX command interpreter
 brew "bash"
 # Clone of cat(1) with syntax highlighting and Git integration
@@ -72,8 +57,6 @@ brew "bat"
 brew "icu4c"
 # Yet another cross-platform graphical process/system monitor
 brew "bottom"
-# Switch Apache / Valet / CLI configs between PHP versions
-brew "brew-php-switcher"
 # Software library to render fonts
 brew "freetype"
 # XML-based font configuration API for X Windows
@@ -82,36 +65,26 @@ brew "fontconfig"
 brew "gettext"
 # Core application library for C
 brew "glib"
-# Manage compile and link flags for libraries
-brew "pkg-config"
 # Human-friendly and fast alternative to cut and (sometimes) awk
 brew "choose-rust"
 # Cross-platform make
 brew "cmake"
+# GNU multiple precision arithmetic library
+brew "gmp"
+# GNU File, Shell, and Text utilities
+brew "coreutils"
 # Get, unpack, build, and install modules from CPAN
 brew "cpanminus"
 # Open source suite of directory software
 brew "openldap"
 # Get a file from an HTTP, HTTPS or FTP server
 brew "curl"
-# Diff that understands syntax
-brew "difftastic"
-# Tool for exploring each layer in a docker image
-brew "dive"
 # Lightweight DNS forwarder and DHCP server
 brew "dnsmasq"
-# Command-line DNS client
-brew "dog"
 # Lightning-fast linter for .env files written in Rust
 brew "dotenv-linter"
-# Tool to verify that your files are in harmony with your .editorconfig
-brew "editorconfig-checker", link: false
-# Useful examples at the command-line
-brew "eg-examples"
 # Spellchecker wrapping library
 brew "enchant"
-# Run arbitrary commands when files change
-brew "entr"
 # Perl lib for reading and writing EXIF metadata
 brew "exiftool"
 # Simple, fast and user-friendly alternative to find
@@ -127,7 +100,7 @@ brew "fzf"
 # Graphics library to dynamically manipulate images
 brew "gd"
 # Disk usage analyzer with console interface written in Go
-brew "gdu", link: false
+brew "gdu"
 # GitHub command-line tool
 brew "gh"
 # Distributed revision control system
@@ -138,8 +111,6 @@ brew "git-crypt"
 brew "git-extras"
 # See your latest local git branches, formatted real fancy
 brew "git-recent"
-# Open-source GitLab command-line tool
-brew "glab"
 # Render markdown on the CLI
 brew "glow"
 # GNU implementation of the famous stream editor
@@ -174,10 +145,6 @@ brew "gzip"
 brew "hadolint"
 # Improved top (interactive process viewer)
 brew "htop"
-# Website copier/offline browser
-brew "httrack"
-# Configurable static site generator
-brew "hugo"
 # ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
 brew "libheif"
 # Tools and libraries to manipulate images in many formats
@@ -188,26 +155,28 @@ brew "irssi"
 brew "jq"
 # Network authentication protocol
 brew "krb5"
-# Lazier way to manage everything docker
-brew "lazydocker"
+# Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
+brew "legitify"
 # Postgres C API library
 brew "libpq"
-# Linguistic software and Finnish dictionary
-brew "libvoikko"
-# Rainbows and unicorns in your console!
-brew "lolcat"
+# Manage compile and link flags for libraries
+brew "pkg-config"
+# YAML Parser
+brew "libyaml"
+# Interpreted, interactive, object-oriented programming language
+brew "python@3.11"
 # Package manager for the Lua programming language
 brew "luarocks"
 # LZMA-based compression program similar to gzip or bzip2
 brew "lzip"
 # Swiss Army Knife for macOS
 brew "m-cli"
-# Mac App Store command-line interface
-brew "mas"
 # Mongrel of mail user agents (part elm, pine, mush, mh, etc.)
 brew "mutt"
 # NCurses Disk Usage
 brew "ncdu"
+# Ambitious Vim-fork focused on extensibility and agility
+brew "neovim"
 # HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server
 brew "nginx"
 # Port scanning utility for large networks
@@ -220,38 +189,28 @@ brew "openjdk@11"
 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
 brew "perl"
-# General-purpose scripting language
-brew "php@8.1"
-# Simple Python style checker in one Python file
-brew "pycodestyle"
+# Coreutils progress viewer
+brew "progress"
 # Python version management
 brew "pyenv"
 # Migrate pip packages from one Python version to another
 brew "pyenv-pip-migrate"
 # Pyenv plugin to manage virtualenv
 brew "pyenv-virtualenv"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.10"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.8"
 # Ruby version manager
 brew "rbenv"
 # RC file (dotfile) management
 brew "rcm"
 # Search tool like grep and The Silver Searcher
 brew "ripgrep"
+# Safe, concurrent, practical language
+brew "rust"
 # Static analysis and lint tool, for (ba)sh scripts
 brew "shellcheck"
 # Autoformat shell script source code
 brew "shfmt"
-# Support CI generation of SBOMs via golang tooling
-brew "spdx-sbom-generator"
-# Version control system designed to be a better CVS
-brew "subversion"
 # Feature-rich console based todo list manager
 brew "task"
 # Terminal user interface for taskwarrior
@@ -270,60 +229,51 @@ brew "tfenv"
 brew "tflint"
 # Static analysis security scanner for your terraform code
 brew "tfsec"
-# Programmatically correct mistyped console commands
-brew "thefuck"
 # Terminal multiplexer
 brew "tmux"
 # Display directories as trees (with optional color/HTML output)
 brew "tree"
-# Vulnerability scanner for container images, file systems, and Git repos
-brew "trivy"
-# Modern watch command
-brew "viddy"
 # Tool for creating isolated virtual python environments
 brew "virtualenv"
 # Command-line interface to the WakaTime api
 brew "wakatime-cli"
 # Executes a program periodically, showing output fullscreen
 brew "watch"
-# Watch files and take action when they change
-brew "watchman"
 # Internet file retriever
 brew "wget"
-# Personal information dashboard for your terminal
-brew "wtfutil"
 # Check your $HOME for unwanted files and directories
 brew "xdg-ninja", args: ["HEAD"]
 # Hackable, minimal, fast TUI file explorer
 brew "xplr"
 # JavaScript package manager
 brew "yarn"
-# A vulnerability scanner for container images and filesystems
-brew "anchore/grype/grype"
 # High-performance load testing tool, written in Golang.
 brew "ddosify/tap/ddosify"
 # lets you quickly switch between multiple git user profiles
 brew "gesquive/tap/git-user"
-# A simple terminal UI for git commands, written in Go
-brew "jesseduffield/lazygit/lazygit"
-# High-performance, schema-free, document-oriented database
-brew "mongodb/brew/mongodb-community"
+brew "keith/formulae/reminders-cli"
 # Imagick PHP extension
 brew "shivammathur/extensions/imagick@8.2"
+# Imagick PHP extension
+brew "shivammathur/extensions/imagick@8.3"
+# Mcrypt PHP extension
+brew "shivammathur/extensions/mcrypt@8.3"
+# PCOV PHP extension
+brew "shivammathur/extensions/pcov@8.3"
+# Redis PHP extension
+brew "shivammathur/extensions/redis@8.3"
+# Uuid PHP extension
+brew "shivammathur/extensions/uuid@8.3"
 # Xdebug PHP extension
 brew "shivammathur/extensions/xdebug@7.4"
 # Xdebug PHP extension
 brew "shivammathur/extensions/xdebug@8.0"
 # Xdebug PHP extension
 brew "shivammathur/extensions/xdebug@8.1"
+# Yaml PHP extension
+brew "shivammathur/extensions/yaml@8.3"
 # General-purpose scripting language
 brew "shivammathur/php/php"
-# General-purpose scripting language
-brew "shivammathur/php/php@7.4"
-# General-purpose scripting language
-brew "shivammathur/php/php@8.0"
-# Ookla Speedtest
-brew "teamookla/speedtest/speedtest"
 # Command-line interface for 1Password
 cask "1password-cli"
 # GPU-accelerated terminal emulator
@@ -338,7 +288,7 @@ cask "coda"
 cask "dbeaver-community"
 # Database version management tool
 cask "dbngin"
-# App to build and share containerized applications and microservices
+# App to build and share containerised applications and microservices
 cask "docker"
 # UI toolkit for building applications for mobile, web and desktop
 cask "flutter"
@@ -360,8 +310,6 @@ cask "font-source-serif-pro"
 cask "fontplop"
 # GIT client
 cask "fork"
-# Set of tools to manage resources and applications hosted on Google Cloud
-cask "google-cloud-sdk"
 # HTTP and GraphQL Client
 cask "insomnia"
 # JetBrains tools manager
@@ -378,19 +326,19 @@ cask "ngrok"
 cask "notunes"
 # Knowledge base that works on top of a local folder of plain text Markdown files
 cask "obsidian"
-# Scheduling application focusing on organization
+# Scheduling application focusing on organisation
 cask "omnifocus"
 # Collaboration platform for API development
 cask "postman"
 # Display image info and preview unsupported formats in QuickLook
 cask "qlimagesize"
-# QuickLook generator for Markdown files
+# Quick Look generator for Markdown files
 cask "qlmarkdown"
-# QuickLook plugin for plaintext files without an extension
+# Quick Look plugin for plaintext files without an extension
 cask "qlstephen"
-# QuickLook plugin for JSON files
+# Quick Look plugin for JSON files
 cask "quicklook-json"
-# QuickLook generator for Adobe Swatch Exchange files
+# Quick Look generator for Adobe Swatch Exchange files
 cask "quicklookase"
 # Automatically hides or quits apps after periods of inactivity
 cask "quitter"
@@ -424,95 +372,5 @@ cask "vlc"
 cask "voikkospellservice"
 # Rust-based terminal
 cask "warp"
-mas "1Password for Safari", id: 1569813296
-mas "Actions", id: 1586435171
-mas "Audiobook Builder", id: 1437681957
-mas "Ivory", id: 6444602274
-mas "Keynote", id: 409183694
-mas "LastPass", id: 926036361
-mas "Numbers", id: 409203825
-mas "Pages", id: 409201541
-mas "Pixelmator Pro", id: 1289583905
-mas "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"
-vscode "andrewmcodes.tailwindcss-extension-pack"
-vscode "austenc.tailwind-docs"
-vscode "bmewburn.vscode-intelephense-client"
-vscode "Box-Of-Hats.bemhelper"
-vscode "bradlc.vscode-tailwindcss"
-vscode "christian-kohler.npm-intellisense"
-vscode "christian-kohler.path-intellisense"
-vscode "DavidAnson.vscode-markdownlint"
-vscode "dbaeumer.vscode-eslint"
-vscode "DotJoshJohnson.xml"
-vscode "eamodio.gitlens"
-vscode "EditorConfig.EditorConfig"
-vscode "esbenp.prettier-vscode"
-vscode "formulahendry.auto-close-tag"
-vscode "formulahendry.auto-rename-tag"
-vscode "formulahendry.code-runner"
-vscode "foxundermoon.shell-format"
-vscode "gencer.html-slim-scss-css-class-completion"
-vscode "GitHub.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"
-vscode "k--kato.intellij-idea-keybindings"
-vscode "liamhammett.inline-parameters"
-vscode "macieklad.tailwind-sass-syntax"
-vscode "MehediDracula.php-namespace-resolver"
-vscode "mikestead.dotenv"
-vscode "MisterJ.vue-volar-extention-pack"
-vscode "MrChetan.phpstorm-parameter-hints-in-vscode"
-vscode "mrorz.language-gettext"
-vscode "ms-azuretools.vscode-azureterraform"
-vscode "ms-azuretools.vscode-docker"
-vscode "ms-python.python"
-vscode "ms-python.vscode-pylance"
-vscode "ms-toolsai.jupyter"
-vscode "ms-toolsai.jupyter-renderers"
-vscode "ms-toolsai.vscode-jupyter-cell-tags"
-vscode "ms-toolsai.vscode-jupyter-slideshow"
-vscode "ms-vscode-remote.remote-containers"
-vscode "ms-vscode-remote.remote-wsl"
-vscode "ms-vscode.azure-account"
-vscode "ms-vscode.cpptools"
-vscode "msjsdiag.vscode-react-native"
-vscode "mtxr.sqltools"
-vscode "neilbrayfield.php-docblocker"
-vscode "nhoizey.gremlins"
-vscode "octref.vetur"
-vscode "oderwat.indent-rainbow"
-vscode "pflannery.vscode-versionlens"
-vscode "phiter.phpstorm-snippets"
-vscode "sibiraj-s.vscode-scss-formatter"
-vscode "SonarSource.sonarlint-vscode"
-vscode "stylelint.vscode-stylelint"
-vscode "sumneko.lua"
-vscode "syler.sass-indented"
-vscode "timonwong.shellcheck"
-vscode "tootone.org-mode"
-vscode "valeryanm.vscode-phpsab"
-vscode "Vue.volar"
-vscode "Vue.vscode-typescript-vue-plugin"
-vscode "WakaTime.vscode-wakatime"
-vscode "wix.vscode-import-cost"
-vscode "XadillaX.viml"
-vscode "xdebug.php-debug"
-vscode "xdebug.php-pack"
-vscode "yinfei.luahelper"
-vscode "yoavbls.pretty-ts-errors"
-vscode "ZainChen.json"
+# Application for generating TOTP and HOTP codes
+cask "yubico-authenticator"

config/nvim/lazyvim.json

@@ -1,6 +1,7 @@
 {
   "extras": [
     "lazyvim.plugins.extras.coding.copilot",
+    "lazyvim.plugins.extras.coding.yanky",
     "lazyvim.plugins.extras.editor.aerial",
     "lazyvim.plugins.extras.editor.leap",
     "lazyvim.plugins.extras.editor.symbols-outline",
@@ -25,4 +26,4 @@
     "NEWS.md": "2123"
   },
   "version": 2
-}
+}

config/nvim/lua/config/keymaps.lua

@@ -1,19 +1,22 @@
 -- Keymaps are automatically loaded on the VeryLazy event
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
 -- Add any additional keymaps here
+local wk = require("which-key")
 
-local keymap = vim.keymap.set
-
---         ╭──────────────────────────────────────────────────────────╮
---         │                       Comment box                        │
---         ╰──────────────────────────────────────────────────────────╯
-local cb = require("comment-box")
-
--- left aligned fixed size box with left aligned text
-keymap({ "n", "v" }, "<Leader>bcb", cb.lbox, { desc = "Comment: Left aligned" })
--- centered adapted box with centered text
-keymap({ "n", "v" }, "<Leader>bcc", cb.ccbox, { desc = "Comment: Centered" })
-
--- centered line
-keymap("n", "<Leader>bcl", cb.cline, { desc = "Comment: Centered line" })
-keymap("i", "<M-l>", cb.cline, { desc = "Comment: Centered line" })
+-- ╭──────────────────────────────────────────────────────────╮
+-- │                       Comment box                        │
+-- ╰──────────────────────────────────────────────────────────╯
+wk.register({
+  ["<Leader>"] = {
+    b = {
+      c = {
+        name = "□ Comment boxes",
+        b = { "<Cmd>CBccbox<CR>", "Box Title" },
+        t = { "<Cmd>CBllline<CR>", "Titled Line" },
+        l = { "<Cmd>CBline<CR>", "Simple Line" },
+        m = { "<Cmd>CBllbox14<CR>", "Marked" },
+        d = { "<Cmd>CBd<CR>", "Remove a box" },
+      },
+    },
+  },
+})

config/nvim/lua/config/lazy.lua

@@ -40,8 +40,8 @@ require("lazy").setup({
     lazy = false,
     -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
     -- have outdated releases, which may break your Neovim install.
-    version = false, -- always use the latest git commit
-    -- version = "*", -- try installing the latest stable version for plugins that support semver
+    -- version = false, -- always use the latest git commit
+    version = "*", -- try installing the latest stable version for plugins that support semver
   },
   install = { colorscheme = { "tokyonight" } },
   checker = { enabled = true }, -- automatically check for plugin updates

config/nvim/lua/plugins/coding.lua

@@ -56,6 +56,15 @@ return {
       },
     },
   },
+  {
+    "laytan/tailwind-sorter.nvim",
+    dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-lua/plenary.nvim" },
+    build = "cd formatter && npm i && npm run build",
+    config = true,
+    opts = {
+      on_save_enabled = true,
+    },
+  },
   -- Describe the regexp under the cursor
   -- https://github.com/bennypowers/nvim-regexplainer
   {

config/nvim/lua/plugins/ui.lua

@@ -1,5 +1,8 @@
 -- luacheck: globals vim
 return {
+  -- Cloak allows you to overlay *'s over defined patterns in defined files.
+  -- https://github.com/laytan/cloak.nvim
+  { "laytan/cloak.nvim" },
   -- Not UFO in the sky, but an ultra fold in Neovim.
   -- https://github.com/kevinhwang91/nvim-ufo/
   {

config/oh-my-posh.omp.json

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

config/tmux/tmux.conf

@@ -8,8 +8,8 @@
 #  │ Bindings                                                 │
 #  ╰──────────────────────────────────────────────────────────╯
 
-# Set <prefix> to Control + Space
-unbind C-b
+# Set <prefix> to Control + Space, keeping the default of C-b intact.
+# unbind C-b
 set -g prefix C-Space
 bind C-Space send-prefix
 
@@ -105,7 +105,7 @@ 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-left "#{hostname_short}/#S"
 set-option -g status-right "%H:%M #{tmux_mode_indicator}"
 
 #  ╭──────────────────────────────────────────────────────────╮
@@ -120,19 +120,19 @@ set -g @suspend_key 'F12'
 ##  A plugin to name your tmux windows smartly.
 ## https://github.com/ofirgall/tmux-window-name
 ### Maximum name length of a window
-set -g @tmux_window_name_max_name_len "30"
+set -g @tmux_window_name_max_name_len "20"
 ### Replace $HOME with ~ in window names
 set -g @tmux_window_name_use_tilde "True"
 set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']"
 set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
-set -g @tmux_window_name_ignored_programs "['sqlite3']" # Default is []
+set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases']" # Default is []
 
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'
 
 ## https://github.com/tmux-plugins/tmux-resurrect
 set -g @resurrect-strategy-nvim 'session'
-set -g @resurrect-dir '$HOME/.local/state/tmux/tmux-resurrect'
+set -g @resurrect-dir '~/.local/state/tmux/tmux-resurrect'
 
 ## https://github.com/MunifTanjim/tmux-mode-indicator
 set -g @mode_indicator_prefix_mode_style 'bg=default,fg=#7aa2f7'
@@ -152,4 +152,5 @@ run-shell ~/.dotfiles/config/tmux/plugins/tmux-sessionist/sessionist.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-mode-indicator/mode_indicator.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-suspend/suspend.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-yank/yank.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-current-pane-hostname/current_pane_hostname.tmux
 

config/user-dirs.dirs

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

config/user-dirs.locale

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

config/wtf/config.yml

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

hosts/air/install.conf.yaml

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

hosts/lakka/install.conf.yaml

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

hosts/tunkki/install.conf.yaml

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

hosts/v/install.conf.yaml

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

install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - clean:
     ~/:

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
@@ -58,6 +61,7 @@ function section_install
       $0 install fonts
       $0 install antigen
       $0 brew install
+      $0 install ohmyposh
       $0 install ohmybash
       $0 install pip
       $0 install cargo
@@ -152,6 +156,8 @@ function section_install
     nvm)
       msg "Installing nvm..."
       curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash
+      git checkout "$DOTFILES/base/zshrc"
+      git checkout "$DOTFILES/base/bashrc"
       $0 install nvm-latest
       msg_yay "nvm installed!"
       ;;
@@ -161,7 +167,8 @@ function section_install
         [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
       fi
       nvm install --lts --latest-npm --default
-      git checkout "$DOTFILES/base/*"
+      git checkout "$DOTFILES/base/zshrc"
+      git checkout "$DOTFILES/base/bashrc"
       msg_yay "latest lts node installed!"
       ;;
     npm)
@@ -179,6 +186,11 @@ function section_install
       bash "$DOTFILES/scripts/install-ohmybash.sh" \
         && msg_yay "oh-my-bash installed!"
       ;;
+    ohmyposh)
+      msg "oh-my-posh install started..."
+      bash "$DOTFILES/scripts/install-ohmyposh.sh" \
+        && msg_yay "oh-my-posh installed!"
+      ;;
     pip)
       msg "pip install started..."
       bash "$DOTFILES/scripts/install-pip-packages.sh"

local/bin/python

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

local/bin/x-git-largest-files.py

@@ -42,26 +42,26 @@ sortByOnDiskSize = False
 class Blob(object):
   sha1 = ''
   size = 0
-  packedSize = 0
+  packed_size = 0
   path = ''
 
   def __init__(self, line):
     cols = line.split()
-    self.sha1, self.size, self.packedSize = cols[0], int(cols[2]), int(cols[3])
+    self.sha1, self.size, self.packed_size = cols[0], int(cols[2]), int(cols[3])
 
   def __repr__(self):
     return '{} - {} - {} - {}'.format(
-      self.sha1, self.size, self.packedSize, self.path)
+      self.sha1, self.size, self.packed_size, self.path)
 
   def __lt__(self, other):
     if (sortByOnDiskSize):
       return self.size < other.size
     else:
-      return self.packedSize < other.packedSize
+      return self.packed_size < other.packed_size
 
   def csv_line(self):
     return "{},{},{},{}".format(
-      self.size/1024, self.packedSize/1024, self.sha1, self.path)
+      self.size/1024, self.packed_size/1024, self.sha1, self.path)
 
 
 def main():
@@ -71,45 +71,45 @@ def main():
 
   args = parse_arguments()
   sortByOnDiskSize = args.sortByOnDiskSize
-  sizeLimit = 1024*args.filesExceeding
+  size_limit = 1024*args.filesExceeding
 
   if args.filesExceeding > 0:
     print("Finding objects larger than {}kB…".format(args.filesExceeding))
   else:
     print("Finding the {} largest objects…".format(args.matchCount))
 
-  blobs = get_top_blobs(args.matchCount, sizeLimit)
+  blobs = get_top_blobs(args.matchCount, size_limit)
 
   populate_blob_paths(blobs)
   print_out_blobs(blobs)
 
 
-def get_top_blobs(count, sizeLimit):
+def get_top_blobs(count, size_limit):
   """Get top blobs from git repository
 
     Args:
         count (int): How many items to return
-        sizeLimit (int): What is the size limit
+        size_limit (int): What is the size limit
 
     Returns:
         dict: Dictionary of Blobs
   """
-  sortColumn = 4
+  sort_column = 4
 
   if sortByOnDiskSize:
-    sortColumn = 3
+    sort_column = 3
 
-  verifyPack = "git verify-pack -v `git rev-parse --git-dir`/objects/pack/pack-*.idx | grep blob | sort -k{}nr".format(sortColumn)  # noqa: E501
-  output = check_output(verifyPack, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
+  verify_pack = "git verify-pack -v `git rev-parse --git-dir`/objects/pack/pack-*.idx | grep blob | sort -k{}nr".format(sort_column)  # noqa: E501
+  output = check_output(verify_pack, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
 
   blobs = dict()
   # use __lt__ to do the appropriate comparison
-  compareBlob = Blob("a b {} {} c".format(sizeLimit, sizeLimit))
-  for objLine in output:
-    blob = Blob(objLine)
+  compare_blob = Blob("a b {} {} c".format(size_limit, size_limit))
+  for obj_line in output:
+    blob = Blob(obj_line)
 
-    if sizeLimit > 0:
-      if compareBlob < blob:
+    if size_limit > 0:
+      if compare_blob < blob:
         blobs[blob.sha1] = blob
       else:
         break
@@ -132,8 +132,8 @@ def populate_blob_paths(blobs):
     print("Finding object paths…")
 
     # Only include revs which have a path. Other revs aren't blobs.
-    revList = "git rev-list --all --objects | awk '$2 {print}'"
-    all_object_lines = check_output(revList, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
+    rev_list = "git rev-list --all --objects | awk '$2 {print}'"
+    all_object_lines = check_output(rev_list, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
     outstanding_keys = list(blobs.keys())
 
     for line in all_object_lines:
@@ -151,16 +151,16 @@ def populate_blob_paths(blobs):
 
 def print_out_blobs(blobs):
   if len(blobs):
-    csvLines = ["size,pack,hash,path"]
+    csv_lines = ["size,pack,hash,path"]
 
     for blob in sorted(blobs.values(), reverse=True):
-      csvLines.append(blob.csv_line())
+      csv_lines.append(blob.csv_line())
 
     command = ["column", "-t", "-s", ","]
     p = Popen(command, stdin=PIPE, stdout=PIPE, stderr=PIPE)
 
     # Encode the input as bytes
-    input_data = ("\n".join(csvLines) + "\n").encode()
+    input_data = ("\n".join(csv_lines) + "\n").encode()
 
     stdout, _ = p.communicate(input_data)
 

scripts/install-cargo-packages.sh

@@ -2,20 +2,31 @@
 # 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 && {
   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"
+  # "starship"
   # An incremental parsing system for programming tools
   "tree-sitter-cli"
   # a subprocess caching utility
@@ -58,4 +69,5 @@ x-have bob && {
   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-tldr.sh

@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2231,SC2034,SC2181,SC2068
-# shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
-
-TLDR_REQUIRED_TOOLS=(git cheat)
-for t in ${TLDR_REQUIRED_TOOLS[@]}; do
-  ! x-have "$t" && echo "(!) $t is missing, can't continue..." && exit 1
-done
-
-TLDR_GIT="https://github.com/tldr-pages/tldr.git"
-TLDR_SOURCE="source: $TLDR_GIT"
-TLDR_SYNTAX="syntax: markdown"
-
-TLDR_TEMP_PREFIX=$(basename "$0")
-TLDR_TEMP_DIR="$XDG_CACHE_HOME/cheat/tldr"
-
-# If there's no .git, clone the folder
-if [ ! -d "$TLDR_TEMP_DIR/.git" ]; then
-  msg_run "Starting to clone $TLDR_GIT"
-  git clone --depth 1 --single-branch -q "$TLDR_GIT" "$TLDR_TEMP_DIR" \
-    && msg_done "Cloned $TLDR_GIT"
-else
-  # Update the repo
-  msg_run "Starting to update $TLDR_GIT"
-  git -C "$TLDR_TEMP_DIR" reset --hard origin/main
-  git -C "$TLDR_TEMP_DIR" pull -q \
-    && msg_done "Updated $TLDR_GIT"
-fi
-
-# Fetch the destination directory from cheat defined directories.
-TLDR_CHEAT_DEST="$(cheat -d | grep tldr | head -1 | awk '{print $2}')"
-
-[ "$TLDR_CHEAT_DEST" = "" ] \
-  && msg_err "cheat doesn't know about the destination" \
-  && exit 1
-
-if [ ! -d "$TLDR_CHEAT_DEST" ]; then
-  mkdir -p "$TLDR_CHEAT_DEST"
-fi
-
-for d in "$TLDR_TEMP_DIR"/pages/*; do
-  DIRNAME=$(basename "$d")
-  # echo "-> $DIRNAME ($d)"
-
-  SECTION_DIR="${TLDR_CHEAT_DEST}/$DIRNAME"
-
-  [ "$DIRNAME" = "common" ] && SECTION_DIR="${TLDR_CHEAT_DEST}"
-
-  TLDR_TAGS="tags: [$DIRNAME]"
-
-  if [ ! -d "$SECTION_DIR" ]; then
-    mkdir -p "$SECTION_DIR"
-  fi
-
-  for FILE in $d/*.md; do
-    BASENAME=$(basename "$FILE" .md)
-    FILENAME="${BASENAME%%.*}"
-    # echo "-> $FILE = $FILENAME"
-    TLDR_FILE="$SECTION_DIR/${BASENAME}"
-    # echo "-> dest: $TLDR_FILE"
-
-    # Update the original file for making the replacable value comparable
-    if [ -f "$FILE" ] && [ '---' != "$(head -1 < "$FILE")" ]; then
-      echo -e "---\n$TLDR_SYNTAX\n$TLDR_TAGS\n$TLDR_SOURCE\n---\n$(cat "$FILE")" > "$FILE"
-    fi
-
-    replacable "$FILE" "$TLDR_FILE"
-    override=$?
-    if [ "$override" -ne 0 ]; then
-      cp "$FILE" "$TLDR_FILE" && msg_run "Updated: $TLDR_FILE"
-    fi
-
-  done
-done

scripts/install-go-packages.sh

@@ -50,4 +50,8 @@ x-have git-profile && {
 }
 
 echo ""
+
+msg_run "Clearing go cache"
+go clean -cache -modcache
+
 msg_ok "Done"

scripts/install-npm-packages.sh

@@ -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-ohmyposh.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env zsh
+#
+# Install oh-my-posh
+#
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+curl -s https://ohmyposh.dev/install.sh | bash -s -- -d ~/.local/bin
+
+OHMYPOSH_CFG="$HOME/.dotfiles/config/oh-my-posh.omp.json"
+
+eval "$(oh-my-posh init zsh --config $OHMYPOSH_CFG)"
+
+#cd ~/.dotfiles || exit
+#oh-my-posh config export image \
+#  --config "$OHMYPOSH_CFG" \
+#  --output "~/.dotfiles/.github/screenshots/oh-my-posh.png" \
+#  --author "Ismo Vuorinen"

tools/dotbot-defaults.yaml

@@ -1,3 +1,4 @@
+---
 - defaults:
     create:
       mode: 0755