From f3338f96bc93ab0e6518d9335b458536cf3277aa Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Thu, 11 May 2023 20:03:49 +0200
Subject: [PATCH] Fix install.sh

---
 install.sh                 | 55 +++++++++++++++++++++-----------------
 nvim/.config/nvim/init.lua |  6 ++---
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/install.sh b/install.sh
index 13e3b41..2520c1c 100755
--- a/install.sh
+++ b/install.sh
@@ -27,37 +27,26 @@ for pkg in "$@"; do
     echo "  -> Stowing $pkg"
     
     # Symlink only the individual files instead of the entire directory
-    [ "$pkg" = "nvim" ] && NVIM=1 && mkdir -p "$HOME/.config/$pkg"
+    [ "$pkg" = "nvim"    ] && NVIM=1 && mkdir -p "$HOME/.config/$pkg"
     [ "$pkg" = "scripts" ] && DASH=1 && mkdir -p "$HOME/.local/bin"
-    [ "$pkg" = "zsh" ] && ZSH=1 && mkdir -p "$HOME/.config/$pkg"
+    [ "$pkg" = "zsh"     ] && ZSH=1  && mkdir -p "$HOME/.config/$pkg"
 
     LC_ALL="C" stow -t "$HOME" --ignore="README.md" "$pkg"
 done
 
-if [ -n "$ZSH" ]; then
-    if ! grep -q "$(id -nu).*/zsh$" /etc/passwd; then
-        command -v zsh >/dev/null 2>&1 || sleep 0.5 &&
-            echo "=> Installing Zsh" && $INSTALL zsh
-
-        sleep 0.5
-        chsh -s /bin/zsh
-    fi
+if [ -n "$NVIM" ] && [ ! -d "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/pack/packer/start/packer.nvim" ]; then
+    command -v nvim >/dev/null 2>&1 ||
+        { sleep 0.5;
+          echo "=> Installing Neovim";
+          $INSTALL nvim; }
 
     sleep 0.5
-    echo "=> Initializing Zsh"
-    echo "  :: Please run the following command from Zsh:"
-    echo "  $ fast-theme ~/.config/zsh/fast-theme.ini"
-fi
-
-if [ -n "$NVIM" ] && [ ! -f "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/autoload/plug.vim" ]; then
-    command -v nvim >/dev/null 2>&1 || sleep 0.5 &&
-        echo "=> Installing Neovim" && $INSTALL nvim
-    
-    sleep 0.5
-    echo "=> Installing vim-plug and plugins for Neovim"
-    curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/autoload/plug.vim" --create-dirs \
-        "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"
-    nvim --headless +PlugInstall +qa
+    echo "=> Installing packer for Neovim"
+    git clone --quiet --depth 1 "https://github.com/wbthomason/packer.nvim" \
+        "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/pack/packer/start/packer.nvim"
+    echo "  :: The LSP servers will be installed automatically when you open a file in Neovim."
+    echo "  :: Please run the following Normal mode command in Neovim to install the plugins:"
+    echo "    :PackerSync"
 fi
 
 if [ -n "$DASH" ] && ! command -v dash >/dev/null 2>&1; then
@@ -66,6 +55,22 @@ if [ -n "$DASH" ] && ! command -v dash >/dev/null 2>&1; then
     $INSTALL dash
 fi
 
+if [ -n "$ZSH" ]; then
+    if ! grep -q "$(id -nu).*/zsh$" /etc/passwd; then
+        command -v zsh >/dev/null 2>&1 ||
+            { sleep 0.5;
+              echo "=> Installing Zsh";
+              $INSTALL zsh; }
+
+        sleep 0.5
+        chsh -s /bin/zsh
+    fi
+
+    sleep 0.5
+    echo "=> Initializing Zsh"
+    echo "  :: Please run the following command from Zsh:"
+    echo "    $ fast-theme ~/.config/zsh/fast-theme.ini"
+fi
+
 sleep 0.5
 echo "=> Done!"
-
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 3180e98..e175e49 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -14,10 +14,7 @@ require('packer').startup(function(use)
   use {
     'williamboman/mason-lspconfig.nvim',
     requires = {
-      {
-        'williamboman/mason.nvim',
-        run = ':MasonUpdate'
-      },
+      'williamboman/mason.nvim',
       'neovim/nvim-lspconfig'
     }
   }
@@ -149,6 +146,7 @@ cmp.setup.cmdline(':', {
 
 -- lsp config
 require('mason').setup {}
+require("mason-registry").refresh()
 require('mason-lspconfig').setup {
   automatic_installation = true
 }