gitconfig, zshrc, install.sh, git_profiles

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,15 +1,8 @@
 [user]
 	name = Ismo Vuorinen
-	email = ismo.vuorinen@geniem.com
+	email = ismo.vuorinen@vincit.fi
-	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]
@@ -36,6 +29,9 @@
 
 [color]
 	ui = true
+	diff = auto
+	branch = auto
+	status = auto
 
 [color "status"]
     added = green bold

install.sh

@@ -73,5 +73,6 @@ handle_file_ln "/Users/ivuorinen/.dotfiles/gitconfig" "/Users/ivuorinen/.gitconf
 handle_file_ln "/Users/ivuorinen/.dotfiles/gitignore_global" "/Users/ivuorinen/.gitignore_global"
 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

@@ -19,6 +19,10 @@ USR_SBIN=/usr/local/sbin
 export PATH="$LOCAL_BIN:$PYTHON_38:$COMPOSER_DIR:$BREW_PYTHON:$GNUBIN_DIR:$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