From 3e13603557cf2859332ea2f6d27d12acaef6af95 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Thu, 11 Jun 2015 00:58:46 +0200 Subject: [PATCH] It makes no sense, to clone the powerlevel9k-theme in all frameworks. Instead, we can simply use the one, which is mounted in /vagrant_data.. --- test-vm/Vagrantfile | 4 ++-- test-vm/antigen.sh | 4 ++-- test-vm/omz.sh | 6 +++--- test-vm/plain.sh | 6 +----- test-vm/prezto.sh | 5 ++--- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/test-vm/Vagrantfile b/test-vm/Vagrantfile index bc6c8921..ee53fcdf 100644 --- a/test-vm/Vagrantfile +++ b/test-vm/Vagrantfile @@ -16,7 +16,7 @@ Vagrant.configure(2) do |config| # Bootstrap config.vm.provision :shell, path: "bootstrap.sh", privileged: false - config.vm.provision :shell, path: "plain.sh" + config.vm.provision :shell, path: "plain.sh", privileged: false config.vm.provision :shell, path: "antigen.sh" config.vm.provision :shell, path: "prezto.sh" config.vm.provision :shell, path: "omz.sh" @@ -44,7 +44,7 @@ Vagrant.configure(2) do |config| # the path on the host to the actual folder. The second argument is # the path on the guest to mount the folder. And the optional third # argument is a set of non-required options. - # config.vm.synced_folder "../data", "/vagrant_data" + config.vm.synced_folder "..", "/vagrant_data" # Provider-specific configuration so you can fine-tune various # backing providers for Vagrant. These expose provider-specific options. diff --git a/test-vm/antigen.sh b/test-vm/antigen.sh index 1ad71af4..0f44c6ca 100644 --- a/test-vm/antigen.sh +++ b/test-vm/antigen.sh @@ -3,7 +3,7 @@ NEW_USER=vagrant-antigen # Create User PASSWORD='$6$OgLg9v2Z$Db38Jr9inZG7y8BzL8kqFK23fF5jZ7FU1oiIBLFjNYR9XVX03fwQayMgA6Rm1rzLbXaf.gkZaTWhB9pv5XLq11' -sudo useradd -p $PASSWORD -g vagrant -s $(which zsh) -m $NEW_USER +useradd -p $PASSWORD -g vagrant -s $(which zsh) -m $NEW_USER echo "$NEW_USER ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/$NEW_USER chmod 440 /etc/sudoers.d/$NEW_USER @@ -16,7 +16,7 @@ chmod 440 /etc/sudoers.d/$NEW_USER echo " source ~/antigen/antigen.zsh\n -antigen theme bhilburn/powerlevel9k powerlevel9k\n +antigen theme /vagrant_data powerlevel9k --no-local-clone\n antigen apply " > ~/.zshrc diff --git a/test-vm/omz.sh b/test-vm/omz.sh index aeb5f897..eead4905 100644 --- a/test-vm/omz.sh +++ b/test-vm/omz.sh @@ -3,7 +3,7 @@ NEW_USER=vagrant-omz # Create User PASSWORD='$6$OgLg9v2Z$Db38Jr9inZG7y8BzL8kqFK23fF5jZ7FU1oiIBLFjNYR9XVX03fwQayMgA6Rm1rzLbXaf.gkZaTWhB9pv5XLq11' -sudo useradd -p $PASSWORD -g vagrant -s $(which zsh) -m $NEW_USER +useradd -p $PASSWORD -g vagrant -s $(which zsh) -m $NEW_USER echo "$NEW_USER ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/$NEW_USER chmod 440 /etc/sudoers.d/$NEW_USER @@ -16,8 +16,8 @@ chmod 440 /etc/sudoers.d/$NEW_USER curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh - cd ~/.oh-my-zsh/custom - git clone https://github.com/bhilburn/powerlevel9k.git themes/powerlevel9k + mkdir -p ~/.oh-my-zsh/custom/themes + ln -s /vagrant_data ~/.oh-my-zsh/custom/themes/powerlevel9k echo ' export ZSH=$HOME/.oh-my-zsh diff --git a/test-vm/plain.sh b/test-vm/plain.sh index e2fa6a86..9c8445f4 100644 --- a/test-vm/plain.sh +++ b/test-vm/plain.sh @@ -1,7 +1,3 @@ #!/usr/bin/zsh -git clone https://github.com/bhilburn/powerlevel9k.git - -echo " -source powerlevel9k/powerlevel9k.zsh-theme\n -" > ~/.zshrc +echo 'source /vagrant_data/powerlevel9k.zsh-theme' > ~/.zshrc diff --git a/test-vm/prezto.sh b/test-vm/prezto.sh index dda885fd..af4e7454 100644 --- a/test-vm/prezto.sh +++ b/test-vm/prezto.sh @@ -3,7 +3,7 @@ NEW_USER=vagrant-prezto # Create User PASSWORD='$6$OgLg9v2Z$Db38Jr9inZG7y8BzL8kqFK23fF5jZ7FU1oiIBLFjNYR9XVX03fwQayMgA6Rm1rzLbXaf.gkZaTWhB9pv5XLq11' -sudo useradd -p $PASSWORD -g vagrant -s $(which zsh) -m $NEW_USER +useradd -p $PASSWORD -g vagrant -s $(which zsh) -m $NEW_USER echo "$NEW_USER ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/$NEW_USER chmod 440 /etc/sudoers.d/$NEW_USER @@ -21,7 +21,6 @@ chmod 440 /etc/sudoers.d/$NEW_USER ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}" done - git clone https://github.com/bhilburn/powerlevel9k.git ~/powerlevel9k - ln -s ~/powerlevel9k/powerlevel9k.zsh-theme ~/.zprezto/modules/prompt/functions/prompt_powerlevel9k_setup + ln -s /vagrant_data/powerlevel9k.zsh-theme ~/.zprezto/modules/prompt/functions/prompt_powerlevel9k_setup sed -i "s/theme\ 'sorin'/theme\ 'powerlevel9k'/g" ~/.zpreztorc )