From 5ee1baad2d27ec731f6b4ff6e1314aecdede6be7 Mon Sep 17 00:00:00 2001
From: Jeff LANCE <email@jefflance.me>
Date: Mon, 26 Feb 2024 21:28:37 +0100
Subject: [PATCH] Up.

---
 .../run_onchange_10-install-packages.sh.tmpl  |  2 -
 .../run_onchange_50-configure-zim.sh          |  9 ---
 .../run_onchange_50-install-zsh.sh.tmpl       | 59 +++++++++++++++++++
 3 files changed, 59 insertions(+), 11 deletions(-)
 delete mode 100644 home/.chezmoiscripts/run_onchange_50-configure-zim.sh
 create mode 100644 home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl

diff --git a/home/.chezmoiscripts/run_onchange_10-install-packages.sh.tmpl b/home/.chezmoiscripts/run_onchange_10-install-packages.sh.tmpl
index 0957503..64d1a92 100644
--- a/home/.chezmoiscripts/run_onchange_10-install-packages.sh.tmpl
+++ b/home/.chezmoiscripts/run_onchange_10-install-packages.sh.tmpl
@@ -6,14 +6,12 @@ packages=(
   curl
   direnv
   ranger
-  starship
   tmux
   trash-cli
   unzip
   wget
   zip
   zoxide
-  zsh
 )
 
 {{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}}
diff --git a/home/.chezmoiscripts/run_onchange_50-configure-zim.sh b/home/.chezmoiscripts/run_onchange_50-configure-zim.sh
deleted file mode 100644
index 5d00aeb..0000000
--- a/home/.chezmoiscripts/run_onchange_50-configure-zim.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-ZIMDIR=${HOME}/.zim
-
-echo "Installing Zim Framework"
-$(which zsh) -c "source ${ZIMDIR}/zimfw.zsh init -q"
-
-exit 0
-
diff --git a/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl b/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl
new file mode 100644
index 0000000..7dcb120
--- /dev/null
+++ b/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+ZIMDIR=${HOME}/.zim
+
+{{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}}
+
+  {{- /* we're on Arch based system */ -}}
+  echo -e "\033[0;32m>>>>> Begin zsh installation <<<<<\033[0m"
+
+  ## Update system
+  {{- if ne .chezmoi.username "root" }}
+    sudo pacman -Syu --noconfirm
+  {{- else }}
+    pacman -Syu --noconfirm
+  {{- end}}
+
+  ## Install packages
+  if [ "$(yay -Qq $package 2> /dev/null)" != $package ]; then
+    {{- if ne .chezmoi.username "root" }}
+      sudo yay -S --noconfirm zsh starship
+    {{- else }}
+      yay -S --noconfirm zsh starship
+    {{- end }}
+  fi
+
+
+{{ else if (eq .chezmoi.osRelease.id "debian" "ubuntu") -}}
+
+  {{- /* we're on Debian based system */ -}}
+  echo -e "\033[0;32m>>>>> Begin zsh installation <<<<<\033[0m"
+
+  ## Update system
+  {{- if ne .chezmoi.username "root" }}
+    DEBIAN_FRONTEND=noninteractive sudo -E apt update
+    DEBIAN_FRONTEND=noninteractive sudo -E apt upgrade --yes
+  {{- else }}
+    DEBIAN_FRONTEND=noninteractive apt update
+    DEBIAN_FRONTEND=noninteractive apt upgrade --yes
+  {{- end}}
+
+  ## Install packages
+  {{- if ne .chezmoi.username "root" }}
+    DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing zsh
+  {{- else }}
+    DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing zsh
+  {{- end }}
+
+  curl -sS https://starship.rs/install.sh | sh
+
+{{- end }}
+
+
+echo -e "\033[0;32m>>>>> Installing Zim Framework <<<<<\033[0m"
+$(which zsh) -c "source ${ZIMDIR}/zimfw.zsh init -q"
+
+echo -e "\033[0;32m>>>>> Finish zsh installation <<<<<\033[0m"
+
+exit 0
+