1
0
This commit is contained in:
Jeff Lance 2024-02-27 10:39:00 +01:00
parent b78a5b68c7
commit d38ff53850
2 changed files with 43 additions and 38 deletions

View File

@ -6,17 +6,18 @@ packages=(
curl curl
direnv direnv
ranger ranger
starship
tmux tmux
trash-cli trash-cli
unzip unzip
wget wget
zip zip
zoxide zoxide
zsh
) )
{{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}} {{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}}
{{- /* we're on Arch based system */ -}}
echo -e "\033[0;32m>>>>> Begin Arch/Manjaro Linux packages installation <<<<<\033[0m" echo -e "\033[0;32m>>>>> Begin Arch/Manjaro Linux packages installation <<<<<\033[0m"
## Update system ## Update system
@ -57,7 +58,6 @@ packages=(
{{ else if (eq .chezmoi.osRelease.id "debian" "ubuntu") -}} {{ else if (eq .chezmoi.osRelease.id "debian" "ubuntu") -}}
{{- /* we're on Debian based system */ -}}
echo -e "\033[0;32m>>>>> Begin Debian/Ubuntu Linux packages installation <<<<<\033[0m" echo -e "\033[0;32m>>>>> Begin Debian/Ubuntu Linux packages installation <<<<<\033[0m"
## Update system ## Update system
@ -70,6 +70,9 @@ packages=(
{{- end}} {{- end}}
## Install packages ## Install packages
packages+=(makedeb)
packages=${packages[@]//starship}
for package in ${packages[@]}; do for package in ${packages[@]}; do
echo "installing packages" echo "installing packages"
@ -80,6 +83,8 @@ packages=(
{{- end }} {{- end }}
done done
curl -sS https://starship.rs/install.sh | sh
echo -e "\033[0;32m>>>>> Finish Debian/Ubuntu Linux packages installation <<<<<\033[0m" echo -e "\033[0;32m>>>>> Finish Debian/Ubuntu Linux packages installation <<<<<\033[0m"
{{- end }} {{- end }}

View File

@ -2,52 +2,52 @@
ZIMDIR=${HOME}/.zim ZIMDIR=${HOME}/.zim
{{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}} ## {{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}}
{{- /* we're on Arch based system */ -}} ## {{- /* we're on Arch based system */ -}}
echo -e "\033[0;32m>>>>> Begin zsh installation <<<<<\033[0m" ## echo -e "\033[0;32m>>>>> Begin zsh installation <<<<<\033[0m"
## Update system ## ## Update system
{{- if ne .chezmoi.username "root" }} ## {{- if ne .chezmoi.username "root" }}
sudo pacman -Syu --noconfirm ## sudo pacman -Syu --noconfirm
{{- else }} ## {{- else }}
pacman -Syu --noconfirm ## pacman -Syu --noconfirm
{{- end}} ## {{- end}}
## Install packages ## ## Install packages
if [ "$(yay -Qq $package 2> /dev/null)" != $package ]; then ## if [ "$(yay -Qq $package 2> /dev/null)" != $package ]; then
{{- if ne .chezmoi.username "root" }} ## {{- if ne .chezmoi.username "root" }}
sudo yay -S --noconfirm zsh starship ## sudo yay -S --noconfirm zsh starship
{{- else }} ## {{- else }}
yay -S --noconfirm zsh starship ## yay -S --noconfirm zsh starship
{{- end }} ## {{- end }}
fi ## fi
{{ else if (eq .chezmoi.osRelease.id "debian" "ubuntu") -}} ## {{ else if (eq .chezmoi.osRelease.id "debian" "ubuntu") -}}
{{- /* we're on Debian based system */ -}} ## {{- /* we're on Debian based system */ -}}
echo -e "\033[0;32m>>>>> Begin zsh installation <<<<<\033[0m" ## echo -e "\033[0;32m>>>>> Begin zsh installation <<<<<\033[0m"
## Update system ## ## Update system
{{- if ne .chezmoi.username "root" }} ## {{- if ne .chezmoi.username "root" }}
DEBIAN_FRONTEND=noninteractive sudo -E apt update ## DEBIAN_FRONTEND=noninteractive sudo -E apt update
DEBIAN_FRONTEND=noninteractive sudo -E apt upgrade --yes ## DEBIAN_FRONTEND=noninteractive sudo -E apt upgrade --yes
{{- else }} ## {{- else }}
DEBIAN_FRONTEND=noninteractive apt update ## DEBIAN_FRONTEND=noninteractive apt update
DEBIAN_FRONTEND=noninteractive apt upgrade --yes ## DEBIAN_FRONTEND=noninteractive apt upgrade --yes
{{- end}} ## {{- end}}
## Install packages ## ## Install packages
{{- if ne .chezmoi.username "root" }} ## {{- if ne .chezmoi.username "root" }}
DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing zsh ## DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing zsh
{{- else }} ## {{- else }}
DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends --ignore-missing zsh ## DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends --ignore-missing zsh
{{- end }} ## {{- end }}
curl -sS https://starship.rs/install.sh | sh ## curl -sS https://starship.rs/install.sh | sh
{{- end }} ## {{- end }}
echo -e "\033[0;32m>>>>> Installing Zim Framework <<<<<\033[0m" echo -e "\033[0;32m>>>>> Installing Zim Framework <<<<<\033[0m"