summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuowen Zhao <ztuowen@gmail.com>2017-01-21 11:03:30 -0700
committerTuowen Zhao <ztuowen@gmail.com>2017-01-21 11:03:30 -0700
commit590713ad2ae21b261b82b948db21f484c569436c (patch)
treec06917ecddc319565d999d8605abfea0d575fa1f
parentda5b9108f49a67e7af7e880e51d1e95e11342ac1 (diff)
parentd2725d44fce59ea7060b4d712c5739512a56882d (diff)
downloadzsh-590713ad2ae21b261b82b948db21f484c569436c.tar.gz
zsh-590713ad2ae21b261b82b948db21f484c569436c.tar.bz2
zsh-590713ad2ae21b261b82b948db21f484c569436c.zip
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
-rw-r--r--plugins/web-search/web-search.plugin.zsh2
-rw-r--r--themes/af-magic.zsh-theme2
2 files changed, 3 insertions, 1 deletions
diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 3b5478ca2..cc970e5fd 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -15,6 +15,7 @@ function web_search() {
github "https://github.com/search?q="
baidu "https://www.baidu.com/s?wd="
ecosia "https://www.ecosia.org/search?q="
+ goodreads "https://www.goodreads.com/search?q="
)
# check whether the search engine is supported
@@ -47,6 +48,7 @@ alias yandex='web_search yandex'
alias github='web_search github'
alias baidu='web_search baidu'
alias ecosia='web_search ecosia'
+alias goodreads='web_search goodreads'
#add your own !bang searches here
alias wiki='web_search duckduckgo \!w'
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 97d142a0f..1c6d1732c 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,7 @@ else
fi
# git settings
-ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"
+ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075]($FG[078]"
ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"