From 7bf46e87622caaafeb7ca292035161ae58ed2c4c Mon Sep 17 00:00:00 2001 From: Armin Jenewein Date: Fri, 30 Jan 2015 11:03:47 +0100 Subject: [PATCH] new powerline setup --- README.textile | 73 -------------------------------------- lib/powerlinecolours | 71 ++++++++++++++++++++++++++++++++++++ oh-my-zsh.sh | 53 --------------------------- themes/powerline.zsh-theme | 2 +- zshrc | 5 +-- 5 files changed, 75 insertions(+), 129 deletions(-) delete mode 100644 README.textile create mode 100644 lib/powerlinecolours delete mode 100644 oh-my-zsh.sh diff --git a/README.textile b/README.textile deleted file mode 100644 index 30f7bd304..000000000 --- a/README.textile +++ /dev/null @@ -1,73 +0,0 @@ -A handful of functions, auto-complete helpers, and stuff that makes you shout... - -bq. "OH MY ZSHELL!" - -h2. Setup - -@oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9. - -h3. The automatic installer... (do you trust me?) - -@wget http://github.com/sjl/oh-my-zsh/raw/master/tools/install.sh -O - | sh@ - -h3. The manual way - - -1. Clone the repository - - @git clone git://github.com/sjl/oh-my-zsh.git ~/.oh-my-zsh@ - -2. Create a new zsh config by copying the zsh template we've provided. - - *NOTE*: If you already have a ~/.zshrc file, you should back it up. @cp ~/.zshrc ~/.zshrc.orig@ in case you want to go back to your original settings. - - @cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@ - -3. Set zsh as your default shell: - - @chsh -s /bin/zsh@ - -4. Start / restart zsh (open a new terminal is easy enough...) - -h3. Problems? - -You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to _Oh My Zsh_. - -h2. Usage - -* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible) -** example: @plugins=(git osx ruby)@ -* Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@. -** Take a look at the "current themes":http://wiki.github.com/sjl/oh-my-zsh/themes that come bundled with _Oh My Zsh_. -* much much more... take a look at @lib/@ what _Oh My Zsh_ offers... - -h2. Useful - -the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty for tips. - -h3. Customization - -If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory. -If you have many functions which go good together you can put them as a *.plugin.zsh file in the @custom/plugins/@ directory and then enable this plugin. -If you would like to override the functionality of a plugin distributed with oh-my-zsh, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@. - - -h3. Uninstalling - -If you want to uninstall it, just run @uninstall_oh_my_zsh@ from the command line and it'll remove itself and revert you to bash (or your previous zsh config). - -h2. Help out! - -I'm far from being a zsh-expert and suspect there are many ways to improve. If you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests! - -h3. Send us your theme! - -I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory. - -h2. Contributors - -This project wouldn't exist without all of our awesome users and contributors. - -* "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors - -Thank you so much! diff --git a/lib/powerlinecolours b/lib/powerlinecolours new file mode 100644 index 000000000..5d1032c22 --- /dev/null +++ b/lib/powerlinecolours @@ -0,0 +1,71 @@ +# custom colour definitions for powerline theme (oh-my-zsh) +# this file should be symlinked to ~/.powerlinecolours if you +# want to make use of it. + +# get your hostname checksum with: + +# OSX: +# echo -n "$(hostname)" | shasum | cut -d" " -f 1 + +# Linux: +# echo -n "$(hostname)" | sha1sum | cut -d" " -f 1 + +# c7d8a6d722a1ec9a16fae165177c418d4fd63175 + +# use shasum on Mac OS X, sha1sum on Linux: +if [[ "$(uname)" == "Darwin" ]]; then + shasum_cmd="shasum" +else + shasum_cmd="sha1sum" +fi + +# calculate hostname sha1 +hash="$(echo -n "$(hostname)" | $shasum_cmd | cut -d" " -f 1)" + +case "$hash" in + + +# specify colour themes for different hosts here (to see the ccolour codes, use the 256-colour-test.py script): +c4c948228b9947cec128662a414e1f4194573329) +colours=(254 24 208 236) +# \ \ \ \________________> prompt background colour for root +# \ \ \__________________> prompt foreground colour for root +# \ \_____________________> prompt background colour for user +# \_______________________> prompt foreground colour for user +;; + +c7d8a6d722a1ec9a16fae165177c418d4fd63175) +colours=(250 234 196 32) +# \ \ \ \________________> prompt background colour for root +# \ \ \__________________> prompt foreground colour for root +# \ \_____________________> prompt background colour for user +# \_______________________> prompt foreground colour for user +;; + +09407639790bbb3778e1c2a9f81c0680186097d1) +colours=(254 62 196 32) +# \ \ \ \________________> prompt background colour for root +# \ \ \__________________> prompt foreground colour for root +# \ \_____________________> prompt background colour for user +# \_______________________> prompt foreground colour for user +;; + +0ccd98ec02bedc50fef38fc9f285eb14b63c89a4) +colours=(254 130 196 32) +# \ \ \ \________________> prompt background colour for root +# \ \ \__________________> prompt foreground colour for root +# \ \_____________________> prompt background colour for user +# \_______________________> prompt foreground colour for user +;; + + + + +esac + +# set colours from array: +prompt_context_user_fg="${colours[1]}" +prompt_context_user_bg="${colours[2]}" +prompt_context_root_fg="${colours[3]}" +prompt_context_root_bg="${colours[4]}" + diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh deleted file mode 100644 index ef66e23f1..000000000 --- a/oh-my-zsh.sh +++ /dev/null @@ -1,53 +0,0 @@ -# Check for updates on initial load... -if [ "$DISABLE_AUTO_UPDATE" != "true" ] -then - /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh -fi - -# Initializes Oh My Zsh - -# add a function path -fpath=($ZSH/functions $ZSH/completions $fpath) - -# Load all of the config files in ~/oh-my-zsh that end in .zsh -# TIP: Add files you don't want in git to .gitignore -for config_file ($ZSH/lib/*.zsh) source $config_file - -# Add all defined plugins to fpath -plugin=${plugin:=()} -for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath) - -# Load and run compinit -autoload -U compinit -compinit -i - -# Load all of the plugins that were defined in ~/.zshrc -for plugin ($plugins); do - if [ -f $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh ]; then - source $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh - elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then - source $ZSH/plugins/$plugin/$plugin.plugin.zsh - fi -done - -# Load all of your custom configurations from custom/ -if [ -d "$ZSH/custom" ]; then - for config_file ($ZSH/custom/*.zsh) source $config_file -fi - -# Load the theme -if [ "$ZSH_THEME" = "random" ] -then - themes=($ZSH/themes/*zsh-theme) - N=${#themes[@]} - ((N=(RANDOM%N)+1)) - RANDOM_THEME=${themes[$N]} - source "$RANDOM_THEME" - echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..." -else - if [ ! "$ZSH_THEME" = "" ] - then - source "$ZSH/themes/$ZSH_THEME.zsh-theme" - fi -fi - diff --git a/themes/powerline.zsh-theme b/themes/powerline.zsh-theme index 465a0e80b..860eb7a74 100644 --- a/themes/powerline.zsh-theme +++ b/themes/powerline.zsh-theme @@ -18,7 +18,7 @@ SEGMENT_SEPARATOR='' RSEGMENT_SEPARATOR='' # use custom colours: -source "$ZSH"/powerlinecolours +source "$ZSH"/lib/powerlinecolours # Begin left side segment # Takes two arguments, background and foreground. Both can be omitted, diff --git a/zshrc b/zshrc index c3f4f2c28..cc550281e 100644 --- a/zshrc +++ b/zshrc @@ -4,7 +4,8 @@ ZSH=.zsh # export ZSH_THEME="random" -export ZSH_THEME="ezzsh" # name of zsh theme +# export ZSH_THEME="ezzsh" # name of zsh theme +export ZSH_THEME="powerline" # name of zsh theme # Set this to true to use case-sensitive completion CASE_SENSITIVE="false" # bool @@ -19,7 +20,7 @@ DISABLE_LS_COLORS="false" # bool DISABLE_AUTO_TITLE="false" # bool # Uncomment following line if you want disable red dots displayed while waiting for completion -DISABLE_COMPLETION_WAITING_DOTS="false" # bool +DISABLE_COMPLETION_WAITING_DOTS="true" # bool # plugins to load (array) # Example format: plugins=(rails git textmate ruby lighthouse)