Commit graph

153 commits

Author SHA1 Message Date
Kaleb Elwert 2f867d6f22 Revert "prompt: remove prompt_sp from prompt_smiley_setup as it is not needed"
This reverts commit 24e5e49ff2.
2017-08-10 16:21:46 -07:00
Kaleb Elwert 24e5e49ff2 prompt: remove prompt_sp from prompt_smiley_setup as it is not needed 2017-08-10 13:39:49 -07:00
Kaleb Elwert 730fc4690e prompt: add sp option to prompt_setup functions
This was a change in zsh 5.4.1 where prompt_sp is now reset on calls to
prompt, unlike previous behavior where it was set by default. This
restores the previous default behavior.

Refs #1423, but is not a complete fix because we need to wait for
external prompts to update as well.
2017-08-10 11:23:30 -07:00
Indrajit Raychaudhuri 5e295b0835 [prompt] Remove spurious duplicate section
Remove duplication 'Prompt Display Length' section.
Also, adjust wrapping for `~`.
2017-08-09 15:07:38 -05:00
Indrajit Raychaudhuri a60499f933 [general] Miscellaneous cleanup and formatting 2017-08-04 13:45:56 -05:00
Kaleb Elwert 7e7124e84a Update agnoster prompt to include security fix
Fixes #1267
2017-07-25 14:15:07 -07:00
Kaleb Elwert 9bdc1b35d5 Migrate sorin prompt to zsh-async (#1385)
This includes some improvements by @indrajitr in addition to the main migration.

The first step was to avoid PROMPT and RPROMPT modification when possible (which may help resolve some other issues as well relating to zsh crashes with the sorin prompt) then update the displayed git information in a separate variable rather than a command.

We use zsh-async for creating and running background tasks. The sorin prompt uses it to update git info without blocking the prompt from displaying (because of how long it can take). In the future it may be worth moving more tasks and more prompts to using this.

The move to zsh-async does make the git prompt slower in some circumstances (most noticeable in large repos), but this is a worthwhile tradeoff to avoid the cache file which had a number of potential security holes.

We have also switched to adding zsh-async as an external submodule (rather than the version bundled with pure) which may cause some migration headaches, but it will be worth it in the long run.
2017-07-24 11:55:02 -07:00
Indrajit Raychaudhuri 17a59bada7 [prompt] Rename helper function promptpwd to prompt-pwd for consistency
Changes:
* In prezto, function names are hyphenated ('-') by convention,
  rename `promptpwd` to `prompt-pwd` accordingly.
* Unset local variable `current_pwd` proactively.
* Tweak additional documentation for `prompt-pwd`.
2017-07-22 13:13:00 -05:00
Indrajit Raychaudhuri ac628c9059 [general] Switch code block formatting to use fence formatting
Changes:
* Indented code block doesn't support syntax highlighting, use fenced
formatting (```) instead for better syntax highlighting
* Wrap commands/functions in backticks
* Typo fixes
2017-07-22 13:11:29 -05:00
Kaleb Elwert 7d5beeab51 Add comments into each of the function files to make them easier to find 2017-07-06 16:13:36 -07:00
Samantha McVey 5cd3380d9d [prompt/sorin] Fix branch code exploit vulnerability
Escape all $ except the first $. Escape all backtick `'s. This prevents
variable names or shell expansions placed as branch names from
remotely exploiting code.

Fixes issue #1267 for sorin prompt.
2017-07-05 13:06:36 -07:00
Kaleb Elwert a0541ce7a5 Default sorin theme to /tmp when TMPDIR is not set
Fixes #1331
2017-06-16 10:37:54 -07:00
Alexander Neumann 2f20a80f72 sorin theme: Use a proper temp file for async data 2017-06-13 10:36:35 -07:00
Kyle Rich 723b3812e1 Convert long-pwd to pwd-length 2017-04-27 13:33:40 -07:00
Kyle Rich 7c509a264f Add zstyle option to show pwd in long format 2017-04-26 11:30:10 -07:00
Patrick Bos c38c2dd909 Move python-info call in paradox from preexec to precmd 2017-04-15 16:44:05 -07:00
Kaleb Elwert 8655cd543b Ensure extendedglob is set in promptpwd 2017-04-13 01:16:44 -07:00
Matt Hamilton 60c433d4ce Move common promptpwd code to external function 2017-04-13 01:15:01 -07:00
Kaleb Elwert b963484fe7 Only try to run python-info if it exists for the paradox prompt 2017-04-11 15:12:09 -07:00
Kire Ledan 95d19b37c1 Added support for python venv display in paradox prompt 2017-04-04 23:52:12 -07:00
Kaleb Elwert 27c2ccd8b9 Update external prompt modules 2017-04-04 23:00:28 -07:00
Plastix 8820b71f37 Update pure prompt to v1.5.2
This fixes a security issue with malicious branch names
2017-04-03 11:42:05 -07:00
Sorin Ionescu 8bd720b0c7 Update pure theme 2016-02-28 22:32:40 -05:00
Sorin Ionescu 165879d4b3 Update pure theme 2015-11-09 02:09:48 -05:00
Sorin Ionescu f2a826e963 Add preview function to sorin theme 2015-05-31 16:51:29 -04:00
Sorin Ionescu bdec6c4e20 Redraw only when called from subprocess 2015-05-31 16:50:03 -04:00
Sorin Ionescu ef634f38a4 Replace signal TERM with KILL 2015-05-31 16:47:16 -04:00
Sorin Ionescu b761261b11 Replace signal USR1 with WINCH 2015-05-31 16:46:42 -04:00
Sorin Ionescu 02c5f776fc [Fix #892] Symlink prompt pure async dependency 2015-05-28 20:24:58 -04:00
Sorin Ionescu f7ea78078f Update pure theme 2015-05-25 21:58:43 -04:00
Sorin Ionescu fe64f91f52 Update sorin screenshot 2015-05-19 18:25:40 -04:00
Sorin Ionescu b46769149b Remove Emacs indicator
The user always knows that he is inside Emacs making the indicator
unnecessary.
2015-05-19 18:25:40 -04:00
Sorin Ionescu 999f0d1a74 Use numerical colors 2015-05-19 18:25:40 -04:00
Sorin Ionescu f6a2c73423 Remove 'git:' prefix 2015-05-19 18:25:40 -04:00
Sorin Ionescu a1dea6ae43 Get Git status asynchronously 2015-05-19 18:25:39 -04:00
Sorin Ionescu 08676a273e Update pure theme 2015-05-03 13:44:41 -04:00
Sorin Ionescu ac8bc74ef0 Update pure theme 2015-04-01 16:32:38 -04:00
Sorin Ionescu 4411c95a83 Update pure theme 2015-02-12 19:17:38 -05:00
Jacob Swartwood 925b94b6e2 Fix Powerline unicode characters
Branch & separator characters are updated to display properly.
2014-12-08 18:02:22 -05:00
Ranek Kiil c171621747 Fix issue with several themes where errors occur
if the git module is not loaded.
2014-12-08 17:58:15 -05:00
Rys Sommefeldt 3dd4cbc3c0 Fix typo
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-11-14 17:24:07 -05:00
Sorin Ionescu d349c1cec7 Convert the PeepCode theme to git-info 2014-11-11 20:51:47 -05:00
Sorin Ionescu a7a4912940 Add paradox theme 2014-11-11 20:51:46 -05:00
Sorin Ionescu 82710c29fc Fix theme function declaration style 2014-11-11 20:51:46 -05:00
Sorin Ionescu 9f82926f6e Add pure theme 2014-11-11 20:51:46 -05:00
Sorin Ionescu 61e91b8fb0 Add agnoster theme 2014-11-11 20:51:46 -05:00
Sorin Ionescu 967c91a351 Add powerline theme 2014-11-11 20:51:46 -05:00
Sorin Ionescu 087fce8548 Update sorin theme screenshot 2014-11-11 20:51:45 -05:00
Sorin Ionescu 2ae905a625 Indicate inside Emacs 2014-11-11 20:51:45 -05:00
Sorin Ionescu 19fc31c342 Indicate SSH connections 2014-11-11 20:51:45 -05:00
Kevin Laude e76df6022d Add cloud theme
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-11-11 20:51:44 -05:00
Sorin Ionescu c2d62c3b47 Add ruby-info to smiley theme 2014-11-11 20:51:44 -05:00
Nadav Shatz 03336db523 Add smiley theme
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-11-11 20:51:44 -05:00
Sorin Ionescu 1bc4235a5e Escape '%' in path 2014-11-11 20:51:44 -05:00
Daniel Møller Kristensen c078c47c9d Add damoekri theme
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-11-11 20:51:44 -05:00
Sorin Ionescu 0bede677e6 Add kylewest theme 2014-11-11 20:51:44 -05:00
Sorin Ionescu ad09f29fd5 Add skwp theme 2014-11-11 20:51:42 -05:00
Paul Gideon Dann 567506f7e7 Update giddie theme
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-11-05 22:52:38 -05:00
Sorin Ionescu 13ed3a1bf7 Add giddie theme 2014-11-05 22:52:38 -05:00
Sorin Ionescu ab7f697734 [Fix #713] Set prompt theme off in unsupported terminal 2014-11-05 17:41:36 -05:00
Sorin Ionescu a84ac5b002 Only one newline at end of file 2014-10-09 23:38:15 -04:00
Sorin Ionescu b4884d4d45 [Fix #626] Escape '%' in path 2014-10-06 16:54:21 -04:00
Sorin Ionescu e836957e4f [Fix #221] Add a simple git-info 2013-05-18 15:31:32 -04:00
Rory O’Kane f431af790b Fix misspellings of the word bellow in READMEs 2013-04-24 22:50:17 -04:00
Sorin Ionescu b531191e2c [Fix #366] Distinct position with red 2013-01-14 15:52:32 -05:00
Sorin Ionescu 4c116cb4d2 Rename git-info zstyle patterns 2012-10-02 12:47:37 -04:00
Sorin Ionescu f12c24e76e Rename python-info zstyle patterns 2012-10-02 12:47:32 -04:00
Sorin Ionescu 8ea0e42b7f Rename ruby-info zstyle patterns 2012-10-02 12:47:26 -04:00
Sorin Ionescu 141a1ba947 Rename editor-info zstyle patterns 2012-10-02 12:47:20 -04:00
Sorin Ionescu d7fb7cd215 Add a missing space to peepcode 2012-09-30 16:07:15 -04:00
Sorin Ionescu eb93677e4a [Fix #303] Remove extra '/' in sorin theme 2012-09-28 18:24:34 -04:00
Sorin Ionescu be0e4245a6 [Fix #301] Unset $MATCH after use 2012-09-26 16:51:32 -04:00
Sorin Ionescu bc8533c30e Update sorin theme screenshot 2012-09-25 17:25:29 -04:00
Sorin Ionescu 52a8c98337 [Fix #290] Add fish shell style PWD to sorin theme 2012-09-25 00:54:49 -04:00
Sorin Ionescu 716c12cfbc Fix vcs_info zstyles in nicoulaj theme 2012-09-10 15:59:38 -04:00
Sorin Ionescu e91bd95ffb Set unused prompts to an empty string 2012-09-10 15:59:38 -04:00
Sorin Ionescu 1ff2b5ee8d Fix dirty indicator spacing in peepcode theme 2012-09-10 15:59:38 -04:00
Sorin Ionescu eb29987ce9 [Fix #277] Make the peepcode theme status symbol customizable 2012-09-10 15:59:18 -04:00
Sorin Ionescu fad7122a92 [Fix #261] Add documentation for writing prompt themes 2012-09-10 15:58:55 -04:00
Sorin Ionescu ab0eedd45e Update sorin theme screenshot 2012-09-09 20:06:12 -04:00
Sorin Ionescu 80909fd04a Change Git branch and prompt color 2012-09-09 19:11:17 -04:00
Sorin Ionescu fea343c03a Move the vi mode indicator to the left prompt 2012-09-09 14:00:43 -04:00
Sorin Ionescu e5e26eccff [#245] Convert helper into a module 2012-09-08 19:23:33 -04:00
Sorin Ionescu dd72b55f52 [Fix #260] Add peepcode theme 2012-09-07 08:59:37 -04:00
Sorin Ionescu cc7e43b242 [Fix #253] Move Prezto settings into their own file 2012-09-03 16:52:47 -04:00
Sorin Ionescu fb9a20591f [Fix #197] Rebrand as Prezto
Conflicts:
	README.md
	runcoms/zshenv
2012-09-03 16:51:27 -04:00
Sorin Ionescu 98c545a102 [Fix #248] Replace virtualenv_info with python-info
Conflicts:
	modules/python/README.md
2012-09-03 10:34:41 -04:00
Sorin Ionescu d22d250a5c Add missing theme screenshots 2012-08-06 16:53:03 -04:00
Sorin Ionescu a9b6c84ea5 Update comments in themes 2012-08-06 16:52:38 -04:00
Sorin Ionescu 7bb6d588d7 Simplify and clean up the steeef theme 2012-08-06 16:45:50 -04:00
Sorin Ionescu 1c136faf73 Remove unnecessary checks in steeef
Many programs affect repositories, not just the command line versions.
2012-08-06 15:44:13 -04:00
Sorin Ionescu 95faf814b5 [Fix #230] Check the expanded command in steeef preexec 2012-08-06 12:32:50 -04:00
Sorin Ionescu 7731be2f5e Fix diction in a comment 2012-05-31 17:35:07 -04:00
Sorin Ionescu 075f516763 Clean up READMEs 2012-05-21 20:34:07 -04:00
Colin Hebert 10ab5e2b58 [Fix #111] Add documentation for prompt 2012-04-15 15:32:40 -04:00
Sorin Ionescu f48a60f40e [Fix #127] Indicate overwrite mode in sorin theme 2012-04-11 17:57:17 -04:00
Sorin Ionescu 000b3653e6 [Fix #126] Do not evaluate undefined $git_info
Fix a bug introduced in aa0c1fa.
2012-04-11 12:29:45 -04:00
Sorin Ionescu 64da1ed627 Rename $editor_keymap_info to $editor_info[keymap] 2012-04-10 10:27:56 -04:00
Sorin Ionescu 1ba592f40a Add usage information for prompt 2012-04-09 17:45:33 -04:00
Sorin Ionescu aa0c1faa19 [Fix #88] Allow arbitrary git-info formats
The terms 'prompt' and 'rprompt' are not always appropriate.
A multi-line theme may choose 'line-one' and 'line-two' instead.

@ColinHebert contributed to this commit.
2012-04-09 17:45:31 -04:00