diff --git a/home/.config/fish/config.fish b/home/.config/fish/config.fish
index ca828fd..f523fb0 100644
--- a/home/.config/fish/config.fish
+++ b/home/.config/fish/config.fish
@@ -14,11 +14,6 @@ set -gx PATH /usr/sbin /sbin /usr/bin /bin /usr/local/sbin /usr/local/bin $HOME/
 
 set -gx EDITOR /usr/bin/vim
 
-# Source local system-specific config.
-if test -e ~/.local.fish
-	. ~/.local.fish
-end
-
 # 256 colors
 if test $TERM = "xterm"
 	set -x TERM "xterm-256color"
@@ -61,3 +56,8 @@ function fish_title
 	end
 end
 
+# Source local system-specific config.
+if test -e ~/.local.fish
+	. ~/.local.fish
+end
+
diff --git a/home/.config/pulse/daemon.conf b/home/.config/pulse/daemon.conf
new file mode 100644
index 0000000..5f866e6
--- /dev/null
+++ b/home/.config/pulse/daemon.conf
@@ -0,0 +1,12 @@
+# My PulseAudio setting overrides.
+# https://wiki.archlinux.org/index.php/PulseAudio
+#
+# Run these commands when changing this config:
+# $ pulseaudio -k
+# $ pulseaudio --start
+
+# Stop per-application volume from adjusting when the Master volume is
+# adjusted.
+flat-volumes = no
+
+# vim:ft=conf
diff --git a/setup b/setup
index 13f0ea8..78246f8 100755
--- a/setup
+++ b/setup
@@ -53,9 +53,13 @@ def crawl(folder):
             continue
 
         # Otherwise it's a file. In install mode, delete the existing file.
-        if install and (os.path.exists(home) or os.path.islink(home)):
-            print("Delete:", home)
-            os.unlink(home)
+        if os.path.exists(home) or os.path.islink(home):
+            if install:
+                print("Delete:", home)
+                os.unlink(home)
+            elif not os.path.islink(home):
+                print("Found existing (non-link file), but not in --install mode:", home)
+                continue
 
         # Already linked?
         if os.path.islink(home):
@@ -73,23 +77,4 @@ def crawl(folder):
 
 crawl(source)
 
-"""for item in os.listdir(source):
-    home   = os.path.join(os.environ.get("HOME", "."), item)
-    target = os.path.join(source, item)
-
-    if install and (os.path.exists(home) or os.path.islink(home)):
-        print("Delete:", home)
-        if os.path.islink(home) or not os.path.isdir(home):
-            os.unlink(home)
-        else:
-            shutil.rmtree(home)
-
-    if os.path.islink(home):
-        print("Already linked:", home)
-        continue
-
-    print("{} -> {}".format(home, target))
-    os.symlink(target, home)
-"""
-
 # vim:expandtab