diff --git a/config.json b/config.json
index 7590aff..fe02a39 100644
--- a/config.json
+++ b/config.json
@@ -8,11 +8,10 @@
     },
     "vim": {
       "link": { "from": "shared/vim", "to": "~/.vimrc" },
-      "post-link": "curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim && vim -es -u ~/.vimrc -i NONE -c 'PlugInstall' -c 'qa'"
+      "-post-link": "curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim && vim -es -u ~/.vimrc -i NONE -c 'PlugInstall' -c 'qa'"
     },
     "nvim": {
-      "link": { "from": "shared/nvim", "to": "~/.config/nvim" },
-      "post-link": "nvim --headless '+Lazy! restore' +qa && echo 'alias vim=nvim' >> ~/.zshrc"
+      "link": { "from": "shared/nvim", "to": "~/.config/nvim" }
     },
     "zsh": {
       "link": { "from": "shared/zsh", "to": "~/.zshrc" }
@@ -50,31 +49,6 @@
       }
     ],
     "linux-vm": [
-      "bin",
-      "git",
-      {
-        "package": "zsh",
-        "install": "sudo apt install -y zsh",
-        "post-link": "./scripts/linux-setup_zsh.sh"
-      },
-      {
-        "package": "tmux",
-        "install": "sudo apt install -y tmux"
-      },
-      {
-        "package": "htop",
-        "install": "sudo apt install -y htop"
-      }
-    ],
-    "linux-dev": [
-      {
-        "package": "git",
-        "install": "sudo apt install -y git"
-      },
-      {
-        "package": "htop",
-        "install": "sudo apt install -y htop"
-      },
       {
         "package": "zsh",
         "install": "sudo apt install -y zsh",
@@ -86,9 +60,41 @@
       },
       {
         "package": "nvim",
-	      "ignore-template": true,
+        "install": "sudo apt install -y neovim"
+      },
+      {
+        "package": "git",
+        "install": "sudo apt install -y git"
+      },
+      {
+        "package": "htop",
+        "install": "sudo apt install -y htop"
+      },
+      "bin"
+    ],
+    "linux-dev": [
+      {
+        "package": "zsh",
+        "install": "sudo apt install -y zsh",
+        "post-link": "./scripts/linux-setup_zsh.sh"
+      },
+      {
+        "package": "tmux",
+        "install": "sudo apt install -y tmux"
+      },
+      {
+        "package": "nvim",
+	"ignore-template": true,
         "link": { "from": "linux-dev/nvim", "to": "~/.config/nvim" },
         "post-link": "nvim --headless '+Lazy! restore' '+MasonUpdate' +qa && echo 'alias vim=nvim' >> ~/.zshrc"
+      },
+      {
+        "package": "git",
+        "install": "sudo apt install -y git"
+      },
+      {
+        "package": "htop",
+        "install": "sudo apt install -y htop"
       }
     ]
   }