Indent with spaces

removed openfortivpn, terraform@0.12, reviewdog, codeclimate, midnight-commander, qcachegrind

Brewfile

@@ -1,43 +1,46 @@
 tap "anchore/grype"
-tap "codeclimate/formulae"
+tap "ddosify/tap"
+tap "dm3ch/tap"
+tap "gesquive/tap"
 tap "github/gh"
 tap "homebrew/autoupdate"
 tap "homebrew/bundle"
 tap "homebrew/cask"
 tap "homebrew/core"
 tap "homebrew/services"
-tap "reviewdog/tap"
+tap "shivammathur/extensions"
-tap "wpscanteam/tap"
+tap "shivammathur/php"
 brew "act"
 brew "python@3.10"
-brew "ansible", link: false
+brew "ansible"
+brew "zstd"
 brew "aspell"
 brew "autoconf"
+brew "awscli"
+brew "bandwhich"
 brew "brew-php-switcher"
 brew "glib"
-brew "openldap"
+brew "pkg-config"
-brew "zstd"
-brew "freetds"
-brew "icu4c"
-brew "libpq"
-brew "php", link: false
-brew "composer"
 brew "coreutils"
+brew "openldap"
 brew "dive"
 brew "dog"
 brew "eg-examples"
-brew "p11-kit"
-brew "unbound"
-brew "gnutls"
 brew "faas-cli"
+brew "freetds"
 brew "fswatch"
 brew "gh"
 brew "git"
 brew "git-extras"
+brew "git-flow-avh"
+brew "git-recent"
 brew "gnu-sed"
+brew "unbound"
+brew "gnutls"
 brew "gnupg"
 brew "goaccess"
 brew "netpbm"
+brew "icu4c"
 brew "harfbuzz"
 brew "librsvg"
 brew "graphviz"
@@ -50,51 +53,60 @@ brew "imagemagick"
 brew "jq"
 brew "lastpass-cli"
 brew "lazydocker"
+brew "libpq"
 brew "libvoikko"
-brew "midnight-commander"
+brew "m-cli"
 brew "nmap"
 brew "nvm"
+brew "openjdk"
 brew "openapi-generator"
-brew "openfortivpn"
-brew "php-cs-fixer"
-brew "php@7.4"
-brew "php@8.0"
-brew "phpmd"
 brew "phpstan"
 brew "python@3.8"
-brew "qcachegrind"
 brew "qt"
 brew "rcm"
 brew "ripgrep"
 brew "ruby"
-brew "s3cmd"
 brew "shellcheck"
+brew "shfmt"
 brew "skopeo"
 brew "terminal-notifier", link: false
-brew "terraform@0.12"
+brew "terraform"
+brew "terragrunt"
 brew "testssl"
-brew "tfenv"
 brew "thefuck"
 brew "tldr"
 brew "tmux"
 brew "tree"
+brew "viddy"
 brew "watch"
 brew "wget"
 brew "z"
 brew "anchore/grype/grype"
-brew "reviewdog/tap/reviewdog"
+brew "ddosify/tap/ddosify"
-brew "wpscanteam/tap/wpscan"
+brew "gesquive/tap/git-user"
+brew "shivammathur/extensions/xdebug@7.4"
+brew "shivammathur/extensions/xdebug@8.0"
+brew "shivammathur/extensions/xdebug@8.1"
+brew "shivammathur/php/php"
+brew "shivammathur/php/php@7.4"
+brew "shivammathur/php/php@8.0"
 cask "docker"
+cask "fig"
 cask "fog"
+cask "fontplop"
+cask "fork"
 cask "google-cloud-sdk"
 cask "insomnia"
+cask "lens"
 cask "ngrok"
 cask "qlimagesize"
 cask "qlmarkdown"
 cask "qlstephen"
-cask "qlvideo"
 cask "quicklook-json"
 cask "quicklookase"
 cask "sequel-ace"
 cask "suspicious-package"
-cask "vagrant"
+cask "syntax-highlight"
+cask "visual-studio-code"
+cask "vlc"
+cask "warp"

README.md

@@ -0,0 +1,17 @@
+# DotFiles
+
+## Setup
+
+## Other stuff
+
+Update `Brewfile`
+
+```bash
+brew bundle dump --force --file=~/.dotfiles/Brewfile
+```
+
+Enable automatic brew updates and upgrades.
+
+```bash
+brew autoupdate start 43200 --upgrade --cleanup --immediate
+```

bash_profile

@@ -1,3 +1,8 @@
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/bash_profile.pre.bash" ]] && builtin source "$HOME/.fig/shell/bash_profile.pre.bash"
 # shellcheck shell=bash
 
 export PATH="$HOME/.local/bin:/usr/local/sbin:$PATH"
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/bash_profile.post.bash" ]] && builtin source "$HOME/.fig/shell/bash_profile.post.bash"

bashrc

@@ -1,3 +1,5 @@
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.pre.bash"
 # shellcheck shell=bash
 
 PHP_PATH=$(brew --prefix php)/bin
