1
0
Fork 0
mirror of synced 2024-11-15 20:48:57 -05:00
Commit graph

92 commits

Author SHA1 Message Date
Eric Nielsen
2d1aea3b74 [prompt] Remove autoload -Uz colors
since we don't need that. We're using the newer '%F{red}color%f' code
instead.

Also use `PS1` instead of `PROMPT`, as suggested at `man zshcontrib`,
under "Writing Themes”.

Refactor code.
2018-02-07 18:15:17 -05:00
Eric Nielsen
e9171405cf [prompt] steef: Update it to be customizable
and to have a help and a preview too.

Inspired by #192, and by having (few but) good prompt themes to serve as
starting points for the users to customize or implement their own.

Also removed the colors functions, since we don't need that. We're using
the newer '%F{red}color%f' code instead. (Actually all our themes are)

Closes #245
2018-01-22 17:37:35 -05:00
Eric Nielsen
7b70cffc0e [prompt] eriner: Simplify help message and use PS1
and `RPS1`, instead of `PROMPT` and `RPROMPT`, as suggested by the zsh
manual at `man zshcontrib`, under "Writing Themes":

> By convention, themes use `PS1`, `PS2`, `RPS1`, etc., rather than the
longer `PROMPT` and `RPROMPT`.
2018-01-08 12:22:35 -05:00
Brottweiler
6f8be83920 Update to new repo URL
from `Eriner/zim` to the new `zimfw/zimfw`.

Closes #238
2018-01-03 10:30:12 -05:00
Eric Nielsen
39e961117d
[prompt] eriner: Add help, preview, parameters
and refactor code, inlining auxiliary functions inside
`prompt_eriner_main`.

Theme colors are now customizable with parameters. Also, it works better
with light backgrounds by using `%Sstandout%s` for the segments which
were originally using black as foreground color (intended for dark
backgrounds).

The help explains the parameters, and the preview shows one color
variation.

Fixes #169. Closes #226.
2017-11-29 09:07:53 -05:00
Eric Nielsen
8aa086c481 [prompt] pure: Update submodule to version 1.6.0 2017-11-01 17:56:25 -05:00
Eric Nielsen
ee7cb6581d [prompt] pure: Update submodule 2017-10-23 10:01:08 -05:00
Eric Nielsen
23b8265f87 [prompt] lean: Update submodule
Fixes #209
2017-10-02 11:59:27 -05:00
Eric Nielsen
8ba9621f48 [prompt] Add sp to the prompt_opts array
in our custom themes.

With zsh starting at version 5.4, when using the `prompt_opts` array,
`nopromptsp` will be set unless the array contains a `sp`. This was
introduced in zsh at
43e55a9bcd (diff-bb10d67e7a8561b66a53a805f3c77a40R233)

Fixes #209
2017-10-01 20:41:43 -05:00
Matt Hamilton
d40b6cf928 [prompt] pass prompt prams from zprompt_theme
While normally it's a good thing that zsh doesn't auto-expand on spaces,
in this case we want to split on spaces into distinct words, that way
the values are passed to `prompt` in multiple params.

Fixes #178
2017-09-18 09:18:20 -04:00
Eric Nielsen
7479e22b17 [prompt] lean: Update submodule 2017-09-11 09:44:49 -05:00
Eric Nielsen
25d97ccac9 [prompt] lean: Update submodule 2017-08-19 14:00:48 -05:00
Eric Nielsen
61019c5827 [prompt] pure: Update submodule 2017-06-28 14:25:15 -05:00
Eric Nielsen
c7fdef5305 [prompt] lean: Update submodule 2017-06-28 14:24:37 -05:00
Eric Nielsen
95f1e3c6ca [prompt] pure: Update submodule 2017-06-08 09:58:41 -05:00
Eric Nielsen
0fec8a7e40 [prompt] lean: Update submodule 2017-06-08 09:58:17 -05:00
Matt Hamilton
7d389add76 [prompt] pure: update submodule 2017-04-30 09:03:25 -07:00
Matt Hamilton
0e2094afef [prompt] liquidprompt: update submodule 2017-04-30 09:03:12 -07:00
Matt Hamilton
60968c428d [prompt] lean: update submodule 2017-04-30 09:02:58 -07:00
Eric Nielsen
c8820313ef Fix liquidprompt preview
breaking the current prompt after `prompt -p`. Actually liquidprompt is
pretty invasive in the way it is implemented, defining extra
`prompt_on`, `prompt_off` and `prompt_OFF` functions to switch it after
it is executed.

Fixes #112, Closes #165
2017-04-30 09:01:36 -07:00
Eric Nielsen
dca1803ced [prompt] Don't expand git_info in eriner theme
to avoid the git-info vulnerability to execute an arbitrary command, as
reported in #158.

Fixes #158 (for eriner theme), Closes #168
2017-04-17 23:17:53 -05:00
Eric Nielsen
d771fd88fb [prompt] Range segment in eriner as in magicmace
This reverts commit eee6e911d2.

As suggested in
https://github.com/Eriner/zim/pull/142#issuecomment-283806756 (and
"thumb-upped" by Tmplt). The Ranger segment was introduced in eriner
theme by Tmplt in https://github.com/Eriner/zim/pull/64. He also added
it to the magicmace theme.
2017-04-17 16:31:07 -05:00
Eric Nielsen
f3e673a52b Rewrite steeef theme using git-info
This uses the verbose mode to be able to display indexed, unindexed and
untracked files indicators. This is the last theme left to be migrated
to git-info, and the first one to use its verbose mode.

