scripts: x-hr & x-welxome-banner

- have: command -v shorthand
- path_append: appends dir to PATH
- path_prepend: prepends dir to PATH
- path_remove: removes dir from PATH

.editorconfig

@@ -7,28 +7,3 @@ indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
-
-[*.lua]
-insert_final_newline = true
-
-[*.yaml]
-indent_size = 2
-insert_final_newline = true
-
-[*.yml]
-indent_size = 2
-insert_final_newline = true
-
-[*.sh]
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-shell_variant      = bash # --language-variant
-binary_next_line   = true
-switch_case_indent = true  # --case-indent
-space_redirects    = false
-keep_padding       = false
-function_next_line = true  # --func-next-line
-
-[local/bin/antigen.zsh]
-ignore = true

.gitignore

@@ -1,6 +1,6 @@
 Brewfile.lock.json
 *.log
 *-secret
+*cache
 .idea
 .vscode
-

.gitmodules

@@ -8,24 +8,9 @@
 	url = https://github.com/wren/dotbot-brew.git
 	ignore = dirty
 
-[submodule "dotbot-if"]
-	path = dotbot-if
-	url = https://github.com/wonderbeyond/dotbot-if.git
-	ignore = dirty
-
-[submodule "dotbot-ifplatform"]
-	path = dotbot-ifplatform
-	url = https://github.com/ssbanerje/dotbot-ifplatform.git
-	ignore = dirty
-
-[submodule "dotbot-gh-extension"]
-	path = dotbot-gh-extension
-	url = https://github.com/fundor333/dotbot-gh-extension.git
-	ignore = dirty
-
-[submodule "dotbot-golang"]
-	path = dotbot-golang
-	url = https://github.com/delicb/dotbot-golang.git
+[submodule "dotbot-include"]
+	path = dotbot-include
+	url = https://gitlab.com/gnfzdz/dotbot-include.git
 	ignore = dirty
 
 [submodule "config/nvim"]

.yamlfmt

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

Brewfile

@@ -23,6 +23,8 @@ brew "ansible"
 brew "ansible-lint"
 # Zstandard is a real-time compression algorithm
 brew "zstd"
+# Open Source Kubernetes Marketplace
+brew "arkade"
 # Spell checker with better logic than ispell
 brew "aspell"
 # Automatic configure script builder
@@ -31,6 +33,8 @@ brew "autoconf"
 brew "awscli"
 # Terminal bandwidth utilization tool
 brew "bandwhich"
+# Clone of cat(1) with syntax highlighting and Git integration
+brew "bat"
 # Yet another cross-platform graphical process/system monitor
 brew "bottom"
 # Switch Apache / Valet / CLI configs between PHP versions
@@ -99,6 +103,8 @@ brew "netpbm"
 brew "icu4c"
 # OpenType text shaping engine
 brew "harfbuzz"
+# Framework for layout and rendering of i18n text
+brew "pango"
 # Library to render SVG files using Cairo
 brew "librsvg"
 # Graph visualization software from AT&T and Bell Labs
@@ -193,6 +199,8 @@ brew "tldr"
 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
@@ -207,8 +215,6 @@ brew "wget"
 brew "wtfutil"
 # JavaScript package manager
 brew "yarn"
-# Tracks most-used directories to make cd smarter
-brew "z"
 # A vulnerability scanner for container images and filesystems
 brew "anchore/grype/grype"
 # High-performance load testing tool, written in Golang.
@@ -267,6 +273,8 @@ cask "insomnia"
 cask "jetbrains-toolbox"
 # Kubernetes IDE
 cask "lens"
+# Neovim Client
+cask "neovide"
 # Reverse proxy, secure introspectable tunnels to localhost
 cask "ngrok"
 # Collaboration platform for API development

add-submodules.sh

@@ -1,7 +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-golang -f https://github.com/delicb/dotbot-golang.git dotbot-golang
-git submodule add --name dotbot-if -f https://github.com/wonderbeyond/dotbot-if.git dotbot-if
-git submodule add --name dotbot-ifplatform -f https://github.com/ssbanerje/dotbot-ifplatform.git dotbot-ifplatform
+git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git dotbot-include

base/bashrc

@@ -1,76 +1,9 @@
+# this is my bashrc config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
 
-# 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_STATE_HOME="$HOME/.local/state"
-export XDG_BIN_HOME="$HOME/.local/bin" # this one is custom
-
-# Homebrew configuration
-export HOMEBREW="/opt/homebrew"
-export HOMEBREW_BIN="$HOMEBREW/bin"
-export HOMEBREW_SBIN="$HOMEBREW/sbin"
-export HOMEBREW_PKG="$HOMEBREW/opt"
-export HOMEBREW_NO_ENV_HINTS=1
-
-export PATH="$XDG_BIN_HOME:$HOMEBREW_BIN:$HOMEBREW_SBIN:/usr/local/sbin:$PATH"
-
-# brew, https://brew.sh
-if command -v brew &> /dev/null; then
-  BREW_BIN=$(brew --prefix)/bin
-  BREW_SBIN=$(brew --prefix)/sbin
-
-  BREW_PYTHON=$(brew --prefix python@3.8)/bin
-  GNUBIN_DIR=$(brew --prefix coreutils)/libexec/gnubin
-  BREW_RUBY=$(brew --prefix ruby)/bin
-  BREW_GEMS=$(gem environment gemdir)/bin
-
-  export PATH="$BREW_PYTHON:$GNUBIN_DIR:$BREW_GEMS:$BREW_RUBY:$BREW_BIN:$BREW_SBIN:$PATH"
-fi
-
-# nvm, the node version manager
-export NVM_LAZY_LOAD=true
-export NVM_COMPLETION=true
-export NVM_AUTO_USE=true
-export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
-
-# If we have go packages, include them to the PATH
-if command -v go &> /dev/null; then
-    export GOPATH=$(go env GOPATH);
-    if [ -d "$GOPATH/bin" ]; then
-        export PATH="$GOPATH/bin:$PATH"
-    fi
-fi
-
-if command -v nvim &> /dev/null; then
-    export EDITOR="nvim"
-fi
-
-# z, https://github.com/rupa/z
-export _Z_DATA="$XDG_STATE_HOME/z"
-
-# 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"
-fi
-
-
-# wakatime, https://github.com/wakatime/wakatime-cli
-export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
-
 # Run x-load-configs in your terminal to reload the files.
 function x-load-configs()
 {
@@ -86,28 +19,3 @@ x-load-configs
 
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null;
-
-# 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"

base/ecrc

@@ -17,4 +17,3 @@
     "MaxLineLength": false
   }
 }
-

base/git_profiles

@@ -5,4 +5,3 @@ email = ismo.vuorinen@vincit.fi
 [home]
 name  = Ismo Vuorinen
 email = ismo@vuorinen.net
-

base/zshrc

