Commit Graph

562 Commits (2817b45f050e753b636ffb471413fef24b193f67)

Author SHA1 Message Date
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
Matthías Páll Gissurarson df51db1412 added a segment to be able to display the result of a custom command. 9 years ago
Dominik Ritter 727b3e501b Now the script just returns instead of exiting with an errorcode. The reason for this is that users can't log in anymore if the specified a wrong path in POWERLEVEL9K_INSTALLATION_PATH and the script `exit`s. With `return` not the whole shell is terminated, so users get an ugly prompt, but are still able to modify .zshrc. 9 years ago
Dominik Ritter a0323b7e80 The installation path of powerlevel9k is now configurable by setting the variable POWERLEVEL9K_INSTALLATION_PATH. The value must be set to the exact location of the powerlevel9k.zsh-theme file (including the file name).
This has only effect if you load your theme as a function and your ZSH version is below 5.0.8.
9 years ago
Dominik Ritter 0aaf999857 For ZSH 5.0.8 `whence -v` tells also the path to the command. In that case we can use that information to get a proper path to the utility functions. 9 years ago
Ben Hilburn 1eadf5ad76 Merge pull request #152 from Tritlo/battery_fix
Battery segment fix and enhancement.
9 years ago
Ben Hilburn 951a4956fc Merge pull request #150 from Tritlo/prompt_end
Add icon for end of left prompt.
9 years ago
Matthías Páll Gissurarson 36fa3f2277 fix some issues with the battery segment 9 years ago
Matthías Páll Gissurarson 231cfda809 added icon to be able to set the end of the prompt explicitly 9 years ago
Ben Hilburn e79a2ffff0 Merge pull request #149 from Tritlo/master
Now allowing the RPROMPT to be on a newline.
9 years ago
Matthías Páll Gissurarson 47eb8f10ac added variable to have rprompt on the newline 9 years ago
Dominik Ritter f9957ca559 Used typeset to define the local array. This does the trick on linux. 9 years ago
Dominik Ritter ce7b99cdaf Added a mechanism to make deprecated segments visible to the user. 9 years ago
Ben Hilburn 9b067ea29c Merge pull request #142 from dritter/rust_version
Added Rust version segment.
9 years ago
Dominik Ritter c81863e234 Add an Identifier to version. 9 years ago
Dominik Ritter 5d314bec8e Add segment for rust version. 9 years ago
Dominik Ritter 643555a30c Huge performance improvement if you use `rvm` segment.
Thanks to @rjorgenson for the hint.
9 years ago
Ben Hilburn 0673352e7e Merge branch 'master' into next 9 years ago
Stéphane Dupille 81a4b3907d Get terminal capabilities using a zsh builtin for portability 9 years ago
Dominik Ritter eef5286005 Issue #131: This fixes history-substring-search, home and end keys. 9 years ago
Dominik Ritter 538d8b8fa8 Bugfix for prezto: In prezto the theme gets called by function (via zstyle). In that case we hardcode the path to the theme as there seems no way to find the location so that we can source our other functions. 9 years ago
Dominik Ritter 29693f957d If the theme-file is linked, dereference that link and source the right functions. 9 years ago
Dominik Ritter 0fa635275c Extracted color functions to a separate file. 9 years ago
Dominik Ritter 2b8cb5b9a4 Extracted VCS-hooks into a separate file. 9 years ago
Dominik Ritter d6584e13da Extracted icons into a separate file. 9 years ago
Dominik Ritter fbd1b99bab Renamed "power-utilities.zsh" to just "utilities.zsh". 9 years ago
Dominik Ritter 23f86afeb3 Merge branch 'next' into color_detection 9 years ago
Ben Hilburn e8771a7039 Merge branch 'master' into next 9 years ago
Ben Hilburn b2e6beec51 Merge pull request #123 from martinpelikan/master
Fixes #122, SI prefixes should be evaluated as strings.
9 years ago
Ben Hilburn 84681d4cc1 Merge pull request #126 from rjorgenson/next
added a prompt segment to display battery status on laptops
9 years ago
Ben Hilburn 981c85af39 Merge pull request #127 from dritter/go_prompt
Adding Go version segment.
9 years ago
Dominik Ritter d13d9565bc Merge branch 'next' into ram_prompt 9 years ago
Daniel Gordon fa85a5158f Rephrasing of error message when TERM not 256 color
- Literal command to be added is highlighted in blue
    - Now beginners won't try to add an incorrect command to ~/.zshrc
