Skip to content

Commit

Permalink
*: some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ryuma017 committed Mar 20, 2024
1 parent 83aa2e7 commit a63f7df
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
8 changes: 1 addition & 7 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
tap "homebrew/bundle"
tap "homebrew/cask"
tap "homebrew/cask-fonts"
tap "homebrew/cask-versions"
tap "homebrew/core"

cask_args appdir: "/Applications", fontdir: "${HOME}/Library/Fonts"

Expand Down Expand Up @@ -37,17 +35,13 @@ brew "make"
brew "zsh"

# Other programs
brew "bat"
brew "curl"
brew "exa"
brew "git"
brew "grpcurl"
brew "htop"
brew "hyperfine"
brew "libpq", link: true
brew "mold"
brew "openssl@3"
brew "starship"
brew "openssl"
brew "telnet"
brew "tmux"
brew "zsh"
Expand Down
2 changes: 1 addition & 1 deletion cargo-install.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
bat
delta
exa
fd-find
ghr
git-delta
hyperfine
oha
ripgrep
Expand Down
14 changes: 6 additions & 8 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ fi

for bin in "${DOTFILES_HOME}/bin"/*; do
if [ -x "$bin" ]; then
info "symlinking ${bin} to ${HOME}/.local/bin"
ln -sf "$bin" "${HOME}/.local/bin/$(basename "$bin")"
info "symlinking ${bin} to ${HOME}/.local/bin/$(basename "$bin")"
ensure ln -sf "$bin" "${HOME}/.local/bin/$(basename "$bin")"
fi
done

Expand All @@ -100,17 +100,15 @@ fi

while IFS= read -r name; do
if [ -n "$name" ]; then
info "installing Rust binaries: $name"
ensure cargo binstall "$name"
info "installing Rust binary: $name"
ensure cargo binstall -yq "$name"
fi
done < "${DOTFILES_HOME}/cargo-install.txt"

# Homebrew

local brew_bin
if [ "$(uname -m)" = "arm64" ]; then
brew_bin="/opt/homebrew/bin/brew"
else
brew_bin="/opt/homebrew/bin/brew"
if [ ! "$(uname -m)" = "arm64" ]; then
brew_bin="/usr/local/bin/brew"
fi

Expand Down

0 comments on commit a63f7df

Please sign in to comment.