diff --git a/init.sh b/init.sh index be86398..36f6bbc 100755 --- a/init.sh +++ b/init.sh @@ -25,12 +25,12 @@ sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug. [[ ! -d $HOME/.dotfiles ]] && cd $HOME && git clone https://github.com/jbohanon/.dotfiles #Make directories & symlinks -mkdir -p $HOME/.config -ln -s $HOME/.dotfiles/zsh $HOME/.config/zsh -ln -s $HOME/.dotfiles/nvim $HOME/.config/nvim -ln -s $HOME/.dotfiles/tmux $HOME/.config/tmux +mkdir -p $HOME/.config +ln -s $HOME/.dotfiles/zsh/ $HOME/.config/zsh +ln -s $HOME/.dotfiles/nvim/ $HOME/.config/nvim +ln -s $HOME/.dotfiles/tmux/ $HOME/.config/tmux ln -s $HOME/.config/nvim/init.vim $HOME/.vimrc -ln -s $HOME/.config/zsh/.zshrc $HOME/.zshrc +mv $HOME/.zshrc $HOME/.zshrc.bak && ln -s $HOME/.config/zsh/.zshrc $HOME/.zshrc ln -s $HOME/.config/tmux/tmux.conf $HOME/.tmux.conf ##Install powerline-fonts @@ -45,7 +45,7 @@ mkdir -p $HOME/.go/downloads sudo ln -s $HOME/.dotfiles/zsh/mygvm /usr/local/bin/mygvm #Install Go -mygvm install go1.18.6 +mygvm install go1.20.1 #link gitconfig ln -s $HOME/.dotfiles/.gitconfig $HOME/.gitconfig @@ -53,6 +53,7 @@ ln -s $HOME/.dotfiles/.gitconfig $HOME/.gitconfig #Install kubectl curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl +rm ./kubectl #install nvm curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 15a59d4..1aed686 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -17,9 +17,12 @@ bind l select-pane -R # Set tmux mode to vi (default is emac) set-window-option -g mode-keys vi +set-option -g renumber-windows on + # List of plugins set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run '~/.dotfiles/tmux/plugins/tpm/tpm' + diff --git a/zsh/.zshrc b/zsh/.zshrc index a3aefd8..f6687fb 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -28,9 +28,8 @@ else fi alias pls='sudo' -alias sshdev='ssh jacob@192.168.10.70' alias cddf='cd $HOME/.dotfiles' -alias nvdf='nvim $HOME/.dotfiles/README.md' +alias nvdf='cddf && nvim $HOME/.dotfiles/README.md' alias cdjb='cd $HOME/src/github.com/jbohanon' if [[ $(uname) == Linux ]]; then @@ -56,16 +55,16 @@ eval "$(starship init zsh)" # >>> conda initialize >>> # !! Contents within this block are managed by 'conda init' !! -__conda_setup="$('/usr/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" -if [ $? -eq 0 ]; then - eval "$__conda_setup" -else - if [ -f "/usr/etc/profile.d/conda.sh" ]; then - . "/usr/etc/profile.d/conda.sh" - else - export PATH="/usr/bin:$PATH" - fi -fi -unset __conda_setup +# __conda_setup="$('/usr/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" +# if [ $? -eq 0 ]; then +# eval "$__conda_setup" +# else +# if [ -f "/usr/etc/profile.d/conda.sh" ]; then +# . "/usr/etc/profile.d/conda.sh" +# else +# export PATH="/usr/bin:$PATH" +# fi +# fi +# unset __conda_setup # <<< conda initialize <<< diff --git a/zsh/config.d/solo.zsh b/zsh/config.d/solo.zsh index 02dcaf3..0a1cc02 100644 --- a/zsh/config.d/solo.zsh +++ b/zsh/config.d/solo.zsh @@ -1,23 +1,62 @@ -# Aliases to reach different repos -alias cdsi='cd $HOME/src/github.com/solo-io' -alias cdg='cd $HOME/src/github.com/solo-io/gloo' -alias nvg='nvim $HOME/src/github.com/solo-io/gloo/README.md' -alias cdgf='cd $HOME/src/github.com/solo-io/gloo-fed' -alias nvgf='nvim $HOME/src/github.com/solo-io/gloo-fed/README.md' -alias cdsp='cd $HOME/src/github.com/solo-io/solo-projects' -alias nvsp='nvim $HOME/src/github.com/solo-io/solo-projects/README.md' -alias cdsa='cd $HOME/src/github.com/solo-io/solo-apis' -alias nvsa='nvim $HOME/src/github.com/solo-io/solo-apis/README.md' -alias cddp='cd $HOME/src/github.com/solo-io/dev-portal' -alias nvdp='nvim $HOME/src/github.com/solo-io/dev-portal/README.md' -alias cdgm='cd $HOME/src/github.com/solo-io/gloo-mesh' -alias nvgm='nvim $HOME/src/github.com/solo-io/gloo-mesh/README.md' -alias cdgmui='cd $HOME/src/github.com/solo-io/gloo-mesh-ui' -alias nvgmui='nvim $HOME/src/github.com/solo-io/gloo-mesh-ui/README.md' -alias cdgme='cd $HOME/src/github.com/solo-io/gloo-mesh-enterprise' -alias nvgme='nvim $HOME/src/github.com/solo-io/gloo-mesh-enterprise/README.md' -alias cdea='cd $HOME/src/github.com/solo-io/ext-auth-service' -alias nvea='nvim $HOME/src/github.com/solo-io/ext-auth-service/README.md' -alias cdrl='cd $HOME/src/github.com/solo-io/rate-limiter' -alias nvrl='nvim $HOME/src/github.com/solo-io/rate-limiter/README.md' +SOLO_DIR="$HOME/src/github.com/solo-io" +SOLO_GITHUB="https://github.com/solo-io" + +mkdir -p $SOLO_DIR + +REPOS=( +"gloo" +"gloo-fed" +"solo-projects" +"solo-apis" +"solo-kit" +"dev-portal" +"gloo-mesh" +"gloo-mesh-ui" +"gloo-mesh-enterprise" +"ext-auth-service" +"rate-limiter" +"envoy-gloo" +"envoy-gloo-ee" +) + +for repo in "${REPOS[@]}" +do + repo_addr="${SOLO_GITHUB}/${repo}" + repo_dir="${SOLO_DIR}/${repo}" + if [[ ! -d $repo_dir ]]; then + pushd $SOLO_DIR + git clone $repo_addr + popd + fi +done + + +# Aliases to reach different repos +alias cdsi='cd $SOLO_DIR' +alias cdg='cd $SOLO_DIR/gloo' +alias nvg='cdg && nvim $SOLO_DIR/gloo/README.md' +alias cdgf='cd $SOLO_DIR/gloo-fed' +alias nvgf='cdgf && nvim $SOLO_DIR/gloo-fed/README.md' +alias cdsp='cd $SOLO_DIR/solo-projects' +alias nvsp='cdsp && nvim $SOLO_DIR/solo-projects/README.md' +alias cdsa='cd $SOLO_DIR/solo-apis' +alias nvsa='cdsa && nvim $SOLO_DIR/solo-apis/README.md' +alias cdsk='cd $SOLO_DIR/solo-kit' +alias nvsk='cdsk && nvim $SOLO_DIR/solo-kit/README.md' +alias cddp='cd $SOLO_DIR/dev-portal' +alias nvdp='cddp && nvim $SOLO_DIR/dev-portal/README.md' +alias cdgm='cd $SOLO_DIR/gloo-mesh' +alias nvgm='cdgm && nvim $SOLO_DIR/gloo-mesh/README.md' +alias cdgmui='cd $SOLO_DIR/gloo-mesh-ui' +alias nvgmui='cdgmui && nvim $SOLO_DIR/gloo-mesh-ui/README.md' +alias cdgme='cd $SOLO_DIR/gloo-mesh-enterprise' +alias nvgme='cdgme && nvim $SOLO_DIR/gloo-mesh-enterprise/README.md' +alias cdea='cd $SOLO_DIR/ext-auth-service' +alias nvea='cdea && nvim $SOLO_DIR/ext-auth-service/README.md' +alias cdrl='cd $SOLO_DIR/rate-limiter' +alias nvrl='cdrl && nvim $SOLO_DIR/rate-limiter/README.md' +alias cdeg='cd $SOLO_DIR/envoy-gloo' +alias nveg='cdeg && nvim $SOLO_DIR/envoy-gloo/README.md' +alias cdee='cd $SOLO_DIR/envoy-gloo-ee' +alias nvee='cdee && nvim $SOLO_DIR/envoy-gloo-ee/README.md'