diff --git a/home/.zshrc.d/upgrade_system.sh b/home/.zshrc.d/upgrade_system.sh
index afa99c1..8111ad8 100755
--- a/home/.zshrc.d/upgrade_system.sh
+++ b/home/.zshrc.d/upgrade_system.sh
@@ -13,6 +13,11 @@ upgrade_system() {
 				;;
 
 			'linux')
+				# Flatpak (could be just about any distro)
+				if command -v flatpak &> /dev/null; then
+					flatpak update
+				fi
+
 				# Debian/Ubuntu
 				if command -v apt &> /dev/null; then
 					sudo sh -c 'apt update && apt upgrade'
@@ -32,9 +37,8 @@ upgrade_system() {
 				;;
 		esac
 
-		if command -v vim &> /dev/null; then
-			vim -c 'PlugUpgrade | q'
-			vim -c 'PlugUpdate | sleep 3 | qa'
+		if command -v nvim &> /dev/null; then
+			nvim -c 'PaqSync' -c 'sleep 5' -c 'qa'
 		fi
 
 		(