(General)~updates to various files due to reinstall on laptop

By reinstalling arch on my laptop, I've had the chance to see any
loose ends or errors in my setup that, by virtue of how fresh the
system is, I'm motivated to fix.

SystemD/.config/systemd/user/emacs.service

@@ -3,8 +3,8 @@ Description=Emacs
 
 [Service]
 Type=forking
-ExecStart=/usr/local/bin/emacs --bg-daemon=MAIN
-ExecStop=/usr/local/bin/emacsclient --socket-name=MAIN --eval "(kill-emacs)"
+ExecStart=/usr/bin/emacs --bg-daemon=MAIN
+ExecStop=/usr/bin/emacsclient --socket-name=MAIN --eval "(kill-emacs)"
 Restart=on-failure
 TimeoutStartSec=0