1
0
Fork 0
mirror of synced 2024-11-12 11:08:58 -05:00
Commit graph

277 commits

Author SHA1 Message Date
Eric Nielsen
d56bddf4b1 Add coalesce function to git-info
that will be used by the minimal theme, and could be used for future
themes too. Prezto had this, but we diminished its necessity by
simplifying how git-info works.
2017-03-27 13:56:47 -07:00
Eric Nielsen
a844454a65 Remove undocumented git-info configuration
`prompt.showinfo` for enabling or disabling it globally or per
repository. It can be globally disabled by not loading the `git-info`
module at all, and prompts currently will not break (and in the future
should still not break) if the module is not loaded.

This removes one git call that is used to check for the
`prompt.showinfo` configuration value.
2017-03-27 13:56:47 -07:00
Eric Nielsen
53aef5a05c Add diverged context to git-info
that, when defined, will be set if branch is both ahead and behind of
remote. If not defined, the `ahead` and `behind` contexts will still be
set, as how they worked previously.
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
c7b2232378 Inline is-true function body, as other functions
defined in Zim. Instead of creating an additional `is-true() { }`
function scope.

Closes #148
2017-03-27 13:56:45 -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
cf0bb77a37 [syntax-highlighting] update submodule 2017-03-08 06:17:35 -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
269f8399d2 [completion] update submodule 2017-03-08 06:16:42 -08:00
Nils Reusse
7d952adf2b [utility] fix warning when logging in on tty
... ${terminfo[colors}, variable not set. Check that the variable
exists before checking for colors.

Closes #125
2017-01-29 14:33:18 -08:00
Tomas Slusny
61ff6019b1 [fasd] Fix completion
- Fix word completion for fasd
- Fix initialization script to have all fasd-related functions inside it
  (functions was not called properly when they was in separate files)
- Add another alias `v` for fasd that will access recently used files
  from .viminfo

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>

Fixes #111, Closes #133
2017-01-22 10:37:36 -08:00
Matt Hamilton
cc34e3f310 [environment] add customizable term title
Adds customizable terminal/window title. Set `${ztermtitle}` in `.zimrc`
to use this functionality.

Check the notes added in templates/zimrc for additional usage info.

Closes #52
2017-01-21 08:54:32 -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
9f4c21cee8 Update git-info README.md
to fix the "Special Action Contexts" title mistakenly being "Untracked
Contexts", and other minor changes.
2017-01-16 10:26:17 -08:00
Eric Nielsen
708f17b18f Update magicmace theme to use the git-info module 2017-01-16 10:26:17 -08:00
Eric Nielsen
cabf368847 Add git-info module
based on the Prezto git module
[function](https://github.com/sorin-ionescu/prezto/blob/master/modules/git/functions/git-info)
and further refactored and simplified.

What changed:
- Commit format only in 'detached HEAD' state, so
  `$(coalesce "%b" "%c")` is not needed, because you only get one of
  those.
- Removed the `added`, `deleted`, `modified`, `renamed` and `unmerged`
  verbose contexts.
- `git status` is only used in verbose mode.
- In non-verbose mode, the `untracked` context is not available, and
  also untracked files are not considered for computing the `dirty`
  context. Using `git status` or checking for untracked files is
  [expensive](https://gist.github.com/sindresorhus/3898739).
2017-01-16 10:26:17 -08:00
Gordon Gao
9529245cbb use setopt NO_CLOBBER instead of unsetopt CLOBBER
Closes #117
2017-01-11 22:16:07 -08:00
Matt Hamilton
b021ba6817 [syntax-highlighting] update submodule 2017-01-05 22:36:00 -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
ca129aa00c [substring-search] update submodule 2017-01-05 22:33:13 -08:00
Matt Hamilton
e267e46f98 [completion] update submodule 2017-01-05 22:32:33 -08:00
Matt Hamilton
9f9cc34273 [syntax-highlighting] update submodule 2016-12-11 09:49:24 -08:00
Matt Hamilton
02a68bea57 [prompt] lean: update submodule
Closes #110
2016-12-11 09:48:47 -08:00
Matt Hamilton
081e4f30d0 [completion] update submodule 2016-12-11 09:48:30 -08:00
Matt Hamilton
b55ed8ad27 [syntax-highlighting] update submodule 2016-12-01 23:51:59 -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
0e56fa4901 [completion] update submodule 2016-12-01 23:51:59 -08:00
Xiao-Ou Zhang
d91d9e3efe [input] Fix typo in README
Closes #102
2016-12-01 23:51:59 -08:00
Eric Nielsen
76ff1bdb3c Add less or more as default PAGER
Set `less` (if available) or `more` as `PAGER`, if `PAGER` is not set.

Closes #101
2016-12-01 23:51:59 -08:00
Eric Nielsen
7a289c4c0d Add less termcap colour variables
Set `less` termcap colour variables, and update the module README.md.
Change the code to enclose all colour logic within a
`(( ${terminfo[colors]} >= 8 ))` condition.
Check if `PAGER` is set before setting the `lm` alias.

Keeping the British "colour" spelling. :-)

Closes #101
2016-12-01 23:51:59 -08:00
Matt Hamilton
1801faf39c [pacman] keep old packages for auru
The choice to remove these packages should be up to the administrator.
Having an old -git package around after experiencing an upstream issue
is always handy.
2016-12-01 23:50:37 -08:00
Matt Hamilton
1f0ed84938 [syntax-highlighting] update submodule 2016-10-25 16:17:30 -07: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
ebdcaf80cd [substring-search] update submodule 2016-10-25 16:16:30 -07:00
Matt Hamilton
6b31e32711 [completion] update submodule 2016-10-25 16:15:49 -07:00
Eric Nielsen
7519f17645 [input] fix prompt after <Tab><Tab><Ctrl-C>
The issue is fixed by adding `zle redisplay` after `zle
expand-and-complete` for the expand-and-complete key binding. An
additional `print -n '...'` is also included to show an indicator while
the menu is loading, and that is purely cosmetic.

There's still one glitch: the prompt jumps one line up after
<Tab><Tab><Ctrl-C>. This was observed in Prezto too.

Fixes #85, closes #89
2016-10-25 16:13:49 -07:00
Eric Nielsen
0a9d105107 [utility] Simplify correction prompt config
For `setopt CORRECT`. Let the user uncomment a line with the `setopt`
directly in the configuration file, instead of having a flag variable
for it.

Closes #90
2016-10-25 16:12:40 -07:00
Sebastian Stammler
e24fed015c [pacman] Add pacI alias to install without syncing
Closes #99
2016-10-25 16:11:16 -07:00
Shaun Hammill
50f74bc56c [meta] zmanage: rescope usage to local variable
Closes #100
2016-10-25 16:06:19 -07:00
Matt Hamilton
b1d5c00d5f [git] fix 'ggL' alias typo
Credit to @toogley for discovering the typo here:
https://github.com/sorin-ionescu/prezto/pull/1157

Since zim and prezto share the same git aliases, it is applicable here
as well.
2016-09-28 04:32:23 -07:00
Eric Nielsen
695d46284c [meta] use uname -a to prevent OS conflicts
Fix `uname` calls with `-o` parameter, as this is not BSD compatible.
As per @Eriner, use `uname -a` instead as a "catch-all" parameter.

Fixes #75, Closes #79
2016-09-28 03:02:10 -07:00
Matt Hamilton
d2458b1a8f [syntax-highlighting] update submodule 2016-09-27 16:40:16 -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
Matt Hamilton
ccd441b197 [completion] update submodule 2016-09-27 16:39:21 -07:00
Eric Nielsen
f812c1bb6a [debug] Refactor debug module
Use `$PS4` debugging prompt to generate timestamps, instead of GNU `date`.
This also keeps timestamps and respective command together, something
that `paste` could not guarantee given some commands may have multiple lines.

The prompt timestamp has a precision of 6 decimals. The `printf "%12.9f\n"`
instruction with 9 decimals was kept to keep producing "the **SAME** output".
This could be replaced to `printf "%12.6f\n"` to make the output
smaller.
Also, only the first line of commands with multiple lines are saved, to
keep the output format backwards-compatible.

Closes #84
2016-09-27 15:59:02 -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
d551b90050 [meta] add zim_debug tool
Closes #51
2016-09-06 13:05:17 -07:00
Matt Hamilton
d55939e528 [meta] add zim_issue template builder 2016-09-05 16:34:27 -07:00
Matt Hamilton
a9c8269291 [prompt] pure: update submodule 2016-09-04 08:46:06 -07:00
Matt Hamilton
0fa860ef84 [completion] update submodule 2016-09-04 08:45:54 -07:00
Matt Hamilton
e2ef8f1bb5 [syntax-highlighting] update submodule 2016-09-04 08:45:32 -07:00
Matt Hamilton
f7d3cdf812 [meta] add module and fixup tools 2016-09-02 18:28:29 -07:00
Matt Hamilton
fc45c8e328 [syntax-highlighting] update submodule 2016-08-30 09:29:30 -07:00
Matt Hamilton
882441c625 [syntax-highlighting] update submodule 2016-08-21 11:38:02 -07:00
Juraj Fiala
a1341265b9 [input] Add PageUp/Down to navigate history
Incredibly useful when combined history-substring-search and/or a laptop keyboard.

Closes #72
2016-08-15 23:14:54 -07:00
Matt Hamilton
e49fdbd260 [syntax-highlighting] update submodule 2016-08-15 20:32:44 -07:00
Fernando Barillas
1b44eb6404 [prompt] Add lean prompt: github.com/miekg/lean
Closes #71
2016-08-15 20:31:17 -07:00
Matt Hamilton
bb81ab09b9 [syntax-highlighting] update submodule 2016-08-11 18:14:11 -07:00
Matt Hamilton
8ff67e0987 [completion] update submodule 2016-08-11 18:13:53 -07:00
Matt Hamilton
8ac887e8e9 [prompt] pure: update submodule 2016-07-27 19:41:05 -07:00
Tmplt
0a33a3de90 [prompt] magicmace: add theme
Closes #69
2016-07-27 19:36:43 -07:00
Matt Hamilton
5556897150 [syntax-highlighting] update submodule 2016-07-26 13:51:04 -07:00
Matt Hamilton
474b7e1add [prompt] pure: update submodule 2016-07-26 13:50:52 -07:00
Matt Hamilton
1af72f41a2 [prompt] liquidprompt: update submodule 2016-07-26 13:50:34 -07:00
Matt Hamilton
8721d39484 [completion] update submodule 2016-07-26 13:50:07 -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
Matt Hamilton
074677207c [substring-search] update submodule 2016-07-16 17:20:14 -07:00
Matt Hamilton
d904e94ae7 [syntax-highlighting] update submodule 2016-07-16 17:19:33 -07:00
Laurentiu Nicola
8a4413f2ec [input] Fix parse error old zsh versions
Closes #61, closes #62.
2016-06-22 16:09:03 -07:00
Matt Hamilton
494e44375c [environment] fix better bracketed paste
Fixes #60
2016-06-22 16:07:46 -07:00
Matt Hamilton
345233741e [environment] better bracketed paste zsh >=5.2 2016-06-15 18:46:54 -07:00
Matt Hamilton
a849172fbb [syntax-highlighting] update submodule 2016-06-10 19:50:55 -07:00
Matt Hamilton
746ac0519c [syntax-highlighting] update submodule 2016-06-03 21:27:23 -07:00
Matt Hamilton
926b47a65d [prompt] update "liquidprompt" theme submodule 2016-06-03 21:27:11 -07:00
Matt Hamilton
e4378dd8b2 [completion] update submodule 2016-06-03 21:26:48 -07:00
Matt Hamilton
7439df5836 [input] add double-dot expansion option
Closes #49
2016-05-20 20:25:04 -07:00
Alex Poslavsky
41154cd0c4 [utility] fix OpenBSD grep color
Use ggrep or use no color, also fixes #54.

Closes #54, closes #55
2016-05-20 18:43:20 -07:00
Igor Zibarev
3c0e49a770 [git] add aliases: stash unapply and full graph
Added git aliases:
- "gsu": Stash unapply to revert applied changes
- "glG": Full graph (like glg but with author and date)

Closes #53
2016-05-14 15:26:03 -07:00
Igor Zibarev
41b9b416a6 [git] fix "git rebase --continue" alias
Renamed "git rebase --continue" alias from "grr" to "grc"
corresponding to README.md of git module.

Closes #53
2016-05-14 15:25:54 -07:00
Matt Hamilton
43403bfcce [syntax-highlighting] update submodule 2016-05-14 13:55:45 -07:00
Georgy Yakovlev
d510f4f861 Fix for OpenBSD ls alias https://github.com/Eriner/zim/issues/47
Closes #48
2016-05-13 13:38:48 -07:00
Matt Hamilton
98f501a435 [pacman] fix pacor alias
closes #43
2016-05-07 23:49:46 -07:00
Matt Hamilton
2dc0de0f97 [syntax-highlighting] update submodule 2016-05-06 14:20:00 -07:00
Matt Hamilton
6dce750b4f [syntax-highlighting] update submodule 2016-05-02 07:36:32 -07:00
Matt Hamilton
296c457ead [prompt] update "pure" theme submodule 2016-05-02 07:36:18 -07:00