Add docker config, fix glob paths

- yamllint
- shfmt config
- fix Go bin path
- fix git credentials config
- add nvm default packages
- updated Brewfile

.editorconfig

@@ -8,9 +8,27 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.yaml,*.yml]
+[*.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

.github/workflows/linters.yml

@@ -1,30 +1,26 @@
 name: reviewdog
-on: [ push ]
+on: [push]
 jobs:
   linters:
     name: Linters
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
       - name: GitHub Actions
         uses: reviewdog/action-actionlint@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-review
-
       - name: detect-secrets
         uses: reviewdog/action-detect-secrets@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-review
-
       - name: markdownlint
         uses: reviewdog/action-markdownlint@v0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-review
-
       - name: shfmt
         uses: reviewdog/action-shfmt@v1
         with:

.gitignore

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

.gitmodules

@@ -13,21 +13,11 @@
 	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
-	ignore = dirty
-
 [submodule "config/nvim"]
 	path = config/nvim
 	url = https://github.com/AstroNvim/AstroNvim.git

.python-version

@@ -0,0 +1 @@
+3

.yamlfmt

@@ -0,0 +1,25 @@
+formatter:
+  type: basic
+  indent: 2
+  retain_line_breaks: false
+  disallow_anchors: false
+  max_line_length: 0
+  scan_folded_as_literal: false
+  indentless_arrays: false
+
+doublestar: true
+
+extensions:
+  - yaml
+  - yml
+
+include:
+  - ./*.{yml,yaml}
+  - ./**/*.{yml,yaml}
+
+exclude:
+  - ./dotbot/**
+  - ./dotbot-*/**
+  - ./config/astronvim/**
+  - ./config/nvim/**
+

Brewfile

@@ -10,12 +10,17 @@ tap "homebrew/cask"
 tap "homebrew/cask-fonts"
 tap "homebrew/core"
 tap "homebrew/services"
+tap "jesseduffield/lazygit"
 tap "mongodb/brew"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
 tap "teamookla/speedtest"
+# Interpreted, interactive, object-oriented programming language
+brew "python@3.11"
 # Automate deployment, configuration, and upgrading
 brew "ansible"
+# Checks ansible playbooks for practices and behaviour
+brew "ansible-lint"
 # Zstandard is a real-time compression algorithm
 brew "zstd"
 # Spell checker with better logic than ispell
@@ -26,6 +31,8 @@ brew "autoconf"
 brew "awscli"
 # Terminal bandwidth utilization tool
 brew "bandwhich"
+# Yet another cross-platform graphical process/system monitor
+brew "bottom"
 # Switch Apache / Valet / CLI configs between PHP versions
 brew "brew-php-switcher"
 # Core application library for C
@@ -34,30 +41,22 @@ brew "glib"
 brew "pkg-config"
 # Cross-platform make
 brew "cmake"
-# Open source suite of directory software
-brew "openldap"
-# Get a file from an HTTP, HTTPS or FTP server
-brew "curl"
-# Libraries to talk to Microsoft SQL Server and Sybase databases
-brew "freetds"
-# C/C++ and Java libraries for Unicode and globalization
-brew "icu4c"
-# Postgres C API library
-brew "libpq"
-# General-purpose scripting language
-brew "php"
-# Dependency Manager for PHP
-brew "composer"
 # GNU File, Shell, and Text utilities
 brew "coreutils"
 # Get, unpack, build, and install modules from CPAN
 brew "cpanminus"
+# Open source suite of directory software
+brew "openldap"
+# Get a file from an HTTP, HTTPS or FTP server
+brew "curl"
 # Diff that understands syntax
 brew "difftastic"
 # Tool for exploring each layer in a docker image
 brew "dive"
 # Command-line DNS client
 brew "dog"
+# Lightning-fast linter for .env files written in Rust
+brew "dotenv-linter"
 # Tool to verify that your files are in harmony with your .editorconfig
 brew "editorconfig-checker"
 # Useful examples at the command-line
@@ -66,8 +65,12 @@ brew "eg-examples"
 brew "faas-cli"
 # Simple, fast and user-friendly alternative to find
 brew "fd"
+# Libraries to talk to Microsoft SQL Server and Sybase databases
+brew "freetds"
 # Monitor a directory for changes and run a shell command
 brew "fswatch"
+# Disk usage analyzer with console interface written in Go
+brew "gdu", link: false
 # GitHub command-line tool
 brew "gh"
 # Distributed revision control system
@@ -92,6 +95,8 @@ brew "gnupg"
 brew "go"
 # Image manipulation
 brew "netpbm"
+# C/C++ and Java libraries for Unicode and globalization
+brew "icu4c"
 # OpenType text shaping engine
 brew "harfbuzz"
 # Library to render SVG files using Cairo
@@ -114,6 +119,8 @@ brew "imagemagick"
 brew "jq"
 # Lazier way to manage everything docker
 brew "lazydocker"
+# Postgres C API library
+brew "libpq"
 # Linguistic software and Finnish dictionary
 brew "libvoikko"
 # Package manager for the Lua programming language
@@ -140,6 +147,14 @@ brew "openapi-generator"
 brew "pandoc"
 # Highly capable, feature-rich programming language
 brew "perl"
+# General-purpose scripting language
+brew "php@8.1"
+# Python version management
+brew "pyenv"
+# Migrate pip packages from one Python version to another
+brew "pyenv-pip-migrate"
+# Pyenv plugin to manage virtualenv
+brew "pyenv-virtualenv"
 # Interpreted, interactive, object-oriented programming language
 brew "python@3.10"
 # Interpreted, interactive, object-oriented programming language
@@ -168,6 +183,8 @@ brew "terragrunt"
 brew "testssl"
 # Terraform version manager inspired by rbenv
 brew "tfenv"
+# Static analysis security scanner for your terraform code
+brew "tfsec"
 # Programmatically correct mistyped console commands
 brew "thefuck"
 # Simplified and community-driven man pages
@@ -178,6 +195,8 @@ brew "tmux"
 brew "tree"
 # Modern watch command
 brew "viddy"
+# Tool for creating isolated virtual python environments
+brew "virtualenv"
 # Command-line interface to the WakaTime api
 brew "wakatime-cli"
 # Executes a program periodically, showing output fullscreen
@@ -196,6 +215,8 @@ brew "anchore/grype/grype"
 brew "ddosify/tap/ddosify"
 # lets you quickly switch between multiple git user profiles
 brew "gesquive/tap/git-user"
+# A simple terminal UI for git commands, written in Go
+brew "jesseduffield/lazygit/lazygit"
 # High-performance, schema-free, document-oriented database
 brew "mongodb/brew/mongodb-community"
 # Xdebug PHP extension

base/angular-config.json

@@ -0,0 +1,6 @@
+{
+  "version": 1,
+  "cli": {
+    "analytics": false
+  }
+}

base/huskyrc

@@ -5,3 +5,4 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
 
 alias php="php -d error_reporting=22527"
+

base/zshrc

@@ -1,3 +1,4 @@
+# this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
 autoload -U colors zsh/terminfo
@@ -24,15 +25,12 @@ 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)/bin
+  GNUBIN_DIR=$(brew --prefix coreutils)/libexec/gnubin
+  BREW_RUBY=$(brew --prefix ruby)/bin
+  BREW_GEMS=$(gem environment gemdir)/bin
 
-    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"
+  export PATH="$BREW_PYTHON:$GNUBIN_DIR:$BREW_GEMS:$BREW_RUBY:$PATH"
 fi
 
 # nvm, the node version manager
@@ -45,16 +43,21 @@ export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || pr
 
 # 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
+    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"
 
@@ -69,9 +72,19 @@ fi
 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"
 
@@ -162,3 +175,4 @@ fi
 [[ -f "$XDG_BIN_HOME/iterm2_shell_integration.zsh" ]] && source "$XDG_BIN_HOME/iterm2_shell_integration.zsh"
 
 eval "$(starship init zsh)"
+

config/alias

@@ -1,4 +1,4 @@
-# shellcheck shell=bash
+#!/usr/bin/env bash
 # macOS specific
 
 # Get installed php versions from brew and setup aliases

config/exports

@@ -5,7 +5,9 @@ export HIST_STAMPS="yyyy-mm-dd"
 # Larger bash history (allow 32³ entries; default is 500)
 export HISTSIZE=32768
 export HISTFILESIZE=$HISTSIZE
-export HISTCONTROL=ignoredups
+# 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"
@@ -21,3 +23,8 @@ 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
+

config/functions

@@ -1,4 +1,4 @@
-# shellcheck shell=bash
+#!/usr/bin/env bash
 #
 # shell functions
 #
@@ -65,3 +65,4 @@ function silent
 {
   "$@" >&/dev/null
 }
+

config/git/config

@@ -2,6 +2,10 @@
   name = Ismo Vuorinen
   email = ismo@ivuorinen.net
 
+[credential]
+  helper = store --file ~/.cache/git/git-credentials
+  helper = cache --timeout 30000
+
 [core]
   excludesfile = ~/.config/git/gitignore
 

config/nvm/default-packages

@@ -0,0 +1,9 @@
+blade-formatter
+corepack
+editorconfig-checker
+github-release-notes
+js-debug
+neovim
+prettier
+standardjs
+stylelint-lsp

config/starship.toml

@@ -4,6 +4,9 @@
 # Inserts a blank line between shell prompts
 add_newline = true
 
+# Timeout for commands executed by starship (in milliseconds).
+command_timeout = 750
+
 # Replace the '❯' symbol in the prompt with '➜'
 [character] # The name of the module we are configuring is 'character'
 success_symbol = '[➜](bold green)' # The 'success_symbol' segment is being set to '➜' with the color 'bold green'

config/wtf/config.yml

@@ -177,4 +177,4 @@ wtf:
         left: 1
         height: 1
         width: 3
-      refreshInterval: 3600
+      refreshInterval: 3600

hosts/tunkki/bash_logout

@@ -1,7 +0,0 @@
-# ~/.bash_logout: executed by bash(1) when login shell exits.
-
-# when leaving the console clear the screen to increase privacy
-
-if [ "$SHLVL" = 1 ]; then
-    [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
-fi

hosts/tunkki/bashrc

@@ -115,3 +115,4 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
+

hosts/v/config/git/config

@@ -72,3 +72,4 @@
 
 [submodule]
 	recurse = true
+

install

@@ -15,9 +15,7 @@ git submodule update --init --recursive
 "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" \
   -d "${BASEDIR}" \
   --plugin-dir=dotbot-brew \
-  --plugin-dir=dotbot-gh-extension \
-  --plugin-dir=dotbot-golang \
   --plugin-dir=dotbot-if \
-  --plugin-dir=dotbot-ifplatform \
+  --plugin-dir=dotbot-gh-extension \
   -c "${CONFIG}" \
   "${@}"

install-without-plugins

@@ -23,4 +23,3 @@ git submodule update --init --recursive
 #  --plugin-dir=dotbot-plugins/dotbot-if \
 #  --plugin-dir=dotbot-plugins/dotbot-ifplatform \
 #  -p dotbot-plugins/dotbot-if/if.py \
-

install.conf.yaml

@@ -1,66 +1,58 @@
----
 - defaults:
     brewfile:
       stderr: true
       stdout: true
     create:
-      mode: 755
+      mode: 0755
     link:
       create: true
       relink: true
-
+      exclude: ["*.md", "*renovate*"]
 - clean:
     ~/:
     ~/.config:
       recursive: true
     ~/.local:
       recursive: true
-
 - create:
     ~/.config:
     ~/.local:
     ~/.local/share:
     ~/.local/state:
     ~/.ssh:
-      mode: 700
+      mode: 0700
     ~/Code:
-
 - link:
     ~/.config/:
       glob: true
-      path: config/*
+      path: config/**
     ~/.local/bin/:
       glob: true
-      path: local/bin/*
+      path: local/bin/**
     ~/.ssh/:
       force: true
       glob: true
-      mode: 600
-      path: ssh/*
+      mode: 0600
+      path: ssh/**
     ~/:
       force: true
       glob: true
-      path: base/*
+      path: base/**
       prefix: "."
-
 - shell:
     - [git submodule update --init --recursive --force]
-    - [bash scripts/install-npm-packages.sh]
-
-- ifmacos:
-    - shell:
-        - [bash scripts/set-macos-defaults.sh]
-    - brewfile:
-        - Brewfile
-
-# hosts: air
+    - bash scripts/install-go-packages.sh
+# hosts!
+## hosts: air
 - if:
     - cond: "[[ $(hostname) = air ]]"
       met:
-        - go:
-            - github.com/skx/sysbox@latest
-
-# hosts: v
+        - link:
+            ~/.config/:
+              glob: true
+              force: true
+              path: hosts/air/config/**
+## hosts: v
 - if:
     - cond: "[[ $(hostname) = v ]]"
       met:
@@ -69,10 +61,16 @@
               glob: true
               force: true
               path: hosts/v/config/**
-        - go:
-            - github.com/skx/sysbox@latest
-
-# hosts: lakka
+## hosts: tunkki
+- if:
+    - cond: "[[ $(hostname) = tunkki ]]"
+      met:
+        - link:
+            ~/.config/:
+              glob: true
+              force: true
+              path: hosts/tunkki/config/**
+## hosts: lakka
 - if:
     - cond: "[[ $(hostname) = lakka ]]"
       met:
@@ -84,7 +82,6 @@
             ~/.zshrc:
               force: true
               path: hosts/lakka/zshrc
-
 # GitHub CLI Extensions
 - ghe:
     # GitHub CLI extension for generating a report on repository dependencies.
@@ -98,22 +95,11 @@
     - davidraviv/gh-clean-branches
     # A beautiful CLI dashboard for GitHub 🚀
     - dlvhdr/gh-dash
-    # GitHub CLI extension for reviewing Dependabot PRs.
-    - einride/gh-dependabot
-    # A GitHub CLI extension that provides summary pull request metrics.
-    - hectcastro/gh-metrics
     # 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
-    - samcoe/gh-triage
-    # Generate account/organization/enterprise reports
-    - stoe/gh-report
-    # Organisation specific extension for gh cli
-    # to retrieve different statistics
-    - VildMedPap/gh-orgstats
-    - vilmibm/gh-screensaver
-    - vilmibm/gh-user-status
+
 #

local/bin/dfm

@@ -49,10 +49,11 @@ function section_install
       bash "$DOTFILES/scripts/settler.sh" && msg_done "🎉 Settler has been run!"
       ;;
     *)
-      menu_section "$USAGE_PREFIX" "all | antigen | starship | npm | macos | settler"
+      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"
@@ -117,21 +118,34 @@ function section_dotfiles
       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
+      hash npm 2> /dev/null && $0 install npm
       msg_ok "Installed packages"
       msg_done "...and we are done!"
       ;;
+    yamlfmt)
+      # format yaml files
+      yamlfmt -conf "$DOTFILES/.yamlfmt"
+      ;;
     shfmt)
       # Format shell scripts according to following rules.
       find "$DOTFILES" \
-        \( -name '*.sh' -or -name '*.zsh' -or -name 'x-*' -or -not '*.pl' \) \
-        -exec shfmt -fn -l -w -i 2 -ci -sr -bn {} \;
+        -type f -perm +111 \
+        -not -path '*/.git/*' \
+        -not -path '*dotbot*' \
+        -not -name '*.pl' \
+        -not -name '*.py' \
+        -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!"
       ;;
     *)
-      menu_section "$USAGE_PREFIX" "reset_all | reset_nvim | shfmt"
+      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"
       ;;
   esac
@@ -144,11 +158,11 @@ function section_check
   X_ARCH=$(uname)
 
   case "$1" in
-    a|arch)
+    a | arch)
       [[ "$2" = "" ]] && echo "$X_ARCH" && exit 0
       [[ $X_ARCH = "$2" ]] && exit 0 || exit 1
       ;;
-    h|host|hostname)
+    h | host | hostname)
       [[ "$2" = "" ]] && echo "$X_HOSTNAME" && exit 0
       [[ $X_HOSTNAME = "$2" ]] && exit 0 || exit 1
       ;;

local/bin/iterm2_shell_integration.zsh

@@ -2,12 +2,12 @@
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -17,7 +17,8 @@ if [[ -o interactive ]]; then
     ITERM_SHELL_INTEGRATION_INSTALLED=Yes
     ITERM2_SHOULD_DECORATE_PROMPT="1"
     # Indicates start of command output. Runs just before command executes.
-    iterm2_before_cmd_executes() {
+    iterm2_before_cmd_executes()
+    {
       if [ "$TERM_PROGRAM" = "iTerm.app" ]; then
         printf "\033]133;C;\r\007"
       else
@@ -25,7 +26,8 @@ if [[ -o interactive ]]; then
       fi
     }
 
-    iterm2_set_user_var() {
+    iterm2_set_user_var()
+    {
       printf "\033]1337;SetUserVar=%s=%s\007" "$1" $(printf "%s" "$2" | base64 | tr -d '\n')
     }
 
@@ -36,15 +38,17 @@ if [[ -o interactive ]]; then
     # \(user.currentDirectory).
     whence -v iterm2_print_user_vars > /dev/null 2>&1
     if [ $? -ne 0 ]; then
-      iterm2_print_user_vars() {
-          true
+      iterm2_print_user_vars()
+      {
+        true
       }
     fi
 
-    iterm2_print_state_data() {
+    iterm2_print_state_data()
+    {
       local _iterm2_hostname="${iterm2_hostname-}"
       if [ -z "${iterm2_hostname:-}" ]; then
-        _iterm2_hostname=$(hostname -f 2>/dev/null)
+        _iterm2_hostname=$(hostname -f 2> /dev/null)
       fi
       printf "\033]1337;RemoteHost=%s@%s\007" "$USER" "${_iterm2_hostname-}"
       printf "\033]1337;CurrentDir=%s\007" "$PWD"
@@ -52,18 +56,21 @@ if [[ -o interactive ]]; then
     }
 
     # Report return code of command; runs after command finishes but before prompt
-    iterm2_after_cmd_executes() {
+    iterm2_after_cmd_executes()
+    {
       printf "\033]133;D;%s\007" "$STATUS"
       iterm2_print_state_data
     }
 
     # Mark start of prompt
-    iterm2_prompt_mark() {
+    iterm2_prompt_mark()
+    {
       printf "\033]133;A\007"
     }
 
     # Mark end of prompt
-    iterm2_prompt_end() {
+    iterm2_prompt_end()
+    {
       printf "\033]133;B\007"
     }
 
@@ -105,7 +112,8 @@ if [[ -o interactive ]]; then
     # * PS1 does not have our escape sequences during command execution
     # * After the command executes but before a new one begins, PS1 has escape sequences and
     #   ITERM2_PRECMD_PS1 has PS1's original value.
-    iterm2_decorate_prompt() {
+    iterm2_decorate_prompt()
+    {
       # This should be a raw PS1 without iTerm2's stuff. It could be changed during command
       # execution.
       ITERM2_PRECMD_PS1="$PS1"
@@ -126,7 +134,8 @@ if [[ -o interactive ]]; then
       ITERM2_DECORATED_PS1="$PS1"
     }
 
-    iterm2_precmd() {
+    iterm2_precmd()
+    {
       local STATUS="$?"
       if [ -z "${ITERM2_SHOULD_DECORATE_PROMPT-}" ]; then
         # You pressed ^C while entering a command (iterm2_preexec did not run)
@@ -145,7 +154,8 @@ if [[ -o interactive ]]; then
     }
 
     # This is not run if you press ^C while entering a command.
-    iterm2_preexec() {
+    iterm2_preexec()
+    {
       # Set PS1 back to its raw value prior to executing the command.
       PS1="$ITERM2_PRECMD_PS1"
       ITERM2_SHOULD_DECORATE_PROMPT="1"
@@ -158,10 +168,10 @@ if [[ -o interactive ]]; then
     # to a VPN.
     if [ -z "${iterm2_hostname-}" ]; then
       if [ "$(uname)" != "Darwin" ]; then
-        iterm2_hostname=`hostname -f 2>/dev/null`
+        iterm2_hostname=$(hostname -f 2> /dev/null)
         # Some flavors of BSD (i.e. NetBSD and OpenBSD) don't have the -f option.
         if [ $? -ne 0 ]; then
-          iterm2_hostname=`hostname`
+          iterm2_hostname=$(hostname)
         fi
       fi
     fi

local/bin/x-backup-folder.sh

@@ -10,14 +10,14 @@ if [ -z "${DIRECTORY}" ]; then
 fi
 
 if [ -z "${FILENAME}" ]; then
-    FILENAME=$DIRECTORY
+  FILENAME=$DIRECTORY
 fi
 
-FILENAME=${FILENAME} | \
-  tr '/' _ | \
-  iconv -t ascii//TRANSLIT | \
-  sed -r s/[^a-zA-Z0-9]+/_/g | \
-  sed -r s/^_+\|-+$//g
+FILENAME=${FILENAME} \
+  | tr '/' _ \
+  | iconv -t ascii//TRANSLIT \
+  | sed -r s/[^a-zA-Z0-9]+/_/g \
+  | sed -r s/^_+\|-+$//g
 
 TIMESTAMP=$(date "+%Y%m%d_%H%M%S")
 FILENAME_TIMESTAMP="${FILENAME}_${TIMESTAMP}"

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

@@ -35,9 +35,9 @@ TIMESTAMP=$(date "+%Y%m%d_%H%M%S")
 FILENAME_TIMESTAMP="${DATABASE}_${FILENAME}_${TIMESTAMP}.sql"
 
 mysqldump \
-  ${DATABASE} \
+  "${DATABASE}" \
   "$(
     echo "show tables like '${PREFIX}%';" \
-      | mysql ${DATABASE} \
+      | mysql "${DATABASE}" \
       | sed '/Tables_in/d'
   )" > "${FILENAME_TIMESTAMP}"

local/bin/x-check-git-attributes

@@ -6,7 +6,7 @@
 
 if ! command -v git &> /dev/null; then
   echo "git could not be found, please install it first"
-  exit
+  exit 1
 fi
 
 missing_attributes=$(git ls-files | git check-attr -a --stdin | grep "text: auto")

local/bin/x-dupes.pl

@@ -206,3 +206,4 @@ sub parsedOptions
     return (%vars);
 
 }
+

local/bin/x-multi-ping.pl

@@ -226,3 +226,4 @@ sub parsedOptions
     return (%vars);
 
 }
+

local/bin/x-open-ports

@@ -3,6 +3,7 @@
 # List open (listened) ports, without the crud that
 # usually comes with `lsof -i`
 #
+# Modified by:     Ismo Vuorinen <https://github.com/ivuorinen> 2020
 # Originally from: https://www.commandlinefu.com/commands/view/8951
 # Original author: https://www.commandlinefu.com/commands/by/wickedcpj
 #

local/bin/x-ssl-expiry-date

@@ -4,37 +4,27 @@
 # -----
 # Check the expiry date of the SSL certificate on the given host.
 #
-#
 # License
 # -------
-#
 # Copyright (c) 2013-2015 by Steve Kemp.  All rights reserved.
 #
 # This script is free software; you can redistribute it and/or modify it under
 # the same terms as Perl itself.
 #
 # The LICENSE file contains the full text of the license.
-#
-#
 
-#
-#  Simple function to show usage information, and exit.
-#
+# Simple function to show usage information, and exit.
 usage()
 {
   echo "Usage: $0 [-d] [-p 443] domain1.org domain2.com .. domainN"
   exit 0
 }
 
-#
-#  Default settings for flags set by the command-line arguments
-#
+# Default settings for flags set by the command-line arguments
 days=0
 port=443
 
-#
-#  Parse the argument(s) - i.e. look for "-d" / "-p 443".
-#
+# Parse the argument(s) - i.e. look for "-d" / "-p 443".
 while getopts "h?dp:" opt; do
   case $opt in
     h)
@@ -53,21 +43,15 @@ while getopts "h?dp:" opt; do
 done
 shift $((OPTIND - 1))
 
-#
-#  Ensure we have some arguments
-#
+# Ensure we have some arguments
 if [ "$#" = "0" ]; then
   usage
 fi
 
-#
 # For each domain-name on the command-line.
-#
 for name in "$@"; do
 
-  #
-  #  Make a temporary file
-  #
+  # Make a temporary file
   # Test if we have BSD or GNU version of mktemp
   if (strings "$(which mktemp)" | grep -q GNU); then
     # We have the GNU version
@@ -77,27 +61,19 @@ for name in "$@"; do
     tmp=$(mktemp -t tmp)
   fi
 
-  #
-  #  Download the certificate
-  #
-  if (! echo "" | openssl s_client -connect $name:$port > $tmp 2> /dev/null); then
+  # Download the certificate
+  if (! echo "" | openssl s_client -connect "$name:$port" > "$tmp" 2> /dev/null); then
     echo "Failed to get cert from https://$name:$port/"
     exit 3
   fi
 
-  #
-  #  Get the expiry date
-  #
+  # Get the expiry date
   date=$(openssl x509 -in "$tmp" -noout -enddate | awk -F= '{print $2}')
 
-  #
-  #  Remove the temporary file
-  #
+  # Remove the temporary file
   rm -f "$tmp"
 
-  #
-  #  Convert the expiry date + todays date to seconds-past epoch
-  #
+  # Convert the expiry date + todays date to seconds-past epoch
   # Check if we have the BSD or the GNU version of date
   if (strings "$(which date)" | grep -q GNU); then
     # We have GNU this is easy
@@ -115,15 +91,11 @@ for name in "$@"; do
 
   now=$(date +%s)
 
-  #
-  #  Day diff
-  #
+  # Day diff
   diff=$(("$then" - "$now"))
   diff=$($diff / 86400)
 
-  #
-  #  All done
-  #
+  # All done
   if [ "$days" = "1" ]; then
     echo "${name}: ${diff}"
   else

local/bin/x-until-error

@@ -3,13 +3,10 @@
 # About
 # -----
 # Repeat the command until it fails - always run at least once.
-#
 
 "$@"
 
-#
-#  If the status code was zero then repeat.
-#
+# If the status code was zero then repeat.
 while [ $? -eq 0 ]; do
   "$@"
 done

local/bin/x-until-success

@@ -14,17 +14,11 @@
 # the same terms as Perl itself.
 #
 # The LICENSE file contains the full text of the license.
-#
-#
 
-#
-#  Run the first time.
-#
+# Run the first time.
 "$@"
 
-#
-#  If the status code was not zero then repeat.
-#
+# If the status code was not zero then repeat.
 while [ $? -ne 0 ]; do
   "$@"
 done

local/bin/x-when-down

@@ -24,7 +24,7 @@ echo "Waiting for $HOST to get down..."
 
 true
 while [ $? -ne 1 ]; do
-  ping -c 1 -W 1 $HOST > /dev/null
+  ping -c 1 -W 1 "$HOST" > /dev/null
 done
 
 shift

local/bin/x-when-up

@@ -22,7 +22,7 @@ if [ $# -lt 2 ]; then
   exit 1
 fi
 
-if [ $1 = "ssh" ]; then
+if [ "$1" = "ssh" ]; then
   HOST=$2
 else
   HOST=$1
@@ -30,15 +30,15 @@ fi
 
 echo "Waiting for $HOST to come online..."
 
-ping -c 1 -W 1 $HOST > /dev/null
+ping -c 1 -W 1 "$HOST" > /dev/null
 while [ $? -ne 0 ]; do
   sleep 1
-  ping -c 1 -W 1 $HOST > /dev/null
+  ping -c 1 -W 1 "$HOST" > /dev/null
 done
 
 # By the time we reach here the ping-command has completed successfully
 # so we can launch the command we were given - along with any arguments.
-if [ $1 != "ssh" ]; then
+if [ "$1" != "ssh" ]; then
   shift
 fi
 

scripts/install-composer.sh

@@ -0,0 +1,19 @@
+#!/bin/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');")"
+
+if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
+then
+    >&2 echo '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
+

scripts/install-go-packages.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# Install Go packages
+#
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+if ! command -v go &> /dev/null; then
+  msg "go hasn't been installed yet."
+else
+  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
+  )
+
+  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"
+
+fi

scripts/install-nfty.sh

@@ -0,0 +1,11 @@
+#!/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/set-macos-defaults.sh

@@ -6,7 +6,7 @@
 # - https://github.com/freekmurze/dotfiles/blob/main/macos/set-defaults.sh
 #
 
-[ "$(uname)" != "Darwin" ] && echo "Not a macOS system" && exit 0;
+[ "$(uname)" != "Darwin" ] && echo "Not a macOS system" && exit 0
 
 # Ask for the administrator password upfront
 sudo -v

scripts/shared.sh

@@ -6,9 +6,9 @@
 
 # -- Colors -- #
 CLR_RED="\033[1;31m"
-CLR_YELLOW='\033[1;33m'
+CLR_YELLOW="\033[1;33m"
 CLR_GREEN="\033[1;32m"
-CLR_BLUE='\033[1;34m'
+CLR_BLUE="\033[1;34m"
 CLR_RESET="\033[0m"
 
 # -- Helpers -- #