Skip to content

Commit

Permalink
Updated packages, cleaned up zshrc, updated kind node versions (#42)
Browse files Browse the repository at this point in the history
  • Loading branch information
mpriscella authored Jul 9, 2024
1 parent 400c067 commit e67a257
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
12 changes: 3 additions & 9 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
[ ! -d "$ZINIT_HOME"/.git ] && git clone --depth 1 https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME"
source "${ZINIT_HOME}/zinit.zsh"

zinit load atuinsh/atuin

##################################### brew #####################################

if [ -d "/opt/homebrew/bin" ]; then
Expand Down Expand Up @@ -54,7 +56,7 @@ fi

export PATH=$HOME/.bin:$HOME/.nvim/bin:$PATH

##################################### aws ######################################
##################################### AWS ######################################

if (type "aws" >/dev/null && type aws_completer >/dev/null); then
aws_completer_path=$(which aws_completer)
Expand Down Expand Up @@ -119,7 +121,6 @@ fi
############## FZF (https://github.com/junegunn/fzf) integration ###############

[ -f "$HOME"/.fzf.zsh ] && source "$HOME"/.fzf.zsh
bindkey -s '^P' 'fzf^M'
export FZF_DEFAULT_COMMAND='find . -not -path "**/.git/**"'

################################## Kubernetes ##################################
Expand All @@ -132,13 +133,8 @@ if type "kind" >/dev/null; then
source <(kind completion zsh)
fi

export RPROMPT=""
if type "kubectl" >/dev/null; then
source <(kubectl completion zsh)
zinit load jonmosco/kube-ps1

export KUBE_PS1_DIVIDER="/"
export KUBE_PS1_SYMBOL_ENABLE=false
fi

#################################### GitHub ####################################
Expand Down Expand Up @@ -199,5 +195,3 @@ if [[ "$TERM_PROGRAM" != "tmux" ]]; then
fi

export RPROMPT=$gen_prompt

bindkey '^R' history-incremental-search-backward
10 changes: 7 additions & 3 deletions dotfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,24 @@ clean_up() {
#######################################
install_dependencies() {
if [ "${ADJUSTED_ID}" = "debian" ]; then
check_packages ack curl exuberant-ctags gawk git jq locales python3 ripgrep tar tmux vim virt-what zsh nodejs npm # Maybe not nodejs? Maybe npm installs it for us.
check_packages ack curl exuberant-ctags fzf gawk git jq locales python3 \
ripgrep tar tmux vim virt-what zsh nodejs npm
npm install -g tree-sitter-cli
install_neovim >/dev/null 2>&1
elif [ "${ADJUSTED_ID}" = "darwin" ]; then
brew tap homebrew/cask-fonts
brew install --casks dbeaver-community font-space-mono-nerd-font
check_packages derailed/k9s/k9s dive gh helm jq kind neovim ripgrep shellcheck sslscan step tmux yq yt-dlp
brew install --casks dbeaver-community font-space-mono-nerd-font wezterm
check_packages ack atuin derailed/k9s/k9s dive fzf gh gnupg hadolint helm \
jordanbaird-ice jq kind neovim ripgrep shellcheck sslscan step \
terraform-ls tmux tree-sitter yq yt-dlp
fi

clean_up
}

#######################################
# Installs neovim from source.
# Necessary until this issue gets resolved: https://github.com/neovim/neovim/issues/15143
# Globals:
# HOME
# PWD
Expand Down
6 changes: 3 additions & 3 deletions kind.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ apiVersion: kind.x-k8s.io/v1alpha4
name: kind-cluster
nodes:
- role: control-plane
image: kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144
image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
- role: worker
image: kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144
image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
- role: worker
image: kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144
image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e

0 comments on commit e67a257

Please sign in to comment.