Only add shortcuts when running in X
Remove gnome-power-manager and lock todo
Add i3status