Originally, the theme also supported svn via vcs_info. The svn support
is lost in this rewrite. Maybe if a new svn-info module is introduced to
Zim...

Closes #157
2017-03-29 19:40:07 -07:00
Eric Nielsen
ae771c878f Rewrite minimal theme using git-info
As previous migrations of themes to git-info, this does not use its
verbose mode, so a repo with just untracked files is not considered
dirty.

It uses the newly-introduced `diverged` context and `coalesce` function
from git-info.

Closes #152
2017-03-27 13:56:47 -07:00
Eric Nielsen
76cf486d5d Only evaluate prompt_gitster_status once
replacing its contents directly into the `PROMPT`, instead of calling
the function continuously.

Closes #150
2017-03-27 13:56:47 -07:00
Eric Nielsen
4b95df9a5f Fix magicmace errors when git-info not enabled
and add a comment stating that the theme requires the `git-info` module.
Also make better usage of the arithmetic command `(( ))`.

Closes #146
2017-03-08 06:20:19 -08:00
Eric Nielsen
176d2ab4d3 Fix gitster theme errors when git-info not enabled
and add a comment stating that the theme requires the `git-info` module.

Closes #145, fixes #144
2017-03-08 06:20:02 -08:00
Eric Nielsen
597d611d7b Fix eriner theme errors when git-info not enabled
as it was incorrectly testing for the `${+functions[git-info]}`.

Closes #142
2017-03-08 06:19:56 -08:00
Eric Nielsen
eee6e911d2 Add Ranger segment to eriner theme
instead of having the Ranger indicator at the status segment, likewise
the magicmace theme.
2017-03-08 06:17:39 -08:00
Eric Nielsen
a469e147cc Rewrite eriner theme using the Zim git-info module
Based on my rewrite of the Agnoster theme, uses simpler segment drawing
functions and only relies on local variables. Uses git-info module in
non-verbose mode, so a repo with only untracked files will not count as
dirty (but dirty state is computed faster). Also took the freedom of
adding an extra space character after the 'r' for the Ranger segment,
and after the dirty indicator for the Git segment. Everything else looks
and behaves exactly the same as the original prompt.
2017-03-08 06:17:39 -08:00
Matt Hamilton
5ef14a64f1 [prompt] pure: update submodule 2017-03-08 06:17:25 -08:00
Matt Hamilton
9416c7de90 [prompt] liquidprompt: update submodule 2017-03-08 06:17:08 -08:00
Matt Hamilton
9d9b6c2ec9 [prompt] lean: update submodule 2017-03-08 06:16:56 -08:00
Matt Hamilton
bf5e3a8c6b [prompt] lean: update submodule 2017-01-21 08:23:43 -08:00
Matt Hamilton
dcc066c1fa [prompt] pure: update submodule 2017-01-21 08:23:28 -08:00
Eric Nielsen
c1b02c06d0 Remove git_prompt_info and parse_git_dirty
as they were only being used by gitster prompt theme and kept for
Oh-My-Zsh compatibility. The newly introduced git-info module (inspired
by the git-info Prezto function) provides a more powerful
implementation than the Oh-My-Zsh inspired git_prompt_info.

Updated gitster to use the git-info module.

Closes #124
2017-01-19 05:10:19 -08:00
Eric Nielsen
708f17b18f Update magicmace theme to use the git-info module 2017-01-16 10:26:17 -08:00
Matt Hamilton
cb8617d3f4 [prompt] pure: update submodule
Closes #113
2017-01-05 22:34:00 -08:00
Matt Hamilton
1073feb097 [prompt] lean: update submodule 2017-01-05 22:33:37 -08:00
Matt Hamilton
02a68bea57 [prompt] lean: update submodule
Closes #110
2016-12-11 09:48:47 -08:00
Matt Hamilton
5798afae97 [prompt] pure: update submodule 2016-12-01 23:51:59 -08:00
Matt Hamilton
edfa747047 [prompt] liquidprompt: update submodule 2016-12-01 23:51:59 -08:00
Matt Hamilton
7da3437b3f [prompt] lean: update submodule 2016-12-01 23:51:59 -08:00
Matt Hamilton
ee9559eb74 [prompt] pure: update submodule 2016-10-25 16:17:14 -07:00
Matt Hamilton
99a45de4d6 [prompt] liquidprompt: update submodule 2016-10-25 16:16:57 -07:00
Matt Hamilton
e209799a5c [prompt] pure: update submodule 2016-09-27 16:40:00 -07:00
Matt Hamilton
b5134b8ab2 [prompt] liquidprompt: update submodule 2016-09-27 16:39:35 -07:00
Eric Nielsen
40ef228286 [prompt] magicmace: fix tab completion
The offender was `print -P`, where `-P` does [prompt
expansion](http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Prompt-Expansion).

I took the freedom to also change a few things:
Move the `add-zsh-hook precmd` up,
add `prompt_magicmace_` prefix to all function names,
add `COLOR_` prefix to all color global variables,
and move assignment to `PROMPT` to `prompt_magicmace_setup`.

Fixes #70, Closes #81
2016-09-27 15:58:45 -07:00
Matt Hamilton
a9c8269291 [prompt] pure: update submodule 2016-09-04 08:46:06 -07:00
Fernando Barillas
1b44eb6404 [prompt] Add lean prompt: github.com/miekg/lean
Closes #71
2016-08-15 20:31:17 -07:00