Merge branch 'master' of https://github.com/mastermindzh/dotfiles

bash/.alias.sh

@@ -26,15 +26,10 @@ alias internalip=$'ip route get 8.8.8.8 | awk \'NR==1 {print $NF}\''
 #show 5 most memory consuming apps
 alias psmem='ps auxf | sort -nr -k 5 | head -n 5'
 
-#git
-alias gitdiff='git diff --name-only --diff-filter=U'
-alias status='git status'
-alias push='git push'
-alias add='git add .'
-
 #dotnet core
 alias efupdate="dotnet ef database update"
 alias efmigrate="dotnet ef migrations add"
+alias dotnetnew="dotnet new webapi -o "
 
 ##utility
 alias nmapscan='nmap -n -sP'

config/.gitconfig

@@ -3,3 +3,7 @@
 	name = Mastermindzh
 [alias]
 	tree = log --graph --decorate --pretty=format:'%ar [%h] %an <%ae> - %s'
+	graph = log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative
+	stats = !git graph --stat
+	pushall = !git remote | xargs -L1 git push --all
+	diffname = !git diff --name-only

config/.npmrc

@@ -0,0 +1,3 @@
+init.author.name=Rick van Lieshout
+init.author.email=info@rickvanlieshout.com
+init.author.url=http://rickvanlieshout.com

install.sh

@@ -95,6 +95,7 @@ function install_config {
 	mkdir -p ~/.config/rofi
 	ln -sf "$PWD"/config/rofi ~/.config/rofi/config
 	ln -sf "$PWD"/config/.gitconfig ~/.gitconfig
+	ln -sf "$PWD"/config/.npmrc ~/.npmrc
 
 	# link system files
 	sudo ln -sf "$PWD"/config/package-managers/pacman.conf /etc/pacman.conf