@@ -6,167 +6,38 @@ colors
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
-
-# 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_STATE_HOME="$HOME/.local/state"
-export XDG_BIN_HOME="$HOME/.local/bin" # this one is custom
-
-# Homebrew configuration
-export HOMEBREW="/opt/homebrew"
-export HOMEBREW_BIN="$HOMEBREW/bin"
-export HOMEBREW_SBIN="$HOMEBREW/sbin"
-export HOMEBREW_PKG="$HOMEBREW/opt"
-export HOMEBREW_NO_ENV_HINTS=1
-
-export PATH="$XDG_BIN_HOME:$HOMEBREW_BIN:$HOMEBREW_SBIN:/usr/local/sbin:$PATH"
-
-# brew, https://brew.sh
-if [ command -v brew &> /dev/null ]; then
-  BREW_PYTHON=$(brew --prefix python)/bin
-  GNUBIN_DIR=$(brew --prefix coreutils)/libexec/gnubin
-  BREW_RUBY=$(brew --prefix ruby)/bin
-  BREW_GEMS=$(gem environment gemdir)/bin
-
-  export PATH="$BREW_PYTHON:$GNUBIN_DIR:$BREW_GEMS:$BREW_RUBY:$PATH"
-fi
-
-# nvm, the node version manager
-export NVM_LAZY_LOAD=true
-export NVM_COMPLETION=true
-export NVM_AUTO_USE=true
-export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${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
-
-# z, https://github.com/rupa/z
-export _Z_DATA="$XDG_STATE_HOME/z"
-
-# 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"
+# shellcheck source=shared.sh
+source "$DOTFILES/scripts/shared.sh"
 
 # Run x-load-configs in your terminal to reload the files.
 function x-load-configs()
 {
-    # Load the shell dotfiles, and then some:
-    for file in $DOTFILES/config/{exports,alias,functions}; do
-        [ -r "$file" ] && [ -f "$file" ] && source "$file"
-        [ -r "$file-secret" ] && [ -f "$file-secret" ] && source "$file-secret"
-        [ -r "$file-$HOSTNAME" ] && [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
-        [ -r "$file-$HOSTNAME-secret" ] && [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
-    done
+  # Load the shell dotfiles, and then some:
+  for file in $DOTFILES/config/{exports,alias,functions}; do
+    [ -f "$file" ] && source "$file"
+    [ -f "$file-secret" ] && source "$file-secret"
+    [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
+    [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
+  done
 }
 x-load-configs
 
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null;
 
-# 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"
-
 # Try to load antigen, if present
-[[ -f "$XDG_BIN_HOME/antigen.zsh" ]] && source "$XDG_BIN_HOME/antigen.zsh"
+ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
+[[ -f "$ANTIGEN_ZSH_PATH" ]] && source "$ANTIGEN_ZSH_PATH"
 
 # antigen is present
-if command -v antigen &> /dev/null; then
-    antigen use oh-my-zsh
+have antigen && {
+  antigen use oh-my-zsh
 
-    antigen bundle ssh-agent
-    antigen bundle colored-man-pages
-    antigen bundle jreese/zsh-titles
-    antigen bundle zsh-users/zsh-syntax-highlighting
-    antigen bundle zsh-users/zsh-completions
-    antigen bundle MichaelAquilina/zsh-you-should-use
-    antigen bundle unixorn/autoupdate-antigen.zshplugin
-    antigen bundle Sparragus/zsh-auto-nvm-use
+  # config/functions
+  x-default-antigen-bundles
 
-    hash php 2>/dev/null && antigen bundle php
-    hash nvm 2>/dev/null && antigen bundle nvm
-    hash docker 2>/dev/null && antigen bundle docker
-    hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
-    hash jq 2>/dev/null && antigen bundle reegnz/jq-zsh-plugin
-    hash docker-compose 2>/dev/null && antigen bundle sroze/docker-compose-zsh-plugin
-
-    # Platform dependant bundles
-    if [[ $(uname) == 'Linux' ]]; then
-        antigen bundle command-not-found
-    elif [[ $(uname) == 'Darwin' ]]; then
-        # If we have brew installed
-        if command -v brew &> /dev/null; then
-            # Only enable brew plugin if brew exists
-            antigen bundle brew
-            # load Z
-            [[ -f "$(brew --prefix z)/etc/profile.d/z.sh" ]] && source "$(brew --prefix z)/etc/profile.d/z.sh"
-        fi
-    fi
-
-    antigen apply
-fi
-
-# 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"
-
-eval "$(starship init zsh)"
+  antigen apply
+}
 
+# starship is present
+have starship && eval "$(starship init zsh)"

config/alias

@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
-# macOS specific
+# shellcheck source="../scripts/shared.sh"
+source "$DOTFILES/scripts/shared.sh"
 
 # Get installed php versions from brew and setup aliases
 function x-set-php-aliases
 {
-  if command -v brew &> /dev/null; then
+  have brew && {
     local php_versions=()
     while IFS="" read -r line; do php_versions+=("$line"); done < <(brew list | grep '^php')
 
@@ -16,9 +17,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"
 
@@ -26,22 +24,23 @@ function x-set-php-aliases
       # shellcheck disable=SC2139
       alias "${php_alias}"r="$php_exec"
       # PHP with error_reporting flag.
-      # shellcheck disable=SC2139
+      # shellcheck disable=SC2139,SC2140
       alias "$php_alias"="$php_exec $php_error_reporting"
       # Local PHP Server.
-      # shellcheck disable=SC2139
-      alias "${php_alias}"s="$php_exec -S localhost:9000"
+      # shellcheck disable=SC2139,SC2140
+      alias "${php_alias}s"="$php_exec -S localhost:9000"
       # Use composer with specific PHP and error_reporting flag on.
-      # shellcheck disable=SC2139
-      alias "${php_alias}"c="$php_exec $php_error_reporting $(which composer)"
+      # shellcheck disable=SC2139,SC2140
+      alias "${php_alias}c"="$php_exec $php_error_reporting $(which composer)"
     done
-  fi
+  }
 }
 
 if [[ $(uname) == 'Darwin' ]]; then
 
   x-set-php-aliases
 
+  # Laravel Sail shortcut
   alias sail='[ -f sail ] && bash sail || bash vendor/bin/sail'
 
   # Flush Directory Service cache
@@ -55,25 +54,32 @@ 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
-alias dn='du -chd1' # directory usage, return only the total
+# tail with follow flag on
+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}' \
-  --volume '${PWD}':/code \
-  --volume /var/run/docker.sock:/var/run/docker.sock \
-  registry.gitlab.com/gitlab-org/ci-cd/codequality:${CODEQUALITY_VERSION:-latest} \
-  /code"
-
-alias composerUp='composer global update'
-alias npmUp='npm -g up'
+alias code_scanner='docker run
+  --env SOURCE_CODE="$PWD"
+  --volume "${PWD}":/code
+  --volume /var/run/docker.sock:/var/run/docker.sock
+  registry.gitlab.com/gitlab-org/ci-cd/codequality:"${CODEQUALITY_VERSION:-latest}"
+  /code'
 
 alias zedit='$EDITOR ~/.dotfiles'
 
+have irssi \
+  && alias irssi="irssi --config='$IRSSI_CONFIG_FILE' --home='$IRSSI_CONFIG_HOME'"
+
 if [[ -f "$HOME/.aliases.local" ]]; then
   # shellcheck disable=SC1091
   source "$HOME/.aliases.local"
 fi
-

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,30 +1,43 @@
-# shellcheck shell=bash
+#!/usr/bin/env bash
+# shellcheck shell=zsh
+# vim: filetype=zsh
 
-export HIST_STAMPS="yyyy-mm-dd"
+export DOTFILES="$HOME/.dotfiles"
+source "$DOTFILES/scripts/shared.sh"
+path_append "$DOTFILES/local/bin"
 
-# 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
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
 
-# Make some commands not show up in history
-export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
 
-# And include the parameter for ZSH
-export HISTORY_IGNORE="(ls|cd|cd -|pwd|exit|date|* --help)"
+# Homebrew configuration
+export HOMEBREW="/opt/homebrew"
+export HOMEBREW_BIN="$HOMEBREW/bin"
+export HOMEBREW_SBIN="$HOMEBREW/sbin"
+export HOMEBREW_PKG="$HOMEBREW/opt"
+export HOMEBREW_NO_ENV_HINTS=1
 
-# Highlight section titles in manual pages
-export LESS_TERMCAP_md="$ORANGE"
+path_append "/usr/local/bin"
+path_append "$HOMEBREW_SBIN"
+path_append "$HOMEBREW_BIN"
+path_append "$XDG_BIN_HOME"
 
-# Don’t clear the screen after quitting a manual page
-export MANPAGER="less -X"
+# brew, https://brew.sh
+have brew && {
+  path_append "$(brew --prefix python)/bin"
+  path_append "$(brew --prefix coreutils)/libexec/gnubin"
+  path_append "$(brew --prefix ruby)/bin"
+  path_append "$(gem environment gemdir)/bin"
+}
 
-# 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
+source "$DOTFILES/config/exports-shell"
+source "$DOTFILES/config/exports-apps"
 
+have nvim && export EDITOR="nvim"

config/exports-apps

@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+# shellcheck shell=bash
+# shellcheck enable=external-sources
+# vim: filetype=zsh
+source "$DOTFILES/scripts/shared.sh"
+
+# 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
+have ansible && {
+  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"
+}
+
+# composer, https://getcomposer.org/
+have composer && {
+  export COMPOSER_HOME="$XDG_STATE_HOME/composer"
+  export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
+  export PATH="$COMPOSER_BIN:$PATH"
+}
+
+# docker, https://docs.docker.com/engine/reference/commandline/cli/
+have docker && {
+  export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
+  x-dc "$DOCKER_CONFIG"
+}
+
+# ffmpeg
+have ffmpeg && {
+  export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
+  x-dc "$FFMPEG_DATADIR"
+}
+
+# gcloud
+have gcloud && {
+  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"
+}
+
+# gem, rubygems
+have gem && {
+  export GEM_HOME="$XDG_STATE_HOME/gem"
+  export GEM_PATH="$XDG_STATE_HOME/gem"
+  export PATH="$GEM_HOME/bin:$PATH"
+  path_append "$GEM_PATH/bin"
+}
+
+# If we have go packages, include them to the PATH
+have go && {
+  export GOPATH="$XDG_DATA_HOME/go"
+  export GOBIN="$XDG_BIN_HOME"
+  x-dc "$GOPATH"
+}
+
+# irssi
+have irssi && {
+  # 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"
+}
+
+# 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
+have op && {
+  export OP_CACHE="$XDG_STATE_HOME/1password"
+  x-dc "$OP_CACHE"
+  eval "$(op completion zsh)"
+  compdef _op op
+}
+
+# pyenv, python environments
+have pyenv && {
+  export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
+  x-dc "$PYENV_ROOT"
+  path_append "$PYENV_ROOT/bin"
+
+  eval "$(pyenv init -)"
+}
+
+# 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,52 @@
+#!/usr/bin/env bash
+# shellcheck shell=bash
+# vim: filetype=zsh
+source "$DOTFILES/scripts/shared.sh"
+
+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
+have dircolors && eval $(dircolors "$XDG_CONFIG_HOME/dircolors")
+
+# 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

@@ -2,6 +2,8 @@
 #
 # shell functions
 #
+# shellcheck source="../scripts/shared.sh"
+source "$DOTFILES/scripts/shared.sh"
 
 # Weather in Tampere, or other city
 function weather
@@ -66,3 +68,28 @@ function silent
   "$@" >&/dev/null
 }
 
+# Defines default antigen bundles
+function x-default-antigen-bundles
+{
+  # these should be always available
+  antigen bundle colored-man-pages
+  antigen bundle command-not-found
+  antigen bundle ssh-agent
+  antigen bundle MichaelAquilina/zsh-you-should-use
+  antigen bundle Sparragus/zsh-auto-nvm-use
+  antigen bundle jreese/zsh-titles
+  antigen bundle unixorn/autoupdate-antigen.zshplugin
+  antigen bundle zsh-users/zsh-completions
+  antigen bundle zsh-users/zsh-syntax-highlighting
+
+  # these should be available if there's need
+  have git && antigen bundle git
+  have brew && antigen bundle brew
+  have docker && antigen bundle docker
+  have docker-compose && antigen bundle sroze/docker-compose-zsh-plugin
+  have jq && antigen bundle reegnz/jq-zsh-plugin
+  have nvm && antigen bundle nvm
+  have php && antigen bundle php
+  have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
+  have rvm && 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
+

config/starship.toml

@@ -5,7 +5,7 @@
 add_newline = true
 
 # Timeout for commands executed by starship (in milliseconds).
-command_timeout = 750
+command_timeout = 1000
 
 # Replace the '❯' symbol in the prompt with '➜'
 [character] # The name of the module we are configuring is 'character'
@@ -35,4 +35,3 @@ version_format = '${major}.${minor}'
 [nodejs]
 format = '[$symbol($version )]($style)'
 version_format = '${major}.${minor}'
-

hosts/air/install.conf.yaml

@@ -0,0 +1,15 @@
+- include: 'hosts/defaults.yaml'
+- shell:
+    - echo "Configuring air"
+- brewfile:
+    - Brewfile
+- link:
+    ~/:
+      force: true
+      glob: true
+      path: hosts/air/base/**
+      prefix: "."
+    ~/.config/:
+      glob: true
+      force: true
+      path: hosts/air/config/**

hosts/defaults.yaml

@@ -0,0 +1,9 @@
+- defaults:
+    create:
+      mode: 0755
+    link:
+      create: true
+      relink: true
+      exclude: ["*.md", "*renovate*"]
+    shell:
+      stdout: true

hosts/lakka/base/zshrc

@@ -0,0 +1,50 @@
+# Lakka zsh configuration.
+#
+# shellcheck shell=bash
+export PATH="$HOME/bin:/usr/local/bin:/usr/bin:/usr/sbin:$PATH"
+
+# Defaults
+export DOTFILES="$HOME/.dotfiles"
+
+# Run x-load-configs in your terminal to reload the files.
+function x-load-configs()
+{
+    # Load the shell dotfiles, and then some:
+    for file in $DOTFILES/config/{exports,alias,functions}; do
+        [ -r "$file" ] && [ -f "$file" ] && source "$file"
+        [ -r "$file-secret" ] && [ -f "$file-secret" ] && source "$file-secret"
+        [ -r "$file-$HOSTNAME" ] && [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
+        [ -r "$file-$HOSTNAME-secret" ] && [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
+    done
+}
+x-load-configs
+
+export PATH="$XDG_BIN_HOME:$PATH"
+export LC_ALL=fi_FI.utf8
+
+export RVM_PATH="$HOME/.rvm"
+export PATH="$RVM_PATH/bin:$PATH"
+[[ -s "$RVM_PATH/scripts/rvm" ]] && source "$RVM_PATH/scripts/rvm" # Load RVM into a shell session *as a function*
+
+# Try to load antigen, if present
+ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
+[[ -f "$ANTIGEN_ZSH_PATH" ]] && source "$ANTIGEN_ZSH_PATH"
+
+# If antigen was loaded
+if command -v antigen &> /dev/null; then
+  antigen use oh-my-zsh
+
+  # config/functions
+  x-default-antigen-bundles
+
+  antigen theme oskarkrawczyk/honukai-iterm-zsh honukai
+
+  antigen apply
+fi
+
+alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state'
+alias nano='nano -wS -$'
+alias gpg=gpg2
+
+ACME_PATH="$HOME/.acme.sh"
+[[ -s "$ACME_PATH/acme.sh.env" ]] && . "$ACME_PATH/acme.sh.env"

hosts/lakka/install.conf.yaml

@@ -0,0 +1,17 @@
+- include: 'hosts/defaults.yaml'
+- shell:
+    - echo "Configuring lakka"
+- link:
+    ~/:
+      force: true
+      glob: true
+      path: hosts/lakka/base/**
+      prefix: "."
+    ~/.config/:
+      glob: true
+      force: true
+      path: hosts/lakka/config/**
+    ~/.irssi/:
+      glob: true
+      force: true
+      path: hosts/lakka/irssi/**

hosts/lakka/zshrc

@@ -1,72 +0,0 @@
-# Lakka zsh configuration.
-#
-# shellcheck shell=bash
-export PATH="/usr/local/bin:/usr/bin:/usr/sbin:$PATH"
-
-# Defaults
-export DOTFILES="$HOME/.dotfiles"
-
-# 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_STATE_HOME="$HOME/.local/state"
-export XDG_BIN_HOME="$HOME/.local/bin" # this one is custom
-
-# z, https://github.com/rupa/z
-export _Z_DATA="$XDG_STATE_HOME/z"
-
-# 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 PATH="$GEM_HOME/bin:$PATH"
-fi
-
-export PATH="$XDG_BIN_HOME:$HOME/bin:$HOME/.rvm/bin:$PATH"
-export LC_ALL=fi_FI.utf8
-
-# 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"
-
-# Try to load antigen, if present
-[[ -f "$XDG_BIN_HOME/antigen.zsh" ]] && source "$XDG_BIN_HOME/antigen.zsh"
-
-# If antigen was loaded
-if command -v antigen &> /dev/null; then
-  antigen use oh-my-zsh
-
-  hash git 2>/dev/null && antigen bundle git
-  hash php 2>/dev/null && antigen bundle php
-
-  antigen bundle autojump
-  antigen bundle command-not-found
-  antigen bundle jreese/zsh-titles
-  antigen bundle zsh-users/zsh-syntax-highlighting
-  antigen bundle zsh-users/zsh-completions
-  antigen bundle unixorn/rvm-plugin
-  antigen bundle unixorn/autoupdate-antigen.zshplugin
-
-  antigen theme oskarkrawczyk/honukai-iterm-zsh honukai
-
-  antigen apply
-fi
-
-alias t='tail -f'
-alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state'
-alias dn='du -chd1'
-alias nano='nano -wS -$'
-alias gpg=gpg2
-
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" ]] # Load RVM into a shell session *as a function*
-. "$HOME/.acme.sh/acme.sh.env"

hosts/tunkki/bashrc

@@ -1,118 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color|*-256color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-

hosts/tunkki/install.conf.yaml

@@ -0,0 +1,13 @@
+- include: 'hosts/defaults.yaml'
+- shell:
+    - echo "Configuring tunkki"
+- link:
+    ~/:
+      force: true
+      glob: true
+      path: hosts/tunkki/base/**
+      prefix: "."
+    ~/.config/:
+      glob: true
+      force: true
+      path: hosts/tunkki/config/**

hosts/v/install.conf.yaml

@@ -0,0 +1,15 @@
+- include: 'hosts/defaults.yaml'
+- shell:
+    - echo "Configuring v"
+- brewfile:
+    - Brewfile
+- link:
+    ~/:
+      force: true
+      glob: true
+      path: hosts/v/base/**
+      prefix: "."
+    ~/.config/:
+      glob: true
+      force: true
+      path: hosts/v/config/**

install

@@ -7,17 +7,31 @@ DOTBOT_DIR="dotbot"
 
 DOTBOT_BIN="bin/dotbot"
 BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+DOTBOT_BIN_PATH="${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}"
+DOTBOT_HOST="$(hostname -s)" || ''
 
 cd "$BASEDIR"
 git submodule sync --quiet --recursive
 git submodule update --init --recursive
 
-"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" \
+"${DOTBOT_BIN_PATH}" \
   -d "${BASEDIR}" \
   --plugin-dir=dotbot-brew \
   --plugin-dir=dotbot-gh-extension \
-  --plugin-dir=dotbot-golang \
-  --plugin-dir=dotbot-if \
-  -p dotbot-if/if.py \
+  --plugin-dir=dotbot-include \
   -c "${CONFIG}" \
   "${@}"
+
+if [ "${DOTBOT_HOST}" != "" ]; then
+  DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}"
+  echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}"
+  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \
+    && echo "(!) Found $DOTBOT_HOST_CONFIG" \
+    && "$DOTBOT_BIN_PATH" \
+      -d "$BASEDIR" \
+      --plugin-dir=dotbot-brew \
+      --plugin-dir=dotbot-gh-extension \
+      --plugin-dir=dotbot-include \
+      -c "$DOTBOT_HOST_CONFIG" \
+      "${@}"
+fi

install-without-plugins

@@ -7,19 +7,27 @@ DOTBOT_DIR="dotbot"
 
 DOTBOT_BIN="bin/dotbot"
 BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+DOTBOT_HOST="$(hostname -s)" || ''
+DOTBOT_BIN_PATH="${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}"
 
 cd "$BASEDIR"
 git submodule sync --quiet --recursive
 git submodule update --init --recursive
 
-"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" \
+"${DOTBOT_BIN_PATH}" \
   -d "${BASEDIR}" \
+  --plugin-dir=dotbot-include \
   -c "${CONFIG}" \
   "${@}"
 
-#  --plugin-dir=dotbot-plugins/dotbot-brew \
-#  --plugin-dir=dotbot-plugins/dotbot-gh-extension \
-#  --plugin-dir=dotbot-plugins/dotbot-golang \
-#  --plugin-dir=dotbot-plugins/dotbot-if \
-#  --plugin-dir=dotbot-plugins/dotbot-ifplatform \
-#  -p dotbot-plugins/dotbot-if/if.py \
+if [ "${DOTBOT_HOST}" != "" ]; then
+  DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}"
+  echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}"
+  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \
+    && echo "(!) Found $DOTBOT_HOST_CONFIG" \
+    && "$DOTBOT_BIN_PATH" \
+      -d "$BASEDIR" \
+      --plugin-dir=dotbot-include \
+      -c "$DOTBOT_HOST_CONFIG" \
+      "${@}"
+fi

install.conf.yaml

@@ -1,13 +1,4 @@
-- defaults:
-    brewfile:
-      stderr: true
-      stdout: true
-    create:
-      mode: 0755
-    link:
-      create: true
-      relink: true
-      exclude: ["*.md"]
+- include: 'hosts/defaults.yaml'
 - clean:
     ~/:
     ~/.config:
@@ -15,101 +6,33 @@
     ~/.local:
       recursive: true
 - create:
+    ~/.cache:
+    ~/.cache/git:
     ~/.config:
     ~/.local:
+    ~/.local/run:
     ~/.local/share:
     ~/.local/state:
     ~/.ssh:
       mode: 0700
     ~/Code:
 - link:
+    ~/:
+      force: true
+      glob: true
+      path: base/**
+      prefix: "."
     ~/.config/:
       glob: true
-      path: config/*
+      path: config/**
     ~/.local/bin/:
       glob: true
-      path: local/bin/*
+      path: local/bin/**
     ~/.ssh/:
       force: true
       glob: true
       mode: 0600
-      path: ssh/*
-    ~/:
-      force: true
-      glob: true
-      path: base/*
-      prefix: "."
+      path: ssh/**
 - shell:
-    - [git submodule update --init --recursive --force]
-    - [chsh -s $(which zsh), Making zsh the default shell]
-- ifmacos:
-    - shell:
-        - [bash scripts/set-macos-defaults.sh]
-    - brewfile:
-        - Brewfile
-# Go packages what should be included in every system
-- go:
-    - github.com/skx/sysbox@latest
-    - github.com/dotzero/git-profile
-    - github.com/google/yamlfmt/cmd/yamlfmt@latest
-# hosts!
-## hosts: air
-- if:
-    - cond: "[[ $(hostname) = air ]]"
-      met:
-        - link:
-            ~/.config/:
-              glob: true
-              force: true
-              path: hosts/air/config/**
-## hosts: v
-- if:
-    - cond: "[[ $(hostname) = v ]]"
-      met:
-        - link:
-            ~/.config/:
-              glob: true
-              force: true
-              path: hosts/v/config/**
-## hosts: tunkki
-- if:
-    - cond: "[[ $(hostname) = tunkki ]]"
-      met:
-        - link:
-            ~/.config/:
-              glob: true
-              force: true
-              path: hosts/tunkki/config/**
-## hosts: lakka
-- if:
-    - cond: "[[ $(hostname) = lakka ]]"
-      met:
-        - link:
-            ~/.irssi/*:
-              force: true
-              glob: true
-              path: hosts/lakka/irssi/**
-            ~/.zshrc:
-              force: true
-              path: hosts/lakka/zshrc
-# 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
-
-#
+    - git submodule update --init --recursive --force
+    - bash local/bin/dfm install all

local/bin/dfm

@@ -9,100 +9,169 @@
 # Helper variables, override with ENVs like `VERBOSE=1 dfm help`
 : "${VERBOSE:=0}"
 : "${DOTFILES:=$HOME/.dotfiles}"
+: "${SHARED_SCRIPT:=$DOTFILES/scripts/shared.sh}"
 : "${INSTALL_SCRIPT:=$DOTFILES/scripts/install-dotfiles.sh}"
 : "${BREWFILE:=$DOTFILES/Brewfile}"
 : "${HOSTFILES:=$DOTFILES/hosts}"
 
 SCRIPT=$(basename "$0")
 
+VERSION_NVM="v0.39.3"
+
 # shellcheck source=./../../scripts/shared.sh
-source "$DOTFILES/scripts/shared.sh"
+source "$SHARED_SCRIPT"
 
 function section_install
 {
-  USAGE_PREFIX="$SCRIPT install"
+  USAGE_PREFIX="$SCRIPT install <command>"
+
+  MENU=(
+    "all:Installs everything in the correct order"
+    "antigen:Updates the antigen.zsh file"
+    "composer:Install composer"
+    "dotenv:Install dotenv-linter"
+    "gh:Install GitHub CLI Extensions"
+    "go:Install Go Packages"
+    "imagick:Install ImageMagick CLI"
+    "starship:Install starship.rs"
+    "macos:Setup nice macOS defaults"
+    "nvm:Install Node Version Manager (nvm)"
+    "npm:Install NPM Packages"
+    "ntfy:Install ntfy"
+    "z:Install z"
+  )
 
   case "$1" in
     all)
+      $0 install macos
       $0 install antigen
       $0 install starship
+      $0 brew install
+      $0 install composer
+      $0 install dotenv
+      $0 install gh
+      $0 install go
+      $0 install imagick
       $0 install nvm
-      $0 install macos
       $0 install npm
+      $0 install ntfy
+      $0 install z
       ;;
     antigen)
-      curl -L git.io/antigen > "$DOTFILES/local/bin/antigen.zsh" && msg_done "🎉 New antigen installed!"
+      curl -L git.io/antigen > "$DOTFILES/local/bin/antigen.zsh" \
+        && msg_yay "New antigen installed!"
+      ;;
+    composer)
+      bash "$DOTFILES/scripts/install-composer.sh" \
+        && msg_yay "composer installed!"
+      ;;
+    dotenv)
+      curl -sSfL \
+        https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh \
+        | sh -s -- -b "$XDG_BIN_HOME" \
+        && msg_yay "dotenv-linter installed!"
+      ;;
+    gh)
+      bash "$DOTFILES/scripts/install-gh-extensions.sh" \
+        && msg_yay "github cli extensions installed!"
+      ;;
+    go)
+      bash "$DOTFILES/scripts/install-go-packages.sh" \
+        && msg_yay "go packages installed!"
+      ;;
+    imagick)
+      curl -L https://imagemagick.org/archive/binaries/magick > "$XDG_BIN_HOME/magick" \
+        && msg_yay "imagick installed!"
       ;;
     starship)
-      curl -sS https://starship.rs/install.sh | sh -s -- --bin-dir ~/.local/bin && msg_done "🎉 starship installed!"
-      ;;
-    nvm)
-      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash && msg_done "   ^=^n^i nvm installed!"
+      curl -sS https://starship.rs/install.sh | sh -s -- --bin-dir ~/.local/bin \
+        && msg_yay "starship installed!"
       ;;
     macos)
-      bash "$DOTFILES/scripts/set-macos-defaults.sh" && msg_done "🎉 Brewfile defined apps has been installed!"
+      bash "$DOTFILES/scripts/set-macos-defaults.sh" \
+        && msg_yay "Brewfile defined apps has been installed!"
+      ;;
+    nvm)
+      curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash \
+        && nvm install --lts --latest-npm --default \
+        && git checkout "$HOME/.zshrc" \
+        && msg_yay "nvm installed!"
       ;;
     npm)
-      bash "$DOTFILES/scripts/install-npm-packages.sh" && msg_done "NPM Packages have been installed!"
+      bash "$DOTFILES/scripts/install-npm-packages.sh" \
+        && msg_yay "NPM Packages have been installed!"
       ;;
-    settler)
-      bash "$DOTFILES/scripts/settler.sh" && msg_done "🎉 Settler has been run!"
+    ntfy)
+      bash "$DOTFILES/scripts/install-ntfy.sh" \
+        && msg_yay "ntfy installed!"
+      ;;
+    z)
+      bash "$DOTFILES/scripts/install-z.sh" \
+        && msg_yay "z has been installed!"
       ;;
     *)
-      menu_section "$USAGE_PREFIX" "all | antigen | starship | nvm | npm | macos | settler"
-      menu_item "all" "Installs antigen, macos, brew and ext_gh"
-      menu_item "antigen" "Updates the antigen.zsh file"
-      menu_item "starship" "Install starship.rs"
-      menu_item "nvm" "Install Node Version Manager (nvm)"
-      menu_item "npm" "Install NPM Packages"
-      menu_item "macos" "Setup nice macOS defaults"
-      menu_item "settler" "Runs the WIP settler.sh"
+      menu_usage "$USAGE_PREFIX" "${MENU[@]}"
       ;;
   esac
 }
 
 function section_brew
 {
-  USAGE_PREFIX="$SCRIPT brew"
+  USAGE_PREFIX="$SCRIPT brew <command>"
 
-  if ! command -v brew &> /dev/null; then
-    menu_section "$USAGE_PREFIX" "brew not available on this system"
-  else
+  MENU=(
+    "install:Installs items defined in Brewfile"
+    "update:Updates and upgrades brew packages"
+    "updatebundle:Updates Brewfile with descriptions"
+    "autoupdate:Setups brew auto-update and runs it immediately"
+  )
+
+  have brew && {
     case "$1" in
       install)
-        brew bundle install --file="$BREWFILE" && msg_done "🎉 Done!"
+        brew bundle install --file="$BREWFILE" && msg_yay "Done!"
         ;;
       update)
         brew update && brew outdated && brew upgrade && brew cleanup
-        msg_done "🎉 Done!"
+        msg_yay "Done!"
         ;;
       updatebundle)
         # Updates .dotfiles/Brewfile with descriptions
         brew bundle dump \
           --force \
           --file="$BREWFILE" \
-          --describe && msg_done "🎉 Done!"
+          --describe && msg_yay "Done!"
         ;;
       autoupdate)
         brew autoupdate delete
         brew autoupdate start 43200 --upgrade --cleanup --immediate
         ;;
       *)
-        menu_section "$USAGE_PREFIX" "install | update | updatebundle | autoupdate"
-        menu_item "install" "Installs items defined in Brewfile"
-        menu_item "update" "Updates and upgrades brew packages"
-        menu_item "updatebundle" "Updates Brewfile with descriptions"
-        menu_item "autoupdate" "Setups brew auto-update and runs it immediately"
+        menu_usage "$USAGE_PREFIX" "${MENU[@]}"
         ;;
     esac
-  fi
+  } || menu_section "$USAGE_PREFIX" "brew not available on this system"
 }
 
 function section_dotfiles
 {
-  USAGE_PREFIX="$SCRIPT dotfiles"
+  USAGE_PREFIX="$SCRIPT dotfiles <command>"
+
+  MENU=(
+    "fmt:Run all formatters"
+    "yamlfmt:Run yamlfmt to all dotfiles, which are in our control"
+    "shfmt:Run shfmt to all dotfiles"
+    "reset_all:Reset everything, runs all configured reset actions"
+    "reset_nvim:Resets nvim. Deletes caches, removes nvim folders and relinks nvim folders"
+  )
 
   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
@@ -115,16 +184,16 @@ function section_dotfiles
         ~/.config/astronvim \
         ~/.config/nvim
       msg_ok "Deleted old nvim files"
-      ln -s ~/.dotfiles/config/astronvim ~/.config/astronvim
-      ln -s ~/.dotfiles/config/nvim ~/.config/nvim
+      ln -s $DOTFILES/config/astronvim ~/.config/astronvim
+      ln -s $DOTFILES/config/nvim ~/.config/nvim
       msg_ok "Linked nvim and astronvim"
-      hash npm 2> /dev/null && $0 install npm
+      have npm && $0 install npm
       msg_ok "Installed packages"
-      msg_done "...and we are done!"
+      msg_done "nvim reset!"
       ;;
     yamlfmt)
       # format yaml files
-      yamlfmt -conf "$DOTFILES/.yamlfmt"
+      have yamlfmt && yamlfmt -conf "$DOTFILES/.yamlfmt" || msg_err "yamlfmt not found"
       ;;
     shfmt)
       # Format shell scripts according to following rules.
@@ -134,29 +203,32 @@ function section_dotfiles
         -not -path '*dotbot*' \
         -not -name '*.pl' \
         -not -name '*.py' \
+        -not -name '*.php' \
+        -not -name '*.zsh' \
         -exec shfmt \
         --language-dialect bash \
         --func-next-line --list --write \
         --indent 2 --case-indent --space-redirects \
         --binary-next-line {} \;
-      msg_done "🎉 dotfiles have been formatted!"
+      msg_yay "dotfiles have been shfmt formatted!"
       ;;
     *)
-      menu_section "$USAGE_PREFIX" "reset_all | reset_nvim | yamlfmt | shfmt"
-      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"
-      menu_item "shfmt" "Run shfmt to all dotfiles"
+      menu_usage "$USAGE_PREFIX" "${MENU[@]}"
       ;;
   esac
 }
 
 function section_check
 {
-  USAGE_PREFIX="$SCRIPT check"
+  USAGE_PREFIX="$SCRIPT check <command>"
   X_HOSTNAME=$(hostname)
   X_ARCH=$(uname)
 
+  MENU=(
+    "arch <arch>:Empty <arch> returns current. Exit code 0=match to current, 1=no match."
+    "host <host>:Empty <host> returns current. Exit code 0=match to current, 1=no match."
+  )
+
   case "$1" in
     a | arch)
       [[ "$2" = "" ]] && echo "$X_ARCH" && exit 0
@@ -167,9 +239,7 @@ function section_check
       [[ $X_HOSTNAME = "$2" ]] && exit 0 || exit 1
       ;;
     *)
-      menu_section "$USAGE_PREFIX" "arch | host"
-      menu_item "arch <arch>" "Empty returns current. Exit code 0 when match, 1 when not."
-      menu_item "host <host>" "Empty returns current. Exit code 0 when match, 1 when not."
+      menu_usage "$USAGE_PREFIX" "${MENU[@]}"
       ;;
   esac
 }
@@ -177,24 +247,31 @@ function section_check
 # Secret menu for visual tests
 function section_tests
 {
-  USAGE_PREFIX="$SCRIPT tests"
+  USAGE_PREFIX="$SCRIPT tests <command>"
+
+  MENU=(
+    "msg:List all log functions from shared.sh"
+  )
 
   case "$1" in
     msg)
       msg "msg"
       msg_done "msg_done"
-      msg_prompt "msg_prompt"
-      msg_prompt_done "msg_prompt_done"
+      msg_done_suffix "msg_done_suffix"
+      msg_err "msg_err"
       msg_nested "msg_nested"
       msg_nested_done "msg_nested_done"
-      msg_run "msg_run" "second_param"
       msg_ok "msg_ok"
+      msg_prompt "msg_prompt"
+      msg_prompt_done "msg_prompt_done"
+      msg_run "msg_run" "second_param"
+      msg_run_done "msg_run_done" "second_param"
       msg_warn "msg_warn"
-      msg_err "msg_err"
+      msg_yay "msg_yay"
+      msg_yay_done "msg_yay_done"
       ;;
     *)
-      menu_section "$USAGE_PREFIX" "msg"
-      menu_item "msg" "List all log functions from shared.sh"
+      menu_usage "$USAGE_PREFIX" "${MENU[@]}"
       ;;
   esac
 }
@@ -202,8 +279,8 @@ function section_tests
 function usage
 {
   echo ""
-  menu_section "Usage: $SCRIPT" "install | reset | brew | check | dotfiles"
-  echo $"   All commands have their own subcommands."
+  msg_prompt "Usage: $SCRIPT <section> <command>"
+  echo $"  Empty <command> prints <section> help."
   echo ""
   section_install
   echo ""

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,13 @@
+#!/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-hr

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+# Simple script to output a solid line in the terminal
+# Useful for marking the end of a task in your bash log
+# Inspired by @LuRsT's script of the same name
+# Can be called directly, or source'd in *rc file
+#
+# Licensed under MIT, (C) Alicia Sykes 2022
+# See: https://github.com/Lissy93/dotfiles
+#
+# Modified by Ismo Vuorinen <https://github.com/ivuorinen> 2023
+
+# Determine width of terminal
+hr_col_count="$(tput cols)"
+if [ -z "${hr_col_count+set}" ] || [ "$hr_col_count" -lt 1 ]; then
+    hr_col_count="${COLUMNS:-80}"
+fi
+
+# Colors
+CLR_RED="\033[1;31m"
+hr_color="${hr_color:=$CLR_RED}"
+hr_reset="\033[0m"
+
+# Prints the HR line
+hr_draw_char() {
+    local CHAR="$1"
+    local LINE=''
+    LINE=$(printf "%*s" "$((hr_col_count - 2))")
+    LINE="${LINE// /${CHAR}}"
+    echo -e "◀${hr_color}${LINE:0:${hr_col_count}}${hr_reset}▶"
+}
+
+# Passes param and calls hr()
+hr() {
+    for WORD in "${@:--}"; do
+        hr_draw_char "$WORD"
+    done
+}
+
+# Determine if file is being run directly or sourced
+(
+  [[ -n $ZSH_EVAL_CONTEXT && $ZSH_EVAL_CONTEXT =~ :file$ ]] \
+    || [[ -n $KSH_VERSION && $(cd "$(dirname -- "$0")" \
+    && printf '%s' "${PWD%/}/")$(basename -- "$0") != "${.sh.file}" ]] \
+    || [[ -n $BASH_VERSION ]] && (return 0 2>/dev/null)
+) && sourced=1 || sourced=0
+
+# Either instantiate immediately, or set alias for later
+if [ "$sourced" -eq 0 ]; then
+  [ "$0" == "${BASH_SOURCE[0]}" ] && hr "$@"
+else
+  export alias hr='hr'
+fi
+

local/bin/x-ip

@@ -0,0 +1,4 @@
+#!/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

local/bin/x-welcome-banner

@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+
+######################################################################
+# 🌞 Welcome Banner                                                  #
+######################################################################
+# Prints personal greeting, system info and data about today         #
+# Intended for use as a MOTD, for when using multiple systems        #
+# For docs and more info, see: https://github.com/lissy93/dotfiles   #
+#                                                                    #
+# Licensed under MIT (C) Alicia Sykes 2022 <https://aliciasykes.com> #
+######################################################################
+
+# Formatting variables
+COLOR_P='\033[1;36m'
+COLOR_S='\033[0;36m'
+RESET='\033[0m'
+
+# Print time-based personalized message, using figlet & lolcat if availible
+function welcome_greeting () {
+  h=$(date +%H)
+  if [ "$h" -lt 04 ] || [[ $h -gt 22 ]];
+    then greeting="Good Night"
+  elif [ "$h" -lt 12 ];
+    then greeting="Good morning"
+  elif [ "$h" -lt 18 ];
+    then greeting="Good afternoon"
+  elif [ "$h" -lt 22 ];
+    then greeting="Good evening"
+  else
+    greeting="Hello"
+  fi
+  WELCOME_MSG="$greeting $USER!"
+  if hash lolcat 2>/dev/null && hash figlet 2>/dev/null; then
+    echo "${WELCOME_MSG}" | figlet | lolcat
+  else
+    echo -e "$COLOR_P${WELCOME_MSG}${RESET}\n"
+  fi
+}
+
+# Print system information with neofetch, if it's installed
+function welcome_sysinfo () {
+  if hash neofetch 2>/dev/null; then
+    neofetch --shell_version off \
+      --disable kernel distro shell resolution de wm wm_theme theme icons terminal \
+      --backend off \
+      --colors 4 8 4 4 8 6 \
+      --color_blocks off \
+      --memory_display info
+  fi
+}
+
+# Print todays info: Date, IP, weather, etc
+function welcome_today () {
+  timeout=1
+  echo -e "\033[1;34mToday\n------"
+
+  # Print date time
+  echo -e "$COLOR_S$(date '+🗓️  Date: %A, %B %d, %Y at %H:%M')"
+
+  # Print local weather
+  curl -s -m $timeout "https://wttr.in?format=%cWeather:+%C+%t,+%p+%w"
+  echo -e "${RESET}"
+
+  # Print IP address
+  if hash ip 2>/dev/null; then
+    ip_address=$(ip route get 8.8.8.8 | awk -F"src " 'NR==1{split($2,a," ");print a[1]}')
+    ip_interface=$(ip route get 8.8.8.8 | awk -F"dev " 'NR==1{split($2,a," ");print a[1]}')
+    echo -e "${COLOR_S}🌐 IP: $(curl -s -m $timeout 'https://ipinfo.io/ip') (${ip_address} on ${ip_interface})"
+    echo -e "${RESET}\n"
+  fi
+}
+
+# Putting it all together
+function welcome() {
+  welcome_greeting
+  welcome_sysinfo
+  welcome_today
+}
+
+# Determine if file is being run directly or sourced
+([[ -n $ZSH_EVAL_CONTEXT && $ZSH_EVAL_CONTEXT =~ :file$ ]] \
+    || [[ -n $KSH_VERSION && $(cd "$(dirname -- "$0")" \
+    && printf '%s' "${PWD%/}/")$(basename -- "$0") != "${.sh.file}" ]] \
+  || [[ -n $BASH_VERSION ]] && (return 0 2>/dev/null)
+) && sourced=1 || sourced=0
+
+# If script being called directly run immediately
+if [ "$sourced" -eq 0 ]; then
+  welcome "$@"
+fi
+
+# EOF
+

scripts/install-composer.sh

@@ -1,19 +1,23 @@
-#!/bin/sh
+#!/usr/bin/env bash
+# Install PHP Package Manager Composer
+#
+# shellcheck source="shared.sh"
+source "$HOME/.dotfiles/scripts/shared.sh"
 
-EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
-php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
+have php && {
+  EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
+  php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+  ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
 
-if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
-then
-    >&2 echo 'ERROR: Invalid installer checksum'
+  if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
+    echo >&2 'ERROR: Invalid installer checksum'
     rm composer-setup.php
     exit 1
-fi
-
-php composer-setup.php --quiet
-RESULT=$?
-rm composer-setup.php
-mv composer.phar ~/.local/bin/composer
-exit $RESULT
+  fi
 
+  php composer-setup.php --quiet
+  RESULT=$?
+  rm composer-setup.php
+  mv composer.phar ~/.local/bin/composer
+  exit $RESULT
+} || msg_err "PHP Not Available, cannot install composer"

scripts/install-gh-extensions.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# Install GitHub CLI extensions
+#
+# shellcheck source="shared.sh"
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+have gh && {
+  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"
+} || msg_err "gh (GitHub Client) could not be found, please install it first"

scripts/install-go-packages.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Install Go packages
+#
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+have go && {
+  packages=(
+    # sysadmin/scripting utilities, distributed as a single binary
+    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
+    # Trim spaces
+    pkg=${pkg// /}
+    # Skip comments
+    if [[ ${pkg:0:1} == "#" ]]; then continue; fi
+
+    msg_run "Installing go package:" "$pkg"
+    go install "$pkg"
+    echo ""
+  done
+
+  msg_ok "Done"
+} || msg "go hasn't been installed yet."

scripts/install-nfty.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-NFTY_VERSION=2.2.0
-
-curl -L "https://github.com/binwiederhier/ntfy/releases/download/v${NFTY_VERSION}/ntfy_${NFTY_VERSION}_macOS_all.tar.gz" > "ntfy_${NFTY_VERSION}_macOS_all.tar.gz"
-tar zxvf "ntfy_${NFTY_VERSION}_macOS_all.tar.gz"
-cp -a "ntfy_${NFTY_VERSION}_macOS_all/ntfy" ~/.local/bin/ntfy
-mkdir -p ~/.config/ntfy 
-cp "ntfy_${NFTY_VERSION}_macOS_all/client/client.yml" ~/.config/ntfy/client.yml
-ntfy --help
-rm -rf "ntfy_${NFTY_VERSION}_macOS_all" "ntfy_${NFTY_VERSION}_macOS_all.tar.gz"

scripts/install-npm-packages.sh

@@ -4,9 +4,7 @@
 # shellcheck source=shared.sh
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-if ! command -v npm &> /dev/null; then
-  msg_err "npm could not be found."
-else
+have npm && {
   packages=(
     # This is a tool to check if your files consider your .editorconfig rules.
     "editorconfig-checker"
@@ -35,4 +33,4 @@ else
     npm install -g --no-fund --no-progress --no-timing "$pkg"
     echo ""
   done
-fi
+} || msg_err "npm could not be found."

scripts/install-ntfy.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+#
+# Install ntfy
+#
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+set -e
+
+have ntfy && {
+  msg "ntfy already installed"
+} || {
+  case $(dfm check arch) in
+    Linux)
+      NTFY_ARCH="linux_$(arch)"
+      ;;
+    Darwin)
+      NTFY_ARCH="macOS_all"
+      ;;
+  esac
+
+  NTFY_VERSION=2.2.0
+  NTFY_URL="https://github.com/binwiederhier/ntfy"
+  NTFY_DEST="ntfy_${NTFY_VERSION}_${NTFY_ARCH}"
+
+  curl -L "$NTFY_URL/releases/download/v${NTFY_VERSION}/${NTFY_DEST}.tar.gz" \
+    > "${NTFY_DEST}.tar.gz"
+  tar zxvf "${NTFY_DEST}.tar.gz"
+  cp -a "${NTFY_DEST}/ntfy" ~/.local/bin/ntfy
+  mkdir -p ~/.config/ntfy
+
+  # copy config only if it does not exist
+  if [ ! -f "$HOME/.config/ntfy/client.yml" ]; then
+    cp "${NTFY_DEST}/client/client.yml" ~/.config/ntfy/client.yml
+  fi
+
+  rm -rf "${NTFY_DEST}" "${NTFY_DEST}.tar.gz"
+}

scripts/install-z.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+#
+# Install z
+#
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+Z_GIT_PATH="https://github.com/rupa/z.git"
+Z_BIN_PATH="$XDG_BIN_HOME/z"
+
+if [ ! -d "$Z_BIN_PATH" ]; then
+  git clone "$Z_GIT_PATH" "$Z_BIN_PATH"
+else
+  msg_done "z ($Z_BIN_PATH/) already installed"
+fi

scripts/set-macos-defaults.sh

@@ -19,6 +19,11 @@ while true; do
   kill -0 "$$" || exit
 done 2> /dev/null &
 
+# Change user shell to zsh if not that already.
+if hash zsh 2> /dev/null; then
+  [[ "$SHELL" != $(which zsh) ]] && chsh -s "$(which zsh)"
+fi
+
 ###############################################################################
 # General UI/UX                                                               #
 ###############################################################################

scripts/shared.sh

@@ -11,6 +11,28 @@ CLR_GREEN="\033[1;32m"
 CLR_BLUE="\033[1;34m"
 CLR_RESET="\033[0m"
 
+# -- Color functions -- #
+function __color_red()
+{
+  local MSG="$1"
+  echo -e "${CLR_RED}${MSG}${CLR_RESET}"
+}
+function __color_yellow()
+{
+  local MSG="$1"
+  echo -e "${CLR_YELLOW}${MSG}${CLR_RESET}"
+}
+function __color_green()
+{
+  local MSG="$1"
+  echo -e "${CLR_GREEN}${MSG}${CLR_RESET}"
+}
+function __color_blue()
+{
+  local MSG="$1"
+  echo -e "${CLR_BLUE}${MSG}${CLR_RESET}"
+}
+
 # -- Helpers -- #
 function __log_marker()
 {
@@ -32,6 +54,11 @@ function __log_marker_warn()
   echo -e "${CLR_YELLOW}⁕${CLR_RESET}"
 }
 
+function __log_marker_question()
+{
+  echo -e "${CLR_YELLOW}?${CLR_RESET}"
+}
+
 function __log_marker_err()
 {
   echo -e "${CLR_RED}⛌${CLR_RESET}"
@@ -48,19 +75,34 @@ function msg()
   echo -e "$(__log_marker) $1"
 }
 
+function msg_yay()
+{
+  echo -e "🎉 $1"
+}
+
+function msg_yay_done()
+{
+  echo -e "🎉 $1 ...$(__log_marker_ok)"
+}
+
 function msg_done()
 {
   echo -e "$(__log_marker) $1 ...$(__log_marker_ok)"
 }
 
+function msg_done_suffix()
+{
+  echo -e "$(__log_marker) ...$(__log_marker_ok)"
+}
+
 function msg_prompt()
 {
-  echo -e "$(__log_marker) $1"
+  echo -e "$(__log_marker_question) $1"
 }
 
 function msg_prompt_done()
 {
-  echo -e "$(__log_marker) $1 ...$(__log_marker_ok)"
+  echo -e "$(__log_marker_question) $1 ...$(__log_marker_ok)"
 }
 
 function msg_nested()
@@ -78,6 +120,11 @@ function msg_run()
   echo -e "${CLR_GREEN}➜ $1${CLR_RESET} $2"
 }
 
+function msg_run_done()
+{
+  echo -e "${CLR_GREEN}➜ $1${CLR_RESET} $2 ...$(__log_marker_ok)"
+}
+
 function msg_ok()
 {
   echo -e "$(__log_marker_ok) $1"
@@ -111,3 +158,69 @@ function fn_exists()
   declare -f -F "$1" > /dev/null
   return $?
 }
+
+# Takes a bash array ("cow:moo", "dinosaur:roar") and loops
+# through the keys to build menu section listing.
+function menu_usage_header()
+{
+  MENU_CMD="$1"
+  shift
+  MENU_ARRAY=("$@")
+
+  KEYS=""
+  for item in "${MENU_ARRAY[@]}"; do
+    CMD=$(echo "${item}" | awk -F ":" '{print $1}')
+    KEYS+="${CMD} | "
+  done
+
+  # "???" removes 3 last characters, being " | " from the end
+  menu_section "$MENU_CMD" "${KEYS%???}"
+}
+
+# Takes the usage command "$0 dotfiles" and a
+# bash array ("cow:moo" "dinosaur:roar") and loops
+# through in building a menu for dfm command usage listing.
+function menu_usage()
+{
+  MENU_CMD="$1"
+  shift
+  MENU_ARRAY=("$@")
+
+  msg "$MENU_CMD"
+
+  for item in "${MENU_ARRAY[@]}"; do
+    CMD=$(echo "${item}" | awk -F ":" '{print $1}')
+    DESC=$(echo "${item}" | awk -F ":" '{print $2}')
+    menu_item "$CMD" "$DESC"
+  done
+}
+
+# shorthand for checking if the system has the bin in path.
+# usage: have php && php -v
+function have
+{
+  command -v "$1" >&/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"}"
+}