From d31fb9f0fd51e35c737b7efd487fecc9bb73260c Mon Sep 17 00:00:00 2001
From: "John F. Mercer" <jfmercer@protonmail.com>
Date: Tue, 14 Nov 2023 08:46:35 -0300
Subject: [PATCH] Add new installs; isolate alias installs

---
 .../linux/run_onchange_before_10_installs.sh.tmpl |  5 ++++-
 ...run_onchange_before_20_parrot_installs.sh.tmpl |  6 ------
 .../run_onchange_before_30_linux_aliases.sh.tmpl  | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 .chezmoiscripts/linux/run_onchange_before_30_linux_aliases.sh.tmpl

diff --git a/.chezmoiscripts/linux/run_onchange_before_10_installs.sh.tmpl b/.chezmoiscripts/linux/run_onchange_before_10_installs.sh.tmpl
index 4db4ec4..b132b11 100644
--- a/.chezmoiscripts/linux/run_onchange_before_10_installs.sh.tmpl
+++ b/.chezmoiscripts/linux/run_onchange_before_10_installs.sh.tmpl
@@ -15,6 +15,7 @@ sudo apt update
 
 packages=(
     "bat"
+    "colordiff"
     "expect" # needed to set shell on Parrot
     "fzf"
     "gh"
@@ -33,6 +34,7 @@ packages=(
     "universal-ctags"
     "vim"
     "wget"
+    "xclip"
 )
 
 # security only packages
@@ -40,6 +42,8 @@ packages=(
 {{ if or (eq .osid "linux-kali") (eq .osid "linux-parrot") }}
 
 sec_packages=(
+    "burpsuite"
+    "gobuster"
     "seclists"
 )
 packages+=("${sec_packages[@]}")
@@ -90,5 +94,4 @@ for pkg in "${rm_packages[@]}"; do
     fi
 done
 
-
 {{- end -}}
diff --git a/.chezmoiscripts/linux/run_onchange_before_20_parrot_installs.sh.tmpl b/.chezmoiscripts/linux/run_onchange_before_20_parrot_installs.sh.tmpl
index 0fe2312..bd2394c 100644
--- a/.chezmoiscripts/linux/run_onchange_before_20_parrot_installs.sh.tmpl
+++ b/.chezmoiscripts/linux/run_onchange_before_20_parrot_installs.sh.tmpl
@@ -17,12 +17,6 @@ python3 -m pip install --no-input arsenal-cli
 # Load default MATE terminal settings
 dbus-launch dconf load /org/mate/terminal/ < $DOTFILES/terminal/MATE.terminal
 
-# Linux specific aliases
-cat <<EOF > $DOTFILES/system/linux.zsh
-alias pbcopy='xclip -selection clipboard'
-alias pbpaste='xclip -selection clipboard -o'
-EOF
-
 # Replace nvim with real vim
 sudo update-alternatives --remove vim /usr/bin/nvim
 sudo apt install -y vim
diff --git a/.chezmoiscripts/linux/run_onchange_before_30_linux_aliases.sh.tmpl b/.chezmoiscripts/linux/run_onchange_before_30_linux_aliases.sh.tmpl
new file mode 100644
index 0000000..f9016c7
--- /dev/null
+++ b/.chezmoiscripts/linux/run_onchange_before_30_linux_aliases.sh.tmpl
@@ -0,0 +1,15 @@
+{{- if eq .chezmoi.os "linux" -}}
+#!/usr/bin/env bash
+
+set -eufo pipefail
+
+DOTFILES="$HOME/.local/share/chezmoi"
+
+# Append aliases to linux.zsh
+cat <<EOF >> "$DOTFILES/system/linux.zsh"
+alias pbcopy='xclip -selection clipboard'
+alias pbpaste='xclip -selection clipboard -o'
+alias bat='batcat'
+EOF
+
+{{- end -}}
\ No newline at end of file