diff --git a/os/arch/automount/install b/os/arch/automount/install
index 08e81233..dde23537 100755
--- a/os/arch/automount/install
+++ b/os/arch/automount/install
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-[[ -f /etc/arch-release ]] || exit
+if [[ -f /etc/arch-release ]]; then
+    sudo pacman -Ss udevil devmon
+    sudo systemctl enable devmon@$(whoami)
+    sudo systemctl start devmon@$(whoami)
 
-sudo pacman -Ss udevil
-sudo systemctl enable devmon@$(whoami)
-sudo systemctl start devmon@$(whoami)
-
-sudo sed -i 's@^# \(success_exec =\)@\1 /home/hlissner/.dotfiles/os/arch/automount/bin/notify-mount@' udevil.conf
+    sudo sed -i 's@^# \(success_exec =\)@\1 /home/hlissner/.dotfiles/os/arch/automount/bin/notify-mount@' udevil.conf
+fi
diff --git a/os/arch/install b/os/arch/install
index d21d410f..3507f48c 100755
--- a/os/arch/install
+++ b/os/arch/install
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+set -e
+shopt -s nullglob
+
 PWD=$(dirname $0)
 
 pacman='sudo pacman --needed --noconfirm'
@@ -44,8 +47,6 @@ fi
 ## Bootstrap
 # Helpful utilities
 $pacaur -S the_silver_searcher fasd tmux hub bc keybase cronie
-
-$pacaur -S udevil devmon
 sudo systemctl enable cronie.service
 
 if [[ -z $SERVER ]]; then
@@ -61,7 +62,7 @@ if [[ -z $SERVER ]]; then
     # Window manager
     $pacaur -S bspwm sxhkd compton
     # Taskbar
-    $pacaur -S lemonbar-xft-git siji-git xtitle sutils-git dunst libnotify
+    $pacaur -S lemonbar-xft-git sutils-git dunst libnotify
     # Utilities
     $pacaur -S rofi feh sxiv maim slop-opengl neofetch-git pass youtube-dl xdotool
     # Apps