diff --git a/.gitconfig b/.gitconfig
index fd37e45..078a1ba 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,10 +17,11 @@
         uncommit = reset --mixed HEAD~
         amend = commit --amend
         unmerged = diff --name-only --diff-filter=U
+    	alias = config --get-regexp ^alias\\.
 [push]
         default = simple
 [color]
 	ui = true
 [user]
-	name = chawley (hannibal)
+	name = chawley
 	email = chawley@planethawleywood.com
diff --git a/Makefile b/Makefile
index e189ab6..f10a7f4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
-server: mkdirs softlinks 
+HOST=$(shell hostname)
+
+server: mkdirs softlinks gitconfig
 	@echo "Running firstrun and Linking softlinks (server)"
 
-nonserver: mkdirs softlinks-non-server softlinks
-	@echo "Running firstrun and Linking softlinks (server)"
+nonserver: mkdirs softlinks-non-server softlinks gitconfig
+	@echo "Running firstrun and Linking softlinks (non-server)"
 
 
 softlinks: dependencies 
@@ -11,7 +13,6 @@ softlinks: dependencies
 	@test -L ${HOME}/.elinks || ln -s ${HOME}/dotfiles/.elinks ${HOME}/.elinks
 	@test -L ${HOME}/.irssi || ln -s ${HOME}/dotfiles/.irssi ${HOME}/.irssi
 	@test -L ${HOME}/.gitconfig || ln -s ${HOME}/dotfiles/.gitconfig ${HOME}/.gitconfig
-	@test -L ${HOME}/.gitconfig || ln -s ${HOME}/dotfiles/.gitconfig ${HOME}/.gitconfig
 	@test -L ${HOME}/.gitignore || ln -s ${HOME}/dotfiles/.gitignore ${HOME}/.gitignore
 	@test -L ${HOME}/.tmux.conf || ln -s ${HOME}/dotfiles/.tmux.conf ${HOME}/.tmux.conf
 
@@ -19,10 +20,9 @@ softlinks-non-server: dependencies-nonserver
 	@test -L ${HOME}/.abcde.conf || ln -s ${HOME}/dotfiles/.abcde.config ${HOME}/.abcde.conf
 	@test -L ${HOME}/.crawlrc || ln -s ${HOME}/dotfiles/.crawlrc ${HOME}/.crawlrc
 	@test -L ${HOME}/.dosbox || ln -s ${HOME}/dotfiles/.dosbox ${HOME}/.dosbox
-	@test -L ${HOME}/.conkyrc || ln -s ${HOME}/dotfiles/.conkyrc ${HOME}/.conkyrc
 
 gitconfig: dependencies softlinks
-	git config --global user.name "${USER} (${HOST})"
+	git config --global user.name "${USER} ($(HOST))"
 	git config --global user.email chawley@planethawleywood.com
 
 dependencies:
@@ -35,7 +35,6 @@ dependencies:
 dependencies-non-server: dependencies
 	sudo apt install abcde || sudo yum install abcde
 	sudo apt install dosbox || sudo yum install dosbox
-	sudo apt install conky || sudo yum install conky
 
 mkdirs:
 	mkdir -p ${HOME}/bin