From 075537ad9e3c43a63a7755760cf778abdf377ec3 Mon Sep 17 00:00:00 2001
From: Ting Zhou <ztlevi.work@gmail.com>
Date: Mon, 26 Aug 2024 10:12:23 -0700
Subject: [PATCH] shell/zsh: use fastfetch

---
 config                               | 2 +-
 legacy_sync_script.zsh               | 1 +
 shell/alacritty/LICENSE_INVENTORY.md | 8 ++++----
 shell/alacritty/_init                | 9 +++++----
 shell/zsh/LICENSE_INVENTORY.md       | 2 +-
 shell/zsh/_init                      | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/config b/config
index dad55c8..c6e4496 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit dad55c86aa732aadadac393c3b015f183ba9d07e
+Subproject commit c6e4496dd680cea5c6e6e045aa5e7bdba14486b4
diff --git a/legacy_sync_script.zsh b/legacy_sync_script.zsh
index cc87c7b..ac1cecc 100755
--- a/legacy_sync_script.zsh
+++ b/legacy_sync_script.zsh
@@ -2,3 +2,4 @@
 # This script is used in `shell/zsh/utils.zsh` update_my_repos. Whenver you have something you want to sync
 # across machines, put the scritps here.
 
+brew uninstall -f neofetch && brew install -f fastfetch
diff --git a/shell/alacritty/LICENSE_INVENTORY.md b/shell/alacritty/LICENSE_INVENTORY.md
index 254ad04..a6f9a50 100644
--- a/shell/alacritty/LICENSE_INVENTORY.md
+++ b/shell/alacritty/LICENSE_INVENTORY.md
@@ -1,6 +1,6 @@
 # License inventory
 
-| license    | packages     |
-| ---------- | ------------ |
-| MIT        | yq, neofetch |
-| Apache-2.0 | alacritty    |
+| license    | packages      |
+| ---------- | ------------- |
+| MIT        | yq, fastfetch |
+| Apache-2.0 | alacritty     |
diff --git a/shell/alacritty/_init b/shell/alacritty/_init
index e58ea1d..fd510cc 100755
--- a/shell/alacritty/_init
+++ b/shell/alacritty/_init
@@ -6,7 +6,7 @@
 source ${0:A:h}/../../deploy
 
 install() {
-  brew install yq neofetch vivid
+  brew install jq yq fastfetch vivid
   case $(_os) in
     linux-arch)
       yay --needed --noconfirm -S alacritty
@@ -82,10 +82,11 @@ link() {
   if [[ $(_os) == "macos" ]]; then
     # Increase macos font size
     # I have a 2K monitor which doesn't support scaling :(
-    local res=$(neofetch resolution | awk '/resolution/{print $2}') # get the main monitor resolution
+    # get the main monitor resolution
+    local width=$(fastfetch -s display --format json | jq -r '.[] | .result[] | select(.primary == true) | .scaled.width')
     local add_num=0
-    if echo $res | rg -q '2560'; then
-      add_num=4
+    if [[ $width -ge '2560' ]]; then
+      add_num=2
     fi
     local increased_font_size=$(($(yq eval '.font.size' $config_file) + $add_num))
     yq eval ".font.size = $increased_font_size" $config_file --inplace
diff --git a/shell/zsh/LICENSE_INVENTORY.md b/shell/zsh/LICENSE_INVENTORY.md
index ef0e091..98d438d 100644
--- a/shell/zsh/LICENSE_INVENTORY.md
+++ b/shell/zsh/LICENSE_INVENTORY.md
@@ -2,7 +2,7 @@
 
 | license | packages |
 | --- | --- |
-| MIT | zinit, direnv, eza, procs, neofetch, jq, vivid, oh-my-zsh, hlissner/zsh-autopair, sd, duf |
+| MIT | zinit, direnv, eza, procs, fastfetch, jq, vivid, oh-my-zsh, hlissner/zsh-autopair, sd, duf |
 | Apache-2.0 | fd, bat, dust |
 | BSD | shfmt, zdharma/fast-syntax-highlighting |
 | Curl | curl |
diff --git a/shell/zsh/_init b/shell/zsh/_init
index ff7cf73..3d285d2 100755
--- a/shell/zsh/_init
+++ b/shell/zsh/_init
@@ -21,7 +21,7 @@ install() {
   fi
 
   # Other utilities
-  brew install shfmt shellcheck neofetch
+  brew install shfmt shellcheck fastfetch
 
   # True color and Italic support https://github.com/syl20bnr/spacemacs/wiki/Terminal
   if _is_callable /usr/bin/tic; then