Commit Graph

697 Commits

Author SHA1 Message Date
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