1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-11 00:10:08 +00:00
Commit graph

768 commits

Author SHA1 Message Date
Andrew Janke
9f552130bd Move current_branch() from git plugin to core lib/git.zsh
Fixes #4085: core -> plugin dependency issue.
Rename it to git_current_branch for clarity that it's git-specific.
Update all plugins that were calling it to use new name.
Fix variable leaks by making more variables in lib/git.zsh local.
Have lib/git.zsh use [[ ]] instead of [ ] everywhere.
2015-12-14 20:28:37 -05:00
Marc Cornellà
8d6fccef81 Merge pull request #4589 from apjanke/agnoster-powerline-char-stronger-warning
agnoster theme: stronger warning about changing SEGMENT_SEPARATOR character
2015-12-15 02:08:45 +01:00
Danyil Bohdan
b15918d414 "fishy" theme: Fix "~" use in prompt
Actually replace the value of the environment variable $HOME with
"~" instead of appending the tilde in front of the prompt.
2015-12-14 13:38:28 +02:00
Danyil Bohdan
2e3731c5b1 "fishy" theme: Shorten path .foo to .f, not .
When the current path is /home/user/.config/doublecmd the prompt
now reads "/h/u/.c/doublecmd", not "/h/u/./doublecmd" as was the
case. This matches what the Fish shell does.

Enclose the Perl snippet in single quotes instead of double quotes.
2015-12-04 20:19:15 +02:00
Justin LeFebvre
76c423862f I noticed that for certain projects with unstaged changed I would get a 'U' character instead of the '●' character. This should fix that. 2015-11-07 20:05:30 -05:00
Andrew Janke
cc116f65d6 agnoster: stronger warning about changing SEGMENT_SEPARATOR character 2015-11-06 19:44:26 -05:00
aioute Gao
e66afc0318 Avoid using "PREFIX" that cause nvm to complain about. 2015-11-02 16:12:38 +09:00
Alexander Golikov
67abf0f955 Update frontcube.zsh-theme
Fix «rvm» variable usage in RPROMPT out
2015-10-22 16:58:44 +05:00
justvitalius
dc3413b91c Fix print rvm version in amuse theme 2015-09-27 19:01:12 +03:00
Robby Russell
a8617192f7 Merge pull request #4340 from pahnev/master
Fixed broken git branch icon
2015-09-26 09:29:14 -07:00
Alexis Hildebrandt
1a51100d09 Fix issues with character widths in emotty theme 2015-09-20 11:45:30 +02:00
Robby Russell
183026f79c Merge pull request #4316 from bronzdoc/feature/rvm_amuse_theme
Display rvm ruby version
2015-09-19 09:22:49 -07:00
Robby Russell
ff780ba546 Merge pull request #4371 from afh/pull/emotty_theme
Add emotty theme
2015-09-19 09:17:47 -07:00
Robby Russell
51677da85f Merge pull request #4091 from apjanke/agnoster-clarify-powerline
agnoster: Use current Powerline chars everywhere, and clarify behavior
2015-09-19 09:05:57 -07:00
Robby Russell
36884cca36 Merge pull request #4189 from bmdhacks/master
agnoster: speed up git prompt
2015-09-19 09:05:41 -07:00
Robby Russell
3b5300c2b3 Merge pull request #4252 from Fice-T/master
Fix graphical bug in cypher theme when return status is non-zero
2015-09-19 09:02:55 -07:00
Robby Russell
576453cdb5 Merge pull request #4173 from sharkySharks/master
Devanagari Om fixed in dogenpunk theme
2015-09-19 09:00:20 -07:00
Robby Russell
bb5bc64e2a Merge pull request #4155 from honnix/fix_color
[theme] Fix color problem of steeef theme
2015-09-19 08:59:49 -07:00
Robby Russell
adaf89caa8 Merge pull request #4113 from apjanke/gnzh-remove-eval
gnzh theme: fix "eval" and related scope problems.
2015-09-19 08:53:14 -07:00
Robby Russell
1324e6126c Merge pull request #4050 from mbologna/michelebologna_fix_git_prompt
Change to use omz git_prompt* functions
2015-09-19 08:51:37 -07:00
Alexis Hildebrandt
550573bfb8 Add emotty theme 2015-09-19 00:11:41 +02:00
Kirill Pahnev
023397983b Fixed broken git branch icon 2015-09-11 08:58:56 +03:00
Andrew Janke
d009f24ac3 gnzh theme: fix "eval" and related problems.
Switch to normal zsh %F/%f prompt escapes to avoid "eval" and extra variables.
Wrap whole thing in anonymous function so the existing `local`
statements actually work. Then switch '...' to eager "..." so
stuff actually works with local variables. And local-ize the
remaining variables that are used only in prompt construction.
2015-09-04 10:34:41 -04:00
bronzdoc
bec496f053 Display rvm-prompt output. 2015-09-02 16:57:13 -06:00
Fice-T
c66c3aef81 Fix graphical bug in cypher theme when return status is non-zero
- When the previous command's return status is non-zero and the prompt
  is redrawn, graphical errors sometimes arise due to the fg{red} not
  being escaped.
