misc: dfm tweaks, documentation, code style

.gitmodules

@@ -8,11 +8,6 @@
 	url = https://github.com/wren/dotbot-brew.git
 	ignore = dirty
 
-[submodule "dotbot-gh-extension"]
-	path = dotbot-gh-extension
-	url = https://github.com/fundor333/dotbot-gh-extension.git
-	ignore = dirty
-
 [submodule "dotbot-include"]
 	path = dotbot-include
 	url = https://gitlab.com/gnfzdz/dotbot-include.git

.yamlfmt

@@ -22,4 +22,3 @@ exclude:
   - ./dotbot-*/**
   - ./config/astronvim/**
   - ./config/nvim/**
-

add-submodules.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 
 git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git dotbot-brew
-git submodule add --name dotbot-gh-extension -f https://github.com/fundor333/dotbot-gh-extension.git dotbot-gh-extension
 git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git dotbot-include

base/zshrc

@@ -38,3 +38,4 @@ if command -v antigen &> /dev/null; then
 fi
 
 eval "$(starship init zsh)"
+

config/alias

@@ -15,9 +15,6 @@ function x-set-php-aliases
       # replace "php@" with "p" so "php@80" becomes "p80"
       local php_alias="${php_abbr//php@/p}"
 
-      # Skip php = php aliasing
-      # if [[ "$php_abbr" == "$php_alias" ]]; then continue; fi;
-
       # Fetch the exec path once
       php_exec="$(brew --prefix "$version")/bin/php"
 
@@ -55,10 +52,18 @@ if [[ $(uname) == 'Darwin' ]]; then
   alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
 fi
 
-alias watchx='watch -dpbc' # watch with: differences, precise, beep and color
+# watch with: differences, precise, beep and color
+alias watchx='watch -dpbc'
+# delete .DS_Store files
 alias zapds='find . -name ".DS_Store" -print -delete'
-alias t='tail -f'   # tail with follow flag on
+# tail with follow flag on
-alias dn='du -chd1' # directory usage, return only the total
+alias t='tail -f'
+# directory usage, return only the total
+alias dn='du -chd1'
+# Mirror site with wget
+alias mirror_site='wget -m -k -K -E -e robots=off'
+# Mirror stdout to stderr, useful for seeing data going through a pipe
+alias peek='tee >(cat 1>&2)'
 
 alias code_scanner='docker run
   --env SOURCE_CODE="$PWD"
@@ -69,6 +74,11 @@ alias code_scanner='docker run
 
 alias zedit='$EDITOR ~/.dotfiles'
 
+if hash irssi 2> /dev/null; then
+  # shellcheck disable=2139
+  alias irssi="irssi --config='$IRSSI_CONFIG_FILE' --home='$IRSSI_CONFIG_HOME'"
+fi
+
 if [[ -f "$HOME/.aliases.local" ]]; then
   # shellcheck disable=SC1091
   source "$HOME/.aliases.local"

config/dircolors

@@ -0,0 +1,233 @@
+# Configuration file for dircolors, a utility to help you set the
+# LS_COLORS environment variable used by GNU ls with the --color option.
+# Copyright (C) 1996-2023 Free Software Foundation, Inc.
+# Copying and distribution of this file, with or without modification,
+# are permitted provided the copyright notice and this notice are preserved.
+#
+# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
+# slackware version of dircolors) are recognized but ignored.
+# Global config options can be specified before TERM or COLORTERM entries
+# ===================================================================
+# Terminal filters
+# ===================================================================
+# Below are TERM or COLORTERM entries, which can be glob patterns, which
+# restrict following config to systems with matching environment variables.
+COLORTERM ?*
+TERM Eterm
+TERM ansi
+TERM *color*
+TERM con[0-9]*x[0-9]*
+TERM cons25
+TERM console
+TERM cygwin
+TERM *direct*
+TERM dtterm
+TERM gnome
+TERM hurd
+TERM jfbterm
+TERM konsole
+TERM kterm
+TERM linux
+TERM linux-c
+TERM mlterm
+TERM putty
+TERM rxvt*
+TERM screen*
+TERM st
+TERM terminator
+TERM tmux*
+TERM vt100
+TERM xterm*
+# ===================================================================
+# Basic file attributes
+# ===================================================================
+# Below are the color init strings for the basic file types.
+# One can use codes for 256 or more colors supported by modern terminals.
+# The default color codes use the capabilities of an 8 color terminal
+# with some additional attributes as per the following codes:
+# Attribute codes:
+# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
+# Text color codes:
+# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
+# Background color codes:
+# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
+#NORMAL 00 # no color code at all
+#FILE 00 # regular file: use no color at all
+RESET 0 # reset to "normal" color
+DIR 01;34 # directory
+LINK 01;36 # symbolic link. (If you set this to 'target' instead of a
+ # numerical value, the color is as for the file pointed to.)
+MULTIHARDLINK 00 # regular file with more than one link
+FIFO 40;33 # pipe
+SOCK 01;35 # socket
+DOOR 01;35 # door
+BLK 40;33;01 # block device driver
+CHR 40;33;01 # character device driver
+ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
+MISSING 00 # ... and the files they point to
+SETUID 37;41 # file that is setuid (u+s)
+SETGID 30;43 # file that is setgid (g+s)
+CAPABILITY 00 # file with capability (very expensive to lookup)
+STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
+OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
+STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
+# This is for files with execute permission:
+EXEC 01;32
+# ===================================================================
+# File extension attributes
+# ===================================================================
+# List any file extensions like '.gz' or '.tar' that you would like ls
+# to color below. Put the suffix, a space, and the color init string.
+# (and any comments you want to add after a '#').
+# Suffixes are matched case insensitively, but if you define different
+# init strings for separate cases, those will be honored.
+#
+# If you use DOS-style suffixes, you may want to uncomment the following:
+#.cmd 01;32 # executables (bright green)
+#.exe 01;32
+#.com 01;32
+#.btm 01;32
+#.bat 01;32
+# Or if you want to color scripts even if they do not have the
+# executable bit actually set.
+#.sh 01;32
+#.csh 01;32
+# archives or compressed (bright red)
+.tar 01;31
+.tgz 01;31
+.arc 01;31
+.arj 01;31
+.taz 01;31
+.lha 01;31
+.lz4 01;31
+.lzh 01;31
+.lzma 01;31
+.tlz 01;31
+.txz 01;31
+.tzo 01;31
+.t7z 01;31
+.zip 01;31
+.z 01;31
+.dz 01;31
+.gz 01;31
+.lrz 01;31
+.lz 01;31
+.lzo 01;31
+.xz 01;31
+.zst 01;31
+.tzst 01;31
+.bz2 01;31
+.bz 01;31
+.tbz 01;31
+.tbz2 01;31
+.tz 01;31
+.deb 01;31
+.rpm 01;31
+.jar 01;31
+.war 01;31
+.ear 01;31
+.sar 01;31
+.rar 01;31
+.alz 01;31
+.ace 01;31
+.zoo 01;31
+.cpio 01;31
+.7z 01;31
+.rz 01;31
+.cab 01;31
+.wim 01;31
+.swm 01;31
+.dwm 01;31
+.esd 01;31
+# image formats
+.avif 01;35
+.jpg 01;35
+.jpeg 01;35
+.mjpg 01;35
+.mjpeg 01;35
+.gif 01;35
+.bmp 01;35
+.pbm 01;35
+.pgm 01;35
+.ppm 01;35
+.tga 01;35
+.xbm 01;35
+.xpm 01;35
+.tif 01;35
+.tiff 01;35
+.png 01;35
+.svg 01;35
+.svgz 01;35
+.mng 01;35
+.pcx 01;35
+.mov 01;35
+.mpg 01;35
+.mpeg 01;35
+.m2v 01;35
+.mkv 01;35
+.webm 01;35
+.webp 01;35
+.ogm 01;35
+.mp4 01;35
+.m4v 01;35
+.mp4v 01;35
+.vob 01;35
+.qt 01;35
+.nuv 01;35
+.wmv 01;35
+.asf 01;35
+.rm 01;35
+.rmvb 01;35
+.flc 01;35
+.avi 01;35
+.fli 01;35
+.flv 01;35
+.gl 01;35
+.dl 01;35
+.xcf 01;35
+.xwd 01;35
+.yuv 01;35
+.cgm 01;35
+.emf 01;35
+# https://wiki.xiph.org/MIME_Types_and_File_Extensions
+.ogv 01;35
+.ogx 01;35
+# audio formats
+.aac 00;36
+.au 00;36
+.flac 00;36
+.m4a 00;36
+.mid 00;36
+.midi 00;36
+.mka 00;36
+.mp3 00;36
+.mpc 00;36
+.ogg 00;36
+.ra 00;36
+.wav 00;36
+# https://wiki.xiph.org/MIME_Types_and_File_Extensions
+.oga 00;36
+.opus 00;36
+.spx 00;36
+.xspf 00;36
+# backup files
+*~ 00;90
+*# 00;90
+.bak 00;90
+.old 00;90
+.orig 00;90
+.part 00;90
+.rej 00;90
+.swp 00;90
+.tmp 00;90
+.dpkg-dist 00;90
+.dpkg-old 00;90
+.ucf-dist 00;90
+.ucf-new 00;90
+.ucf-old 00;90
+.rpmnew 00;90
+.rpmorig 00;90
+.rpmsave 00;90
+#
+# Subsequent TERM or COLORTERM entries, can be used to add / override
+# config specific to those matching environment variables.

config/exports

@@ -1,53 +1,20 @@
 #!/usr/bin/env bash
-# shellcheck shell=bash
+# shellcheck shell=zsh
+# vim: filetype=zsh
+
+export DOTFILES="$HOME/.dotfiles"
+export PATH="$DOTFILES/local/bin:$PATH"
 
 # Explicitly set XDG folders
 # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_STATE_HOME="$HOME/.local/state"
-export XDG_BIN_HOME="$HOME/.local/bin" # this one is custom
 
-# History env variables
+# custom variables
-export HIST_STAMPS="yyyy-mm-dd"
+export XDG_BIN_HOME="$HOME/.local/bin"
-# Larger bash history (allow 32³ entries; default is 500)
+export XDG_CACHE_HOME="$HOME/.cache"
-export HISTSIZE=32768
+export XDG_RUNTIME_DIR="$HOME/.local/run"
-export HISTFILESIZE=$HISTSIZE
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-export HISTCONTROL=ignoreboth
-# Make some commands not show up in history
-export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
-# And include the parameter for ZSH
-export HISTORY_IGNORE="(ls|cd|cd -|pwd|exit|date|* --help)"
-
-# Highlight section titles in manual pages
-export LESS_TERMCAP_md="$ORANGE"
-
-# Don’t clear the screen after quitting a manual page
-export MANPAGER="less -X"
-
-# Always enable colored `grep` output
-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
-
-export LC_ALL=fi_FI.utf8
-
-# If we are using zsh, color our dir lists and such
-if [ $SHELL = $(which zsh) ]; then
-  LS_COLORS='no=00;37:fi=00:di=00;33:ln=04;36:pi=40;33:so=01;35:bd=40;33;01:'
-  export LS_COLORS
-  zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
-fi
-
-# Antigen configuration
-# https://github.com/zsh-users/antigen/wiki/Configuration
-export ADOTDIR="$XDG_DATA_HOME/antigen"
-export ANTIGEN_SYSTEM_RECEIPT_F=".local/share/antigen/antigen_system_lastupdate"
-export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
 
 # Homebrew configuration
 export HOMEBREW="/opt/homebrew"
@@ -68,85 +35,9 @@ if command -v brew &> /dev/null; then
   export PATH="$BREW_PYTHON:$GNUBIN_DIR:$BREW_GEMS:$BREW_RUBY:$PATH"
 fi
 
-# nvm, the node version manager
+source "$DOTFILES/config/exports-shell"
-export NVM_LAZY_LOAD=true
+source "$DOTFILES/config/exports-apps"
-export NVM_COMPLETION=true
-export NVM_AUTO_USE=true
-export NVM_DIR="${XDG_CONFIG_HOME}/nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"                   # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
-
-# If we have go packages, include them to the PATH
-if command -v go &> /dev/null; then
-  export GOPATH="$XDG_DATA_HOME/go"
-  export GOBIN="$XDG_BIN_HOME"
-  mkdir -p "$GOPATH"
-fi
 
 if command -v nvim &> /dev/null; then
   export EDITOR="nvim"
 fi
-
-# docker, https://docs.docker.com/engine/reference/commandline/cli/
-if command -v docker &> /dev/null; then
-  export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
-  mkdir -p "$DOCKER_CONFIG"
-fi
-
-# z, https://github.com/rupa/z
-export _Z_DATA="$XDG_STATE_HOME/z"
-[[ -f "$XDG_BIN_HOME/z/z.sh" ]] && source "$XDG_BIN_HOME/z/z.sh"
-
-# composer, https://getcomposer.org/
-if command -v composer &> /dev/null; then
-  export COMPOSER_HOME="$XDG_STATE_HOME/composer"
-  export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
-  export PATH="$COMPOSER_BIN:$PATH"
-fi
-
-# gem, rubygems
-if command -v gem &> /dev/null; then
-  export GEM_HOME="$XDG_STATE_HOME/gem"
-  export GEM_PATH="$XDG_STATE_HOME/gem"
-  export PATH="$GEM_HOME/bin:$PATH"
-fi
-
-# pyenv, python environments
-export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
-mkdir -p "$PYENV_ROOT"
-export PATH="$PYENV_ROOT/bin:$PATH"
-
-if command -v pyenv &> /dev/null; then
-  eval "$(pyenv init -)"
-fi
-
-# wakatime, https://github.com/wakatime/wakatime-cli
-export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
-
-# op (1Password cli) is present
-if hash op 2> /dev/null; then
-  export OP_CACHE="$XDG_STATE_HOME/1password"
-  mkdir -p "$OP_CACHE"
-  eval "$(op completion zsh)"
-  compdef _op op
-fi
-
-# Ansible configuration
-# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
-if hash ansible 2> /dev/null; then
-  export ANSIBLE_HOME="$XDG_STATE_HOME/ansible"
-  mkdir -p "$ANSIBLE_HOME"
-fi
-
-# gcloud is present
-if hash gcloud 2>/dev/null; then
-  GCLOUD_LOC=$(gcloud info --format="value(installation.sdk_root)" --quiet)
-  [[ -f "$GCLOUD_LOC/path.zsh.inc" ]] && builtin source "$GCLOUD_LOC/path.zsh.inc"
-  [[ -f "$GCLOUD_LOC/completion.zsh.inc" ]] && builtin source "$GCLOUD_LOC/completion.zsh.inc"
-fi
-
-# 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"
-

config/exports-apps

@@ -0,0 +1,107 @@
+#!/usr/bin/env bash
+# shellcheck shell=bash
+# shellcheck enable=external-sources
+# vim: filetype=zsh
+
+# Antigen configuration
+# https://github.com/zsh-users/antigen/wiki/Configuration
+export ADOTDIR="$XDG_DATA_HOME/antigen"
+export ANTIGEN_SYSTEM_RECEIPT_F=".local/share/antigen/antigen_system_lastupdate"
+export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
+
+# Ansible configuration
+# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
+if hash ansible 2> /dev/null; then
+  export ANSIBLE_HOME="$XDG_CONFIG_HOME/ansible"
+  export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible.cfg"
+  export ANSIBLE_GALAXY_CACHE_DIR="$XDG_CACHE_HOME/ansible/galaxy_cache"
+  x-dc "$ANSIBLE_HOME"
+  x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
+fi
+
+# composer, https://getcomposer.org/
+if command -v composer &> /dev/null; then
+  export COMPOSER_HOME="$XDG_STATE_HOME/composer"
+  export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
+  export PATH="$COMPOSER_BIN:$PATH"
+fi
+
+# docker, https://docs.docker.com/engine/reference/commandline/cli/
+if command -v docker &> /dev/null; then
+  export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
+  x-dc "$DOCKER_CONFIG"
+fi
+
+# ffmpeg
+if hash ffmpeg 2> /dev/null; then
+  export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
+  x-dc "$FFMPEG_DATADIR"
+fi
+
+# gcloud
+if hash gcloud 2> /dev/null; then
+  GCLOUD_LOC=$(gcloud info --format="value(installation.sdk_root)" --quiet)
+  [[ -f "$GCLOUD_LOC/path.zsh.inc" ]] && builtin source "$GCLOUD_LOC/path.zsh.inc"
+  [[ -f "$GCLOUD_LOC/completion.zsh.inc" ]] && builtin source "$GCLOUD_LOC/completion.zsh.inc"
+fi
+
+# gem, rubygems
+if command -v gem &> /dev/null; then
+  export GEM_HOME="$XDG_STATE_HOME/gem"
+  export GEM_PATH="$XDG_STATE_HOME/gem"
+  export PATH="$GEM_HOME/bin:$PATH"
+fi
+
+# If we have go packages, include them to the PATH
+if command -v go &> /dev/null; then
+  export GOPATH="$XDG_DATA_HOME/go"
+  export GOBIN="$XDG_BIN_HOME"
+  x-dc "$GOPATH"
+fi
+
+# irssi
+if hash irssi 2> /dev/null; then
+  # These variables are used in ./alias with --config and --home
+  export IRSSI_CONFIG_HOME="$XDG_CONFIG_HOME/irssi"
+  export IRSSI_CONFIG_FILE="$IRSSI_CONFIG_HOME/config"
+  x-dc "$IRSSI_CONFIG_HOME"
+fi
+
+# nvm, the node version manager
+export NVM_LAZY_LOAD=true
+export NVM_COMPLETION=true
+export NVM_AUTO_USE=true
+export NVM_DIR="$XDG_CONFIG_HOME/nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"                   # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
+
+# op (1Password cli) is present
+if hash op 2> /dev/null; then
+  export OP_CACHE="$XDG_STATE_HOME/1password"
+  x-dc "$OP_CACHE"
+  eval "$(op completion zsh)"
+  compdef _op op
+fi
+
+# pyenv, python environments
+if command -v pyenv &> /dev/null; then
+  export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
+  x-dc "$PYENV_ROOT"
+  export PATH="$PYENV_ROOT/bin:$PATH"
+
+  eval "$(pyenv init -)"
+fi
+
+# wakatime, https://github.com/wakatime/wakatime-cli
+export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
+x-dc "$WAKATIME_HOME"
+
+# z, https://github.com/rupa/z
+export _Z_DATA="$XDG_STATE_HOME/z"
+[[ -f "$XDG_BIN_HOME/z/z.sh" ]] && source "$XDG_BIN_HOME/z/z.sh"
+
+# Misc
+export ANDROID_HOME="$XDG_DATA_HOME/android"
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
+

config/exports-secret.example

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#
+# This file is secret and wont be added to the git repo.
+
+export GITLAB_API_TOKEN=""
+export GREN_GITHUB_TOKEN=""

config/exports-shell

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+# shellcheck shell=bash
+# vim: filetype=zsh
+
+export LC_ALL=fi_FI.utf8
+
+# Bash completion file location
+export BASH_COMPLETION_USER_FILE="${XDG_CONFIG_HOME}/bash-completion/bash_completion"
+
+# History env variables
+export HIST_STAMPS="yyyy-mm-dd"
+# Larger bash history (allow 32³ entries; default is 500)
+export HISTSIZE=32768
+export HISTFILESIZE=$HISTSIZE
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+export HISTCONTROL=ignoreboth
+# Make some commands not show up in history
+export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
+# And include the parameter for ZSH
+export HISTORY_IGNORE="(ls|cd|cd -|pwd|exit|date|* --help)"
+
+# Highlight section titles in manual pages
+export LESS_TERMCAP_md="$ORANGE"
+
+# Don’t clear the screen after quitting a manual page
+export MANPAGER="less -X"
+
+# Always enable colored `grep` output
+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
+
+# 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"
+
+# Set dircolors based on the file, if it exists
+if command -v dircolors &> /dev/null; then
+  # shellcheck disable=SC2046
+  eval $(dircolors "$XDG_CONFIG_HOME/dircolors")
+fi
+
+# If we are using zsh, color our dir lists and such
+if [ "$SHELL" = "$(which zsh)" ]; then
+  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"
+fi
+

config/functions

@@ -66,6 +66,29 @@ function silent
   "$@" >&/dev/null
 }
 
+# Remove directory from the PATH variable
+# usage: path_remove ~/.local/bin
+function path_remove
+{
+  PATH=$(echo -n "$PATH" | awk -v RS=: -v ORS=: "\$0 != \"$1\"" | sed 's/:$//')
+}
+
+# Append directory to the PATH
+# usage: path_append ~/.local/bin
+function path_append
+{
+  path_remove "$1"
+  PATH="${PATH:+"$PATH:"}$1"
+}
+
+# Prepend directory to the PATH
+# usage: path_prepend ~/.local/bin
+function path_prepend
+{
+  path_remove "$1"
+  PATH="$1${PATH:+":$PATH"}"
+}
+
 # Defines default antigen bundles
 function x-default-antigen-bundles
 {
@@ -91,4 +114,3 @@ function x-default-antigen-bundles
   hash python 2> /dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
   hash rvm 2> /dev/null && antigen bundle unixorn/rvm-plugin
 }
-

config/misc/screenrc

@@ -0,0 +1,16 @@
+# Disable the startup message
+startup_message off
+
+# Set a large scrollback buffer
+defscrollback 32000
+
+# Always start `screen` with UTF-8 enabled (`screen -U`)
+defutf8 on
+
+# Scroll with mouse wheel (http://stackoverflow.com/a/1125947)
+termcapinfo xterm* ti@:te@
+
+# Some settings for screen + vim
+term xterm-256color
+maptimeout 10
+

install.conf.yaml

@@ -10,6 +10,7 @@
     ~/.cache/git:
     ~/.config:
     ~/.local:
+    ~/.local/run:
     ~/.local/share:
     ~/.local/state:
     ~/.ssh:
@@ -35,24 +36,3 @@
 - shell:
     - git submodule update --init --recursive --force
     - bash local/bin/dfm install all
-# GitHub CLI Extensions
-- ghe:
-    # GitHub CLI extension for generating a report on repository dependencies.
-    - andyfeller/gh-dependency-report
-    # GitHub CLI extension to generate montage from GitHub user avatars
-    - andyfeller/gh-montage
-    # An opinionated GitHub Cli extension for creating
-    # changelogs that adhere to the keep a changelog specification.
-    - chelnak/gh-changelog
-    # Safely deletes local branches with no upstream and no un-pushed commits
-    - davidraviv/gh-clean-branches
-    # A beautiful CLI dashboard for GitHub 🚀
-    - dlvhdr/gh-dash
-    # A github-cli extension script to clone all repositories
-    # in an organization, optionally filtering by topic.
-    - matt-bartel/gh-clone-org
-    # being an extension to view the overall health of
-    # an organization's use of actions
-    - rsese/gh-actions-status
-
-#

local/bin/dfm

@@ -15,6 +15,8 @@
 
 SCRIPT=$(basename "$0")
 
+VERSION_NVM="v0.39.3"
+
 # shellcheck source=./../../scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
 
@@ -29,7 +31,10 @@ function section_install
       $0 install starship
       $0 brew install
       $0 install composer
-      $0 install dotenv-linter
+      $0 install dotenv
+      $0 install gh
+      $0 install go
+      $0 install imagick
       $0 install nvm
       $0 install npm
       $0 install ntfy
@@ -43,12 +48,24 @@ function section_install
       bash "$DOTFILES/scripts/install-composer.sh" \
         && msg_done "🎉 composer installed!"
       ;;
-    dotenv-linter)
+    dotenv)
       curl -sSfL \
         https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh \
         | sh -s -- -b "$XDG_BIN_HOME" \
         && msg_done "🎉 dotenv-linter installed!"
       ;;
+    gh)
+      bash "$DOTFILES/scripts/install-gh-extensions.sh" \
+        && msg_done "🎉 github cli extensions installed!"
+      ;;
+    go)
+      bash "$DOTFILES/scripts/install-go-packages.sh" \
+        && msg_done "🎉 go packages installed!"
+      ;;
+    imagick)
+      wget https://imagemagick.org/archive/binaries/magick > "$XDG_BIN_HOME/magick" \
+        && msg_done "🎉 imagick installed!"
+      ;;
     starship)
       curl -sS https://starship.rs/install.sh | sh -s -- --bin-dir ~/.local/bin \
         && msg_done "🎉 starship installed!"
@@ -58,9 +75,9 @@ function section_install
         && msg_done "🎉 Brewfile defined apps has been installed!"
       ;;
     nvm)
-      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash \
+      curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash \
-        && git checkout "$HOME/.zshrc" \
         && nvm install --lts --latest-npm --default \
+        && git checkout "$HOME/.zshrc" \
         && msg_done "🎉 nvm installed!"
       ;;
     npm)
@@ -73,14 +90,17 @@ function section_install
       ;;
     z)
       bash "$DOTFILES/scripts/install-z.sh" \
-        && msg_done "🎉 Z has been installed!"
+        && msg_done "🎉 z has been installed!"
       ;;
     *)
-      menu_section "$USAGE_PREFIX" "all | antigen | composer | dotenv-linter | starship | macos | nvm | npm"
+      menu_section "$USAGE_PREFIX" "all | antigen | composer | dotenv | gh | go | imagick | starship | macos | nvm | npm"
       menu_item "all" "Installs macos defaults, antigen, starship, brew, nvm, npm packages and others"
       menu_item "antigen" "Updates the antigen.zsh file"
       menu_item "composer" "Install composer"
-      menu_item "dotenv-linter" "Install dotenv-linter"
+      menu_item "dotenv" "Install dotenv-linter"
+      menu_item "gh" "Install GitHub CLI Extensions"
+      menu_item "go" "Install Go Packages"
+      menu_item "imagick" "Install ImageMagick CLI"
       menu_item "starship" "Install starship.rs"
       menu_item "macos" "Setup nice macOS defaults"
       menu_item "nvm" "Install Node Version Manager (nvm)"
@@ -133,6 +153,12 @@ function section_dotfiles
   USAGE_PREFIX="$SCRIPT dotfiles"
 
   case "$1" in
+    fmt)
+      msg_ok "Running all formatters"
+      $0 dotfiles yamlfmt
+      $0 dotfiles shfmt
+      msg_done "...done!"
+      ;;
     reset_all)
       msg_ok "Running all reset commands"
       $0 dotfiles reset_nvim
@@ -174,7 +200,8 @@ function section_dotfiles
       msg_done "🎉 dotfiles have been shfmt formatted!"
       ;;
     *)
-      menu_section "$USAGE_PREFIX" "reset_all | reset_nvim | yamlfmt | shfmt"
+      menu_section "$USAGE_PREFIX" "fmt | reset_all | reset_nvim | yamlfmt | shfmt"
+      menu_item "fmt" "Run all formatters"
       menu_item "reset_all" "Reset everything, runs all configured reset actions"
       menu_item "reset_nvim" "Resets nvim. Deletes caches, removes nvim folders and relinks nvim folders"
       menu_item "yamlfmt" "Run yamlfmt to all dotfiles, which are in our control"

local/bin/x-compare-versions.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+"""
+Version Comparison tool for the CLI.
+
+Adapted from script found in anishathalye's dotfiles.
+https://github.com/anishathalye/dotfiles/blob/master/bin/vercmp
+"""
+
+import operator
+import sys
+
+from packaging import version
+
+str_to_operator = {
+    "==": operator.eq,
+    "!=": operator.ne,
+    "<": operator.lt,
+    "<=": operator.le,
+    ">": operator.gt,
+    ">=": operator.ge,
+}
+
+
+def vercmp(expr):
+    """Version Comparison function."""
+    words = expr.split()
+    comparisons = [words[i: i + 3] for i in range(0, len(words) - 2, 2)]
+    for left, op_str, right in comparisons:
+        compare_op = str_to_operator[op_str]
+        if not compare_op(version.parse(left), version.parse(right)):
+            return False
+    return True
+
+
+def main():
+    """Triggers version comparison if line is provided."""
+    for line in sys.stdin:
+        if not vercmp(line):
+            sys.exit(1)
+    sys.exit(0)
+
+
+def test():
+    """Basic functionality tests."""
+    assert not vercmp("1.9 >= 2.4")
+    assert vercmp("2.4 >= 2.4")
+    assert vercmp("2.5 >= 2.4")
+    assert vercmp("3 >= 2.999")
+    assert vercmp("2.9 < 2.9a")
+    assert vercmp("2.9a >= 2.8")
+
+
+if __name__ == "__main__":
+    if len(sys.argv) == 2 and sys.argv[1] == "test":
+        test()
+    else:
+        main()

local/bin/x-dc

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Verify folder exists, and if it does not, create it.
+
+dir="$1"
+
+[ $# -eq 0 ] && {
+  echo "Usage: $0 full/path/to/dir/to/create"
+  exit 1
+}
+
+if [ ! -d "$dir" ]; then
+  mkdir -p "$dir" && exit 0
+fi
+

local/bin/x-ip

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Source: https://github.com/thirtythreeforty/dotfiles/blob/master/bin/extip
+
+curl icanhazip.com "${@}"
+

local/bin/x-thumbgen

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Generate thumbnails using magick
+# https://imagemagick.org/script/download.php
+#
+# Defaults to current directory creating thumbs with 1000x1000
+# images with 200px white borders around the original image.
+#
+# Defaults can be overridden with ENV variables like this:
+# $ THMB_BACKGROUND=black x-thumbgen ~/images/
+#
+# Created by: Ismo Vuorinen <https://github.com/ivuorinen> 2015
+
+: "${THMB_SOURCE:=$1}"
+: "${THMB_BACKGROUND:=white}"
+: "${THMB_RESIZE:=800x800}"
+: "${THMB_EXTENT:=1000x1000}"
+
+[ $# -eq 0 ] && {
+  echo "Usage: $0 /full/path/to/image/folder"
+  exit 1
+}
+
+if [ "$THMB_SOURCE" == "" ] || [ ! -d "$THMB_SOURCE" ]; then
+  THMB_SOURCE=$(pwd)
+fi
+
+if command -v magick &> /dev/null; then
+
+  magick \
+    "$THMB_SOURCE/*" \
+    -resize "$THMB_RESIZE" \
+    -background "$THMB_BACKGROUND" \
+    -gravity center \
+    -extent "$THMB_EXTENT" \
+    -set filename:fname '%t_thumb.%e' +adjoin '%[filename:fname]'
+
+else
+  echo "magick not found in PATH, https://imagemagick.org/script/download.php"
+fi

scripts/install-gh-extensions.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+# Install GitHub CLI extensions
+#
+# shellcheck source="shared.sh"
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+if ! command -v gh &> /dev/null; then
+  msg_run "gh (GitHub Client) could not be found, please install it first"
+else
+  extensions=(
+    # GitHub CLI extension for generating a report on repository dependencies.
+    andyfeller/gh-dependency-report
+    # GitHub CLI extension to generate montage from GitHub user avatars
+    andyfeller/gh-montage
+    # An opinionated GitHub Cli extension for creating
+    # changelogs that adhere to the keep a changelog specification.
+    chelnak/gh-changelog
+    # Safely deletes local branches with no upstream and no un-pushed commits
+    davidraviv/gh-clean-branches
+    # A beautiful CLI dashboard for GitHub 🚀
+    dlvhdr/gh-dash
+    # A github-cli extension script to clone all repositories
+    # in an organization, optionally filtering by topic.
+    matt-bartel/gh-clone-org
+    # being an extension to view the overall health of
+    # an organization's use of actions
+    rsese/gh-actions-status
+  )
+
+  msg "Starting to install GitHub CLI extensions..."
+
+  for ext in "${extensions[@]}"; do
+    # Trim spaces
+    ext=${ext// /}
+    # Skip comments
+    if [[ ${ext:0:1} == "#" ]]; then continue; fi
+
+    msg_run "Installing $ext"
+    gh extensions install "$ext"
+    echo ""
+  done
+
+  msg_ok "Done"
+fi

scripts/install-go-packages.sh

@@ -12,6 +12,8 @@ else
     github.com/skx/sysbox@latest
     github.com/dotzero/git-profile@latest
     github.com/google/yamlfmt/cmd/yamlfmt@latest
+    github.com/ericchiang/pup@latest
+    github.com/suntong/html2md@latest
   )
 
   for pkg in "${packages[@]}"; do