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
5971 commits 1 branch 0 tags 138 MiB
Commit graph

713 commits

Author SHA1 Message Date
Andrew Janke
299cd4777a Themes: switch to using ruby_prompt_info() 
Changes themes displaying RVM or other Ruby version info to use the central
ruby_prompt_info function. This supports more Ruby versioning mechanisms,
reduces copy-and-paste code, and avoids "zsh: no such file or directory: rvm-prompt"
when run on machines that do not have RVM installed.

Changes the prefix/suffix variable names to ZSH_THEME_RUBY_PROMPT_PREFIX and
ZSH_THEME_RUBY_PROMPT_SUFFIX, since they apply to all Ruby versioning mechanisms,
not just RVM.

Allows empty ZSH_THEME_RUBY_PROMPT_PREFIX and ZSH_THEME_RUBY_PROMPT_SUFFIX.
 2019-05-08 08:45:34 +02:00
David Dejori
8db0f352e8 agnoster: remove empty line (#7775) 2019-04-18 18:27:20 +02:00
KillWolfVlad
ebee94b8cf bira: remove extra spaces (#7767) 2019-04-16 21:54:09 +02:00
Marc Cornellà
b57c0ac6e2
Delete deprecated pure theme 2019-04-10 21:26:56 +02:00
Marc Cornellà
0c3499ecd9
Fix showing aws prompt out of the box for 'fishy' theme (#7747) 
This fixes the RPROMPT setting for fishy theme so as to preserve its old value,
instead of overwriting it like it did before.

Also, fix unnecessary export of RPROMPT in aws plugin.
 2019-04-09 22:20:00 +02:00
djr-jsr
8a94013f37 bira: add virtualenv support in prompt 
Fixes #7483
Closes #4973
 2019-04-09 15:48:00 +02:00
programmer04
53d6a692d1 Fix showing aws prompt for theme fishy (append RPROMPT instead of overwrite) 2019-04-08 22:08:37 +02:00
Kevin Kuhl
a85ce89a3d refined: reset command exec time (#6117) 
Fixes #6116
 2019-04-07 20:31:28 +02:00
Marc Cornellà
e59cc94805 themes: fix prompt verbosity on window resize 
%_ is a prompt expansion sequence that expands to the status of the parser.
This means that on window resize, the status of the execution of the
window resize hook (TRAPWINCH) would be displayed while reloading the
prompt line. This looked like cmdand cursh$ or then$ depending on the
body of the TRAPWINCH function.

Fixes #7262
 2019-03-25 17:05:50 +01:00
shellbye
5ff21efad7 Add pygmalion-virtualenv theme (#5139) 2019-03-24 17:25:26 +01:00
Rob Lugton
83d1139432 agnoster: show AWS_PROFILE in prompt (#6621) 2019-03-23 19:20:28 +01:00
Brian Hong
851899e59e theme/gallifrey: set color to red if root (#6203) 2019-01-31 14:57:37 +01:00
Aurélien Bourdon
e0ee79f2bc Remove duplicate space on the maran theme (#7454) 2018-12-31 11:12:55 -08:00
Ezequiel Pochiero
f96d18ca93 avit: fix handling of time since last commit (#7350) 2018-10-27 17:09:55 +02:00
Marc Cornellà
2fce9a4d44
agnoster: use %n instead of $USER to fix quoting 
Fixes #7268

With `$USER`, we'd need to quote it in case special characters like `\` are present in
the $USER value, like if the user is part of an AD domain.

With `%n` the quoting is done automatically by zsh.
See http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Login-information
 2018-10-17 20:53:07 +02:00
Marc Cornellà
3a6fa9149b Fix tilde substitution in theme prompts 
These themes used an adhoc substitution of $HOME for tilde
in $PWD, but it's better to use '%~' and is less error prone.

See #7160
 2018-10-07 23:01:25 +02:00
Marc Cornellà
e107b85e3a
agnoster: fix prompt_status error (#6450) 
This commit fixes the runtime error that says:

  prompt_status:2: symbols: attempt to assign array value to non-array

It trips over a local array which is not properly declared.
 2018-09-26 17:23:31 +02:00
Marc Cornellà
a3d13eb76a
fix invalid syntax in old zsh versions 2018-09-26 17:19:59 +02:00
Carlo Dapor
afa8dc46ec Fix agnoster initial diagnostic error 
This PR fixes the runtime error that displays this:

```log
prompt_status:2: symbols: attempt to assign array value to non-array
```.

It trips over a local array which is not properly declared.
 2018-09-25 21:46:27 +02:00
Marten Seemann
150a3c9c83 agnoster: respect git config oh-my-zsh.hide-status (#6362) 2018-09-24 14:11:57 +02:00
Marc Cornellà
4d940109e3 misc: remove execution permission from various files 2018-09-15 23:57:12 +02:00
Nick Diego Yamane
143cc8f901 Fix rvm-prompt usage in fino* themes (#6477) 
* theme/fino: Check rvm-prompt is installed before to try to use it

Signed-off-by: Nick Diego Yamane <nick.diego@gmail.com>

* theme/fino-time: Check rvm-prompt is installed before to try to use it

Signed-off-by: Nick Diego Yamane <nick.diego@gmail.com>
 2018-08-29 12:01:10 -07:00
Marc Cornellà
b70a703a09 trapd00r: clean up the script 2018-08-20 18:15:49 +02:00
Marc Cornellà
e972624997 trapd00r: simplify logic and optimize for loop 
This version splits the `$PWD` by the slashes and prints the path
directory by directory, printing the separators as before.
 2018-08-20 18:03:41 +02:00
Marc Cornellà
b4c8b60bb4 trapd00r: change more slowly between yellows 
Also refactor the logic
 2018-08-20 17:55:22 +02:00
Marc Cornellà
3d1719c618 trapd00r: optimize reset of foreground colors 2018-08-20 17:50:11 +02:00
Marc Cornellà
4774bc62d5 trapd00r: look for 256-color support, not $DISPLAY 
Checking if the terminal supports 256 colors is better suited for
our purpose. Checking if `$DISPLAY` is set doesn't tell us if our
colors will be displayed correctly.
 2018-08-20 17:45:36 +02:00
Marc Cornellà
1d26e2ab6f trapd00r: convert perl script to zsh 
Used color encodings from
https://metacpan.org/source/WOLDRICH/Term-ExtendedColor-0.224/lib/Term/ExtendedColor.pm
 2018-08-20 17:37:26 +02:00
Michele Iacobone
abca62add1 Fix for external dependency in trapd00r theme (#5579) 2018-08-19 22:43:47 +02:00
Frederic Crozat
e4d2d27af4 Agnoster: solarized light variant (#4680) 
* agnoster: do not hardcode black foreground.

This would allow easy customization when using light color schemes, like
solarized-light

* agnoster: implement light theme variant

Use same variable as in blinks theme, to detect if solarized theme used
is a light or dark one.
 2018-08-19 22:28:37 +02:00
Janosch Schwalm
19b925e741 use https everywhere (#6574) 
* use https everywhere

* use https links on the files that are left

Also, removed some broken links and updated redirections.
 2018-08-07 20:42:01 +02:00
Marc Cornellà
a1448e9f8a example: move example theme to custom folder 2018-07-19 23:02:25 +02:00
Unknown-Guy
f09fed6195 change mortalscumbag to use core git_current_branch (#6965) 2018-07-03 17:37:18 +02:00
nyim
3a7a590862 mortalscumbag add icon showing local branch behind (#4364) 2018-07-01 20:41:52 +02:00
Jonathen Russell
71e4a166cf simple theme: indication of privileges (#3728) 
I found this quite annoying not being in this theme after switching from gentoo-theme, it's helpful and it doesn't detract from simplicity.
 2018-07-01 19:15:54 +02:00
Marc Cornellà
8f3737f45b Revert fbcda4d 
The PROMPT building method clashes with other themes and
plugins that modify the PROMPT variable.

Also reverted the $jobstates trick due to it not working
inside $PROMPT.
 2018-05-23 11:33:34 +02:00
Andrew Baumann
fbcda4d5a9 agnoster: cut down on fork/execs improve performance when not in a repo (#6210) 
* agnoster: improve perf with use of $jobstates (zsh/parameter module)

This saves multiple fork/execs (for the subshell and wc) each
time the prompt is rendered

* agnoster: compute git repo_path only when in a git repo

this avoids needlessly invoking git twice every time we render the prompt

* agnoster: avoid subshell when rendering prompt

Rather than forking a subshell to print the prompt, construct it
incrementally by appending to $PROMPT.

v2: fix incorrect CURRENT_BG
v3: fix bzr and hg prompting

Thanks @mcornella for the help.
 2018-05-17 14:46:27 +02:00
Joshua Kovach
362b061f5c Fix branch not updating on checkout in steeef (#6784) 
* Fix branch not updating on checkout in steeef

* Check for `hub` in steeef when switching branches
 2018-05-07 18:19:45 +02:00
Marc Cornellà
45a9f28464
[half-life] Fix last command check 
Fixes #6758
 2018-04-23 20:47:19 +02:00
Sean Abraham
604f580f05 Make steeef theme much faster by not iterating through all history (#6359) 
* Make steef much faster by not printing all history each time

* Use whence -c to expand shell functions as well

* Use $2 (expanded command about to be ran)
 2018-04-22 22:37:06 +02:00
Marc Cornellà
d7948b39dc
[rkj-repos] Make hg prompt check less strict (#6746) 
* [rkj-repos] Make `hg prompt` check less strict

Move the `hg prompt` check inside the hg_prompt_info function so that
it returns an empty string if hg-prompt isn't installed.

Fixes #6743.

* [rkj-repos] Check for hg in `hg prompt` function
 2018-04-19 23:32:53 +02:00
安正超
86a0b86562 [cloud theme] add a space (#3215) 2018-04-17 21:34:03 +02:00
cori schlegel
fa93ea0d75 [rkj-repos] Check for 'hg prompt' and exit if not found (#6655) 
* Check for  extension, and exit if not found. Addresses #6036

* Fix styles in rkj-repos.theme
 2018-04-15 15:48:31 +02:00
Alexis Hildebrandt
8e1cfc9154 Fix emotty theme when using zsh 5.2 (#5998) 
see http://www.zsh.org/mla/workers/2015/msg03259.html
 2018-04-15 15:16:28 +02:00
Cory Snider
f9d4a067ec Reduce number of git calls when displaying prompt (#3795) 
The avit theme's _git_time_since_commit function was running git twice.
Reduce it with a single call to `git log`, checking the exit code for
success.
 2018-04-15 14:45:58 +02:00
Paul Morganthall
47406d7afe Replace preview link. (#6369) 
The old preview on Skitch is no longer available (closed account?). The new preview is on a free Flickr which might last longer. ?
 2017-11-01 05:56:14 -07:00
Vihang Mehta
291e96dcd0 Fix RKJ theme coloring and make it slightly more readable (#5582) 2017-05-03 12:06:07 +02:00
Marc Cornellà
5667161d49 Fix host display in nebirhos theme 
Fixes #6028
 2017-04-21 20:18:16 +02:00
Marc Cornellà
66bae5a5de Merge branch 'rename-pure-theme' 2017-03-30 21:46:57 +02:00
Marc Cornellà
aaf7fa007f Add deprecation notice to pure theme 2017-03-30 21:45:26 +02:00
Elias Fröhner
b4b55fa502 Remove wrong whitespace in bira theme (#5985) 
The whitespace in line 13 creates a double whitespace when combined with line 24. Therefore 2 whitespaces appear between ${user_host} and ${current_dir}.
 2017-03-30 20:46:25 +02:00
Marc Cornellà
8653f5da6d Rename pure theme to 'refined' 2017-03-16 18:11:18 +01:00
haandol
0b4bba4ca2 Change af-magic theme's branch color (#5730) 2017-01-09 08:06:17 +01:00
Patrick José Pereira
0f498e8d45 'themes/trapd00r.zsh-theme: Solve typos' 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2016-12-30 10:34:16 -02:00
Patrick José Pereira
0c7bb4de0d 'themes/steeef.zsh-theme: Solve typos' 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2016-12-30 10:34:16 -02:00
Patrick José Pereira
747b6ec5f7 'themes/pure.zsh-theme: Solve typos' 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2016-12-30 10:34:16 -02:00
Patrick José Pereira
a414bb3eb4 'themes/half-life.zsh-theme: Solve typos' 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2016-12-30 10:34:16 -02:00
Jocelyn Thode
cff228e342 Update bira theme (#4954) 
* Add '#' instead of '$' when in root
* Make return code bold
 2016-10-15 14:02:01 +02:00
Marc Cornellà
015598b8a8 Display suvash prompt w/o Ruby; refactor code 2016-10-14 00:24:30 +02:00
FireWave
fe605e142f Change confusing 12h without AM/PM to a clean 24h display. 
It was not possible to simply add AM/PM since strftime return blank for %p %P
 2016-10-03 15:00:39 -04:00
FireWave
9d35d3a5d5 Revert "Change confusing 12h-time without AM/PM to system-localized time" 
This reverts commit 06d52a6038.
 2016-10-03 14:58:51 -04:00
FireWave
06d52a6038 Change confusing 12h-time without AM/PM to system-localized time 2016-09-30 14:12:03 -04:00
Dawnflash Lightstring
7e5483d672 Add check for git and bzr to agnoster theme 
Plugin command-not-found on Arch Linux returns 0 if git or bzr is found in repos, hence outputting unwanted pkgfile output.
Checking if the commands exist first fixes all such issues.
 2016-09-21 12:20:08 +02:00
grindhold
d1ce70f685 added support for bazaar in agnoster theme (#5016) 
the agnoster theme is now able to render basic information
if the user is currently residing inside a bazaar folder.
if so, it will render a green promt segment with "bzr" and
the current revision number in it. if there are untracked
files, the bar will be rendered in yellow. if there are
changes to already tracked files, a + character will be
printed.
 2016-09-19 20:00:42 -07:00
Matt Nichols
fb8953d525 Fix peepcode theme ruby prompt info (#5339) 
The ruby prompt info was not interpolating properly. Switching to use
 ruby_prompt_info helper. This addresses the issue.
 2016-09-19 20:00:16 -07:00
khenarghot
292a62e3ab Fix git emptiness check in dogenpunk theme (#5329) 
The parsing output for full git log output too slow so it replaced
with last commit show request, wich cause error if repository is empty
 2016-08-21 18:40:34 +02:00
Arz Yu
1e9084c3c7 muse theme: Remove extra spaces for none git/virtualenv prompt (#5278) 
* muse theme: Remove a extra space for none git prompt

* muse theme: Remove a extra space for none virtualenv prompt
 2016-08-14 17:33:48 -07:00
Anton
a7e30b26ba Fix hg call when missing on archlinux with command-not-found (#5218) 2016-07-22 15:04:35 +02:00
Adam Glenn
cc8285b1f7 adding python virtualenv support to the prompt (#5031) 
adding python virtualenv support to muse theme
 2016-07-19 21:01:00 +02:00
Harald Nordgren
53acf21182 Peepcode theme: Don't try to use RVM if it's not available (#5154) 2016-06-15 00:12:24 +02:00
Pierre Dimitrou
b1ab13d9e6 Add rbenv support for ruby version display 2016-05-14 22:05:35 +02:00
Marc Cornellà
d310fac7f6 Merge pull request #4572 from aioutecism/master 
Avoid using "PREFIX" that cause nvm to complain about.
 2016-04-06 12:03:20 +02:00
Marc Cornellà
82a4587427 Use grep -q for silent behavior 2016-04-04 23:06:08 +02:00
Marc Cornellà
e1b04cfecd Fix logic of bureau_git_status function 
This separates the gathering of file status, repository status and
stash.
 2016-04-04 20:39:10 +02:00
Jon-Erik Johnzon (TorrentKatten)
e8a9d0ee1a localization support for clock in candy theme 
Now uses 12-hour clock or 24-hour clock depending
on user locale
 2016-03-30 21:46:39 +02:00
Marc Cornellà
7cc1eab6fa Merge pull request #2752 from isqua/bureau_theme_fix 
Fix checkmark for clean repo in bureau theme
 2016-03-30 04:36:41 +02:00
Yad Smood
9cc3e8bf29 Optimize the ys.zsh-theme make it simpler 2016-03-24 15:29:24 +08:00
Robby Russell
83cf8dc16f Merge pull request #4790 from lckarssen/avit-theme-fixes 
Avit theme fixes
 2016-03-11 00:18:00 -08:00
Robby Russell
fdff70006c Merge pull request #4863 from ysmood/optimize-ys-theme 
Optimize the ys.zsh-theme make it more expressive
 2016-03-11 00:17:14 -08:00
L.C. Karssen
55fed4f8cd Fix use of CARETCOLOR in avit theme 
$CARETCOLOR was not to actually colour the caret, so change to root user
wouldn't show in the prompt. Now both ▶ and ◀ follow $CARETCOLOR.
 2016-03-07 22:15:45 +01:00
L.C. Karssen
9c36248439 Better visible colours in avit for Ubuntu terminal 
Make some colours in the avit theme bold for better visibility in the
default Ubuntu terminal theme.
 2016-03-07 22:14:33 +01:00
L.C. Karssen
cfac963772 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2016-03-07 22:09:02 +01:00
Yad Smood
9a2376bd29 add: exit code 2016-02-21 02:42:42 +08:00
Yad Smood
aeca2ad899 Optimize the ys.zsh-theme make it more expressive 2016-02-21 01:39:01 +08:00
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
L.C. Karssen
0a47451a46 Updated colour of ◀ in PROMPT2 of the avit theme. 
In commit 729fd53 I incorrectly only changed PROMPT1. Now both ▶ and ◀ follow $CARETCOLOR.
 2016-01-13 10:00:32 +01:00
L.C. Karssen
63e216ba9d oh-my-zsh avit theme: instead of only showing the last 3 directories in the $PWD shorten the path by removing some middle parts if $PWD becomes too long. 2016-01-13 10:00:32 +01:00
L.C. Karssen
18801e25d2 Shorter way of creating bold colours in a ZSH theme (applied to the avit theme). 2016-01-13 10:00:32 +01:00
L.C. Karssen
ceca00a503 Adapt some colours in the avit theme for better visibility in the default Ubuntu terminal theme. 2016-01-13 10:00:32 +01:00
L.C. Karssen
854c41d843 Fix in avit theme: $CARETCOLOR was not to actually colour the caret, so change to root user wouldn't show in the prompt. 2016-01-13 10:00:32 +01:00
L.C. Karssen
a67dfae72b Set colour for user@hostname to red if we're root (or sudo) in the bira theme. 2016-01-13 10:00:32 +01: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