2015-08-16 22:53:07 -06:00
Brian Degenhardt
b875df8970 agnoster: speed up git prompt
Problem

On detached-refs, the git prompt is very slow because it uses a command
to output all refs, which takes 32s on the twitter internal git repo.

Solution

Use git-rev-parse instead of git-show-ref to only output the head ref.
Runtime drops to 0.03 seconds.

Note

Interestingly, git-rev-parse isn't slow without the --head arguement so
I'll probably be cooking up a patch for the git team to speed this up
eventually, but it's still pointless to sigpipe git as it walks the
filesystem.
2015-07-27 14:19:23 -07:00
Sharky
cacc6c34b7 replaced Om spelling so letters would not overlap 2015-07-19 12:33:37 -05:00
Sharky
5a1dd14f13 removed incorrect Devanagari conjunct symbol at end of Om 2015-07-19 11:50:43 -05:00
Alex Talker
a3f0439de3 Fix little typo that makes the statement useless. 2015-07-19 13:56:10 +03:00
Hongxin Liang
46d13384db [theme] Fix color problem of steeef theme
steeef theme sets colors depending on $TERM, however if %F is
used, it must be closed by %f instead of %{$reset_color%}.

Further on, all %f directives have been replaced by %F and color
support of current TERM is checked more properly.
2015-07-13 18:43:00 +02:00
Andrew Janke
c82deedc97 agnoster: Protect Unicode esape sequences with local LC_* settings 2015-07-03 01:46:34 -04:00
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
Robby Russell
8ab841116b Merge pull request #2218 from wari/linuxonly-rename
`linuxonly` doesn't work unless renamed properly
2013-11-12 19:40:09 -08:00
Leonardo Santagada
009b906111 agnoster theme not showing virtualenv status
agnoster theme was checking if the default virtualenv prompt was turned off and not showing its own... so there was no way to see which virtualenv was selected.
2013-11-09 13:02:38 -02:00
isquariel
d34ab7f373 Added the Bureau theme 2013-11-08 23:26:25 +04:00
Pablo Rubianes
248890b6e6 Modification to the frisk theme to work with the BZR lib 2013-11-06 20:16:09 -02:00
Profpatsch
5718d2b688 Forgot one symbol for hg. 2013-11-04 23:35:42 +01:00
Wari Wahab
7eb2f528a6 linuxonly doesn't work unless renamed properly
Unlike all other files listed in the themes directory, this file is the only
one that's "doing it's own thing"
2013-11-04 23:20:12 +08:00
Robby Russell
042ee6e6ed Merge pull request #2138 from Profpatsch/theme-agnoster
More expressive symbols for git and mercurial.
2013-10-24 20:28:22 -07:00
Jacob Magnusson
0f9db24f9f Fix: Agnoster theme added venv name even if disabled
See http://www.virtualenv.org/en/latest/index.html\?highlight\=virtual_env_disable_prompt\#activate-script for info regarding this.
2013-10-20 16:07:19 +02:00
Profpatsch
fa85b4d6ee More expressive symbols for git and mercurial. 2013-10-02 23:24:21 +02:00
Robby Russell
61e3951e4b Revert "Replace no unicode glyph on hexa string"
This reverts commit baffc3b0bd.
2013-09-19 13:18:16 -07:00
Robby Russell
b57118bd37 Merge pull request #2065 from prudprud/master
Replace no unicode glyph on hexa string
2013-09-19 07:00:16 -07:00
Maxime Chaisse-Leal
4dbe4378db Added WIP alert to the gallois' theme 2013-09-18 21:56:10 +02:00
Nathan Cox
dfe36d7b7b Added virtualenv plugin data to af-magic theme. 2013-09-18 08:09:15 -07:00
Robby Russell
1c468c63c0 Merge pull request #839 from eproxus/sunrise-fixes
Correct color and font issues on Ubuntu
2013-09-11 06:18:46 -07:00
Mr Prud
baffc3b0bd Replace no unicode glyph on hexa string 2013-08-29 14:07:09 +02:00
Kasper Kronborg Isager
2c56345917 Add Pure theme 2013-08-10 19:19:30 -04:00
Steven De Coeyer
5bad3f890d Updates Zhann theme 2013-08-05 21:15:28 +02:00
Vincent
2defe0b5c5 Update jonathan.zsh-theme
Made it work with UTF-8 Console.
Thanks goes to http://blog.ganneff.de/blog/2013/03/zsh-config---and-prompt.html
2013-07-08 01:17:33 +02:00
Robby Russell
89b8e05009 Merge pull request #1868 from mlacorte/master
Fix for broken colors in "superjarin" theme
2013-06-25 09:22:52 -07:00
Gong Hao
ebfc9042ed add virtualenv prompt support for agnoster theme 2013-06-25 12:29:48 +08:00
Robby Russell
78dba754d1 Merge pull request #1872 from gdetrez/new-powerline-range
Update the character used from powerline
2013-06-21 07:11:47 -07:00
Robby Russell
46d4606e66 Merge pull request #1756 from rkj/master
Fixed missing retcode if you tried to use themes/rkj
2013-06-17 21:23:18 -07:00
Grégoire Détrez
97849bd9b6 Update the character used in powerline
The code points have been updated in 53fbfe1, see
- 53fbfe15fe
- https://github.com/Lokaltog/powerline/issues/4
2013-06-06 13:06:29 +02:00
Michael LaCorte
0118e18289 Fixed color on git prompt for superjarin theme 2013-06-05 12:37:02 -07:00
Roman Kamyk
cf9b0119fa Fixed missing retcode function 2013-04-24 06:50:48 -07:00
Robby Russell
b6ea876971 Merge pull request #690 from essembeh/master
Adding ~/.ssh/config parsing for host list and theme.
2013-04-23 21:27:51 -07:00
Robby Russell
8890df1251 Merge pull request #922 from sbfaulkner/master
patch rbenv support for themes
2013-04-23 20:57:24 -07:00
Robby Russell
b035662e4c Merge pull request #1053 from cwoodcox/master
Added a neat theme called half-life. It's pretty and quite functional.
2013-04-23 20:56:18 -07:00
Robby Russell
27ff262e09 Merge pull request #1088 from avit/avit-theme
avit theme
2013-04-23 20:49:14 -07:00
Robby Russell
d6a36b1756 Merge pull request #1575 from mguindin/agnoster-change
[agnoster-theme] modifying theme for dirty/staged files
2013-04-23 20:17:40 -07:00
Robby Russell
42127bee6d Merge pull request #1715 from dbohdan/master
Fixed a UTF-8 problem in the theme "fishy"
2013-04-23 19:58:59 -07:00
Roman Kamyk
5dae44ac59 Return code instead of dollar sign 2013-04-16 10:10:21 -07:00
Danyil Bohdan
2d2aa64167 Implemented UTF-8 support in fishy.zsh-theme. 2013-04-12 18:19:09 +03:00
Robby Russell
85426a57a2 Merge pull request #1526 from filipechagas/master
Gitfast plugin - Untracked files char not shown %
2013-04-12 06:17:19 -07:00
Robby Russell
989b6ec29e Merge pull request #1208 from jaischeema/master
Add new theme : jaischeema
2013-04-07 19:32:41 -07:00
Robby Russell
b68db6e15a Merge pull request #1060 from danielbayerlein/new-theme-inspired-by-peepcode
Add Theme "itchy"
2013-04-07 19:31:54 -07:00
Robby Russell
2606772676 Merge pull request #1679 from KokaKiwi/master
A new plugin "colored-man" and a greeny theme "kiwi"
2013-04-07 19:03:39 -07:00
Sergio Rafael Gianazza
c8423eb6d7 Removed colors from parenthesis. 2013-04-04 18:11:37 -03:00
Sergio Rafael Gianazza
0707bfce53 New theme: Gianu Theme
I created a theme that I feel confortable with and want to share with
everyone.

