Commit graph

804 commits

Author SHA1 Message Date
Ben Hilburn
c4fdc8f708 Improved speed of prompt_vcs by 50%-66%. 2016-08-31 10:35:05 -04:00
Ben Hilburn
520eed1248 Removing zle-* overrides, appear fixed in new ZSH. 2016-08-30 21:19:14 -04:00
Ben Hilburn
02cc43ff09 Merge pull request #309 from krischer/conda-prompt-changes
Conda prompt speedup and configuration
2016-08-30 20:57:46 -04:00
Ben Hilburn
683ca10e36 vcs: adding detection of unstaged / staged for svn repos 2016-08-30 20:44:07 -04:00
Christian Rebischke
3b0da2c348 fixed svn-detect-changes().. the svn prompt has now the same behaviour as the git prompt.. 2016-08-30 20:41:51 -04:00
Christian Rebischke
e134c70bc1 swapped half and full dirty in svn-detect-changes 2016-08-30 20:41:51 -04:00
Christian Rebischke
31589a5097 added svn hooks.. hope this works 2016-08-30 20:41:51 -04:00
Christian Rebischke
62e41ada1f added vi-svn-detect-changes() in functions/vcs.zsh 2016-08-30 20:41:51 -04:00
Ben Hilburn
55f061c04d Enabling subversion support for the vcs segment. 2016-08-30 20:41:51 -04:00
Lion Krischer
9bc55ab175
Using default way of setting icons and updating doc 2016-08-31 00:31:33 +02:00
Lion Krischer
35beead430
Using set_default function 2016-08-31 00:23:38 +02:00
Lion Krischer
50b978ddc8
Using default color setters 2016-08-31 00:21:01 +02:00
Lion Krischer
97e5684e52
Adapting to newer conda version 2016-08-31 00:08:01 +02:00
Lion Krischer
fb211bc04c
Document all the conda prompt changes 2016-08-31 00:08:01 +02:00
Lion Krischer
c382c538f0
Make the conda prompt fully configurable 2016-08-31 00:08:01 +02:00
Lion Krischer
8a62fceb7b
Much faster conda env detection - no more file I/O needed. 2016-08-31 00:08:01 +02:00
Ben Hilburn
02820a9f3f Merge pull request #300 from andjscott/prompt_dir_shortening
Handle spaces in path when shortening
2016-08-30 17:40:31 -04:00
Andrew Scott
ec53035b13 Handle spaces in path when shortening 2016-08-11 21:28:31 +01:00
Ben Hilburn
9d172f58c2 Finally adding a license to powerlevel9k 2016-07-12 21:07:51 -04:00
Ben Hilburn
96731951be Merge branch 'noverbose-battery' of https://github.com/dnmiller/powerlevel9k into nonverbose-battery 2016-07-12 20:44:30 -04:00
Ben Hilburn
3291b4d476 Merging ability to hide tags from VCS segment. 2016-07-12 20:28:01 -04:00
Ben Hilburn
b893d66a46 Merge branch 'next' of https://github.com/Xetius/powerlevel9k into xetius-vcs-hide-tags 2016-07-12 20:17:25 -04:00
Chris Hudson
ef2d01a2aa Added POWERLEVEL9K_VCS_HIDE_TAGS variable to control displaying of vcs tags in segment 2016-07-07 22:40:26 +01:00
Ben Hilburn
4666bd49e6 Now printing a warning if $LANG is set incorrectly. 2016-07-07 13:51:26 -04:00
Ben Hilburn
1c9ec53d58 Merge branch 'master' into next 2016-07-07 13:04:13 -04:00
ruifeng.shan
d7c449be34 revise mac battery error when mac default date use linux's 2016-07-07 13:02:16 -04:00
Mateus "Doodad" Medeiros
20b4d2b43e Make prompt_custom not print the segment if empty
Currently you can't make a conditional custom segment. This changes the
prompt_custom function responsible for printing custom segments so that
it won't print the segment in case the content is empty.

