Commit Graph

560 Commits (dca0f7f9177a76f4d8ea8ed9d03f46b114f0319d)

Author SHA1 Message Date
Ben Hilburn 520eed1248 Removing `zle-*` overrides, appear fixed in new ZSH. 8 years ago
Ben Hilburn 02cc43ff09 Merge pull request #309 from krischer/conda-prompt-changes
Conda prompt speedup and configuration
8 years ago
Ben Hilburn 683ca10e36 vcs: adding detection of unstaged / staged for svn repos 8 years ago
Christian Rebischke 31589a5097 added svn hooks.. hope this works 8 years ago
Ben Hilburn 55f061c04d Enabling subversion support for the `vcs` segment. 8 years ago
Lion Krischer 9bc55ab175
Using default way of setting icons and updating doc 8 years ago
Lion Krischer 35beead430
Using set_default function 8 years ago
Lion Krischer 50b978ddc8
Using default color setters 8 years ago
Lion Krischer 97e5684e52
Adapting to newer conda version 8 years ago
Lion Krischer c382c538f0
Make the conda prompt fully configurable 8 years ago
Lion Krischer 8a62fceb7b
Much faster conda env detection - no more file I/O needed. 8 years ago
Andrew Scott ec53035b13 Handle spaces in path when shortening 8 years ago
Ben Hilburn 96731951be Merge branch 'noverbose-battery' of https://github.com/dnmiller/powerlevel9k into nonverbose-battery 8 years ago
Ben Hilburn 4666bd49e6 Now printing a warning if $LANG is set incorrectly. 8 years ago
ruifeng.shan d7c449be34 revise mac battery error when mac default date use linux's 8 years ago
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.
8 years ago
Dan Miller 19ccfa64eb Add option for non-verbose battery 9 years ago
Ben Hilburn 467742286f Merge pull request #275 from andjscott/prompt_dir_shortening
Handle shorting path when in the .git directory
9 years ago
Andrew Scott d720b725e8 Use git's show-toplevel to get top level directory 9 years ago
Ben Hilburn 45ff1d1b51 Merge pull request #276 from andjscott/package_name
Only match first name in package.json
9 years ago
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
9 years ago
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",
      }
    }
9 years ago
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).
9 years ago
Ben Hilburn 41888bf2a9 Merge pull request #260 from thuandt/python-icon
PYTHON ICON for virtualenv prompt
9 years ago
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.
9 years ago
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.
9 years ago
Thuan (Duong Tien) 086cd1fdcf [ADD] python icon in virtualenv prompt 9 years ago
Ben Hilburn 0b57ee3669 Merge pull request #256 from cbourgeois/next
Fix incorrect background jobs number
9 years ago
David McKay 61a0cee4f5 Using logical CPUs, as it's a fairer reflection of CPU load 9 years ago
Clement Bourgeois 1c17acb758 Fix incorrect background jobs number 9 years ago
David McKay d2728f0dd1 Consolidated if statements and fixed OSX cpu cores command 9 years ago
David McKay 78b4ab0414 Improvements to load prompt, now reporting warning and critical at 50% and 70% cpu core utilisation 9 years ago
Jan Laermann 391b3327ee Added anaconda segment.
The segment relies on a lookaround to determine the currently
active conda environment.
If available ack is preferred, otherwise grep will be used.
Recent versions of grep offer `-P` to support perl-regex.
Older ones (e.g. those shipped on OSX) will fail.
9 years ago
Ben Hilburn 511bbcf124 Merge pull request #247 from orhanbalci/next
rust icon added to rust segment
9 years ago
Dominik Ritter 7b2e995299 Fix truncation of changeset in detached tag mode 9 years ago
orhanbalci 72315fdc59 rust icon added 9 years ago
Ben Hilburn 0f4e3e7588 git-tagname: Now showing hash/branchname when sitting on a tag 9 years ago
Ben Hilburn aec9d95295 Merge pull request #229 from alexlafroscia/add-package-name-shortening-strategy
Add shortening strategy based on package.json name
9 years ago
Dominik Ritter 104e774873 Fix configurability of actionformat color 9 years ago
Alex LaFroscia 4ca6938801 Apply max dir length to package name shortener 9 years ago
Ben Hilburn 2d3131fb8a Merge pull request #230 from sabricot/docker_machine
Add a new segment for current active docker machine
9 years ago
Sudarshan Wadkar 7fcac16c5f Combine two checks into one 9 years ago
Sudarshan Wadkar f7b7ff21c9 Fix NVM prompt to return if not used
This commit changes nvm prompt setup to return immediately if no node
version is installed/available.
Currently, prompt complains for lack of global node version.
Specifically, if you install nvm (from brew or manually) and do not have
global node installed (or set), then the prompt should not set or show
anything. This commit ensures this by immediately returning if
`nvm current` returns "none".
9 years ago
sabricot 3c95feb0bd Add a docker machine segment 9 years ago
Alex LaFroscia daa7255e85 Add shortening strategy based on package.json name 9 years ago
Sudarshan Wadkar 415194941c [WIP] Rebase to origin:next branch 9 years ago
Ben Hilburn 9d8041fc76 Fixed actionformat color coding 9 years ago
Ben Hilburn cd5c2e7dcd trying to debug color code that won't deref in `vcs_states` 9 years ago
Ben Hilburn b3fae48893 Merge pull request #220 from dritter/rename_vcs_default_state
Rename vcs default state
9 years ago
Ben Hilburn 5d31763a8e Merge pull request #219 from rmad17/nodeenv-support
Adding `nodeenv` segment.
9 years ago
Dominik Ritter 9ac79bd3aa Rename VCS default state to `clean` 9 years ago
Ben Hilburn 2260b83c98 Merge pull request #214 from dritter/fix_vcs_foreground_color
Allowing VCS Foreground Color to be over-rideable.
9 years ago
Dominik Ritter e9953710f7 Clean up states in VCS segment 9 years ago
rmad17 8d0f4c9e1d Fixed name issue 9 years ago
rmad17 06dd26a0bd Added nodeenv support 9 years ago
rmad17 e0603314d5 Nodeenv work 9 years ago
Ben Hilburn e93d053035 Merge pull request #216 from natemccurdy/issues/215
Improve the rbenv prompt by using `version-name`
9 years ago
Nate McCurdy 01bdee42a2 Improve the rbenv prompt by using `version-name`
Prior to this, the rbenv prompt only showed something if the
$RBENV_VERSION environment variable was set. This was not a complete
solution because rbenv can be configured locally, per directory, with
dotfiles. When using dotfiles, the $RBENV_VERSION variables is not set.

