From 7910866985f53ed0ad9a1c818e680e6233b7ecc9 Mon Sep 17 00:00:00 2001
From: FallenWarrior2k <simon.engmann+github@fallenwarrior.me>
Date: Sun, 6 Sep 2020 18:44:03 +0200
Subject: [PATCH] Fix some minor Vim issues (#518)

---
 src/steps/upgrade.vim | 3 +--
 src/steps/vim.rs      | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/steps/upgrade.vim b/src/steps/upgrade.vim
index 1638c015..bd47d488 100644
--- a/src/steps/upgrade.vim
+++ b/src/steps/upgrade.vim
@@ -1,5 +1,5 @@
 if exists(":NeoBundleUpdate")
-    echo NeoBundle
+    echo "NeoBundle"
     NeoBundleUpdate
 endif
 
@@ -11,7 +11,6 @@ endif
 if exists(":PlugUpgrade")
     echo "Plug"
     PlugUpgrade
-    PlugClean
     PlugUpdate
 endif
 
diff --git a/src/steps/vim.rs b/src/steps/vim.rs
index 279e4e47..e2d5ab73 100644
--- a/src/steps/vim.rs
+++ b/src/steps/vim.rs
@@ -27,10 +27,14 @@ pub fn vimrc(base_dirs: &BaseDirs) -> Result<PathBuf> {
 
 fn nvimrc(base_dirs: &BaseDirs) -> Result<PathBuf> {
     #[cfg(unix)]
-    return base_dirs.home_dir().join(".config/nvim/init.vim").require();
+    let base_dir =
+        // Bypass directories crate as nvim doesn't use the macOS-specific directories.
+        std::env::var_os("XDG_CONFIG_HOME").map_or_else(|| base_dirs.home_dir().join(".config"), PathBuf::from);
 
     #[cfg(windows)]
-    return base_dirs.cache_dir().join("nvim/init.vim").require();
+    let base_dir = base_dirs.cache_dir();
+
+    base_dir.join("nvim/init.vim").require()
 }
 
 fn upgrade(vim: &PathBuf, vimrc: &PathBuf, ctx: &ExecutionContext) -> Result<()> {