Skip to content

Commit

Permalink
Minor tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
jfmercer committed Nov 14, 2023
1 parent f247c0c commit e85cd1a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
16 changes: 16 additions & 0 deletions .chezmoiscripts/linux/run_onchange_before_10_installs.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ sudo apt update

packages=(
"bat"
"colordiff"
"expect" # needed to set shell on Parrot
"fzf"
"gh"
Expand All @@ -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[@]}")
Expand All @@ -62,6 +66,9 @@ sudo chmod 644 /etc/apt/keyrings/gierens.gpg /etc/apt/sources.list.d/gierens.lis
sudo apt update
sudo apt install -y eza

# Skip the git stuff (delta, lazygit) on Parrot
{{ if (ne .osid "linux-parrot") }}

# # noninteractive rust install (needed for delta)
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
source "$HOME/.cargo/env"
Expand All @@ -79,6 +86,8 @@ tar xf lazygit.tar.gz lazygit
sudo install lazygit /usr/local/bin
rm -rf "$HOME"/lazygit*

{{ end }}

# Remove packages
rm_packages=("nano")

Expand All @@ -90,5 +99,12 @@ for pkg in "${rm_packages[@]}"; do
fi
done

# Linux specific aliases
cat <<EOF > $DOTFILES/system/linux.zsh
alias pbcopy='xclip -selection clipboard'
alias pbpaste='xclip -selection clipboard -o'
# Debian links bat as batcat
alias bat='batcat'
EOF

{{- end -}}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e85cd1a

Please sign in to comment.