The prompt format is: <user>@<host> <current_dir> (<git_status>)$
2013-04-04 16:18:48 -03:00
Nicolas Jeker
f358f61414 use hostname instead of hostname -s
hostname -s is not available on every implementation of hostname, e.g. Cygwin uses hostname from coreutils which doesn't work.
2013-04-02 12:33:06 +03:00
KokaKiwi
3ad05df020 Add 'kiwi' theme 2013-03-30 16:01:31 +01:00
Robby Russell
5e7e987ff7 Merge pull request #1657 from ysmood/master
Add a new theme 'ys'
2013-03-26 22:12:48 -07:00
Robby Russell
95b46e7eac Merge pull request #1658 from kavu/patch-1
Fix git dirty status in dallas.zsh-theme
2013-03-26 22:12:21 -07:00
Robby Russell
4e101bed86 Merge pull request #1558 from sbooob/master
Mercurial repository info in agnoster theme
2013-03-26 22:05:55 -07:00
Yohann Bianchi
5128669a76 IMPROVED: untracked file status has priority over modified (ie: if you have both modified and untracked files, your prompt will be red indicating the presence of untracked files) 2013-03-26 09:57:11 +01:00
Max Riveiro
7903f51856 Fix git dirty status in dallas.zsh-theme 2013-03-13 12:36:48 +04:00
y.s
55c6fd5c38 opt: Optimize the color scheme. Add some basic comments. 2013-03-13 15:55:35 +08:00
Sébastien M-B
07838055a8 Merge remote-tracking branch 'upstream/master' 2013-03-12 16:52:57 +01:00
y.s
a66bc75ad7 add: A new theme 'ys'. 2013-03-12 21:15:22 +08:00
Michele Bologna
0b6e735885 added comment for auto-generated hostname color 2013-03-05 23:01:00 +01:00
Michele Bologna
c2d42f5a90 added michelebologna theme 2013-03-05 22:50:27 +01:00
Sébastien M-B
2595484a97 Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/aliases.zsh
2013-02-08 19:08:06 +01:00
Matt Guindin
ef8e3a67f2 [agnoster] modifying theme to show dot for dirty files and plus for staged files in git repos 2013-01-30 20:46:08 -05:00
Adolfo Benedetti
76e828691b updated adben theme: added offline content, subversion support, refactored prompt 2013-01-30 18:58:58 +01:00
Yohann Bianchi
28b737416f ADDED: Mercurial prompt info support even if hg prompt extension is unavailable 2013-01-20 13:10:31 +01:00
Yohann Bianchi
8e9cf45200 ADDED: Mercurial repository info 2013-01-19 00:52:09 +01:00
Robby Russell
312da3ea05 Merge pull request #941 from dcreager/configurable-blinks-theme
blinks theme works with light and dark Solarized
2013-01-10 22:37:25 -08:00
Filipe Chagas
021e6de323 added crcandy theme
it's just the candy theme with a new line before.
in order to make easier to see the result of the
commands and to avoid confusing
2012-12-28 18:04:15 -02:00
Jack Henahan
e7f24a8319 add symbol in darcs repos to match git and mercurial 2012-12-24 13:43:45 -05:00
Isaac Wolkerstorfer
e4624c6a36 Revert "agnoster theme shows error code instead of an "x""
This reverts commit f09af57179.

