diff options
| author | Jakob Stendahl <jakobste@uio.no> | 2020-08-27 09:16:27 +0200 |
|---|---|---|
| committer | Jakob Stendahl <jakobste@uio.no> | 2020-08-27 09:16:27 +0200 |
| commit | 67c181b213519205fe0e7bac4646349652835dbb (patch) | |
| tree | e6986d8761e0f6fbfce7e92916679c1d284bf61f /install | |
| parent | 80985a3f817074537bb5d997fc4923294a0c3993 (diff) | |
| download | dotfiles-67c181b213519205fe0e7bac4646349652835dbb.tar.gz dotfiles-67c181b213519205fe0e7bac4646349652835dbb.zip | |
Update to p10k, and do some small updates
Diffstat (limited to 'install')
| -rwxr-xr-x[-rw-r--r--] | install/install_debian.sh | 26 | ||||
| -rwxr-xr-x | install/install_mac.sh | 36 |
2 files changed, 25 insertions, 37 deletions
diff --git a/install/install_debian.sh b/install/install_debian.sh index 462beaf..ba4fec2 100644..100755 --- a/install/install_debian.sh +++ b/install/install_debian.sh @@ -22,10 +22,10 @@ function dlgYN() { done } -dlgYN "> Install \"Highlight, atool, w3m, mediainfo\"" res +dlgYN "> Install \"Highlight, atool, w3m, mediainfo, vim, git\"" res if [ $res -eq 1 ]; then tput sc - sudo apt -y install highlight atool w3m mediainfo curl zsh + sudo apt -y install highlight atool w3m mediainfo curl zsh, vim, git tput rc; tput ed fi @@ -33,28 +33,21 @@ dlgYN "> Install Oh-My-Zsh" res if [ $res -eq 1 ]; then tput sc sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" - tput rc; tput ed -fi - -dlgYN "> Install zsh-autosuggestions" res -if [ $res -eq 1 ]; then - tput sc + + # Zsh-autosuggestions git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions + # Zsh-syntax-highlighting + git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting + tput rc; tput ed fi -dlgYN "> Install Powerline" res +dlgYN "> Install Powerline and Powerlevel10k" res if [ $res -eq 1 ]; then tput sc pip3 install pygments pip3 install powerline-status - tput rc; tput ed -fi - -dlgYN "> Install powerlevel9k" res -if [ $res -eq 1 ]; then - tput sc - git clone https://github.com/bhilburn/powerlevel9k.git ~/.oh-my-zsh/custom/themes/powerlevel9k + git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k tput rc; tput ed fi @@ -67,6 +60,7 @@ if [ $res -eq 1 ]; then ln -isf "$CWD/linux/tmux.conf" ~/.tmux.conf ln -isf "$CWD/Common/vimrc" ~/.vimrc ln -isf "$CWD/Common/vim" ~/.vim + ln -isf "$CWD/Common/p10k.zsh" ~/.p10k.zsh tput rc; tput ed fi diff --git a/install/install_mac.sh b/install/install_mac.sh index 79a7261..9ac4bc4 100755 --- a/install/install_mac.sh +++ b/install/install_mac.sh @@ -29,10 +29,10 @@ if [ $res -eq 1 ]; then tput rc; tput ed fi -dlgYN "> Install \"Highlight, atool, w3m, mediainfo\"" res +dlgYN "> Install \"Highlight, atool, w3m, mediainfo, vim\"" res if [ $res -eq 1 ]; then tput sc - brew install highlight atool w3m mediainfo + brew install highlight atool w3m mediainfo vim tput rc; tput ed fi @@ -40,44 +40,38 @@ dlgYN "> Install Oh-My-Zsh" res if [ $res -eq 1 ]; then tput sc sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" - tput rc; tput ed -fi - -dlgYN "> Install zsh-autosuggestions" res -if [ $res -eq 1 ]; then - tput sc + + # Zsh-autosuggestions git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions + # Zsh-syntax-highlighting + git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting + tput rc; tput ed fi -dlgYN "> Install Powerline" res +dlgYN "> Install Powerline && powerlevel10k" res if [ $res -eq 1 ]; then tput sc - pip3 install pygments + pip3 install pygments pip3 install powerline-status - tput rc; tput ed -fi - -dlgYN "> Install Powerlevel10k" res -if [ $res -eq 1 ]; then - tput sc - brew install romkatv/powerlevel10k/powerlevel10k + brew install romkatv/powerlevel10k/powerlevel10k tput rc; tput ed fi dlgYN "> Create symlinks" res if [ $res -eq 1 ]; then CWD=$(PWD) - tput sc - ln -isf "$CWD/bin" ~/bin - ln -isf "$CWD/mac/zshrc" ~/.zshrc + tput sc + ln -isf "$CWD/bin" ~/bin + ln -isf "$CWD/mac/zshrc" ~/.zshrc ln -isf "$CWD/mac/tmux.conf" ~/.tmux.conf ln -isf "$CWD/mac/Hyperterm/hyper.js" ~/.hyper.js ln -isf "$CWD/mac/Hyperterm/local" ~/.hyper_plugins/local ln -isf "$CWD/Common/vimrc" ~/.vimrc ln -isf "$CWD/Common/vim" ~/.vim + ln -isf "$CWD/Common/p10k.zsh" ~/.p10k.zsh rm -r ~/Library/texmf/tex && ln -isf "$CWD/Common/tex" ~/Library/texmf/tex - tput rc; tput ed + tput rc; tput ed fi tput setaf 3 |