Skip to content

Commit

Permalink
changes for zsh
Browse files Browse the repository at this point in the history
  • Loading branch information
ishustava committed Jun 15, 2022
1 parent 2d8b6a8 commit 2a7aa79
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 31 deletions.
35 changes: 12 additions & 23 deletions .bash_profile
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
export GOPATH=$HOME/go
export PATH=$GOPATH/bin:/usr/local/bin:$PATH:/usr/local/kubebuilder/bin

GIT_PS1_SHOWDIRTYSTATE=1
GIT_PS1_SHOWUPSTREAM="verbose"
GIT_PS1_SHOWUNTRACKEDFILES=1
GIT_PS1_DESCRIBE_STYLE='contains'
GIT_PS1_SHOWCOLORHINTS=1
bindkey '^[[A' history-search-backward
bindkey '^[[B' history-search-forward

bind '"\e[A": history-search-backward'
bind '"\e[B": history-search-forward'

source ~/.git-prompt.sh
source /usr/local/etc/bash_completion.d/git-completion.bash
source /usr/local/opt/chruby/share/chruby/chruby.sh

PROMPT_COMMAND='__git_ps1 "\n\e[1;33m\w:\e[0m" "\n\\\$ "'
source /opt/homebrew/share/zsh/site-functions

alias ll='ls -ltrao'
alias k='kubectl'
Expand Down Expand Up @@ -96,16 +86,7 @@ function pw() {
export GPG_TTY=$(tty)

# fasd
fasd_cache="$HOME/.fasd-init-bash"

if [ "$(command -v fasd)" -nt "$fasd_cache" -o ! -s "$fasd_cache" ]; then
fasd --init posix-alias bash-hook bash-ccomp bash-ccomp-install >| "$fasd_cache"
fi


source "$fasd_cache"

source "$HOME/.cargo/env"
eval "$(fasd --init auto)"

# The next line updates PATH for the Google Cloud SDK.
if [ -f '/Users/irynashustava/Downloads/google-cloud-sdk/path.bash.inc' ]; then . '/Users/irynashustava/Downloads/google-cloud-sdk/path.bash.inc'; fi
Expand All @@ -117,3 +98,11 @@ export PATH="/usr/local/opt/[email protected]/bin:$PATH"
alias python=/usr/local/opt/[email protected]/bin/python3
export PATH="/usr/local/sbin:$PATH"

eval "$(/opt/homebrew/bin/brew shellenv)"

if type brew &>/dev/null; then
FPATH=$(brew --prefix)/share/zsh-completions:$FPATH

autoload -Uz compinit
compinit
fi
3 changes: 1 addition & 2 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ tap 'homebrew/core'
cask 'iterm2'
cask 'flycut'
cask 'shiftit'
cask 'minikube'
cask '1password'
cask 'firefox'
cask 'virtualbox'
Expand All @@ -32,7 +31,6 @@ brew 'consul'
brew 'vault'
brew 'terraform'
brew 'kubernetes-cli'
brew 'kubernetes-helm'
brew 'tldr'
brew 'neovim'
brew 'universal-ctags', args: ['HEAD']
Expand Down Expand Up @@ -60,3 +58,4 @@ brew 'tfenv'
brew 'tflint'
brew 'tfsec'
brew 'vault'
brew 'minikube'
13 changes: 7 additions & 6 deletions install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#!/bin/bash -eu

echo "Symlinking files"
ln -sf $PWD/.bash_profile $HOME/.zprofile
ln -sf $PWD/.bash_profile $HOME/.bash_profile
ln -sf $PWD/.gitconfig $HOME/.gitconfig
ln -sf $PWD/.git-prompt.sh $HOME/.git-prompt.sh
echo "Done symlinking files"

echo "Installing Homebrew"
if which brew > /dev/null
then
Expand All @@ -11,11 +18,5 @@ fi
echo "Running 'brew bundle'"
brew bundle

echo "Symlinking files"
ln -sf $PWD/.bash_profile $HOME/.bash_profile
ln -sf $PWD/.gitconfig $HOME/.gitconfig
ln -sf $PWD/.git-prompt.sh $HOME/.git-prompt.sh
echo "Done symlinking files"

echo "Setting up vim"
curl vimfiles.luan.sh/install | bash

0 comments on commit 2a7aa79

Please sign in to comment.