diff --git a/fish/config.fish b/fish/config.fish
index 4d93ff34..1c9bc627 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,18 +1,12 @@
-bass source "$HOME/.profile"
+bass source .profile
 set --unexport fish_greeting
 fish_vi_key_bindings
 
-for config in (find "$XDG_CONFIG_HOME/" -name 'config.fish')
-    if [ "$config" != (status -f) ]
-        source $config
-    end
-end
-
-for function_d in (find "$XDG_CONFIG_HOME/" -name functions -type d)
+for function_d in (find "$XDG_CONFIG_HOME/" -maxdepth 3 -name functions -type d)
     set fish_function_path "$function_d" $fish_function_path
 end
 
-for completion_d in (find "$XDG_CONFIG_HOME/" -name completions -type d)
+for completion_d in (find "$XDG_CONFIG_HOME/" -maxdepth 3 -name completions -type d)
     set fish_completion_path "$completion_d" $fish_completion_path
 end
 
diff --git a/vagrant/.profile b/vagrant/.profile
index 210b1cbd..b398b0aa 100644
--- a/vagrant/.profile
+++ b/vagrant/.profile
@@ -1,11 +1,13 @@
 for f in "$XDG_CONFIG_HOME"/**/Vagrantfile; do
     dir="$(dirname "$f")"
     name="$(basename "$dir")"
-    cat > "$XDG_DATA_HOME/applications/$name.desktop" <<-EOF
-	[Desktop Entry]
-	Name=$name
-	Type=Application
-	Path=$dir
-	Exec=vagrant up
+
+    desktopf="$XDG_DATA_HOME/applications/$name.desktop"
+    test -f "$desktopf" || cat > "$desktopf" <<-EOF
+		[Desktop Entry]
+		Name=$name
+		Type=Application
+		Path=$dir
+		Exec=vagrant up
 EOF
 done