From bb6771e968762b2d63800ff566b77fb104eb38aa Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Fri, 5 Aug 2022 09:37:38 +0300
Subject: [PATCH] Refine neovim updates

---
 config.toml                             |  2 +-
 home/.config/nvim/lua/pluginmanager.lua | 11 ++++++++---
 home/.config/zsh/03-aliases.zsh         |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/config.toml b/config.toml
index 5bd3320c..ec0114fe 100644
--- a/config.toml
+++ b/config.toml
@@ -1,5 +1,5 @@
 [actions]
-nvim-packer-sync = "nvim +PackerSync"
+nvim-packer-sync = "nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync'"
 
 [config]
 backup = true
diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua
index 16825faa..07fa44c0 100644
--- a/home/.config/nvim/lua/pluginmanager.lua
+++ b/home/.config/nvim/lua/pluginmanager.lua
@@ -79,7 +79,12 @@ require('packer').startup(function()
     use "rafamadriz/friendly-snippets" -- Snippets collection
 
     -- treesitter syntax highlight
-    use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
+    use {
+        'nvim-treesitter/nvim-treesitter',
+        run = function()
+            require('nvim-treesitter.install').update({with_sync = true})
+        end
+    }
 
     -- treesitter plugin for commentstring
     use 'JoosepAlviste/nvim-ts-context-commentstring'
@@ -112,8 +117,8 @@ require('packer').startup(function()
     -- Vim <3 Asciidoctor
     use 'habamax/vim-asciidoctor'
 
-	-- Modern filetype.vim replacement
-	use("nathom/filetype.nvim")
+    -- Modern filetype.vim replacement
+    use("nathom/filetype.nvim")
 
 end)
 
diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh
index 93a6db86..dedf1c3c 100644
--- a/home/.config/zsh/03-aliases.zsh
+++ b/home/.config/zsh/03-aliases.zsh
@@ -155,7 +155,7 @@ update() {
 	}
 
 	plugins() {
-		nvim +PackerSync +TSUpdate
+		nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync'
 		zinit self-update
 		zinit update -p
 		$HOME/.tmux/plugins/tpm/bin/update_plugins all