From 5301230aab6920a75f88d9a9a656bb2876169f8c Mon Sep 17 00:00:00 2001
From: Julien Rabier <taziden@flexiden.org>
Date: Tue, 24 Oct 2023 20:28:27 +0200
Subject: [PATCH] [zsh] remove exa, replace with eza

---
 deploy_dotfiles.sh                           | 81 +++++++++-----------
 dot_sheldon/plugins.toml.tmpl                |  3 -
 dot_zsh/aliases.tmpl                         |  4 +-
 private_dot_config/sheldon/plugins.toml.tmpl |  3 -
 4 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/deploy_dotfiles.sh b/deploy_dotfiles.sh
index abab7ef..f51cdcb 100755
--- a/deploy_dotfiles.sh
+++ b/deploy_dotfiles.sh
@@ -3,75 +3,70 @@
 MISSING=""
 
 if ! [ -x "$(command -v curl)" ]; then
-    echo "curl manque et doit être installé"
-    MISSING="${MISSING} curl"
+	echo "curl manque et doit être installé"
+	MISSING="${MISSING} curl"
 fi
 
 if ! [ -x "$(command -v git)" ]; then
-    echo "git manque et doit être installé"
-    MISSING="${MISSING} git"
+	echo "git manque et doit être installé"
+	MISSING="${MISSING} git"
 fi
 
 if ! [ -x "$(command -v zsh)" ]; then
-    echo "zsh manque et doit être installé"
-    MISSING="${MISSING} zsh"
-fi
-
-if ! [ -x "$(command -v exa)" ]; then
-    echo "exa manque et doit être installé"
-    MISSING="${MISSING} exa"
+	echo "zsh manque et doit être installé"
+	MISSING="${MISSING} zsh"
 fi
 
 if ! [ -x "$(command -v fdfind)" ]; then
-    echo "fdfind manque et doit être installé"
-    MISSING="${MISSING} fd-find"
+	echo "fdfind manque et doit être installé"
+	MISSING="${MISSING} fd-find"
 fi
 
 if ! [ -x "$(command -v rg)" ]; then
-    echo "ripgrep manque et doit être installé"
-    MISSING="${MISSING} ripgrep"
+	echo "ripgrep manque et doit être installé"
+	MISSING="${MISSING} ripgrep"
 fi
 
 if [ -n "$MISSING" ]; then
-    echo "Installation de $MISSING"
-    sudo apt update
-    sudo apt -y install $MISSING
+	echo "Installation de $MISSING"
+	sudo apt update
+	sudo apt -y install $MISSING
 fi
 
 if ! [ -x "$HOME/.bin/starship" ]; then
-    echo "Installation de starship"
-    mkdir -p "$HOME/.bin"
-    curl -sfL https://starship.rs/install.sh -o /tmp/install.sh
-    chmod +x /tmp/install.sh
-    /tmp/install.sh -y -b "$HOME/.bin"
-    rm /tmp/install.sh
+	echo "Installation de starship"
+	mkdir -p "$HOME/.bin"
+	curl -sfL https://starship.rs/install.sh -o /tmp/install.sh
+	chmod +x /tmp/install.sh
+	/tmp/install.sh -y -b "$HOME/.bin"
+	rm /tmp/install.sh
 fi
 
 if [ ! "$SHELL" = "/bin/zsh" ]; then
-    sudo usermod "$USER" -s /bin/zsh && echo "Nouveau shell: zsh"
+	sudo usermod "$USER" -s /bin/zsh && echo "Nouveau shell: zsh"
 fi
 
 if [ ! -x "$HOME/.bin/chezmoi" ]; then
-    echo "Installation de chezmoi"
-    mkdir -p "$HOME/.bin"
-    curl -sfL https://git.io/chezmoi -o /tmp/chezmoi.sh
-    chmod +x /tmp/chezmoi.sh
-    /tmp/chezmoi.sh -b "$HOME/.bin" -d
-    rm /tmp/chezmoi.sh
+	echo "Installation de chezmoi"
+	mkdir -p "$HOME/.bin"
+	curl -sfL https://git.io/chezmoi -o /tmp/chezmoi.sh
+	chmod +x /tmp/chezmoi.sh
+	/tmp/chezmoi.sh -b "$HOME/.bin" -d
+	rm /tmp/chezmoi.sh
 fi
 
 if [ ! -d "$HOME/.local/share/chezmoi/.git" ]; then