9 years ago
Dominik Ritter e94394bc67 Merge branch 'next' into go_prompt 9 years ago
Dominik Ritter 5addfdc9e0 Moved utility-functions to "functions/power-utilities.zsh". 9 years ago
rjorgenson 3e828cbaa4 fixed some edge cases I ran into during usage of the linux segment 9 years ago
rjorgenson ff3f6b8e83 added time remaining support to battery segment on Linux 9 years ago
rjorgenson fb6738967e added Linux support to battery prompt segment 9 years ago
rjorgenson 2e406a5bdf editor automatically removed whitespace 9 years ago
rjorgenson 118008c402 fixed output string color declaration 9 years ago
rjorgenson acf5e97756 added battery prompt segment usable on OS X systems 9 years ago
Dominik Ritter c10cbabb9e Merge branch 'next' into color_detection 9 years ago
Martin Pelikan 8e458e5e9a Fixes #122, SI prefixes should be evaluated as strings. 9 years ago
Ben Hilburn ce1ea04c13 Merge pull request #118 from dritter/whitespace_customization
Made whitespaces between segment separators customizable
9 years ago
Ben Hilburn 34add8aedf Merge pull request #117 from dritter/vi_customizations
Make the vi_mode segement more customizable.
9 years ago
Ben Hilburn 01b158c020 Merge branch 'vcs_cleanup' of https://github.com/dritter/powerlevel9k into dritter-vcs_cleanup 9 years ago
Ben Hilburn d459ec0983 Merge pull request #114 from alexlafroscia/add-nvm-prompt-segment
Add nvm prompt segment
9 years ago
Ben Hilburn 9f92995f61 Merge pull request #120 from partp/fix-virtualenv
Fixes `VIRTUAL_ENV_DISABLE_PROMPT` condition
9 years ago
rjorgenson 5add0daad0 added prompt segment for todo.txt task number 9 years ago
Parth Panchal ae035e537a Fixes `VIRTUAL_ENV_DISABLE_PROMPT` condition 9 years ago
Dominik Ritter b04fae9173 Made whitespaces between segment separators customizable. 9 years ago
Dominik Ritter 86b460f06b vi_mode segement more customizable. 9 years ago
Dominik Ritter ab3577a795 Merge remote-tracking branch 'ben/next' into go_prompt 9 years ago
Dominik Ritter cd7e8bea61 Merge remote-tracking branch 'ben/next' into ram_prompt 9 years ago
Dominik Ritter 5a0f330cd7 Merge remote-tracking branch 'ben/next' into color_detection 9 years ago
Dominik Ritter 3bb8cd4593 Merge remote-tracking branch 'ben/next' into vcs_cleanup 9 years ago
Alex LaFroscia 7e6339ec27 Add NVM prompt segment
Prints out the Node version that is currently active if it is different than the default version specified by NVM
9 years ago
Dominik Ritter f7e1f64b4c Added handling for bright colors. 9 years ago
Dominik Ritter 6bf2869a1c Cleanup of VCS-segment. Now `vcs_info` is only invoked, if the user configured to show the `vcs` segment. 9 years ago
Dominik Ritter 20447a22c9 Removed unnecessary literal escape sequences. 9 years ago
Dominik Ritter 0e37d8ef86 Added a new function `isSameColor` to handle color comparisons. It is now possible to compare ANSI colors (e.g. "black" or "bg-red") with ZSH-style colors (e.g. "001"). This way the subsegments work much better, as users can define color codes the way they like. 9 years ago
John Koelndorfer 66b4194daf Quote value of IS_BSD_SED.
If this isn't quoted, in can bleed through to stdout in certain
circumstances.
9 years ago
Dominik Ritter d436c60f24 Merge branch 'ram_prompt' of github.com:dritter/powerlevel9k into ram_prompt 9 years ago
Dominik Ritter be8bb63fc3 Merge branch 'next' into go_prompt 9 years ago
Dominik Ritter e8a53c253b Merge branch 'next' into ram_prompt 9 years ago
v1rgul 7394608d56 Font Awesome fontconfig new icons (fixed errors) 9 years ago
v1rgul 60fc0cae70 Font Awesome fontconfig new icons 9 years ago
Ben Hilburn 5c09cf3e27 Minor comment addition for system load prompt segment. 9 years ago
Ben Hilburn 6a0eb2fb11 Cleaning up comments around font icon settings. 9 years ago
Ben Hilburn b96c5a18c1 Merge pull request #106 from V1rgul/master
Added awesome-fontconfig support
9 years ago
Ben Hilburn f18c92d766 Merge pull request #104 from dritter/vi_mode_cleanup
VI-mode cleanup
9 years ago
Ben Hilburn 163a373847 Merge pull request #103 from dritter/status_segment_cleanup
status vs longstatus cleanup
9 years ago
v1rgul 4fa3228900 Added awesome fontconfig support 9 years ago
Dominik Ritter 6d24f93760 Alphabetical order. 9 years ago
Dominik Ritter f52a7f2570 Corrected calculation of used swap under linux. 9 years ago
Dominik Ritter c760d3a505 Better compatibility with shellcheck.net. 9 years ago
Dominik Ritter ffc0d9e162 KEYMAP may be "main" or "viins" in VI-Mode. 9 years ago
Dominik Ritter fc59f06f39 code more readable. 9 years ago
Dominik Ritter b31d0ff395 Made VI-Mode plugin working again. 9 years ago
Dominik Ritter 2e7d0f14d2 Shellcheck-support for vi_mode segment & alphabetical order of prompts. 9 years ago
Dominik Ritter 1a5edebae7 Added a segment that shows the current GO version number. 9 years ago
Dominik Ritter 58d5f9a078 Added subsegments in flat-mode. 9 years ago
Dominik Ritter 4602e948c9 There is now no difference between longstatus and status any more. Just use status, and if you just want to display it conditionally set POWERLEVEL9K_STATUS_VERBOSE=false.
Also here I unified the use of named color codes to make the subsegment-display work.
9 years ago
Dominik Ritter 43a6079d83 Ram as own prompt. 9 years ago
Dominik Ritter 2809000f9c printHumanReadableSize should be able to process floats. 9 years ago
Ben Hilburn 6deb3fe094 Merge pull request #98 from christian-schulze/vi-mode-segment
Add vi-mode segment
9 years ago
Gilad Goldberg 958b11b77e Make docs reflect difference between status and longstatus 9 years ago
Christian Schulze 665ed59e6a $0 suffixes for color customization 9 years ago
Christian Schulze c08a209e20 add vi-mode segment 9 years ago
Ben Hilburn bc1b5a4c0b Reverting merge of PR #91 9 years ago
Ben Hilburn 692e6a7130 Revert "Merge pull request #91 from tusharsrivastava/master"
This reverts commit 2a2dfdfa29, reversing
changes made to 1390fbdea5.
9 years ago
Dominik Ritter 87fab65609 Corrected ZSH option names. 9 years ago
Dominik Ritter 689b6d8f8c Shellcheck.net: Quote variables. 9 years ago
Dominik Ritter 2384b6aaba Merge remote-tracking branch 'ben/next' into shellcheck_fixes 9 years ago
Ben Hilburn 6b45e84b2e Merge branch 'master' into next
Fixed conflict caused by PR #91.
9 years ago
Dominik Ritter d7e3cb31b8 Merge remote-tracking branch 'ben/next' into icon_protection2 9 years ago
Dominik Ritter 43dc8f853d Merge remote-tracking branch 'ben/next' into shellcheck_fixes 9 years ago
Ben Hilburn 32398beab8 Merge pull request #87 from dritter/improve_same_color_segments
Add a color separater between segments of the same color.
9 years ago
Dominik Ritter 08c3649c6a Obey shellcheck.net: Quote the rhs of != in [[ ]] to prevent glob matching 9 years ago