From 44182aa331821ca286bef96adb33eeafe655b692 Mon Sep 17 00:00:00 2001
From: Maximilian Wolf <69987866+MaxWolf-01@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:16:51 +0200
Subject: [PATCH] add fastfetch

---
 setup       | 20 +++++++++++++-------
 zsh/aliases |  2 ++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/setup b/setup
index 5b25189..eb08a3b 100755
--- a/setup
+++ b/setup
@@ -18,8 +18,7 @@ apps() {
       blueman \
       gnome-shell-extensions-gpaste \
       gparted \
-      pulseaudio-module-bluetooth \
-      zathura
+      pulseaudio-module-bluetooth
     toolbox
 }
 
@@ -55,7 +54,7 @@ cli() {
     sudo chsh -s "$(which zsh)" "$USER" # set zsh as default shell
 
     # vim 9
-    sudo add-apt-repository ppa:jonathonf/vim -y
+    yes | sudo add-apt-repository ppa:jonathonf/vim -y
     sudo apt install --reinstall vim -y
     curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 
@@ -76,6 +75,13 @@ cli() {
     sudo mkdir -p /usr/local/bin
     sudo ln -s ~/bin/* /usr/local/bin/
 
+    # fastfetch on ubuntu 22.04+
+    if grep -q "Ubuntu" /etc/os-release && [ "$(awk -F'=' '/VERSION_ID/{print $2}' /etc/os-release | tr -d '\"' | awk -F'.' '{if ($1 > 22 || ($1 == 22 && $2 >= 4)) print 1; else print 0}')" -eq 1 ]; then
+      yes | sudo add-apt-repository ppa:zhangsongcui3371/fastfetch
+      sudo apt update
+      sudo apt install -y fastfetch
+    fi
+
     ### remove bloat
     # screen reader
     sudo apt-get remove -y orca
@@ -92,13 +98,13 @@ desktop() {
     fi
 
     # webp support for eye of gnome image viewer
-    sudo add-apt-repository ppa:helkaluin/webp-pixbuf-loader
+    yes | sudo add-apt-repository ppa:helkaluin/webp-pixbuf-loader
     sudo apt-get update
     sudo apt install webp-pixbuf-loader
     xdg-mime default org.gnome.eog.desktop image/webp
 
     # encrypted volumes
-    sudo add-apt-repository ppa:unit193/encryption
+    yes | sudo add-apt-repository ppa:unit193/encryption
     sudo apt-get update
     sudo apt-get install veracrypt
 }
@@ -159,7 +165,7 @@ get_restic() {
 
 android() {
   pkg update && pkg upgrade
-  pkg install python gh
+  pkg install python gh fastfetch
   gh auth login
 
   vault_dir=~/storage/shared/obsidian # https://android.stackexchange.com/a/185949
@@ -293,7 +299,7 @@ discord() {  # will setup discord and betterdiscord on first run, update both on
 ytdlp() {
   sudo apt-get install -y ffmpeg
 
-  sudo add-apt-repository ppa:tomtomtom/yt-dlp    # Add ppa repo to apt
+  yes | sudo add-apt-repository ppa:tomtomtom/yt-dlp    # Add ppa repo to apt
   sudo apt update                                 # Update package list
   sudo apt install -y yt-dlp                      # Install yt-dlp
 }
diff --git a/zsh/aliases b/zsh/aliases
index 9e334ab..feecd22 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -42,6 +42,8 @@ alias ipr='ip -c r'
 alias lc='lolcat'
 alias catl='lolcat'
 
+alias ff='fastfetch'
+
 # conda #
 #########
 alias mkenv='mamba create --name'