taziden/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[zsh] remove exa, replace with eza

Browse Source
This commit is contained in:
Julien Rabier 2023-10-24 20:28:27 +02:00
parent 0a7c0db277
commit 5301230aab
4 changed files with 40 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
deploy_dotfiles.sh
View File

@ -3,75 +3,70 @@
MISSING="" MISSING=""
if ! [ -x "$(command -v curl)" ]; then if ! [ -x "$(command -v curl)" ]; then
echo "curl manque et doit être installé" echo "curl manque et doit être installé"
MISSING="${MISSING} curl" MISSING="${MISSING} curl"
fi fi
if ! [ -x "$(command -v git)" ]; then if ! [ -x "$(command -v git)" ]; then
echo "git manque et doit être installé" echo "git manque et doit être installé"
MISSING="${MISSING} git" MISSING="${MISSING} git"
fi fi
if ! [ -x "$(command -v zsh)" ]; then if ! [ -x "$(command -v zsh)" ]; then
echo "zsh manque et doit être installé" echo "zsh manque et doit être installé"
MISSING="${MISSING} zsh" MISSING="${MISSING} zsh"
fi
if ! [ -x "$(command -v exa)" ]; then
echo "exa manque et doit être installé"
MISSING="${MISSING} exa"
fi fi
if ! [ -x "$(command -v fdfind)" ]; then if ! [ -x "$(command -v fdfind)" ]; then
echo "fdfind manque et doit être installé" echo "fdfind manque et doit être installé"
MISSING="${MISSING} fd-find" MISSING="${MISSING} fd-find"
fi fi
if ! [ -x "$(command -v rg)" ]; then if ! [ -x "$(command -v rg)" ]; then
echo "ripgrep manque et doit être installé" echo "ripgrep manque et doit être installé"
MISSING="${MISSING} ripgrep" MISSING="${MISSING} ripgrep"
fi fi
if [ -n "$MISSING" ]; then if [ -n "$MISSING" ]; then
echo "Installation de $MISSING" echo "Installation de $MISSING"
sudo apt update sudo apt update
sudo apt -y install $MISSING sudo apt -y install $MISSING
fi fi
if ! [ -x "$HOME/.bin/starship" ]; then if ! [ -x "$HOME/.bin/starship" ]; then
echo "Installation de starship" echo "Installation de starship"
mkdir -p "$HOME/.bin" mkdir -p "$HOME/.bin"
curl -sfL https://starship.rs/install.sh -o /tmp/install.sh curl -sfL https://starship.rs/install.sh -o /tmp/install.sh
chmod +x /tmp/install.sh chmod +x /tmp/install.sh
/tmp/install.sh -y -b "$HOME/.bin" /tmp/install.sh -y -b "$HOME/.bin"
rm /tmp/install.sh rm /tmp/install.sh
fi fi
if [ ! "$SHELL" = "/bin/zsh" ]; then 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 fi
if [ ! -x "$HOME/.bin/chezmoi" ]; then if [ ! -x "$HOME/.bin/chezmoi" ]; then
echo "Installation de chezmoi" echo "Installation de chezmoi"
mkdir -p "$HOME/.bin" mkdir -p "$HOME/.bin"
curl -sfL https://git.io/chezmoi -o /tmp/chezmoi.sh curl -sfL https://git.io/chezmoi -o /tmp/chezmoi.sh
chmod +x /tmp/chezmoi.sh chmod +x /tmp/chezmoi.sh
/tmp/chezmoi.sh -b "$HOME/.bin" -d /tmp/chezmoi.sh -b "$HOME/.bin" -d
rm /tmp/chezmoi.sh rm /tmp/chezmoi.sh
fi fi
if [ ! -d "$HOME/.local/share/chezmoi/.git" ]; then if [ ! -d "$HOME/.local/share/chezmoi/.git" ]; then
mkdir -p "$HOME/.vim/backup" mkdir -p "$HOME/.vim/backup"
echo "Application des dotfiles …" echo "Application des dotfiles …"
cd "$HOME" || exit cd "$HOME" || exit
"$HOME/.bin/chezmoi" init --apply --verbose https://git.sysnove.net/jrabier/dotfiles "$HOME/.bin/chezmoi" init --apply --verbose https://git.sysnove.net/jrabier/dotfiles
echo "Application des dotfiles terminée" echo "Application des dotfiles terminée"
else else
echo "Mise à jour de chezmoi" echo "Mise à jour de chezmoi"
"$HOME/.bin/chezmoi" upgrade "$HOME/.bin/chezmoi" upgrade
echo "Mise à jour des dotfiles" echo "Mise à jour des dotfiles"
"$HOME/.bin/chezmoi" update -v "$HOME/.bin/chezmoi" update -v
echo "Mise à jour des plugins ZSH" echo "Mise à jour des plugins ZSH"
"$HOME/.bin/sheldon" lock --update "$HOME/.bin/sheldon" lock --update
mkdir -p "$HOME/.vim/backup" mkdir -p "$HOME/.vim/backup"
fi fi

3
dot_sheldon/plugins.toml.tmpl
View File

@ -33,9 +33,6 @@ github = 'Aloxaf/fzf-tab'
[plugins.jq-zsh-plugin] [plugins.jq-zsh-plugin]
github = 'reegnz/jq-zsh-plugin' github = 'reegnz/jq-zsh-plugin'
[plugins.zsh-aliases-exa]
github = 'DarrinTisdale/zsh-aliases-exa'
[plugins.zsh-autopair] [plugins.zsh-autopair]
github = 'hlissner/zsh-autopair' github = 'hlissner/zsh-autopair'

4
dot_zsh/aliases.tmpl
View File

@ -14,8 +14,8 @@ alias zz='zcat $1 | most'
{{ if eq .chezmoi.hostname "taupo" -}} {{ if eq .chezmoi.hostname "taupo" -}}
alias cat="batcat" alias cat="batcat"
alias lah='exa -lbhHigmuSa --time-style=long-iso --color-scale' # all list alias lah='eza -lbhHigmuSa --time-style=long-iso --color-scale' # all list
alias lxh='exa -lbhHigmuSa@ --time-style=long-iso --color-scale' # all + extended 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 dig="dog --time A NS MX TXT AAAA SOA $1"
alias ddig='/usr/bin/dig' alias ddig='/usr/bin/dig'
{{ else -}} {{ else -}}

3
private_dot_config/sheldon/plugins.toml.tmpl
View File

@ -33,9 +33,6 @@ github = 'Aloxaf/fzf-tab'
[plugins.jq-zsh-plugin] [plugins.jq-zsh-plugin]
github = 'reegnz/jq-zsh-plugin' github = 'reegnz/jq-zsh-plugin'
[plugins.zsh-aliases-exa]
github = 'DarrinTisdale/zsh-aliases-exa'
[plugins.zsh-autopair] [plugins.zsh-autopair]
github = 'hlissner/zsh-autopair' github = 'hlissner/zsh-autopair'