From 2aacd6d3e93b248d4da40bef9595308a7fd6bbae Mon Sep 17 00:00:00 2001
From: RealStickman <mrc@frm01.net>
Date: Sun, 21 May 2023 17:04:59 +0200
Subject: [PATCH] Remove pip installation. Use font-manager from official repos

---
 arch-setup/install.sh                | 4 +---
 arch-setup/packages/aurpkgs.txt      | 2 --
 arch-setup/packages/officialpkgs.txt | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch-setup/install.sh b/arch-setup/install.sh
index 44d0884f..bed30bfb 100755
--- a/arch-setup/install.sh
+++ b/arch-setup/install.sh
@@ -45,8 +45,6 @@ echo Updating keyring
 sudo pacman -Sy --noconfirm archlinux-keyring
 echo Updating repos and packages
 sudo pacman -Syu
-echo Installing pip
-sudo pacman -S --needed python-pip
 echo Select packages to install
 
 cmd=(dialog --separate-output --checklist "Select Desktop environment/Window manager:" 22 76 16)
@@ -267,7 +265,7 @@ elif [[ ! $(pacman -Q | grep yay) ]] && [[ ! $(pacman -Q | grep paru) ]]; then
     cd ..
 fi
 
-#AUR
+# AUR
 echo Installing default AUR programs
 paru -S --needed - <"$setupdir/packages/aurpkgs.txt"
 # TODO for btrfsmaintenance, use btrfsmaintenance (1)
diff --git a/arch-setup/packages/aurpkgs.txt b/arch-setup/packages/aurpkgs.txt
index 21fa6add..14a823df 100644
--- a/arch-setup/packages/aurpkgs.txt
+++ b/arch-setup/packages/aurpkgs.txt
@@ -4,8 +4,6 @@ bitwarden
 btrfsmaintenance
 davfs2
 downgrade
-ffmpeg-normalize-git
-font-manager-git
 jellyamp
 jellyfin-media-player
 joplin-appimage
diff --git a/arch-setup/packages/officialpkgs.txt b/arch-setup/packages/officialpkgs.txt
index 7df371a6..58f84127 100644
--- a/arch-setup/packages/officialpkgs.txt
+++ b/arch-setup/packages/officialpkgs.txt
@@ -25,6 +25,7 @@ firewalld
 fish
 flameshot
 foliate
+font-manager-git
 freetype2
 fwupd
 fwupd-efi