-cp -if `pwd`/.vimrc ~/.vimrc
-cp -if `pwd`/.bashrc ~/.bashrc
-cp -if `pwd`/.Xresources ~/.Xresources
-cp -if `pwd`/muttrc ~/.mutt/muttrc
-mkdir -p ~/.i3
-cp -if `pwd`/i3/* ~/.i3/
+
+cp -if `pwd`/.vimrc ~/.vimrc || true
+cp -if `pwd`/.bashrc ~/.bashrc || true
+cp -if `pwd`/muttrc ~/.mutt/muttrc || true
+cp -if `pwd`/msmtp ~/.mutt/msmtp || true
+cp -if `pwd`/offlineimaprc ~/.mutt/offlineimaprc || true
+sudo cp -if `pwd`/sudo/mpd.conf /etc/mpd.conf || true
+sudo cp -if `pwd`/sudo/settings.json /etc/transmission-daemon/settings.json || true
+
+if [ "$1" = "-x" ]
+then
+ echo 'Also copying X files for non headless'
+ mkdir -p ~/.i3
+ cp -if `pwd`/i3/* ~/.i3/ || true
+ cp -if `pwd`/.xinitrc ~/.xinitrc || true
+ cp -if `pwd`/.Xresources ~/.Xresources || true
+fi