Skip to content

Commit

Permalink
feat: brews, installer updates, starship formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
jmreicha committed Dec 26, 2024
1 parent 31b9ff6 commit a2e5798
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
5 changes: 5 additions & 0 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ brew "bats-support"
brew "bats-assert"
brew "bats-file"
brew "bats-detik"
brew "cfn-lint"
brew "colordiff"
brew "conftest"
brew "coreutils"
Expand All @@ -43,6 +44,7 @@ brew "goenv"
brew "granted"
brew "gron"
brew "helm"
brew "htop"
brew "iann0036/iamlive/iamlive"
brew "iperf3"
brew "jesseduffield/lazygit/lazygit"
Expand Down Expand Up @@ -76,6 +78,7 @@ brew "sslscan"
brew "starship"
brew "tcpdump"
brew "terraform-docs"
brew "tfk8s"
brew "tfenv"
brew "tflint"
brew "tfsort"
Expand All @@ -102,11 +105,13 @@ cask "drawio"
cask "orbstack"
cask "firefox"
cask "font-meslo-lg-nerd-font"
cask "ghostty"
cask "iterm2"
cask "microsoft-teams"
cask "obsidian"
cask "signal"
cask "slack"
cask "visual-studio-code"
cask "wezterm"
cask "zen-browser"
cask "zoom"
10 changes: 5 additions & 5 deletions config/starship/starship.toml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ format = "[${symbol}nix ${state} ]($style)"
[memory_usage]
disabled = false
threshold = -1
symbol = ""
symbol = " "
style = "#5f8787"
format = "([  ](#767676)[$ram_pct $symbol]($style))"

Expand Down Expand Up @@ -190,30 +190,30 @@ format = "([  ](#767676)[tf $output]($style))"
description = "Show disk used"
command = 'df -h --output=avail "$PWD" | tail -n 1'
style = "#00af5f"
format = "[  ](#767676)[$output ]($style)"
format = "[  ](#767676)[$output  ]($style)"
when = "true"
os = "linux"

[custom.disk-mac]
description = "Show % of disk used"
command = "df -k | grep -E '/dev/disk(1|3)s(3|4)' | awk '{ print $5 }' | head -n 1 | sed 's/%//'"
style = "#00af5f"
format = "[  ](#767676)[$output% ]($style)"
format = "[  ](#767676)[$output%  ]($style)"
when = "true"
os = "macos"

[custom.loadavg-linux]
description = "Show load average"
command = "cat /proc/loadavg | cut -d' ' -f 2"
style = "#5f8787"
format = "([  ](#767676)[$output ]($style))"
format = "([  ](#767676)[$output  ]($style))"
when = "true"
os = "linux"

[custom.loadavg-mac]
description = "Show load average"
command = "sysctl -n vm.loadavg | cut -d' ' -f 2"
style = "#5f8787"
format = "([  ](#767676)[$output ]($style))"
format = "([  ](#767676)[$output  ]($style))"
when = "true"
os = "macos"
11 changes: 11 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,23 @@ _macos() {
fi
echo "Installing tools from Brewfile"
brew bundle install
brew update
brew bundle install

# AWS CLI
if ! command -v aws &>/dev/null; then
echo "Installing AWS CLI"
curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "AWSCLIV2.pkg"
sudo installer -pkg AWSCLIV2.pkg -target /
fi

# Spotify
if ! [[ -d /Applications/Spotify.app ]]; then
echo "Installing and configuring Spotify"
brew install --cask spotify
bash <(curl -sSL https://spotx-official.github.io/run.sh) --blockupdates
fi

# vim key repeating settings https://vimforvscode.com/enable-key-repeat-vim
defaults write -g ApplePressAndHoldEnabled -bool false
}
Expand Down Expand Up @@ -331,6 +340,7 @@ configure() {
echo "Configuring environment"

# Create extra directories if they don't exist
mkdir -p "$HOME/.config/ghostty"
mkdir -p "$HOME/.terragrunt/plugins"
mkdir -p "$HOME/.aws"
mkdir -p "$HOME/.ssh"
Expand Down Expand Up @@ -362,6 +372,7 @@ configure() {
rm -rf "$HOME/.tmux.conf" || true && ln -s "$INSTALLER_PATH/configs/.tmux.conf" "$HOME/.tmux.conf"
rm -rf "$HOME/.gitconfig" || true && ln -s "$INSTALLER_PATH/configs/.gitconfig" "$HOME/.gitconfig"
rm -rf "$HOME/.ssh/config" || true && ln -s "$INSTALLER_PATH/configs/config/ssh" "$HOME/.ssh/config"
rm -rf "$HOME/.config/ghostty/config" || true && ln -s "$INSTALLER_PATH/configs/config/ghostty/config" "$HOME/.config/ghostty/config"
rm -rf "$HOME/.config/starship.toml" || true && ln -s "$INSTALLER_PATH/configs/config/starship/starship.toml" "$HOME/.config/starship.toml"

# i3/wayland configurations
Expand Down

0 comments on commit a2e5798

Please sign in to comment.