@@ -7,3 +9,6 @@ export PATH="$PHP_PATH:$HOME/.composer/vendor/bin/:/usr/local/opt/ruby/bin:/usr/
 export NVM_DIR="$HOME/.nvm"
 [ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"  # This loads nvm
 [ -s "/usr/local/opt/nvm/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.post.bash"

config/git/config

@@ -0,0 +1,39 @@
+[user]
+    name = Ismo Vuorinen
+    email = ismo.vuorinen@vincit.fi
+[core]
+    excludesfile = ~/.config/git/gitignore
+[alias]
+    reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
+    reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
+    nah = !git reset --hard && git clean -df
+    undo-commit = reset HEAD~ --soft
+    llog = log --pretty=fuller
+    logs = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
+    rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
+    tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
+    branchbydate = for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(refname:short)'
+    branchcolor = "!for ref in $(git for-each-ref --sort=-committerdate --format=\"%(refname)\" refs/heads/ refs/remotes ); do git log -n1 $ref --pretty=format:\"%Cgreen%cr%Creset %C(yellow)%d%Creset %C(bold blue)<%an>%Creset%n\" | cat ; done | awk '! a[$0]++'"
+
+[filter "lfs"]
+    clean = git-lfs clean -- %f
+    smudge = git-lfs smudge -- %f
+    process = git-lfs filter-process
+    required = true
+[init]
+    defaultBranch = master
+[pull]
+    rebase = false
+
+[color]
+    ui = true
+    diff = auto
+    branch = auto
+    status = auto
+
+[color "status"]
+    added = green bold
+    changed = yellow
+    deleted = red bold strike
+    untracked = cyan
+    branch = yellow black bold ul

git_profiles

@@ -0,0 +1,8 @@
+[work]
+name  = Ismo Vuorinen
+email = ismo.vuorinen@vincit.fi
+
+[home]
+name  = Ismo Vuorinen
+email = ismo@vuorinen.net
+

gitconfig

@@ -1,38 +0,0 @@
-[user]
-	name = Ismo Vuorinen
-	email = ismo.vuorinen@geniem.com
-	signingkey = 027A74A88B2CC570
-[core]
-	excludesfile = ~/.gitignore_global
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true
-[commit]
-	template = ~/.stCommitMsg
-[alias]
-    reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
-    reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
-    nah = !git reset --hard && git clean -df
-
-[filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true
-[init]
-	defaultBranch = master
-[pull]
-	rebase = false
-
-[color]
-	ui = true
-
-[color "status"]
-    added = green bold
-    changed = yellow
-    deleted = red bold strike
-    untracked = cyan
-    branch = yellow black bold ul

huskyrc

@@ -0,0 +1,7 @@
+#!/bin/env bash
+
+export NVM_DIR="$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
+
+alias php="php -d error_reporting=22527"

install.sh

@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# Usage:
+#
+#    sh install.sh
+#
+# Environment variables: VERBOSE, CP, LN, MKDIR, RM, DIRNAME.
+#
+#    env VERBOSE=1 sh install.sh
+#
+# DO NOT EDIT THIS FILE
+# 
+# This file is generated by rcm(7) as:
+#
+#   rcup -B 0 -g
+#
+# To update it, re-run the above command.
+#
+: ${VERBOSE:=0}
+: ${CP:=/bin/cp}
+: ${LN:=/bin/ln}
+: ${MKDIR:=/bin/mkdir}
+: ${RM:=/bin/rm}
+: ${DIRNAME:=/usr/bin/dirname}
+verbose() {
+  if [ "$VERBOSE" -gt 0 ]; then
+    echo "$@"
+  fi
+}
+handle_file_cp() {
+  if [ -e "$2" ]; then
+    printf "%s " "overwrite $2? [yN]"
+    read overwrite
+    case "$overwrite" in
+      y)
+        $RM -rf "$2"
+        ;;
+      *)
+        echo "skipping $2"
+        return
+        ;;
+    esac
+  fi
+  verbose "'$1' -> '$2'"
+  $MKDIR -p "$($DIRNAME "$2")"
+  $CP -R "$1" "$2"
+}
+handle_file_ln() {
+  if [ -e "$2" ]; then
+    printf "%s " "overwrite $2? [yN]"
+    read overwrite
+    case "$overwrite" in
+      y)
+        $RM -rf "$2"
+        ;;
+      *)
+        echo "skipping $2"
+        return
+        ;;
+    esac
+  fi
+  verbose "'$1' -> '$2'"
+  $MKDIR -p "$($DIRNAME "$2")"
+  $LN -sf "$1" "$2"
+}
+handle_file_ln "/Users/ivuorinen/.dotfiles/Brewfile" "/Users/ivuorinen/.Brewfile"
+handle_file_ln "/Users/ivuorinen/.dotfiles/alias" "/Users/ivuorinen/.alias"
+handle_file_ln "/Users/ivuorinen/.dotfiles/bash_profile" "/Users/ivuorinen/.bash_profile"
+handle_file_ln "/Users/ivuorinen/.dotfiles/bashrc" "/Users/ivuorinen/.bashrc"
+handle_file_ln "/Users/ivuorinen/.dotfiles/config/antigen.zsh" "/Users/ivuorinen/.config/antigen.zsh"
+handle_file_ln "/Users/ivuorinen/.dotfiles/config/gh/config.yml" "/Users/ivuorinen/.config/gh/config.yml"
+handle_file_ln "/Users/ivuorinen/.dotfiles/config/git/config" "/Users/ivuorinen/.config/git/config"
+handle_file_ln "/Users/ivuorinen/.dotfiles/config/git/gitignore" "/Users/ivuorinen/.config/git/gitignore"
+handle_file_ln "/Users/ivuorinen/.dotfiles/git_profiles" "/Users/ivuorinen/.git_profiles"
+handle_file_ln "/Users/ivuorinen/.dotfiles/huskyrc" "/Users/ivuorinen/.huskyrc"
+handle_file_ln "/Users/ivuorinen/.dotfiles/install.sh" "/Users/ivuorinen/.install.sh"
+handle_file_ln "/Users/ivuorinen/.dotfiles/local/bin/x-open-ports" "/Users/ivuorinen/.local/bin/x-open-ports"
+handle_file_ln "/Users/ivuorinen/.dotfiles/vuerc" "/Users/ivuorinen/.vuerc"
+handle_file_ln "/Users/ivuorinen/.dotfiles/zshrc" "/Users/ivuorinen/.zshrc"