This fixes the issue by taking the output of the `rbenv version-name`
command which shows the real rbenv version being used based on any of
the 4 ways to change rbenv as shown here:

https://github.com/rbenv/rbenv#choosing-the-ruby-version

If the current version of Ruby being used is the same as the global
Ruby, nothing is shown.

This commit also adds documentation to the README that describes the
prompt.

Fixes issue #215
9 years ago
Dominik Ritter a1ef6548d5 Fix dynamic coloring of VCS segment
The VCS segment had a lot of own color definitions. Now they are all
gone, so that the only color definitions are when the segment gets
printed.
9 years ago
Dominik Ritter 7efc6e4187 Fix go test
If no GO is available, there should be no output.
9 years ago
Ben Hilburn 4bbff138fb Merging @theminor's changes from PR #204 9 years ago
Ben Hilburn 4897c795fa Merge branch 'master' into next 9 years ago
Ben Hilburn dfd7ae1f1d Merge pull request #205 from dritter/dir_delimiter
Change default dir truncation delimitor to ellipsis
9 years ago
Ben Hilburn 4f4a15de82 Merge pull request #198 from dritter/vcs_customizable
VCS-hooks customizable
9 years ago
Ben Hilburn 25bf6d60a0 Merge pull request #181 from dritter/split_up_ram_segment
Split up `ram` segment into `ram` and `swap`.
9 years ago
Dominik Ritter 54254600d1 Change default dir truncation delimitor to ellipsis 9 years ago
John Minor d7c26513c8 Add "_UNTRACKED" option for _VCS to change colors - default yellow 9 years ago
Dominik Ritter 15665a4f95 Joining conditional segments now work as expected. If between the last
printed segment is a full but conditional segment, the joined one gets
promoted.
This fixes #186
9 years ago
Dominik Ritter cd78c66997 First try: Now joined segments are promoted to "full" segments, if their
predecessor was conditional and had no output.
9 years ago
Dominik Ritter 930ae170a4 Made the VCS-hooks customizable. 9 years ago
Dominik Ritter eba3a3ca95 Reworked the AWS Elastic Beanstalk segment. 9 years ago
James Bowman af119c9406 Adding command prompt for AWS Elastic Beanstalk environment name. 9 years ago
Dominik Ritter 6aadf76397 Split up `ram` segment into `ram` and `swap`. 9 years ago
Dominik Ritter c379cf2657 Syntax fix. 9 years ago
v1rgul 29b346930b fix wc glitch on OSX 9 years ago
v1rgul 11d00ce713 background_jobs: show number if verbose 9 years ago
Dominik Ritter 01e4e8d324 Added "visual identifier" concept to `icons_test` segment. 9 years ago
rjorgenson 3767397711 fixing segment call for new state implementation in prompt_load 9 years ago
Ben Hilburn 817cdf98a1 Merge pull request #191 from rjorgenson/next
added check for nvm command before running
9 years ago
Kayant cf921fb90c Add sub folder icon when in home subdirectories
Big thanks to @dritter for guidance, @rjorgenson for great explanation.
And @bhilburn for further guidance and encouragement.
See http://i.imgur.com/2Vncypo.png for a presentation of how it looks.
9 years ago
Robert Jorgenson 6f2f78b21f fixed conditional statement 9 years ago
Robert Jorgenson 446f46473b reworked nvm check
Now the prompt segment just returns without doing anything if nvm is not present.
9 years ago
Ben Hilburn 88ed3c2378 Merge branch 'symlink_resolving_improvement' of https://github.com/dritter/powerlevel9k into dritter-symlink_resolving_improvement 9 years ago
Robert Jorgenson 2fa7b1d08f don't output segment if node_version was not populated 9 years ago
rjorgenson e29b3545bd fixed called to ioreg on OS X machines 9 years ago
rjorgenson 9aeff8d43b added check for nvm command before running 9 years ago
Dominik Ritter 989a9b3b4b Improved symlink dereferencing on OSX by calling a perl script. 9 years ago
Dominik Ritter 0b27bdc6f5 Comment cleanup. 9 years ago
Dominik Ritter cdf08734db Cleanup of the `load` segment. 9 years ago
Dominik Ritter d0a76d721c Sorted segments alphabetically. 9 years ago
Dominik Ritter bbaa4a57f9 The foreground and background instructions are spaceless by default. No
need to make them spaceless explicitly.
9 years ago
Ben Hilburn 8dfca40eaf Cleaning up comments. Also fixes #135. 9 years ago
Ben Hilburn c39c8cbb99 Merge pull request #173 from dritter/consistent_visual_identifier
Better support for segments that are just icons.
9 years ago
Niklas Heer 3441f750bf used set_default-function instead 9 years ago
Niklas Heer f472ba7341 added a new variable POWERLEVEL9K_SHORTEN_DELIMITER to specifiy the delimiter 9 years ago
Niklas Heer 2fdbd6158c added fishe-like shortening strategy 9 years ago
Dominik Ritter e9ef0429e4 More consistent visual identifiers. Now even segments that just have an
icon as content print these icons as visual identifiers. Some of these
segments have a verbose mode. If this verbose mode is false, some print
just the icon (like the battery segment), which didn't work correctly
before this change.
9 years ago
Dominik Ritter d5a8211aa1 Merge branch 'battery_visual_identifier' of github.com:dritter/powerlevel9k into battery_visual_identifier 9 years ago
Dominik Ritter 2a519ee2d7 Merge branch 'status_color_fix' into battery_visual_identifier 9 years ago
Dominik Ritter ac4502ca1f Added the "visual identifier" concept to the `vcs` segment. 9 years ago
Dominik Ritter 5cfd800585 Added the "visual identifier" concept to the `symfony2_version` segment. 9 years ago
Dominik Ritter 045f451e4e Added the "visual identifier" concept to the `symfony2_tests` and
`rspec_stats` segments.
9 years ago
Dominik Ritter b738ba900c Added the "visual identifiers" concept to the `ram` segment. 9 years ago
Dominik Ritter 7ed0abebd6 Little VCS segment cleanup. 9 years ago
Dominik Ritter 0cb1c0ffda Changed the order of default segments. 9 years ago
Dominik Ritter ad2e4f0bcc Added ability to join segments together. You always join a segment
with the previous one. Just add "_joined" to the segment name in
your `POWERLEVEL9K_LEFT_PROMPT_ELEMENTS`-array.