-    mkdir -p "$HOME/.vim/backup"
-    echo "Application des dotfiles …"
-    cd "$HOME" || exit
-    "$HOME/.bin/chezmoi" init --apply --verbose https://git.sysnove.net/jrabier/dotfiles
-    echo "Application des dotfiles terminée"
+	mkdir -p "$HOME/.vim/backup"
+	echo "Application des dotfiles …"
+	cd "$HOME" || exit
+	"$HOME/.bin/chezmoi" init --apply --verbose https://git.sysnove.net/jrabier/dotfiles
+	echo "Application des dotfiles terminée"
 else
-    echo "Mise à jour de chezmoi"
-    "$HOME/.bin/chezmoi" upgrade
-    echo "Mise à jour des dotfiles"
-    "$HOME/.bin/chezmoi" update -v
-    echo "Mise à jour des plugins ZSH"
-    "$HOME/.bin/sheldon" lock --update
-    mkdir -p "$HOME/.vim/backup"
+	echo "Mise à jour de chezmoi"
+	"$HOME/.bin/chezmoi" upgrade
+	echo "Mise à jour des dotfiles"
+	"$HOME/.bin/chezmoi" update -v
+	echo "Mise à jour des plugins ZSH"
+	"$HOME/.bin/sheldon" lock --update
+	mkdir -p "$HOME/.vim/backup"
 fi
diff --git a/dot_sheldon/plugins.toml.tmpl b/dot_sheldon/plugins.toml.tmpl
index b9f69cf..c69367c 100644
--- a/dot_sheldon/plugins.toml.tmpl
+++ b/dot_sheldon/plugins.toml.tmpl
@@ -33,9 +33,6 @@ github = 'Aloxaf/fzf-tab'
 [plugins.jq-zsh-plugin]
 github = 'reegnz/jq-zsh-plugin'
 
-[plugins.zsh-aliases-exa]
-github = 'DarrinTisdale/zsh-aliases-exa'
-
 [plugins.zsh-autopair]
 github = 'hlissner/zsh-autopair'
 
diff --git a/dot_zsh/aliases.tmpl b/dot_zsh/aliases.tmpl
index 5982321..f9ae2a0 100644
--- a/dot_zsh/aliases.tmpl
+++ b/dot_zsh/aliases.tmpl
@@ -14,8 +14,8 @@ alias zz='zcat $1 | most'
 
 {{ if eq .chezmoi.hostname "taupo" -}}
 alias cat="batcat"
-alias lah='exa -lbhHigmuSa --time-style=long-iso --color-scale'  # all list
-alias lxh='exa -lbhHigmuSa@ --time-style=long-iso --color-scale' # all + extended list
+alias lah='eza -lbhHigmuSa --time-style=long-iso --color-scale'  # all list
+alias lxh='eza -lbhHigmuSa@ --time-style=long-iso --color-scale' # all + extended list
 alias dig="dog --time A NS MX TXT AAAA SOA $1"
 alias ddig='/usr/bin/dig'
 {{ else -}}
diff --git a/private_dot_config/sheldon/plugins.toml.tmpl b/private_dot_config/sheldon/plugins.toml.tmpl
index b9f69cf..c69367c 100644
--- a/private_dot_config/sheldon/plugins.toml.tmpl
+++ b/private_dot_config/sheldon/plugins.toml.tmpl
@@ -33,9 +33,6 @@ github = 'Aloxaf/fzf-tab'
 [plugins.jq-zsh-plugin]
 github = 'reegnz/jq-zsh-plugin'
 
-[plugins.zsh-aliases-exa]
-github = 'DarrinTisdale/zsh-aliases-exa'
-
 [plugins.zsh-autopair]
 github = 'hlissner/zsh-autopair'