linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3901 commits 1 branch 0 tags 138 MiB
Commit graph

587 commits

Author SHA1 Message Date
Andrew Janke
4cd281ba1b agnoster: Define Powerline chars with escape sequence, and use same character on 
all platforms. Add clarifying comments. This makes everything consistent
with the current Powerline-patched fonts definitions.
 2015-06-25 20:13:59 -04:00
Michele Bologna
68b792bbb6 Change to use omz git_prompt* functions 
Removed references for official git __git_ps1() functions.
Change to use omz function git_prompt* functions like:
- git_prompt_info() -> branch name
- git_prompt_status() -> check if untracked, modified, added,
  stashed file are in the current git repo
- git_remote_status() -> check if current repo is ahead, behind,
  or diverged.
These functions returns string automatically added to your PS1;
these are customizable via exporting ZSH_THEME_GIT_PROMPT*
 2015-06-16 10:56:19 +02:00
Robby Russell
5fba46a8c4 Merge pull request #3821 from tresni/fix_minimal 
Fix minimal.zsh-theme's check for in_svn and add support for mercurial
 2015-06-14 22:16:21 -07:00
Robby Russell
3d2bf227ea Merge pull request #4001 from ivanfoo/fixOddCharsOnMac 
Fixed odd chars on mac for agnoster theme
 2015-06-14 22:01:07 -07:00
ivanfoo
c6460ef3e7 Fixed odd chars on mac for agnoster theme 2015-06-15 00:25:22 +02:00
Michele Bologna
81eec406c8 * Added header with help and information 
* Moved git information to left prompt, with
  support for:
    * +ZSH_THEME_GIT_PROMPT_UNTRACKED, MODIFIED,
    STASHED, ADDED, UPSTREAM STATUS
    (if applicable)