Developers: Be aware that the order of parameters given to
left/right_prompt_segment has changed!
9 years ago
Dominik Ritter cd5b4d0deb Added the "state" concept to the `dir` segment. 9 years ago
Dominik Ritter 056d4ff29a Only check for a user defined variable if we really have an visual
identifier.
9 years ago
Dominik Ritter 409303f45d Added the "visual identifier" concept to the `rbenv` segment. 9 years ago
Dominik Ritter 4fc59fd57c Added the "visual identifier" concept to the `node_version` segment. 9 years ago
Dominik Ritter 1d0f47fb97 Bugfix: the default should be a pure color, not a full ZSH color
modifier.
9 years ago
Dominik Ritter 78d22ba309 Interesting: We don't need to swap the whitespaces if the visual
identifier should be rendered on the right side, because the terminal
gets printed from left to right and the double width characters need
their "print me right"-whitespaces on the right side anyways.
9 years ago
Dominik Ritter 6f7d6f7259 For left aligned segments start the foreground color after the visual
identifier has been printed.
9 years ago
Dominik Ritter c5726bc548 Added the "visual identifier" concept to the `todo` segment. 9 years ago
Dominik Ritter d514b077d0 Added the "visual identifier" concept to the `rvm` segment. 9 years ago
Dominik Ritter fd0fcba5e9 Added the "visual identifier" concept to the `node_version` segment. 9 years ago
Dominik Ritter 35b1cb5b8d Added the "visual identifier" concept to the `load` segment. 9 years ago
Dominik Ritter bb5cca9af7 Added the "visual identifier" concept to the `ip` segment. 9 years ago
Dominik Ritter d5d5acb490 Added the "visual identifier" concept to the `dir` segment. 9 years ago
Dominik Ritter e505c0698e Added the "visual identifier" concept to the `aws` segment. 9 years ago
Dominik Ritter 1194826ef4 Used the new "visual identifier" concept for the battery segment. 9 years ago
Dominik Ritter 0c528461fb Allow users to overwrite the color for the visual identifier only. 9 years ago
Dominik Ritter 036433dd53 Segments now can have "visual identifiers" which are basically just
special icons.
9 years ago
Dominik Ritter 21f80e4da7 Removed trailing whitespaces. 9 years ago
Dominik Ritter 5a4de1d274 Split up the `status` segment into a `background_jobs`, `root_indicator` and `status` segment.
This fixes #163
9 years ago
Ben Hilburn 0059f9a066 Merge pull request #154 from dritter/hotfix/utility_function_loading
Try to fetch the utility function path automatically
9 years ago
Ben Hilburn df153db93b Merge pull request #157 from dritter/battery_rework
Performance improvement of battery segment
9 years ago
Dominik Ritter 8c71a28a77 The script location should only be set once! 9 years ago
Dominik Ritter 0dc36ee614 We need to always evaluate the path for the home/folder icon mechanism to work correctly. 9 years ago
Dominik Ritter b01588e2f9 File might be a symlink. 9 years ago
Dominik Ritter 46575182c7 Fallback mechanism is now more robust. If does not matter if the user specified a file or a directory in `POWERLEVEL9K_INSTALLATION_PATH`. 9 years ago
Dominik Ritter 972e24ad41 Added more checks to find the installation dir. Now we try to find prezto automatically and print a nice warning as a fallback. 9 years ago
Dominik Ritter c10bac90ba In Awesome-Mode either print a home-icon or a folder icon, depending in which directory the user is. 9 years ago
Ben Hilburn 3fea92369f Merge pull request #153 from Tritlo/custom_string
Adding a segment that can execute a custom command.
9 years ago
Dominik Ritter b8d7d1387e By default: set verbose mode on. 9 years ago
Ben Hilburn 08a3b49d73 Merge pull request #155 from dritter/hotfix/go_version_fix
Fix for the GO segment.
9 years ago
Dominik Ritter 23e2a54067 Added a verbose mode. 9 years ago
Dominik Ritter 323610cebf More structure to the battery segment: Now there is a concept of "states" that a battery can have. That makes the code much clearer and users could adjust the colors of these states as they want. 9 years ago
Dominik Ritter 3437c7850c Battery icon is already defined in the icons-array. 9 years ago
Dominik Ritter c8137fcf1a Pre-Grep the raw data to save some memory and to avoid cluttering up the output of `setopt xtrace` too much. 9 years ago
Dominik Ritter dad38b0592 Better code structure. 9 years ago
Dominik Ritter da2b8e342e Arithmetics in ZSH 101: If you want to calculate a percentage, multiply the numerator with 100 _before_ the devision. With that method there is no need for hacks to convert the numerator into a float. 9 years ago
Dominik Ritter 239aa29a12 Better use of test flags. 9 years ago
Dominik Ritter 8d72b5eb12 Renamed variable "conn" to "icon_color" 9 years ago
Dominik Ritter b316089c6b Make use of set_default method for better code readability. 9 years ago
Dominik Ritter c0efe9c342 Performance improvement: Avoid aggregation of data over and over again by extracting a local variable. 9 years ago
Dominik Ritter 7774294113 Performance improvement by calculating the battery percentage with zsh. 9 years ago
Dominik Ritter 4b636d226e Renamed variable. 9 years ago
Dominik Ritter 49a3a3e750 The `nvm` segment should use the standard node icon (rather than defining an own icon). 9 years ago
Dominik Ritter 351dc84320 Fix for the GO version. 9 years ago