Add new installs; isolate alias installs

jfmercer · Nov 14, 2023 · d31fb9f · d31fb9f
1 parent f247c0c
commit d31fb9f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git 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,13 +34,16 @@ packages=(
     "universal-ctags"
     "vim"
     "wget"
+    "xclip"
 )
 
 # security only packages
 # this separate list helps with Github CI to pass
 {{ 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
@@ -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
@@ -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 -}}