diff --git a/git/.gitconfig b/git/.gitconfig
index 2794ade..fff9108 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,3 +1,5 @@
 [user]
 	email = yannik.schmidt@fau.de
 	name = Sheppy
+[push]
+	default = simple
diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index c0bfe48..966c22d 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -24,6 +24,7 @@ Mod=Mod4     # Use the super key as the main modifier
 
 #client handling
 hc keybind $Mod-Shift-q quit
+hc keybind $Mod-Shift-p /bin/sh -c "/sbin/poweroff; herbstclient quit"
 hc keybind $Mod-Shift-r reload
 hc keybind $Mod-q close
 
diff --git a/other/grub b/other/grub
new file mode 100644
index 0000000..5992fef
--- /dev/null
+++ b/other/grub
@@ -0,0 +1,32 @@
+# If you change this file, run 'update-grub' afterwards to update
+# /boot/grub/grub.cfg.
+# For full documentation of the options in this file, see:
+#   info -f grub -n 'Simple configuration'
+
+GRUB_DEFAULT=2
+GRUB_TIMEOUT=-1
+GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
+GRUB_CMDLINE_LINUX_DEFAULT="quiet libata.force=3.00:disable,4.00:disable"
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to enable BadRAM filtering, modify to suit your needs
+# This works with Linux (no patch required) and with any kernel that obtains
+# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
+#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef"
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+#GRUB_GFXMODE=640x480
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY="true"
+
+# Uncomment to get a beep at grub start
+#GRUB_INIT_TUNE="480 440 1"
diff --git a/other/local.conf b/other/local.conf
new file mode 100644
index 0000000..b45e4b7
--- /dev/null
+++ b/other/local.conf
@@ -0,0 +1 @@
+options usbhid quirks=0x1a2c:0x0027:0x20000000
diff --git a/zshrc b/zshrc
index c6867f8..22a71e4 100644
--- a/zshrc
+++ b/zshrc
@@ -62,6 +62,7 @@ alias zshconf="vim ~/.zshrc"
 
 #ambigious aliases
 alias dual="xrandr --output DVI-I-2 --right-of DVI-I-1"
+alias shutown="/sbin/poweroff"
 
 #aliases migrated from bashrc
 alias spc='gcc -std=c99 -pedantic -Wall -Werror -D_XOPEN_SOURCE=700 -o'