local/bin/x-open-ports

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+#
+# List open (listened) ports, without the crud that
+# usually comes with `lsof -i`
+#
+# Originally from: https://www.commandlinefu.com/commands/view/8951
+# Original author: https://www.commandlinefu.com/commands/by/wickedcpj
+#
+echo 'User:                Command:                  Port:';
+echo '=====================================================';
+
+lsof -i 4 -P -n +c 0 | \
+    grep -i 'listen' | \
+    awk '{print $3, $1, $9}' | \
+    sed 's/ [a-z0-9\.\*]*:/ /' | \
+    sort -k 3 -n | \
+    xargs printf '%-20s %-25s %-5s\n' | uniq
+
+echo "";
+

zshrc

@@ -1,11 +1,29 @@
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
 # shellcheck shell=bash
 
+export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH"
+
+LOCAL_BIN="$HOME/.local/bin"
 OPT_FOLDER="/usr/local/opt"
 PHP_74=$(brew --prefix php@7.4)/bin
+PHP_80=$(brew --prefix php@8.0)/bin
 PHP_CUR=$(brew --prefix php)/bin
-export PATH="$HOME/.local/bin:$PHP_74:$PHP_CUR:$HOME/Library/Python/3.8/bin:$HOME/.composer/vendor/bin:$OPT_FOLDER/python@3.8/bin:$OPT_FOLDER/coreutils/libexec/gnubin:$OPT_FOLDER/ruby/bin:/usr/local/sbin:$PATH"
+PYTHON_38="$HOME/Library/Python/3.8/bin"
+COMPOSER_DIR="$HOME/.composer/vendor/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
+USR_SBIN=/usr/local/sbin
+
+export PATH="$LOCAL_BIN:$PYTHON_38:$COMPOSER_DIR:$BREW_PYTHON:$GNUBIN_DIR:$BREW_GEMS:$BREW_RUBY:$USR_SBIN:$PATH"
 source "$HOME/.config/antigen.zsh"
 
+export NVM_DIR="$HOME/.nvm"
+[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"  # This loads nvm
+[ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
+
 export NVM_DIR="$HOME/.nvm"
 export NVM_LAZY_LOAD=true
 export NVM_COMPLETION=true
@@ -15,10 +33,10 @@ antigen use oh-my-zsh
 
 antigen bundle php
 antigen bundle nvm
-antigen bundle ruby
+# antigen bundle ruby
 antigen bundle docker
 antigen bundle ssh-agent
-antigen bundle git-auto-fetch
+# antigen bundle git-auto-fetch
 
 antigen bundle colored-man-pages
 antigen bundle jreese/zsh-titles
@@ -29,7 +47,7 @@ antigen bundle Sparragus/zsh-auto-nvm-use
 antigen bundle reegnz/jq-zsh-plugin
 antigen bundle MichaelAquilina/zsh-you-should-use
 antigen bundle sroze/docker-compose-zsh-plugin
-antigen bundle voronkovich/phpcs.plugin.zsh
+# antigen bundle voronkovich/phpcs.plugin.zsh
 antigen bundle unixorn/autoupdate-antigen.zshplugin
 
 antigen theme oskarkrawczyk/honukai-iterm-zsh honukai
@@ -50,6 +68,11 @@ export HIST_STAMPS="yyyy-mm-dd"
 
 source "$HOME/.alias"
 
-source "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc"
+GCLOUD_INSTALL_LOCATION=$(gcloud info --format="value(installation.sdk_root)" --quiet)
-source "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc"
+
-source "/usr/local/etc/profile.d/z.sh"
+source "$GCLOUD_INSTALL_LOCATION/path.zsh.inc"
+source "$GCLOUD_INSTALL_LOCATION/completion.zsh.inc"
+source "$(brew --prefix z)/etc/profile.d/z.sh"
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"