1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-21 03:41:57 +00:00
Commit graph

571 commits

Author SHA1 Message Date
Kenneth Reitz
568f4812f2 update kennethreitz.zsh-theme 2016-02-14 04:19:46 -05:00
Kenneth Reitz
07424c92a8 Update kennethreitz.zsh-theme 2016-02-14 03:44:31 -05:00
Marc Cornellà
3d522ff3a6 Remove non-working symbols and tidy up logic 2016-02-12 23:39:47 +01:00
Nick Russo
20b8b6cc74 Sets spacing to 1 when git is absent for consistency 2016-02-12 01:20:47 -08:00
Marc Cornellà
8a3b78e011 Merge pull request #4536 from alexws54tk/patch-1
Update frontcube.zsh-theme
2015-12-15 03:26:19 +01:00
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
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