With this it becomes possible to make conditional custom prompts simply
by making it not print anything when it's not supposed to be shown.
2016-07-07 13:02:16 -04:00
Ben Hilburn
81c55b4b74 Merge pull request #282 from Mrngilles/new_python_icon
Changed python icon to snake
2016-07-07 12:54:50 -04:00
Marin Gilles
f50ac9edd8 Changed python icon to snake 2016-06-23 07:51:02 +02:00
Dan Miller
d39e57f4d7 Update README with POWERLEVEL9K_BATTERY_VERBOSE option 2016-06-16 22:35:53 -07:00
Dan Miller
19ccfa64eb Add option for non-verbose battery 2016-06-16 22:33:09 -07:00
Ben Hilburn
467742286f Merge pull request #275 from andjscott/prompt_dir_shortening
Handle shorting path when in the .git directory
2016-06-14 13:28:08 -04:00
Andrew Scott
d720b725e8 Use git's show-toplevel to get top level directory 2016-06-14 11:58:33 +01:00
Ben Hilburn
45ff1d1b51 Merge pull request #276 from andjscott/package_name
Only match first name in package.json
2016-06-13 22:12:55 -04:00
Ben Hilburn
af825c7cf4 Merge pull request #261 from wadkar/pyenv
Add pyenv segment to show active non-system python version
2016-06-13 22:10:22 -04:00
Andrew Scott
c3019d11ef Handle shorting path when in the .git directory
`git rev-parse --git-dir` returns just `.` when in the top level of
a`.git` directory. This would cause a problem when extracting the
package_path. Closes #271
2016-06-12 14:52:10 +01:00
Andrew Scott
19ceb08372 Only match first name in package.json
This ensures that the following package.json extract would just give the
prompt "foo" rather than "foo\nbar".

    {
      "name": "foo",
      "author":
      {
          "name": "bar",
      }
    }
2016-06-12 14:50:22 +01:00
Sudarshan Wadkar
99429ab268 Add new pyenv segment to show active python version
This commit provides a new segment `pyenv` to show current python environment.
This prompt can be used in place of `virtualenv` segment. However, it is
targeted at users of [pyenv](https://github.com/yyuu/pyenv) and not meant to
replace the `virtualenv` segment.

The prompt works by parsing output of `pyenv version` and displaying the first
word of the output as segment text. The design (color etc.) is same as the
`virtualenv` segment including the icon. The segment would need to be
revisited if `pyenv version` changes its output format.

Tested on my personal machines (Mac OSX 10.11.4 and Ubuntu 15.04).
2016-06-03 15:50:37 -04:00
Ben Hilburn
cef8c65586 Merge pull request #268 from mateusmedeiros/hide-custom-segment-when-empty
Make prompt_custom not print the segment if empty
2016-05-27 11:55:04 -04:00
Ben Hilburn
41888bf2a9 Merge pull request #260 from thuandt/python-icon
PYTHON ICON for virtualenv prompt
2016-05-27 11:53:02 -04:00
Ben Hilburn
66ece86773 Merge pull request #266 from dritter/264_fix_script_location
Refactor location installation path code
2016-05-27 11:48:33 -04:00
Mateus "Doodad" Medeiros
89fdfa0148 Make prompt_custom not print the segment if empty
Currently you can't make a conditional custom segment. This changes the
prompt_custom function responsible for printing custom segments so that
it won't print the segment in case the content is empty.

With this it becomes possible to make conditional custom prompts simply
by making it not print anything when it's not supposed to be shown.
2016-05-24 11:02:35 -03:00
Dominik Ritter
47879f4b7b Refactor location installation path code
Now it is possible to set the installation path by setting
POWERLEVEL9K_INSTALLATION_PATH. If set, this path will always be used.
If it was not set manually, we try to determine the path automatically.
2016-05-24 02:31:52 +02:00
Thuan (Duong Tien)
086cd1fdcf [ADD] python icon in virtualenv prompt 2016-05-04 21:48:46 +07:00
Thuan (Duong Tien)
ec25e3b3af [ADD] PYTHON_ICON 2016-05-04 21:16:16 +07:00
Ben Hilburn
0b57ee3669 Merge pull request #256 from cbourgeois/next
Fix incorrect background jobs number
2016-05-03 21:59:07 -04:00
Ben Hilburn
af7d952480 Merge pull request #252 from rawkode/feature/better-battery-core-improvements
Improvements to load prompt, now reporting warning and critical at 50…
2016-05-02 17:29:32 -04:00
David McKay
61a0cee4f5 Using logical CPUs, as it's a fairer reflection of CPU load 2016-05-02 15:35:43 +01:00
Clement Bourgeois
1c17acb758 Fix incorrect background jobs number 2016-04-29 14:20:19 +02:00
David McKay
d2728f0dd1 Consolidated if statements and fixed OSX cpu cores command 2016-04-25 07:08:36 +01:00