1
0
Fork 0
mirror of synced 2024-11-17 21:45:35 -05:00
Commit graph

46 commits

Author SHA1 Message Date
Eric Nielsen
882408b762 [prompt] eriner: Fix ${USER} not being evaluated
I broke this on the last commit. My bad.

Fixes #318
2018-12-23 18:21:18 -05:00
Eric Nielsen
21696a4f70 [git-info] Document that flag (e) is needed
so proper expansion of ref names occurs, due to changes done in 53a3cd7.
2018-12-21 22:48:54 -05:00
Eric Nielsen
364d6b831d [prompt] steeef: Fix git-info stashed zstyle
Only define it if it's non-empty. New git-info changes will consider
zstyles to be defined even if they are empty.
2018-10-10 18:24:45 -05:00
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
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
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
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
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
Tmplt
0a33a3de90 [prompt] magicmace: add theme
Closes #69
2016-07-27 19:36:43 -07:00
nshtg
3a37a3f0e1 [prompt] steeef: always update git information
steeef would not update the git information if we stayed in the same directory.

Fixes #66. Closes #67.
2016-07-26 13:48:39 -07:00
Amin Bandali
6b2dad4bd1 [prompt] steeef: '#' prompt for privileged users
Use `%(!.#.$)` which will display `$` for normal users and `#` for privileged users

Closes #65
2016-07-26 13:36:12 -07:00
Tmplt
5f7a75a969 [prompt] add ranger indicator to eriner theme
closes #64
2016-07-17 08:18:49 -07:00
Cenk Gündoğan
fcc4c573a8 [prompt] fix gitster path to reflect git repo
allow optional parameter for short_pwd

Closes #41
2016-04-02 13:33:01 -07:00
Matt Hamilton
cb12222811 use 'command git' in prompts
Fixes Zim issue with interation with any functions or aliases that wrap
'git'. See issue #30 for more information.
2016-02-04 15:08:22 -05:00
Matt Hamilton
9f838982fb [prompt] syntax refactor 2016-01-07 08:10:29 -05:00
caedus75
b46edd43a8 [prompt] add setup function to themes
proper setup and preview of themes with 'prompt' function

closes #12, closes #15
2016-01-07 08:07:11 -05:00
Matt Hamilton
5f68411637 [prompt] gitster: use short_pwd 2016-01-06 09:41:40 -05:00
Matt Hamilton
be23020b2e [prompt] eriner: use short_pwd 2016-01-05 04:15:21 -05:00
caedus75
f2806b45bf fix prompt substitutions/expansions
The 'prompt' function disables any option set with 'setopt'.
To make options persistent we need to use the 'prompt_opts' array
instead

Closes #8
2015-12-30 04:42:31 -05:00
Matt Hamilton
b7977d28f2 add powerline symbols note 2015-12-29 11:19:36 -05:00
Matt Hamilton
1ee4d85547 fix gitster prompt 2015-12-27 21:13:08 -05:00
Matt Hamilton
598326aa9f fix minimal prompt 2015-12-27 21:11:58 -05:00
Matt Hamilton
5572a2330d update steef again 2015-12-22 10:52:15 -05:00
Matt Hamilton
6fa8dcb95d update steeef prompt 2015-12-22 09:47:19 -05:00
Matt Hamilton
fb549f108a use autoload -Uz, not -U 2015-12-21 20:16:43 -05:00
Matt Hamilton
02ec35a8d4 add gitster theme 2015-12-18 11:02:56 -05:00
Matt Hamilton
5cf08f503f add minimal prompt 2015-12-18 10:51:58 -05:00
Matt Hamilton
a08039ca4a add locale safety and user check 2015-12-18 10:11:49 -05:00
Matt Hamilton
66941895f6 update function names in eriner prompt 2015-12-15 21:51:28 -05:00
Matt Hamilton
25cec0876a update eriner prompt 2015-12-15 19:21:06 -05:00
Matt Hamilton
0783d12ca3 add steef prompt 2015-12-15 14:05:59 -05:00
Matt Hamilton
3a62391e0e initial commit 2015-12-15 00:12:17 -05:00