It is far more aesthetically pleasing, and conveys the correct amount of information. The exact numeric status code is extremely rarely of use, and increases cognitive parsing burden on the user.
(cherry picked from commit 8f664edcaf55adcc540f0fe43d4205b66e4f9fb6)
2012-12-21 11:45:57 -05:00
Robby Russell
462136a9d6 Merge pull request #794 from markdrago/cloud_parameter
add ability to set custom prefix for cloud theme
2012-12-04 06:52:32 -08:00
Andrei Gorgan
8925cff334 Fix prompt color: Change it back to green 2012-12-03 12:29:45 +02:00
Andrei Gorgan
e096e4041f Print last exit status in mortalscumbag prompt 2012-12-03 12:03:43 +02:00
Robby Russell
fdf3a3998f Merge pull request #1295 from XL64/master
Fixed johnathan-zsh.theme if rbenv doesn't exists
2012-12-02 13:02:38 -08:00
Robby Russell
1f284071de Merge pull request #1298 from nickhutchinson/fishy
Update fishy theme to collapse working directory in PROMPT
2012-12-02 13:02:22 -08:00
Robby Russell
275e7cba8f Merge pull request #1235 from henryyan/master
Improved maven plugin added a lot of auto complection, add git-extras plugin
2012-12-02 12:48:45 -08:00
Robby Russell
e89f950985 Merge pull request #1256 from seegno/master
Added sf Symfony2 binary alias
2012-12-02 12:43:59 -08:00
Robby Russell
66df0f8089 Merge pull request #1317 from thcipriani/junkfood_theme
Added junkfood theme
2012-12-02 12:36:32 -08:00
Robby Russell
5ed75de5ce Merge pull request #1353 from a-b/master
Prompt symbol update
2012-12-02 12:26:12 -08:00
Robby Russell
1417111bad Merge pull request #1453 from simonoff/master
new theme and rvm theming support
2012-12-02 12:20:31 -08:00
Robby Russell
423d66da5b Merge pull request #409 from Bregor/patch-1
Dollar sign instead of percent in unprivileged user prompt (as in real ge
2012-12-02 12:10:32 -08:00
Robby Russell
4fea3ce219 Merge pull request #1455 from NeuralSandwich/master
Battery plugin: Added support for Apple Macs
2012-12-02 12:07:13 -08:00
Sean Jones
5f62d2c183 Added Candy-Kingdom theme 2012-12-02 19:46:53 +00:00
Robby Russell
77e4c1c9f1 Merge pull request #253 from loopj/master
Added function git_remote_status to lib/git.zsh which extracts if the local branch is ahead/behind/diverged from remote
2012-12-02 11:43:09 -08:00
Robby Russell
e4a596c095 Merge pull request #516 from adben/master
New Theme
2012-12-02 10:51:25 -08:00
Alexander Simonov
27841ca7c1 Set default for rvm prompt prefix/suffix 2012-12-02 20:30:25 +02:00
Alexander Simonov
f9de64460c Simonoff theme 2012-12-02 19:56:17 +02:00
Robby Russell
8796fd01cc Merge pull request #455 from aslamnd/master
New theme
2012-12-02 09:54:54 -08:00
Robby Russell
08cb82b9f4 Merge pull request #448 from n0nick/patch-1
Updated the frisk theme to display Bazaar branch information as well
2012-12-02 09:54:24 -08:00
Robby Russell
3657bf8efa Merge pull request #1421 from cristim/master
Added a small mod of the tjkirch theme
2012-12-01 11:40:44 -08:00
Robby Russell
25a2f029a4 Merge pull request #1399 from tresni/patch-1
Update themes/minimal.zsh-theme
2012-12-01 11:39:54 -08:00
Hauke Stange
3d7622831f fixed symbolic-ref git view of agnoster theme 2012-11-27 21:43:23 +01:00
Hauke Stange
7fc612bcb9 removed 'x' from prompt_context() function name 2012-11-27 21:20:56 +01:00
Cristian Măgherușan-Stanciu
7c768543df Added a small mod of the tjkirch theme
- single-line prompt
- removed the extra line after each command output
2012-11-25 17:15:16 +01:00
Tiago Ribeiro
6c45d217af Added host to prompt 2012-11-20 00:33:52 +00:00
Brian Hartvigsen
99468cb4ec Update themes/minimal.zsh-theme
Cleans up minimal theme by not using a custom prompt function
Removed case of 2 spaces showing if not in a version controlled folder
Adds support for svn_prompt_info
2012-11-07 23:53:44 -07:00
Fuad Saud
f09af57179 agnoster theme shows error code instead of an "x" 2012-11-03 05:05:38 -02:00
Henry Yan
3ad138a08a Merge remote-tracking branch 'upstream/master'
* upstream/master: (35 commits)
  make README reflect latest changes
  URL Tools Plugin
  added a comment to the composer installation alias
  added Composer completition and aliases
  added two aliases to Symfony2 Plugin
  fix test aliases
  Missing comment line
  look for test/unit instead of test/units. #typo
  Correct error message.
  Clean up doc
  Jira ticket shortcut to browse existing issues or create a new issue.
  Add zeus plugin
  Make rvm prompt function a bit cleaner
  Fixing the rvm_prompt_info command, now it will not show empty parens if no rvm is currently being used
  Add link to gist
  Updated documentation for agnoster theme
  Use HISTFILE evironment variable directly rather than copying it
  added autojump plugin support for mac os x + port
  Colemak plugin
  Per directory history plugin
  ...
2012-10-14 22:06:48 +08:00
Alexander Berezovsky
8f7b126d2f updated symbol 2012-10-13 13:34:02 -07:00
Tyler Cipriani
53412de75c Something to be said for symmetry 2012-10-11 14:02:55 -06:00
Tyler Cipriani
5872daea49 spacing makes me something 2012-10-11 13:59:08 -06:00
Tyler Cipriani
2ba668b91c parens tweak 2012-10-11 13:57:21 -06:00
Tyler Cipriani
bb5db62314 removed weird characters 2012-10-11 13:48:38 -06:00
Tyler Cipriani
8d86bb298d moved spacing 2012-10-11 09:26:39 -06:00
Isaac Wolkerstorfer
b207792f30 Add link to gist 2012-09-25 19:06:13 -05:00
Isaac Wolkerstorfer
6e85ff5b44 Updated documentation for agnoster theme 2012-09-25 18:35:08 -05:00
James Smith
00bff0a996 Red prompt for remote hosts 2012-09-20 19:35:09 -07:00
Tyler Cipriani
8ecc252f0c Last spacing adjustment...I swear 2012-09-19 09:34:45 -06:00
Tyler Cipriani
9510eb0e5a Modified spacing one last time 2012-09-18 11:13:36 -06:00
Tyler Cipriani
a8d426087b modified spacing on junkfood theme 2012-09-17 14:12:09 -06:00
Tyler Cipriani
b534b38063 Added fat arrow the theme 2012-09-17 12:16:06 -06:00
Isaac Wolkerstorfer
bf4157514f Refactored theme 2012-09-17 11:44:25 -05:00
Tyler Cipriani
00e11991e0 Added space to prompt 2012-09-17 10:25:19 -06:00
Tyler Cipriani
11a4c67f34 Added junkfood theme 2012-09-17 10:19:37 -06:00
Isaac Wolkerstorfer
b11e289141 Add agnoster.zsh-theme 2012-09-13 14:02:09 +02:00
Xavier Lacoste
ce74be1e1d Merge remote-tracking branch 'upstream/master' 2012-09-13 08:43:20 +02:00
James Smith
6c13721f55 Merge remote-tracking branch 'upstream/master' 2012-09-11 11:42:18 -07:00
Nicholas Hutchinson
2643ac975b Update fishy theme to collapse working directory in PROMPT.
For non-trailing path components, we show only the first character. So, as in Fish proper, we convert ~/some/really/really/really/long/path/name to ~/s/r/r/r/l/p/name.
2012-09-02 10:38:08 +12:00
Robby Russell
921d2f49ef Merge pull request #1228 from clutt0n/master
Small improving themes/jnrowe.zsh-theme
2012-09-01 08:33:09 -07:00
Xavier Lacoste
28d3b80db1 Add empty function rbenv_prompt_info() if doesn't exists 2012-08-30 16:25:36 +02:00
Marcelo Eden
76f2429e8e new 3den theme with RVM and GIT 2012-08-14 12:23:11 -03:00
James Smith
772bc51c3a Merge 2012-07-24 13:39:07 -07:00
clutton
decb9c82b5 delete os specific disable-patterns 2012-07-24 14:16:03 +03:00
clutton
d5bfbf05d1 improvement: define PROMPT_HOST once on startup 2012-07-24 05:36:18 +03:00
Andrew Vit
3fea7c3b27 Added avit theme 2012-07-19 03:03:18 -07:00
Henry Yan
4a11d2c35c merge from upstream master 2012-07-17 00:36:50 +08:00
clutton
6a2e04fefb modify themes/jnrowe.zsh-theme, add host directive "Ξ (mbsd) ~ →" 2012-07-16 02:59:30 +03:00
Robby Russell
11034217a7 Merge pull request #1200 from andyfleming/master
New theme af-magic.zsh-theme
2012-07-11 16:52:33 -07:00
jais
8d60f9a0d8 Fix the rvm gemset right prompt:wq 2012-07-03 15:12:55 +10:00