diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 4e80e8c..9c7ab83 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -5,6 +5,7 @@ vim.cmd [[ source ~/.vimrc.common ]]
 
 require 'configuration'
 require 'keys'
+require 'os'
 
 vim.cmd [[ source ~/.vim/plugins.vim ]]
 
@@ -16,9 +17,9 @@ function ensure_metadata_directories_exist()
     }
 
     for _, opt in ipairs(paths) do
-        local first_path = opt[1]
-        if string.find(first_path, "//$") then
-            os.execute("mkdir -p " .. first_path)
+        local firstPath = opt[1]
+        if string.find(firstPath, "//$") then
+            os.execute("mkdir", "-p", firstPath)
         end
     end
 end
diff --git a/vimrc b/vimrc
index 32c7e5e..bf45210 100644
--- a/vimrc
+++ b/vimrc
@@ -3,24 +3,25 @@
 
 source ~/.vimrc.common
 
-set nocompatible        " use enhanced vim features
+if !has('nvim')
+    set nocompatible        " use enhanced vim features
 
-let s:localdir=expand("~/.local/vim")
-if !isdirectory(s:localdir)
-    call mkdir(s:localdir, "p")
+    let s:localdir=expand("~/.local/vim")
+    if !isdirectory(s:localdir)
+        call mkdir(s:localdir, "p")
+    endif
+
+    let &backupdir=expand(s:localdir . "/backup//" . ",.")
+    let &undodir=expand(s:localdir . "/undo//")
+    let &viminfofile=expand(s:localdir . "/viminfo")
+
+    " Shada data. Parameters as follows: (see :help shada)
+    "   %   number of buffers to save and restore when no file argument is given
+    "   '   maximum number of previously edited files for which marks are remembered
+    "   h   disable highlighted search patterns on start
+    "   /   omitted, so all search history is saved
+    "   <   maximum number of lines saved for each register
+    "   :   maximum number of lines of command history to save
+    "   s   shada entries over 100 KiB are skipped
+    set viminfo=%100,'100,h,<1000,:100,s100
 endif
-
-let &backupdir=expand(s:localdir . "/backup//" . ",.")
-let &undodir=expand(s:localdir . "/undo//")
-let &viminfofile=expand(s:localdir . "/viminfo")
-
-" Shada data. Parameters as follows: (see :help shada)
-"   %   number of buffers to save and restore when no file argument is given
-"   '   maximum number of previously edited files for which marks are remembered
-"   h   disable highlighted search patterns on start
-"   /   omitted, so all search history is saved
-"   <   maximum number of lines saved for each register
-"   :   maximum number of lines of command history to save
-"   s   shada entries over 100 KiB are skipped
-set viminfo=%100,'100,h,<1000,:100,s100
-