diff --git a/init.sh b/init.sh index ad250de..853cb53 100755 --- a/init.sh +++ b/init.sh @@ -1,32 +1,40 @@ +#!/bin/bash + +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 "PKGINST: ${PKGINST}" #Install zsh #Install neovim #Install ripgrep #Install fd -sudo add-apt-repository ppa:neovim-ppa/stable -sudo apt update && sudo apt install -y zsh neovim ripgrep fd-find fzf +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 #Install oh-my-zsh sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" #Install oh-my-zsh plugins -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 +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 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 -cd ~ && git clone https://github.com/jbohanon/.dotfiles +[[ ! -d $HOME/.dotfiles ]] && cd $HOME && git clone https://github.com/jbohanon/.dotfiles #Make directories & symlinks mkdir $HOME/.config ln -s $HOME/.dotfiles/zsh $HOME/.config/zsh ln -s $HOME/.dotfiles/nvim $HOME/.config/nvim -ln -s $HOME/.config/nvim/.vimrc $HOME/.vimrc +ln -s $HOME/.config/nvim/init.vim $HOME/.vimrc ln -s $HOME/.config/zsh/.zshrc $HOME/.zshrc #Install powerline-fonts -sudo apt install fonts-powerline +which apt && $PKGINST fonts-powerline || which dnf && $PKGINST powerline-fonts #Install starship curl -sS https://starship.rs/install.sh | sh #Install mygvm mkdir $HOME/go mkdir -p $HOME/.go/downloads -ln -s $HOME/.dotfiles/zsh/mygvm /usr/local/bin/mygvm +sudo ln -s $HOME/.dotfiles/zsh/mygvm /usr/local/bin/mygvm #Install Go mygvm go1.18.6 diff --git a/nvim/nvim b/nvim/nvim new file mode 120000 index 0000000..8b5a7d9 --- /dev/null +++ b/nvim/nvim @@ -0,0 +1 @@ +/home/jacob/.dotfiles/nvim \ No newline at end of file diff --git a/zsh/config.d/completion.zsh b/zsh/config.d/completion.zsh new file mode 100644 index 0000000..af23561 --- /dev/null +++ b/zsh/config.d/completion.zsh @@ -0,0 +1,9 @@ + +# The following lines were added by compinstall + +zstyle ':completion:*' completer _complete _ignored +zstyle :compinstall filename '/home/jacob/.dotfiles/zsh/config.d/completion.zsh' + +autoload -Uz compinit +compinit +# End of lines added by compinstall diff --git a/zsh/zsh b/zsh/zsh new file mode 120000 index 0000000..9ac784a --- /dev/null +++ b/zsh/zsh @@ -0,0 +1 @@ +/home/jacob/.dotfiles/zsh \ No newline at end of file