dfm: dotfiles update

Brewfile

@@ -120,6 +120,8 @@ brew "mas"
 brew "midnight-commander"
 # Ambitious Vim-fork focused on extensibility and agility
 brew "neovim"
+# No Nonsense Neovim Client in Rust
+brew "neovide"
 # Port scanning utility for large networks
 brew "nmap"
 # Manage multiple Node.js versions
@@ -128,6 +130,8 @@ brew "nvm"
 brew "openjdk"
 # Generate clients, server & docs from an OpenAPI spec (v2, v3)
 brew "openapi-generator"
+# Swiss-army knife of markup format conversion
+brew "pandoc"
 # Highly capable, feature-rich programming language
 brew "perl"
 # Interpreted, interactive, object-oriented programming language
@@ -232,8 +236,6 @@ 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
@@ -266,8 +268,12 @@ cask "syntax-highlight"
 cask "visual-studio-code"
 # Multimedia player
 cask "vlc"
+# Spell-checking service for Finnish
+cask "voikkospellservice"
 # Rust-based terminal
 cask "warp"
+# View output from scripts in the menu bar
+cask "xbar"
 mas "1Password for Safari", id: 1569813296
 mas "Flow", id: 1423210932
 mas "GarageBand", id: 682658836
@@ -275,4 +281,5 @@ mas "iMovie", id: 408981434
 mas "Keynote", id: 409183694
 mas "Numbers", id: 409203825
 mas "Pages", id: 409201541
+mas "pullBar", id: 1601913905
 mas "Tailscale", id: 1475387142

config/git/gitignore

@@ -4,6 +4,7 @@
 *.cache
 *~
 
+*-secret
 __secret
 __ignored
 __test_*.php

config/nvim/lua/custom/plugins.lua

@@ -204,4 +204,7 @@ return function(use)
     requires = { "jose-elias-alvarez/null-ls.nvim" }
   }
 
+  -- WakaTime Support
+  use { "wakatime/vim-wakatime" }
+
 end

local/bin/dfm

@@ -84,6 +84,7 @@ function section_brew
         --describe && msg_done "🎉 Done!"
       ;;
     autoupdate)
+      brew autoupdate delete
       brew autoupdate start 43200 --upgrade --cleanup --immediate
       ;;
     *)
@@ -172,4 +173,3 @@ case "$1" in
   tests) section_tests "$2" ;;
   *) usage && exit 1 ;;
 esac
-

local/bin/git-dirty

@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+# Get git repository status for all subdirectories
+# recursively in specified dir.
+#
+# Check the default dir:
+#   `git-dirty.sh`
+# Check specific dir:
+#   `git-dirty.sh ~/Projects`
+# Override default dir with env:
+#   `GIT_DIRTY_DIR=$HOME/Projects git-dirty.sh`
+#
+# If you want to skip directory from checks, just add `.ignore` file next
+# to the `.git` folder. ProTip: Add `.ignore` to your global `.gitignore`.
+#
+# The script automatically skips folders:
+#   node_modules, vendor
+#
+# SET Defaults:
+# Default dir to check, can be overridden in env (.bashrc, .zshrc, ...)
+: "${GIT_DIRTY_DIR:=$HOME/Code}"
+
+# If user has provided folder as a first argument, use it.
+if [ "$1" != "" ]; then
+  GIT_DIRTY_DIR="$1"
+fi
+
+# UTF-8 ftw
+GITDIRTY="❌ "
+GITCLEAN="✅ "
+
+catch()
+{
+  echo "Error $1 occurred on $2"
+}
+
+gitdirty()
+{
+  local d="$1"
+  trap 'catch $? $LINENO' ERR
+
+  if [[ -d "$d" ]]; then
+    if [[ -e "$d/.ignore" ]]; then
+      echo -e ""
+    else
+      # Check that $d is not '--', 'vendor', or 'node_modules'
+      if [[ "${d:0:2}" == "--" ]] || [[ "$d" == "vendor" ]] || [[ "$d" == "node_modules" ]]; then
+        echo ""
+      else
+        cd "$d" > /dev/null
+
+        # If we have `.git` folder, check it.
+        if [[ -d ".git" ]]; then
+          ISDIRTY=$(git diff --shortstat 2> /dev/null | tail -n1)
+          ICON="$GITCLEAN"
+
+          [[ $ISDIRTY != "" ]] && ICON="$GITDIRTY"
+
+          printf " %s %s\n" "$ICON" "$(pwd)"
+        else
+          # If it wasn't git repository, check subdirectories.
+          gitdirtyrepos -- *
+        fi
+      fi
+      cd .. > /dev/null
+    fi
+  fi
+}
+
+gitdirtyrepos()
+{
+  for x in "$@"; do
+    gitdirty "$x"
+  done
+}
+
+set -e
+trap 'case $? in
+        139) echo "segfault occurred";;
+        11) echo "ssegfault occurred";;
+      esac' EXIT
+
+gitdirtyrepos "$GIT_DIRTY_DIR"

rcrc

@@ -1,2 +1,2 @@
-EXCLUDES="*.md *.sh *.lock.json Brewfile scripts"
+EXCLUDES="*.md *.sh *.lock.json Brewfile scripts *-secret"
 HOSTNAME=$(hostname -s)

scripts/install-dotfiles.sh

@@ -84,6 +84,7 @@ handle_file_ln "$HOME/.dotfiles/git_profiles" "$HOME/.git_profiles"
 handle_file_ln "$HOME/.dotfiles/huskyrc" "$HOME/.huskyrc"
 handle_file_ln "$HOME/.dotfiles/local/bin/antigen.zsh" "$HOME/.local/bin/antigen.zsh"
 handle_file_ln "$HOME/.dotfiles/local/bin/dfm" "$HOME/.local/bin/dfm"
+handle_file_ln "$HOME/.dotfiles/local/bin/git-dirty" "$HOME/.local/bin/git-dirty"
 handle_file_ln "$HOME/.dotfiles/local/bin/x-check-git-attributes" "$HOME/.local/bin/x-check-git-attributes"
 handle_file_ln "$HOME/.dotfiles/local/bin/x-dupes" "$HOME/.local/bin/x-dupes"
 handle_file_ln "$HOME/.dotfiles/local/bin/x-foreach" "$HOME/.local/bin/x-foreach"

zshrc

@@ -48,7 +48,9 @@ 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