* Removed right prompt
* Refactored following Google's guidelines for
  scripts [ http://goo.gl/oJSXH2 ]
    * Using local variables where applicable
 2015-06-11 21:13:48 +02:00
leif.hanack
70c4a27fd6 Added a possibility to display the remote branch and the number of commits you are ahead or behind 2015-06-10 14:36:54 +02:00
Samuel Parkinson
de56943a0e Improved the _git_time_since_commit function. 
Check for at least one commit using a `git log` limit of one.

Improves the performance inside git repos with a large history.
 2015-06-10 14:36:53 +02:00
Andrew Janke
3cc3084f5f Fix typo in $VCS_CLEAN_COLOR in adben theme 2015-06-10 14:36:53 +02:00
Mark Mendoza
a98501d2ce Grep bug in Agnoster 2015-06-10 14:36:52 +02:00
Robby Russell
4224c2a1af Merge pull request #3494 from AlexTalker/short-host 
Fix echo nothing if $SHORT_HOST doesn't exist.
 2015-06-05 08:07:12 -07:00
Robby Russell
51e366e546 Merge pull request #3339 from Xophmeister/master 
Minor cosmetic fix to minimal theme
 2015-06-05 08:06:32 -07:00
Brian Hartvigsen
5c9c373cd7 Fix minimal.zsh-theme's check for in_svn and add support for mercurial 2015-04-28 00:05:11 -07:00
Robby Russell
aa9325a0b3 Merge pull request #3025 from DanielOaks/ys-newness 
Let 'ys' theme use hg repo info too
 2015-02-22 10:30:20 -08:00
Robby Russell
b91ca24df4 Merge pull request #3394 from zghember/master 
Update theme "jispwoso" to support ret status and git
 2015-02-22 10:28:42 -08:00
Robby Russell
d80f620e63 Merge pull request #3561 from jakobj/master 
removed superfluous vcs_info_msg in trapd00r theme
 2015-02-22 10:10:17 -08:00
Robby Russell
377b1f9089 Merge pull request #3580 from LukasDoe/master 
Modify theme to optimize the usability, when you use solarized dark as s...
 2015-02-22 10:08:34 -08:00
Roderick Randolph
46e6e2e23a Fixes incorrect prompt arrow color 
Fixes a bug where color of status arrow in prompt is red even when the exit code was zero (or success). This fix correclty returns green arrow on success and red for non-success exit code.
 2015-02-16 12:22:18 -05:00
Alex Talker
8cf04ed3d7 Fix echo nothing if $SHORT_HOST doesn't exist. 2015-02-15 20:44:35 +03:00
Matthias Doering
7c00bcdb82 Modify theme to optimize the usability, when you use solarized dark as shell color scheme. 2015-02-14 10:34:22 -08:00
Robby Russell
aab7532747 Merge pull request #3566 from mcornella/pfault-master 
Repost #2606: fix git status in rkj-repos theme
 2015-02-10 11:21:45 -08:00
Robby Russell
17216bee9c Merge pull request #3143 from roramirez/theme-linux 
remove path not found for linuxonly theme
 2015-02-10 11:21:12 -08:00
Martin Schrodi
f04246aa48 rkj-repos: code cleanup and updated with functions from lib/git.zsh (thx mcornella) 2015-02-10 19:35:00 +01:00
Martin Schrodi
c3940cf44a Fixed breakage in new git repo without commits 2015-02-10 19:35:00 +01:00
Marc Cornellà
2193135ebc Clean up appearance lib file and redundant colors calls in other files 2015-02-10 19:22:50 +01:00
Jakob Jordan
6bccb1a7b0 removed superfluous vcs_info_msg in trapd00r theme 
in the trapd00r theme vcs info is already displayed on the first line if in a version controlled directory. the second vcs info was displayed at the end of the second line without providing additional information. this was removed.
 2015-02-09 18:18:15 +01:00
isqua
e2bf7cb3df Fix checkmark for clean repo in bureau theme 2015-01-13 19:46:03 +03:00
zghember
8105d4acc9 Merge commit '175b4a807383530aa75145b5b6fdedb3ce1f11f2' 2015-01-03 14:41:34 +08:00
David Feinberg
02d647773a added node- before node version for consistency 2014-12-14 18:28:06 -08:00
David Feinberg
77da20997e mira theme shows active node, ruby and java versions 2014-12-14 18:19:00 -08:00
Robby Russell
07c013c671 Merge pull request #3389 from bubenkoff/add-current-bookmark-rkj-repoz 
add current bookmark to rkj-repos theme
 2014-12-14 16:34:49 -08:00
Robby Russell
eced76e0fd Merge pull request #3326 from DanielFGray/master 
ignore any grep aliases that might be defined
 2014-12-14 16:32:11 -08:00
zghember
6fd0b73e9a Merge commit '141c2e593401f245a9f9bb0799ada8bf14b677d7' 2014-12-15 00:23:34 +08:00
zghember
6f70d288cc Update theme "jispwoso" to support ret status and git 2014-12-11 19:47:29 +08:00
Anatoly Bubenkov
9bab8ccb89 add current bookmark to rkj-repos theme 2014-12-10 13:40:34 +01:00
Robby Russell
60a41a866a Merge pull request #3283 from jaapz/master 
Added VIRTUAL_ENV_DISABLE_PROMPT to steeef.zsh-theme
 2014-11-27 20:01:28 -08:00
Christopher Harrison
663d43241c Minor cosmetic fix to minimal theme 
Set the closing square-brace's FG colour to white, to match the opening brace, when the repo directory is dirty.
 2014-11-24 09:56:47 +00:00
DanielFGray
00ec11d3c0 ignore any grep aliases that might be defined 2014-11-16 02:47:35 -06:00
Jarin Udom
d0f3fb3a4f Merge simplified superjarin theme 2014-11-10 18:42:31 -08:00
Marc Cornellà
95d795e8ca Change all hostname calls for $HOST or $SHORT_HOST 2014-11-06 18:33:56 +01:00
Marc Cornellà
74177c5320 Change all whoami calls for $USER variable 
This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.
 2014-11-06 18:33:56 +01:00
Robby Russell
4eff7926b3 Merge pull request #2648 from dfarrell07/master 
Fixed which output at each new shell creation
 2014-11-06 09:19:20 -08:00
Jaap Broekhuizen
eae70054d1 Added VIRTUAL_ENV_DISABLE_PROMPT to steeef.zsh-theme 
This stops the virtual env name from being printed before it is actually being
used in the zsh prompt.
 2014-11-03 12:29:19 +01:00
Rodrigo Ramírez Norambuena
b0013ceb29 remove path not found for linuxonly theme 2014-09-16 12:21:08 -03:00
Robby Russell
a8ef111a79 Merge pull request #3072 from clippit/patch-1 
Fix missing add-zsh-hook in pygmalion.zsh-theme
 2014-09-03 15:51:50 +02:00
Letian Zhang
9c1255d358 fix missing add-zsh-hook in pygmalion.zsh-theme 
Fix "command not found: add-zsh-hook" since #3053 removes `autoload -U add-zsh-hook`
 2014-09-01 09:49:31 +08:00
Halil Özgür
2b83accbf8 Use the library function for ruby prompt 
Not everyone uses rvm and the library has already got a function for this.
 2014-09-01 04:14:03 +03:00
Robby Russell
56d9acfbaf Merge pull request #3044 from alexshd/patch-1 
Resets the font colour to original
 2014-08-31 12:11:05 -07:00
Alex Shadrin
eee7345f1f Resets the font colour to original 2014-08-20 13:57:28 +03:00
Daniel Oaks
49e10ae449 Make 'ys' theme use hg repo info too 2014-08-14 00:01:35 +10:00
Adam Poskitt
fdb30392b1 Update half-life.zsh-theme 
Add spaces before bullet-points to more easily distinguish them from one another and the rest of the prompt when using smaller font-sizes and do not add a blank line prior to prompt output; if there's a desire for spacing, one can use their terminal's line-height to achieve this.
 2014-08-04 15:10:11 +01:00
Andy Hayden
aa82bd7400 terminal party show exit status with color 2014-07-08 21:51:48 -07:00
Clemens Werther
999bd355f7 fix root mode not working in bureau 2014-06-08 14:04:50 +02:00
Menno Pruijssers
aee8877988 fixed rvm warning 2014-06-08 10:43:26 +02:00
Marc Cornellà
fbf4a78acf Show user prompt in gnzh theme regardless of UID 
Fixes #2008.
 2014-06-06 11:27:53 +02:00
Yuanxuan Wang
6bf7f39345 Steeef theme checks untracked files instead of directories 2014-05-28 11:20:41 +02:00
tcasparro
53323abdb1 Added git mode support for merging, rebasing, and bisecting 
<B> Designates Bisecting
>M< Designates Merging
>R> Designates Rebasing
 2014-03-26 10:37:56 -07:00
Daniel Farrell
b2ce306c4f Simplified gallois RPS1 setup using some helpful scripts 2014-03-25 23:37:28 -04:00
Daniel Farrell
3976b93f39 Fixed which output at each new shell creation 2014-03-23 15:59:35 -04:00
Robby Russell
ae1a9e25a1 Merge pull request #995 from wting/fix_gnzh_ruby_detection 
Fix gnzh theme to detect local rvm installations
 2014-03-22 15:40:00 -07:00
Kory Prince
d3babe0d79 Don't show useless '[]' when chruby_prompt_info is empty 2014-03-17 11:02:47 -05:00
Robby Russell
ee21fe9447 Merge pull request #2380 from rkh/chruby-gallois 
add chruby info to gallois theme
 2014-03-13 16:18:55 -07:00
Robby Russell
8d8df3fd7a Merge pull request #2435 from tompelka/master 
Adding commit hash to branch name in my favorit rjk-repos theme.
 2014-03-13 16:18:30 -07:00
Robby Russell
d943d23aa0 Merge pull request #2466 from jarus/steeef-virtualenv-fix 
Improve virtualenv prompt in steeef theme
 2014-03-13 16:18:06 -07:00
Robby Russell
07c2bdf45d Merge pull request #2588 from kerimdzhanov/remote-themes-copyright-info 
Remove all copyright information in themes. Closes #2587
 2014-03-13 16:15:51 -07:00
Robby Russell
86a272ef81 Merge pull request #2596 from ryanwmarsh/fixing_bureau_scrollback 
Fixes #2467 tab completion scrolls back in terminal when using bureau
 2014-03-11 07:44:30 -07:00
Ryan Marsh
c3c8cc318d Fixes #2467 tab completion scrolls back in terminal when using bureau theme 2014-03-10 18:36:51 -05:00
Dan Kerimdzhanov
c249c69065 Remove all copyright information in themes. Closes #2587 2014-03-08 23:51:59 +06:00
Robby Russell
e744bf22ca Merge pull request #2479 from mrbfrank/theme-agnoster 
theme agnoster: update characters to match latest powerline fonts
 2014-03-08 08:39:54 -08:00
Robby Russell
ae9a9b7f70 Merge pull request #2481 from felds/master 
highlight the username when root
 2014-03-08 08:15:29 -08:00
Robby Russell
2208854597 Cleaning up conflict with merge of #2330 2014-03-08 08:02:23 -08:00
Felds Liscia
4d83da770a highlight the username when root 2014-01-30 15:15:57 -02:00
mrbfrank
685ea4a361 theme agnoster: remove trailing space 
re-implemented expired pull request https://github.com/robbyrussell/oh-my-zsh/pull/1759
 2014-01-29 13:35:21 -06:00
mrbfrank
7daaa188da corrected branch character 
changed ± to 
 2014-01-28 21:54:00 -06:00
mrbfrank
78ffa71cb6 updated url to latest powerline-patched fonts 
clearing up some confusion in issue#1906
 2014-01-28 18:02:40 -06:00
Christoph Heer
3d41804fbc Improve virtualenv prompt in steeef theme 2014-01-24 23:01:35 +01:00
Tomas Pelka
23e57c177c Adding commit hash to branch name in my favorit rjk-repos theme. 2014-01-16 12:15:41 +01:00
Daniele
3e5e2d45e9 Fix bad right prompt placing. 2013-12-31 12:41:28 +01:00
Konstantin Haase
f6bb74e452 add chruby info to gallois theme 2013-12-27 14:25:06 +01:00
Andy Fleming
c05a28a7d9 typo fix 2013-12-10 00:11:22 +00:00
Andy Fleming
cbd63f220d Fix for virtualenv support - fixes #2328, fixes #2297, resolves #2319 2013-12-09 19:38:27 +00:00
Robby Russell
cd219f70a4 Merge pull request #1520 from prooftechnique/master 
add symbol in darcs repos to match git and mercurial (smt theme)
 2013-12-02 23:55:46 -08:00
Robby Russell
f974fa31dc Merge pull request #1574 from adben/master 
updated theme adben
 2013-12-02 23:55:25 -08:00
Robby Russell
a762b3e85b Merge pull request #1683 from mnme/master 
replace hostname -s with hostname in ys theme for compatibility
 2013-12-02 23:54:12 -08:00
Robby Russell
533e31f2cc Merge pull request #1956 from emesix/patch-1 
Update jonathan.zsh-theme
 2013-12-02 23:32:56 -08:00
Robby Russell
3ff772d68b Merge pull request #2022 from Zhann/master 
Updates Zhann theme
 2013-12-02 23:30:25 -08:00
Robby Russell
bbadcf77e3 Merge pull request #2034 from kasperisager/master 
Add Pure theme
 2013-12-02 23:27:45 -08:00
Robby Russell
b38db4a2d2 Merge pull request #2097 from natecox/master 
Added virtualenv plugin data to af-magic theme.
 2013-12-02 23:26:03 -08:00
Robby Russell
4fc0806123 Merge pull request #1030 from solnic/master 
[themes/josh] Use $(current_branch) in prompt
 2013-12-02 23:21:41 -08:00
Robby Russell
7a6caf679a Merge pull request #950 from sonicradish/master 
sonicradish - 256 color oh-my-zsh theme [dark/solarized]
 2013-12-02 23:19:10 -08:00
Robby Russell
1badb744bf Merge pull request #948 from excepttheweasel/master 
Added peepcode theme
 2013-12-02 23:18:31 -08:00
Robby Russell
1c185f0055 Merge pull request #946 from rach/master 
Little tweak on the robbyrussell.zsh-theme
 2013-12-02 23:17:25 -08:00
Robby Russell
4954335b64 Merge pull request #781 from pilif/two-lined-pygmalion 
make pygmalion theme use two lines when needed
 2013-12-02 23:15:19 -08:00
Robby Russell
2a43c5eebd Merge pull request #684 from masnick/master 
Update to fino.zsh-theme
 2013-12-02 23:11:10 -08:00
Robby Russell
07594af171 Merge pull request #639 from MarcoPeraza/git_unpushed 
Show if you're ahead of remote in the wedisagree theme
 2013-12-02 23:08:37 -08:00
Robby Russell
fb614a0e80 Merge pull request #2229 from prubianes/master 
Bazaar Integration Lib
 2013-12-02 22:37:28 -08:00
Robby Russell
9357f2f41d Merge pull request #2236 from Isquariel/nvm 
Added function to show current Node.js version and new Bureau theme
 2013-12-02 22:35:41 -08:00
Dhruva Sagar
3d851daf45 Added Amuse zsh theme 2013-11-29 12:28:52 +05:30
Eddie Monge
3930a63253 no tabs in a space-d file 2013-11-14 16:17:23 -08:00
Robby Russell
7a7eda1287 Merge pull request #2219 from Profpatsch/theme-agnoster 
Forgot one symbol for hg.
 2013-11-13 13:28:44 -08:00