1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-24 06:40:07 +00:00
Commit graph

756 commits

Author SHA1 Message Date
Marc Cornellà
93c837fec8 random: add ZSH_THEME_RANDOM_QUIET setting
Fixes #9180

Co-authored-by: James Eapen <jamespeapen@gmail.com>
2020-09-20 13:41:21 +02:00
Marc Cornellà
bc9d4b89bb Remove racially-charged language from the codebase
The ZSH_THEME_RANDOM_BLACKLIST variable will be deprecated until it's
removed 2 months from now.
2020-09-18 19:43:44 +02:00
Marc Cornellà
7256c03ce1 fishy: fix one-level directory bug and bad array assignment in zsh 5.0.1 2020-09-02 15:15:24 +02:00
Marc Cornellà
a7f5170d68 Remove perl dependency 2020-09-01 11:52:32 +02:00
Florian Klink
4ed6fd2b8b
pygmalion: use pure zsh instead of perl (#9210)
My system doesn't have `perl` in $PATH, so using this theme clutters the
shell output quite a bit.

Turns out, the same thing can be accomplished in pure zsh (with
extendedglob).

Co-Authored-By: Marc Cornellà <marc.cornella@live.com>
2020-08-29 00:27:06 +02:00
Marc Cornellà
69a380771e Remove non-existing %p prompt sequence from themes
Fixes #8022
2020-08-04 15:55:04 +02:00
Larson Carter
7afaee858a
Bug and Feature Request Templates + MLH Theme + Readme (#9068)
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
Co-authored-by: Bartek Pacia <barpac02@gmail.com>
2020-07-05 17:59:12 +02:00
Kyle Laker
d24a9dbccc
agnoster: fix git working tree check (#9072)
`git rev-parse --is-inside-work-tree` does not have a different exit
code when not within a work tree; the difference is in the output,
either "true" when in a work tree, or "false" when not.

The if was modified similarly to the check for the hide-status config,
which also parses command output rather than exit code.

Co-authored-by: Kyle Laker <klaker@easydynamics.com>
2020-07-01 19:05:53 +02:00
Marc Cornellà
0f3c424e4c muse: clean up theme 2020-06-10 12:57:01 +02:00
Marc Cornellà
a2a83be982 smt: fix time since last commit logic
Fixes #5244
2020-06-09 19:36:16 +02:00
Marc Cornellà
374b4e02ef peepcode: add virtualenv prompt and fix git calls 2020-06-08 20:36:27 +02:00
Yauhen
5d1cdb22c1
fino-time: fix virtualenv prompt by escaping dollar sign (#8991) 2020-06-03 17:40:05 +02:00
Marc Cornellà
8cb449ee20 avit: fix $reset_color sequence in prompt
Fixes #8952
2020-05-23 18:02:54 +02:00
Marc Cornellà
4ac36d57f1 fino-time: fix git and ruby prompt sequences
Fixes #8856
2020-05-22 19:52:13 +02:00
Marc Cornellà
b721053c87 af-magic: account for active conda envs in dash line
See https://github.com/ohmyzsh/ohmyzsh/issues/8081#issuecomment-632182715
2020-05-21 20:48:46 +02:00
Marc Cornellà
c52441b624 pygmalion: revert multiline prompt change
Fixes #2317
Closes #2321
2020-05-10 20:06:24 +02:00
Marc Cornellà
d247f98d3e nebirhos: use short hostname in prompt
Fixes #6050
2020-03-26 12:39:51 +01:00
Marc Cornellà
4009668500 random: remove random theme from possible themes to choose from
...preventing an infinite loop.
2020-03-02 23:53:43 +01:00
Julian Parsert
dbd2f77bd9
norm: add hg prompt (#6725) 2020-02-27 18:28:08 +01:00
Marc Cornellà
d959283898 avit: fix prompt sequence (fixes #8678) 2020-02-25 12:21:06 +01:00
Marc Cornellà
3d4890dcc0 Add blacklist variable for random theme
Co-authored-by: Fran Garcia <fran.miranda@gmail.com>
2020-02-19 20:00:22 +01:00
Marc Cornellà
b297bf9296 Add themes in $ZSH_CUSTOM to the pool of candidates
Also add comments and unset leftover variables, and print only the
name of the theme loaded.

When looking for $ZSH_CUSTOM themes, the chosen algorithm is to add
the theme names to the pool disregarding the path, and then source
whatever theme is selected with the same logic as the init script,
which is to source first custom themes even if there is another
default theme of the same name.

Co-authored-by: Mihai Serban <mihai.serban@gmail.com>
2020-02-19 19:34:16 +01:00
Willy Weiskopf
6adad5c300 Move random theme functionality into "random" theme
The statements for selecting a random theme in oh-my-zsh.sh and the themes
plugin are duplicate. Most people eventually settle on a theme, making those
lines in oh-my-zsh.sh superfluous. To address those, it may makes sense to put
the random theme functionality into a theme of its own (since themes are just
zsh scripts.
2020-02-19 18:20:28 +01:00
Marc Cornellà
d76258ff55 avit: add years since last commit if appropriate 2020-02-19 18:19:46 +01:00
Marc Cornellà
77813a330b avit: clean up theme code 2020-02-19 17:24:20 +01:00
Marc Cornellà
443ad88024 avit: replace custom prompt functions with OMZ ones
Fixes #8637
2020-02-19 16:53:32 +01:00
Marc Cornellà
c1b798aff3
agnoster: fix bzr prompt with breezy installed (#8646)
* Change indentation to 2 spaces in prompt_bzr function
* Check if in a bzr repository and optimize bzr calls in prompt_bzr
2020-02-19 00:16:54 +01:00
Marc Cornellà
de261bd29c af-magic: fix virtualenv prompt suffix 2020-02-18 22:28:58 +01:00
Marc Cornellà
d49397a01d af-magic: fix dashed separator sizing and refactor
Fixes #8081
2020-02-18 19:18:23 +01:00
Marc Cornellà
05cae34676 Detect dependency plugins in candy-kingdom and kiwi themes
Fixes #5029
Fixes #5342
2020-02-11 17:43:59 +01:00
Aliaksei Maiseyeu
6bebc254e8
af-magic: fix showing aws prompt out of the box (#8243)
Fix issue related to #7615, #7747 and #6346

After the update, aws prompt (which should be visible out of the box) disappears when a user uses a theme af-magic, because of fact that plugins are loaded before themes.
This pull request fixes issue with not showing aws prompt in theme af-magic, by appending RPROMPT in theme af-magic instead overwriting.
2020-02-04 13:27:18 +01:00
Marc Cornellà
b80b1a1e8b Actions to take after repository migration is complete (#8394)
* Change project URL from robbyrussell to ohmyzsh org

* Update git remote to use ohmyzsh org repository
2019-11-20 17:26:18 -08:00
Jacob Tomaw
1ba0af650a Use safer append to hook function arrays (#8406)
Use add-zsh-hook to add functions to hooks. That way they won't be added again
when doing `source ~/.zshrc` multiple times.

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
2019-11-19 18:47:12 +01:00
Isaac Clayton
ef96a38fa5 Upgrade some URLs to HTTPS (#8202)
* Update http to https in Solarized
* Upgrade http to https for 'Burger In Your Shell'
* Upgrade http to https for tmux.github.io
2019-11-08 15:42:02 +01:00
Shriniwas Sharma
f7d9dae12e bira: move virtualenv information (#8266) 2019-10-16 09:28:19 +02:00
nv035674
32338fd40c robbyrussell: restore prompt spacing (#8148) 2019-09-13 23:30:17 +02:00
Hanjiang Yu
c44569f06e robbyrussell: remove local variable (#8131)
Now it can be sourced in a function, like zplug.
2019-09-08 15:07:33 +02:00
Sean Collins
9c3e3ae5e4 Change description for Evan's theme to something neutral (#6304) 2019-09-08 15:05:20 +02:00
Matthew Armand
43ed0b455e af-magic: add hg prompt and tweak virtualenv info (#8056)
- Add mercurial support to af-magic, so now the vcs prompt will show up in either a git or hg repository
- The virtualenv prompt was white and bumped up against the user@hostname output
- Fixed that so its green (which I thought highlighted it more thematically) and has a space before user@hostname
2019-08-19 18:54:49 +02:00
Marc Cornellà
89366be43f
Revert "agnoster: fix VIRTUAL_ENV_DISABLE_PROMPT logic (#8050)" (#8061)
This reverts commit 59c1ec80aa.
2019-08-06 18:01:32 +02:00
Rocky
59c1ec80aa agnoster: fix VIRTUAL_ENV_DISABLE_PROMPT logic (#8050)
Fixes #7985
2019-07-31 09:23:50 +02:00
Marc Cornellà
17f4cfca99
af-magic: make separator window-size-aware (#7739) 2019-07-13 12:48:10 +02:00
Crackpot
9060c1ddae crcandy: use 24h format in prompt (#7926) 2019-06-14 14:46:08 +02:00
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