diff --git a/.gitignore b/.gitignore
index 67713e0..ab50645 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 .DS_Store
-vim/dirs/*
-vim/.netrwhist
-spacemacs.d/.spacemacs.env
+nvim.configlink/dirs/*
+nvim.configlink/.netrwhist
+spacemacs.d.symlink/.spacemacs.env
 *.lock.json
 
diff --git a/fish.configlink/config.fish b/fish.configlink/config.fish
new file mode 100644
index 0000000..b6e73b1
--- /dev/null
+++ b/fish.configlink/config.fish
@@ -0,0 +1,2 @@
+starship init fish | source
+
diff --git a/fish.configlink/fish_variables b/fish.configlink/fish_variables
new file mode 100644
index 0000000..fa8bff9
--- /dev/null
+++ b/fish.configlink/fish_variables
@@ -0,0 +1,32 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_initialized:3100
+SETUVAR fish_color_autosuggestion:555\x1ebrblack
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:005fd7
+SETUVAR fish_color_comment:990000
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:009900
+SETUVAR fish_color_error:ff0000
+SETUVAR fish_color_escape:00a6b2
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:00a6b2
+SETUVAR fish_color_param:00afff
+SETUVAR fish_color_quote:999900
+SETUVAR fish_color_redirection:00afff
+SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x60help\x60\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_completion:\x1d
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
diff --git a/vim/autoload/pathogen.vim b/nvim.configlink/autoload/pathogen.vim
similarity index 100%
rename from vim/autoload/pathogen.vim
rename to nvim.configlink/autoload/pathogen.vim
diff --git a/vim/colors/solarized.vim b/nvim.configlink/colors/solarized.vim
similarity index 100%
rename from vim/colors/solarized.vim
rename to nvim.configlink/colors/solarized.vim
diff --git a/vim/init.vim b/nvim.configlink/init.vim
similarity index 100%
rename from vim/init.vim
rename to nvim.configlink/init.vim
diff --git a/scripts/setup_symlinks b/scripts/setup_symlinks
index 7f6fa26..7505654 100755
--- a/scripts/setup_symlinks
+++ b/scripts/setup_symlinks
@@ -12,22 +12,20 @@ setup_symlinks() {
         ln -s "$source" "$dest"
     done
 
-    # Spacemacs
-    rm -rf "$HOME/.spacemacs.d"
-    ln -s "$DOTS/spacemacs.d" "$HOME/.spacemacs.d"
-
-    # Vim
-    rm -rf "$HOME/.vim"
-    ln -s "$DOTS/vim" "$HOME/.vim"
-
-    rm -rf "$HOME/.config/nvim"
-    ln -s "$DOTS/vim" "$HOME/.config/nvim"
-
-    # Starship
-    rm -rf "$HOME/.config/starship.toml"
-    ln -s "$DOTS/nushell/starship.toml" "$HOME/.config/starship.toml"
-
     echo "symlinks ✓"
 }
 
+setup_configlinks() {
+    for source in $(find "$DOTS" -iname "*.configlink")
+    do
+        dest="$HOME/.config/`basename \"${source%.*}\"`"
+        rm -rf "$dest"
+        ln -s "$source" "$dest"
+    done
+
+    echo "configlinks ✓"
+}
+
 setup_symlinks
+setup_configlinks
+
diff --git a/spacemacs.d/init.el b/spacemacs.d.symlink/init.el
similarity index 100%
rename from spacemacs.d/init.el
rename to spacemacs.d.symlink/init.el
diff --git a/spacemacs.d/layers/README.md b/spacemacs.d.symlink/layers/README.md
similarity index 100%
rename from spacemacs.d/layers/README.md
rename to spacemacs.d.symlink/layers/README.md
diff --git a/nushell/starship.toml b/starship/starship.toml.configlink
similarity index 100%
rename from nushell/starship.toml
rename to starship/starship.toml.configlink