Merge branch 'main' of ssh://github.com/jbohanon/.dotfiles

This commit is contained in:
2023-07-24 07:47:04 -04:00
2 changed files with 30 additions and 21 deletions

28
init.sh
View File

@@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
# Make sure we have our local bin directory
sudo mkdir -p /usr/local/bin
which apt && PKGINST='sudo apt install -y' && PKGUPD='sudo apt update' || which dnf && PKGINST='sudo dnf install -y' && PKGUPD='sudo dnf update -y' which apt && PKGINST='sudo apt install -y' && PKGUPD='sudo apt update' || which dnf && PKGINST='sudo dnf install -y' && PKGUPD='sudo dnf update -y'
echo "PKGUPD: ${PKGUPD}" echo "PKGUPD: ${PKGUPD}"
@@ -9,21 +12,16 @@ echo "PKGINST: ${PKGINST}"
which apt && sudo add-apt-repository ppa:neovim-ppa/stable || which dnf && sudo dnf copr enable agriffis/neovim-nightly which apt && sudo add-apt-repository ppa:neovim-ppa/stable || which dnf && sudo dnf copr enable agriffis/neovim-nightly
[[ $PKGINST != '' ]] && $PKGUPD && $PKGINST zsh neovim ripgrep fd-find fzf [[ $PKGINST != '' ]] && $PKGUPD && $PKGINST zsh neovim ripgrep fd-find fzf
#Install oh-my-zsh # install zellij
sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" curl -L -o "$HOME/Downloads/zellij.tar.gz" "https://github.com/zellij-org/zellij/releases/latest/download/zellij-x86_64-unknown-linux-musl.tar.gz"
tar -zxf "$HOME/Downloads/zellij.tar.gz"
sudo mv zellij /usr/local/bin/zellij
rm "$HOME/Downloads/zellij.tar.gz"
#Install oh-my-zsh plugins
if [[ -d $HOME/.oh-my-zsh ]]; then
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
fi
# install vim-plug # install vim-plug
sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
#Clone dotfiles
[[ ! -d $HOME/.dotfiles ]] && cd $HOME && git clone https://github.com/jbohanon/.dotfiles
# Make directories & symlinks # Make directories & symlinks
mkdir -p $HOME/.config mkdir -p $HOME/.config
ln -s $HOME/.dotfiles/zsh/ $HOME/.config/zsh ln -s $HOME/.dotfiles/zsh/ $HOME/.config/zsh
@@ -31,7 +29,6 @@ ln -s $HOME/.dotfiles/nvim/ $HOME/.config/nvim
ln -s $HOME/.dotfiles/tmux/ $HOME/.config/tmux ln -s $HOME/.dotfiles/tmux/ $HOME/.config/tmux
ln -s $HOME/.config/nvim/init.vim $HOME/.vimrc ln -s $HOME/.config/nvim/init.vim $HOME/.vimrc
mv $HOME/.zshrc $HOME/.zshrc.bak && 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 ## Install powerline-fonts
#which apt && $PKGINST fonts-powerline || which dnf && $PKGINST powerline-fonts #which apt && $PKGINST fonts-powerline || which dnf && $PKGINST powerline-fonts
@@ -57,3 +54,12 @@ rm ./kubectl
# install nvm # install nvm
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
# Install oh-my-zsh
sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
# Install oh-my-zsh plugins
if [[ -d $HOME/.oh-my-zsh ]]; then
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
fi

View File

@@ -15,6 +15,7 @@ REPOS=(
"gloo-mesh-enterprise" "gloo-mesh-enterprise"
"ext-auth-service" "ext-auth-service"
"rate-limiter" "rate-limiter"
"caching-service"
"envoy-gloo" "envoy-gloo"
"envoy-gloo-ee" "envoy-gloo-ee"
) )
@@ -58,6 +59,8 @@ alias cdea='cd $SOLO_DIR/ext-auth-service'
alias nvea='cdea && nvim_readme' alias nvea='cdea && nvim_readme'
alias cdrl='cd $SOLO_DIR/rate-limiter' alias cdrl='cd $SOLO_DIR/rate-limiter'
alias nvrl='cdrl && nvim_readme' alias nvrl='cdrl && nvim_readme'
alias cdcs='cd $SOLO_DIR/caching-service'
alias nvcs='cdcs && nvim_readme'
alias cdeg='cd $SOLO_DIR/envoy-gloo' alias cdeg='cd $SOLO_DIR/envoy-gloo'
alias nveg='cdeg && nvim_readme' alias nveg='cdeg && nvim_readme'
alias cdee='cd $SOLO_DIR/envoy-gloo-ee' alias cdee='cd $SOLO_DIR/envoy-gloo-ee'