Indent with spaces

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

Brewfile

@@ -1,6 +1,6 @@
 tap "anchore/grype"
-tap "codeclimate/formulae"
 tap "ddosify/tap"
+tap "dm3ch/tap"
 tap "gesquive/tap"
 tap "github/gh"
 tap "homebrew/autoupdate"
@@ -8,22 +8,21 @@ tap "homebrew/bundle"
 tap "homebrew/cask"
 tap "homebrew/core"
 tap "homebrew/services"
-tap "reviewdog/tap"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
-tap "wpscanteam/tap"
 brew "act"
 brew "python@3.10"
 brew "ansible"
+brew "zstd"
 brew "aspell"
 brew "autoconf"
+brew "awscli"
 brew "bandwhich"
 brew "brew-php-switcher"
 brew "glib"
 brew "pkg-config"
 brew "coreutils"
 brew "openldap"
-brew "zstd"
 brew "dive"
 brew "dog"
 brew "eg-examples"
@@ -57,15 +56,12 @@ brew "lazydocker"
 brew "libpq"
 brew "libvoikko"
 brew "m-cli"
-brew "midnight-commander"
 brew "nmap"
 brew "nvm"
 brew "openjdk"
 brew "openapi-generator"
-brew "openfortivpn"
 brew "phpstan"
 brew "python@3.8"
-brew "qcachegrind"
 brew "qt"
 brew "rcm"
 brew "ripgrep"
@@ -74,9 +70,9 @@ 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"
@@ -88,22 +84,19 @@ brew "z"
 brew "anchore/grype/grype"
 brew "ddosify/tap/ddosify"
 brew "gesquive/tap/git-user"
-brew "reviewdog/tap/reviewdog"
 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"
-brew "wpscanteam/tap/wpscan"
+cask "docker"
 cask "fig"
 cask "fog"
 cask "fontplop"
 cask "fork"
 cask "google-cloud-sdk"
 cask "insomnia"
-cask "iterm2"
-cask "keybase"
 cask "lens"
 cask "ngrok"
 cask "qlimagesize"
@@ -114,5 +107,6 @@ cask "quicklookase"
 cask "sequel-ace"
 cask "suspicious-package"
 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
+```

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,45 +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
-	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
-
-[color "status"]
-    added = green bold
-    changed = yellow
-    deleted = red bold strike
-    untracked = cyan
-    branch = yellow black bold ul

install.sh

@@ -69,9 +69,11 @@ handle_file_ln "/Users/ivuorinen/.dotfiles/bash_profile" "/Users/ivuorinen/.bash
 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/gitconfig" "/Users/ivuorinen/.gitconfig"
+handle_file_ln "/Users/ivuorinen/.dotfiles/config/git/config" "/Users/ivuorinen/.config/git/config"
-handle_file_ln "/Users/ivuorinen/.dotfiles/gitignore_global" "/Users/ivuorinen/.gitignore_global"
+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"

zshrc

@@ -2,6 +2,8 @@
 [[ -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
@@ -12,11 +14,16 @@ 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_RUBY:$USR_SBIN:$PATH"
+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