nvim: Update

.editorconfig

@@ -8,6 +8,9 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.lua]
+insert_final_newline = true
+
 [*.yaml,*.yml]
 indent_size = 2
 insert_final_newline = true

.gitignore

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

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,15 @@ 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_BIN=$(brew --prefix)/bin
-    BREW_SBIN=$(brew --prefix)/sbin
+  BREW_SBIN=$(brew --prefix)/sbin
 
-    BREW_PYTHON=$(brew --prefix python@3.8)/bin
+  BREW_PYTHON=$(brew --prefix python@3.8)/bin
-    GNUBIN_DIR=$(brew --prefix coreutils)/libexec/gnubin
+  GNUBIN_DIR=$(brew --prefix coreutils)/libexec/gnubin
-    BREW_RUBY=$(brew --prefix ruby)/bin
+  BREW_RUBY=$(brew --prefix ruby)/bin
-    BREW_GEMS=$(gem environment gemdir)/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:$BREW_BIN:$BREW_SBIN:$PATH"
 fi
 
 # nvm, the node version manager
@@ -45,7 +46,8 @@ 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);
+    export GOPATH="$XDG_DATA_HOME/go";
+    mkdir -p "$GOPATH"
     if [ -d "$GOPATH/bin" ]; then
         export PATH="$GOPATH/bin:$PATH"
     fi
@@ -162,3 +164,4 @@ fi
 [[ -f "$XDG_BIN_HOME/iterm2_shell_integration.zsh" ]] && source "$XDG_BIN_HOME/iterm2_shell_integration.zsh"
 
 eval "$(starship init zsh)"
+

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,9 @@ 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.
+shopt -s checkwinsize
+
+

config/functions

@@ -65,3 +65,4 @@ function silent
 {
   "$@" >&/dev/null
 }
+

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.conf.yaml

@@ -59,6 +59,7 @@
       met:
         - go:
             - github.com/skx/sysbox@latest
+            - github.com/dotzero/git-profile
 
 # hosts: v
 - if:
@@ -71,6 +72,15 @@
               path: hosts/v/config/**
         - go:
             - github.com/skx/sysbox@latest
+            - github.com/dotzero/git-profile
+
+# hosts tunkki
+- if:
+    - cond: "[[ $(hostname) = tunkki ]]"
+      met:
+        - go:
+            - github.com/skx/sysbox@latest
+            - github.com/dotzero/git-profile
 
 # hosts: lakka
 - if:
@@ -98,22 +108,10 @@
     - 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

@@ -124,7 +124,7 @@ function section_dotfiles
     shfmt)
       # Format shell scripts according to following rules.
       find "$DOTFILES" \
-        \( -name '*.sh' -or -name '*.zsh' -or -name 'x-*' -or -not '*.pl' \) \
+        \( -name '*.sh' -or -name '*.zsh' -or -name 'x-*' \) \
         -exec shfmt -fn -l -w -i 2 -ci -sr -bn {} \;
       msg_done "🎉 dotfiles have been formatted!"
       ;;
@@ -209,3 +209,4 @@ case "$1" in
   tests) section_tests "$2" ;;
   *) usage && exit 0 ;;
 esac
+

local/bin/git-dirty

@@ -80,3 +80,4 @@ trap 'case $? in
       esac' EXIT
 
 gitdirtyrepos "$GIT_DIRTY_DIR"
+

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

@@ -35,9 +35,10 @@ 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")
@@ -17,3 +17,4 @@ if [[ "$missing_attributes" ]]; then
 else
   echo "All files have a corresponding rule in .gitattributes"
 fi
+

local/bin/x-dupes.pl

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

local/bin/x-foreach

@@ -14,3 +14,4 @@ for dir in $($cmd); do
     eval "$@" # allow multiple commands like "foo && bar"
   )
 done
+

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
 #
@@ -18,3 +19,4 @@ lsof -i 4 -P -n +c 0 \
   | uniq
 
 echo ""
+

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
-  #  Download the certificate
+  if (! echo "" | openssl s_client -connect "$name:$port" > "$tmp" 2> /dev/null); then
-  #
-  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
@@ -132,3 +104,4 @@ for name in "$@"; do
     echo "    Days: ${diff}"
   fi
 done
+

local/bin/x-until-error

@@ -3,13 +3,11 @@
 # 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,12 @@
 # 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-validate-sha256sum.sh

@@ -50,3 +50,4 @@ elif [ "$(get_sha256sum "$filename")" = "$file_hash" ]; then
 else
   error "$filename doesn't match provided sha256sum"
 fi
+

local/bin/x-when-down

@@ -24,9 +24,10 @@ 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,16 +30,17 @@ 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-npm-packages.sh

@@ -36,3 +36,4 @@ else
     echo ""
   done
 fi
+

scripts/set-macos-defaults.sh

@@ -299,3 +299,4 @@ for app in "Activity Monitor" "Address Book" "Calendar" "Contacts" "cfprefsd" \
   killall "${app}" > /dev/null 2>&1
 done
 echo "Done. Note that some of these changes require a logout/restart to take effect."
+

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 -- #
@@ -111,3 +111,4 @@ function fn_exists()
   declare -f -F "$1" > /dev/null
   return $?
 }
+