Fix install.sh

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 [ -n "$NVIM" ] && [ ! -d "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/pack/packer/start/packer.nvim" ]; then
-    if ! grep -q "$(id -nu).*/zsh$" /etc/passwd; then
+    command -v nvim >/dev/null 2>&1 ||
-        command -v zsh >/dev/null 2>&1 || sleep 0.5 &&
+        { sleep 0.5;
-            echo "=> Installing Zsh" && $INSTALL zsh
+          echo "=> Installing Neovim";
-
+          $INSTALL nvim; }
-        sleep 0.5
-        chsh -s /bin/zsh
-    fi
 
     sleep 0.5
-    echo "=> Initializing Zsh"
+    echo "=> Installing packer for Neovim"
-    echo "  :: Please run the following command from Zsh:"
+    git clone --quiet --depth 1 "https://github.com/wbthomason/packer.nvim" \
-    echo "  $ fast-theme ~/.config/zsh/fast-theme.ini"
+        "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/pack/packer/start/packer.nvim"
-fi
+    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:"
-if [ -n "$NVIM" ] && [ ! -f "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/autoload/plug.vim" ]; then
+    echo "    :PackerSync"
-    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
 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!"
-

nvim/.config/nvim/init.lua

@@ -14,10 +14,7 @@ require('packer').startup(function(use)
   use {
     'williamboman/mason-lspconfig.nvim',
     requires = {
-      {
+      'williamboman/mason.nvim',
-        'williamboman/mason.nvim',
-        run = ':MasonUpdate'
-      },
       'neovim/nvim-lspconfig'
     }
   }
@@ -60,7 +57,7 @@ vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead' }, {
 })
 
 -- appearance
-vim.cmd.highlight({ 'Normal', 'guibg=NONE', 'ctermbg=NONE' })
+vim.cmd.highlight { 'Normal', 'guibg=NONE', 'ctermbg=NONE' }
 vim.g.background = 'dark'
 
 -- lightline config
@@ -105,7 +102,7 @@ cmp.setup {
     ['<C-e>'] = cmp.mapping.abort(),
     ['<CR>'] = cmp.mapping.confirm {
       behavior = cmp.ConfirmBehavior.Replace,
-      select = true,
+      select = true
     },
     ['<Tab>'] = cmp.mapping(function(fallback)
       if cmp.visible() then
@@ -124,12 +121,12 @@ cmp.setup {
       else
         fallback()
       end
-    end, { 'i', 's' }),
+    end, { 'i', 's' })
   },
   sources = {
     { name = 'nvim_lsp' },
-    { name = 'luasnip' },
+    { name = 'luasnip' }
-  },
+  }
 }
 
 cmp.setup.cmdline('/', {
@@ -149,9 +146,11 @@ cmp.setup.cmdline(':', {
 
 -- lsp config
 require('mason').setup {}
+require("mason-registry").refresh()
 require('mason-lspconfig').setup {
   automatic_installation = true
 }
+
 local lsp = require('lspconfig')
 local capabilities = require('cmp_nvim_lsp').default_capabilities()