From 2e4539b0d4613e8e5081c81b80959e506038d295 Mon Sep 17 00:00:00 2001 From: Clay Anderson Date: Wed, 1 Nov 2017 06:57:15 -0600 Subject: Added link to powerline (#6352) --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index fd4a0abc0..558d24120 100644 --- a/README.md +++ b/README.md @@ -79,10 +79,11 @@ To use a different theme, simply change the value to match the name of your desi ```shell ZSH_THEME="agnoster" # (this is one of the fancy ones) -# you might need to install a special Powerline font on your console's host for this to work # see https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#agnoster ``` +_Note: many themes require installing the [Powerline Fonts](https://github.com/powerline/fonts) in order to render properly._ + Open up a new terminal window and your prompt should look something like this: ![Agnoster theme](https://cloud.githubusercontent.com/assets/2618447/6316862/70f58fb6-ba03-11e4-82c9-c083bf9a6574.png) -- cgit v1.2.3-70-g09d2 From f812cfa16ab605a88793dce5b169886ae2802031 Mon Sep 17 00:00:00 2001 From: Eli Boyarski Date: Wed, 1 Nov 2017 15:10:02 +0200 Subject: README.md: shit load -> shit-load (#6344) * README.md: shit load -> shit-load * README.md: shit-load -> shitload --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 558d24120..4531f7b7b 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/to ### Plugins -Oh My Zsh comes with a shit load of plugins to take advantage of. You can take a look in the [plugins](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins) directory and/or the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins) to see what's currently available. +Oh My Zsh comes with a shitload of plugins to take advantage of. You can take a look in the [plugins](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins) directory and/or the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins) to see what's currently available. #### Enabling Plugins -- cgit v1.2.3-70-g09d2 From 2526d71c56efe821caec6e2f03f0e5d695db3ecb Mon Sep 17 00:00:00 2001 From: Doug Yun Date: Wed, 1 Nov 2017 06:21:07 -0700 Subject: Use HTTPS for Planet Argon links (#6326) --- README.md | 4 ++-- tools/install.sh | 2 +- tools/upgrade.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 4531f7b7b..0771a0361 100644 --- a/README.md +++ b/README.md @@ -226,7 +226,7 @@ We're on the social media. ## Merchandise -We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](http://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town! +We have [stickers](https://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](http://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town! ## License @@ -234,6 +234,6 @@ Oh My Zsh is released under the [MIT license](LICENSE.txt). ## About Planet Argon -![Planet Argon](http://pa-github-assets.s3.amazonaws.com/PARGON_logo_digital_COL-small.jpg) +![Planet Argon](https://pa-github-assets.s3.amazonaws.com/PARGON_logo_digital_COL-small.jpg) Oh My Zsh was started by the team at [Planet Argon](https://www.planetargon.com/?utm_source=github), a [Ruby on Rails development agency](https://www.planetargon.com/skills/ruby-on-rails-development?utm_source=github). diff --git a/tools/install.sh b/tools/install.sh index 3f4de8681..187c828f5 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -107,7 +107,7 @@ main() { echo '' echo 'p.s. Follow us at https://twitter.com/ohmyzsh.' echo '' - echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.' + echo 'p.p.s. Get stickers and t-shirts at https://shop.planetargon.com.' echo '' printf "${NORMAL}" env zsh diff --git a/tools/upgrade.sh b/tools/upgrade.sh index d5e7e8ba8..25b2de27a 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -33,7 +33,7 @@ then printf '%s\n' ' /____/ ' printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version." printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh" - printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at: http://shop.planetargon.com/" + printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at: https://shop.planetargon.com/" else printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?' fi -- cgit v1.2.3-70-g09d2 From 970fcec40e7f4b4fb1b3789d67a396d16226056d Mon Sep 17 00:00:00 2001 From: Muhammad Surga Savero Date: Sat, 4 Nov 2017 17:32:14 +0000 Subject: README.md: ZSH_THEM_RANDOM.. > ZSH_THEME_RANDOM.. (#6390) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 0771a0361..df5ef48be 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ ZSH_THEME="random" # (...please let it be pie... please be some pie..) And if you want to pick random theme from a list of your favorite themes: ```shell -ZSH_THEM_RANDOM_CANDIDATES=( +ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) -- cgit v1.2.3-70-g09d2 From 7a7480b987c00bd916e2abf7179f92164ac44362 Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Wed, 8 Nov 2017 10:46:40 -0800 Subject: Updating template and README to list plugins on individual lines vs one long one. Easier scanning for you and me. --- README.md | 22 +++++++++++++++++----- templates/zshrc.zsh-template | 4 +++- 2 files changed, 20 insertions(+), 6 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index df5ef48be..541f48d40 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ __Oh My Zsh will not make you a 10x developer...but you might feel like one.__ Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_ -Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll use the time that you're saving to start flossing more often. +Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll use the time that you're saving to start flossing more often. 😬 To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. @@ -51,10 +51,22 @@ Oh My Zsh comes with a shitload of plugins to take advantage of. You can take a Once you spot a plugin (or several) that you'd like to use with Oh My Zsh, you'll need to enable them in the `.zshrc` file. You'll find the zshrc file in your `$HOME` directory. Open it with your favorite text editor and you'll see a spot to list all the plugins you want to load. -For example, this line might begin to look like this: +```shell +vi ~/.zshrc +``` + +For example, this might begin to look like this: ```shell -plugins=(git bundler osx rake ruby) +plugins=( + git + bundler + dotenv + osx + rake + rbenv + ruby +) ``` #### Using Plugins @@ -69,7 +81,7 @@ We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme _Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just the right one (for him)._ -Once you find a theme that you want to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like: +Once you find a theme that you'd like to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like: ```shell ZSH_THEME="robbyrussell" @@ -193,7 +205,7 @@ If you'd like to upgrade at any point in time (maybe someone just released a new upgrade_oh_my_zsh ``` -Magic! +Magic! 🎉 ## Uninstalling Oh My Zsh diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 966d7a975..bba2d370d 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -58,7 +58,9 @@ ZSH_THEME="robbyrussell" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git) +plugins=( + git +) source $ZSH/oh-my-zsh.sh -- cgit v1.2.3-70-g09d2