Ben Hilburn
4897c795fa
Merge branch 'master' into next
2016-02-05 10:57:56 -08:00
Ben Hilburn
dfd7ae1f1d
Merge pull request #205 from dritter/dir_delimiter
...
Change default dir truncation delimitor to ellipsis
2016-02-05 10:49:09 -05:00
Ben Hilburn
4f4a15de82
Merge pull request #198 from dritter/vcs_customizable
...
VCS-hooks customizable
2016-02-05 10:40:20 -05:00
Ben Hilburn
25bf6d60a0
Merge pull request #181 from dritter/split_up_ram_segment
...
Split up `ram` segment into `ram` and `swap`.
2016-02-05 10:37:28 -05:00
Dominik Ritter
54254600d1
Change default dir truncation delimitor to ellipsis
2016-02-03 22:35:14 +01:00
John Minor
d7c26513c8
Add "_UNTRACKED" option for _VCS to change colors - default yellow
2016-01-27 22:52:48 +00:00
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
2016-01-23 01:45:39 +01:00
Dominik Ritter
cd78c66997
First try: Now joined segments are promoted to "full" segments, if their
...
predecessor was conditional and had no output.
2016-01-23 01:45:39 +01:00
Dominik Ritter
930ae170a4
Made the VCS-hooks customizable.
2016-01-23 01:44:22 +01:00
Dominik Ritter
eba3a3ca95
Reworked the AWS Elastic Beanstalk segment.
2016-01-23 01:35:53 +01:00
James Bowman
af119c9406
Adding command prompt for AWS Elastic Beanstalk environment name.
2016-01-23 01:34:01 +01:00
Dominik Ritter
6aadf76397
Split up ram segment into ram and swap.
2016-01-23 01:27:05 +01:00
Dominik Ritter
c379cf2657
Syntax fix.
2016-01-22 19:52:00 +01:00
v1rgul
29b346930b
fix wc glitch on OSX
2016-01-22 01:56:43 +01:00
v1rgul
11d00ce713
background_jobs: show number if verbose
2016-01-18 05:11:05 +01:00
Dominik Ritter
01e4e8d324
Added "visual identifier" concept to icons_test segment.
2016-01-17 01:02:03 +01:00
rjorgenson
3767397711
fixing segment call for new state implementation in prompt_load
2016-01-15 21:52:08 -07:00
Ben Hilburn
817cdf98a1
Merge pull request #191 from rjorgenson/next
...
added check for nvm command before running
2016-01-15 18:53:42 -08:00
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.
2016-01-16 01:08:52 +00:00
Robert Jorgenson
6f2f78b21f
fixed conditional statement
2016-01-14 16:19:12 -07:00
Robert Jorgenson
446f46473b
reworked nvm check
...
Now the prompt segment just returns without doing anything if nvm is not present.
2016-01-14 16:16:27 -07:00
Ben Hilburn
88ed3c2378
Merge branch 'symlink_resolving_improvement' of https://github.com/dritter/powerlevel9k into dritter-symlink_resolving_improvement
2016-01-14 13:13:30 -08:00
Robert Jorgenson
2fa7b1d08f
don't output segment if node_version was not populated
2016-01-14 14:09:39 -07:00
rjorgenson
e29b3545bd
fixed called to ioreg on OS X machines
2016-01-14 11:07:11 -07:00
rjorgenson
9aeff8d43b
added check for nvm command before running
2016-01-14 11:05:26 -07:00
Dominik Ritter
989a9b3b4b
Improved symlink dereferencing on OSX by calling a perl script.
2016-01-09 16:25:15 +01:00
Dominik Ritter
0b27bdc6f5
Comment cleanup.
2016-01-08 20:44:35 +01:00
Dominik Ritter
cdf08734db
Cleanup of the load segment.
2016-01-08 20:42:06 +01:00
Dominik Ritter
d0a76d721c
Sorted segments alphabetically.
2016-01-08 20:34:45 +01:00
Dominik Ritter
bbaa4a57f9
The foreground and background instructions are spaceless by default. No
...
need to make them spaceless explicitly.
2016-01-07 22:09:11 +01:00
Ben Hilburn
8dfca40eaf
Cleaning up comments. Also fixes #135 .
2016-01-05 13:56:07 -08:00
Ben Hilburn
c39c8cbb99
Merge pull request #173 from dritter/consistent_visual_identifier
...
Better support for segments that are just icons.
2016-01-05 13:11:43 -08:00
Niklas Heer
3441f750bf
used set_default-function instead
2015-12-31 19:04:26 +01:00
Niklas Heer
f472ba7341
added a new variable POWERLEVEL9K_SHORTEN_DELIMITER to specifiy the delimiter
2015-12-31 15:57:56 +01:00
Niklas Heer
2fdbd6158c
added fishe-like shortening strategy
2015-12-30 15:49:23 +01:00
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.
2015-12-29 13:46:07 +01:00
Dominik Ritter
d5a8211aa1
Merge branch 'battery_visual_identifier' of github.com:dritter/powerlevel9k into battery_visual_identifier
2015-12-18 01:07:22 +01:00
Dominik Ritter
2a519ee2d7
Merge branch 'status_color_fix' into battery_visual_identifier
2015-12-18 00:59:04 +01:00
Dominik Ritter
ac4502ca1f
Added the "visual identifier" concept to the vcs segment.
2015-12-18 00:47:37 +01:00
Dominik Ritter
5cfd800585
Added the "visual identifier" concept to the symfony2_version segment.
2015-12-17 18:24:35 +01:00
Dominik Ritter
045f451e4e
Added the "visual identifier" concept to the symfony2_tests and
...
`rspec_stats` segments.
2015-12-17 18:22:34 +01:00
Dominik Ritter
b738ba900c
Added the "visual identifiers" concept to the ram segment.
2015-12-17 18:17:06 +01:00
Dominik Ritter
7ed0abebd6
Little VCS segment cleanup.
2015-12-17 10:51:52 +01:00
Dominik Ritter
0cb1c0ffda
Changed the order of default segments.
2015-12-17 10:48:11 +01:00
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!
2015-12-16 19:26:27 +01:00
Dominik Ritter
cd5b4d0deb
Added the "state" concept to the dir segment.
2015-12-15 03:21:24 +01:00
Dominik Ritter
056d4ff29a
Only check for a user defined variable if we really have an visual
...
identifier.
2015-12-15 02:43:42 +01:00
Dominik Ritter
409303f45d
Added the "visual identifier" concept to the rbenv segment.
2015-12-15 02:36:57 +01:00
Dominik Ritter
4fc59fd57c
Added the "visual identifier" concept to the node_version segment.
2015-12-15 02:36:02 +01:00
Dominik Ritter
1d0f47fb97
Bugfix: the default should be a pure color, not a full ZSH color
...
modifier.
2015-12-15 02:20:11 +01:00
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.
2015-12-15 02:08:59 +01:00
Dominik Ritter
6f7d6f7259
For left aligned segments start the foreground color after the visual
...
identifier has been printed.
2015-12-15 02:08:59 +01:00
Dominik Ritter
c5726bc548
Added the "visual identifier" concept to the todo segment.
2015-12-15 02:08:59 +01:00
Dominik Ritter
d514b077d0
Added the "visual identifier" concept to the rvm segment.
2015-12-15 02:08:59 +01:00
Dominik Ritter
fd0fcba5e9
Added the "visual identifier" concept to the node_version segment.
2015-12-15 02:08:59 +01:00
Dominik Ritter
35b1cb5b8d
Added the "visual identifier" concept to the load segment.
2015-12-15 02:02:14 +01:00
Dominik Ritter
bb5cca9af7
Added the "visual identifier" concept to the ip segment.
2015-12-15 02:02:14 +01:00
Dominik Ritter
d5d5acb490
Added the "visual identifier" concept to the dir segment.
2015-12-15 02:02:14 +01:00
Dominik Ritter
e505c0698e
Added the "visual identifier" concept to the aws segment.
2015-12-15 01:59:46 +01:00
Dominik Ritter
1194826ef4
Used the new "visual identifier" concept for the battery segment.
2015-12-15 01:59:46 +01:00
Dominik Ritter
0c528461fb
Allow users to overwrite the color for the visual identifier only.
2015-12-15 01:59:46 +01:00
Dominik Ritter
036433dd53
Segments now can have "visual identifiers" which are basically just
...
special icons.
2015-12-15 01:59:46 +01:00
Dominik Ritter
21f80e4da7
Removed trailing whitespaces.
2015-12-15 01:59:46 +01:00
Dominik Ritter
5a4de1d274
Split up the status segment into a background_jobs, root_indicator and status segment.
...
This fixes #163
2015-12-13 12:43:40 +01:00
Ben Hilburn
0059f9a066
Merge pull request #154 from dritter/hotfix/utility_function_loading
...
Try to fetch the utility function path automatically
2015-12-12 16:23:04 -08:00
Ben Hilburn
df153db93b
Merge pull request #157 from dritter/battery_rework
...
Performance improvement of battery segment
2015-12-12 16:21:14 -08:00
Dominik Ritter
8c71a28a77
The script location should only be set once!
2015-11-28 19:45:49 +01:00
Dominik Ritter
0dc36ee614
We need to always evaluate the path for the home/folder icon mechanism to work correctly.
2015-11-28 11:11:10 +01:00
Dominik Ritter
b01588e2f9
File might be a symlink.
2015-11-28 01:56:26 +01:00
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.
2015-11-28 01:33:33 +01:00
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.
2015-11-28 01:26:24 +01:00
Dominik Ritter
c10bac90ba
In Awesome-Mode either print a home-icon or a folder icon, depending in which directory the user is.
2015-11-28 00:03:07 +01:00
Ben Hilburn
3fea92369f
Merge pull request #153 from Tritlo/custom_string
...
Adding a segment that can execute a custom command.
2015-11-24 15:27:07 -08:00
Dominik Ritter
b8d7d1387e
By default: set verbose mode on.
2015-11-25 00:26:10 +01:00
Ben Hilburn
08a3b49d73
Merge pull request #155 from dritter/hotfix/go_version_fix
...
Fix for the GO segment.
2015-11-24 15:23:03 -08:00
Dominik Ritter
23e2a54067
Added a verbose mode.
2015-11-25 00:21:20 +01:00
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.
2015-11-25 00:06:03 +01:00
Dominik Ritter
3437c7850c
Battery icon is already defined in the icons-array.
2015-11-24 18:31:22 +01:00
Dominik Ritter
c8137fcf1a
Pre-Grep the raw data to save some memory and to avoid cluttering up the output of setopt xtrace too much.
2015-11-24 18:17:04 +01:00
Dominik Ritter
dad38b0592
Better code structure.
2015-11-24 02:36:37 +01:00
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.
2015-11-23 18:10:09 +01:00
Dominik Ritter
239aa29a12
Better use of test flags.
2015-11-23 00:48:59 +01:00
Dominik Ritter
8d72b5eb12
Renamed variable "conn" to "icon_color"
2015-11-23 00:42:15 +01:00
Dominik Ritter
b316089c6b
Make use of set_default method for better code readability.
2015-11-23 00:12:52 +01:00
Dominik Ritter
c0efe9c342
Performance improvement: Avoid aggregation of data over and over again by extracting a local variable.
2015-11-23 00:11:19 +01:00
Dominik Ritter
7774294113
Performance improvement by calculating the battery percentage with zsh.
2015-11-23 00:09:37 +01:00
Dominik Ritter
4b636d226e
Renamed variable.
2015-11-22 00:08:43 +01:00
Dominik Ritter
49a3a3e750
The nvm segment should use the standard node icon (rather than defining an own icon).
2015-11-22 00:04:55 +01:00
Dominik Ritter
351dc84320
Fix for the GO version.
2015-11-21 23:20:38 +01:00
Matthías Páll Gissurarson
df51db1412
added a segment to be able to display the result of a custom command.
2015-11-21 23:11:34 +01:00
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 exits. With return not the whole shell is terminated, so users get an ugly prompt, but are still able to modify .zshrc.
2015-11-21 21:29:20 +01:00
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.
2015-11-21 21:26:50 +01:00
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.
2015-11-21 21:04:58 +01:00
Ben Hilburn
1eadf5ad76
Merge pull request #152 from Tritlo/battery_fix
...
Battery segment fix and enhancement.
2015-11-20 16:29:40 -08:00
Ben Hilburn
951a4956fc
Merge pull request #150 from Tritlo/prompt_end
...
Add icon for end of left prompt.
2015-11-20 16:23:20 -08:00
Matthías Páll Gissurarson
36fa3f2277
fix some issues with the battery segment
2015-11-20 12:13:10 +01:00
Matthías Páll Gissurarson
231cfda809
added icon to be able to set the end of the prompt explicitly
2015-11-19 01:04:52 +01:00
Ben Hilburn
e79a2ffff0
Merge pull request #149 from Tritlo/master
...
Now allowing the RPROMPT to be on a newline.
2015-11-18 10:54:21 -08:00
Matthías Páll Gissurarson
47eb8f10ac
added variable to have rprompt on the newline
2015-11-17 20:37:59 +01:00
Dominik Ritter
f9957ca559
Used typeset to define the local array. This does the trick on linux.
2015-11-17 18:34:18 +01:00
Dominik Ritter
ce7b99cdaf
Added a mechanism to make deprecated segments visible to the user.
2015-11-17 01:39:49 +01:00
Ben Hilburn
9b067ea29c
Merge pull request #142 from dritter/rust_version
...
Added Rust version segment.
2015-11-16 09:10:58 -08:00
Dominik Ritter
c81863e234
Add an Identifier to version.
2015-11-15 23:46:17 +01:00
Dominik Ritter
5d314bec8e
Add segment for rust version.
2015-11-15 23:46:17 +01:00
Dominik Ritter
643555a30c
Huge performance improvement if you use rvm segment.
...
Thanks to @rjorgenson for the hint.
2015-11-15 23:35:15 +01:00
Ben Hilburn
0673352e7e
Merge branch 'master' into next
2015-11-13 09:49:39 -08:00
Stéphane Dupille
81a4b3907d
Get terminal capabilities using a zsh builtin for portability
2015-11-13 12:06:03 +01:00
Dominik Ritter
eef5286005
Issue #131 : This fixes history-substring-search, home and end keys.
2015-11-11 22:45:23 +01:00
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.
2015-11-07 16:32:48 +01:00
Dominik Ritter
29693f957d
If the theme-file is linked, dereference that link and source the right functions.
2015-11-04 00:40:11 +01:00
Dominik Ritter
0fa635275c
Extracted color functions to a separate file.
2015-10-24 01:05:37 +02:00
Dominik Ritter
2b8cb5b9a4
Extracted VCS-hooks into a separate file.
2015-10-24 00:05:15 +02:00
Dominik Ritter
d6584e13da
Extracted icons into a separate file.
2015-10-23 23:42:59 +02:00
Dominik Ritter
fbd1b99bab
Renamed "power-utilities.zsh" to just "utilities.zsh".
2015-10-23 23:39:50 +02:00
Dominik Ritter
23f86afeb3
Merge branch 'next' into color_detection
2015-10-22 10:10:15 +02:00
Ben Hilburn
e8771a7039
Merge branch 'master' into next
2015-10-21 16:59:59 -07:00
Ben Hilburn
b2e6beec51
Merge pull request #123 from martinpelikan/master
...
Fixes #122 , SI prefixes should be evaluated as strings.
2015-10-21 16:54:10 -07:00
Ben Hilburn
84681d4cc1
Merge pull request #126 from rjorgenson/next
...
added a prompt segment to display battery status on laptops
2015-10-21 16:53:32 -07:00
Ben Hilburn
981c85af39
Merge pull request #127 from dritter/go_prompt
...
Adding Go version segment.
2015-10-21 16:51:44 -07:00
Dominik Ritter
d13d9565bc
Merge branch 'next' into ram_prompt
2015-10-20 00:25:16 +02:00
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
2015-10-19 13:02:24 -05:00
Dominik Ritter
e94394bc67
Merge branch 'next' into go_prompt
2015-10-19 17:39:43 +02:00
Dominik Ritter
5addfdc9e0
Moved utility-functions to "functions/power-utilities.zsh".
2015-10-19 17:37:18 +02:00
rjorgenson
3e828cbaa4
fixed some edge cases I ran into during usage of the linux segment
2015-10-18 21:03:47 -07:00
rjorgenson
ff3f6b8e83
added time remaining support to battery segment on Linux
2015-10-18 19:48:45 -07:00
rjorgenson
fb6738967e
added Linux support to battery prompt segment
2015-10-18 16:30:16 -07:00
rjorgenson
2e406a5bdf
editor automatically removed whitespace
2015-10-18 11:05:37 -07:00
rjorgenson
118008c402
fixed output string color declaration
2015-10-18 11:01:52 -07:00
rjorgenson
acf5e97756
added battery prompt segment usable on OS X systems
2015-10-18 10:55:37 -07:00
Dominik Ritter
c10cbabb9e
Merge branch 'next' into color_detection
2015-10-18 19:43:41 +02:00
Martin Pelikan
8e458e5e9a
Fixes #122 , SI prefixes should be evaluated as strings.
2015-10-18 00:11:24 -07:00
Ben Hilburn
ce1ea04c13
Merge pull request #118 from dritter/whitespace_customization
...
Made whitespaces between segment separators customizable
2015-10-17 20:33:16 -07:00
Ben Hilburn
34add8aedf
Merge pull request #117 from dritter/vi_customizations
...
Make the vi_mode segement more customizable.
2015-10-17 20:19:53 -07:00
Ben Hilburn
01b158c020
Merge branch 'vcs_cleanup' of https://github.com/dritter/powerlevel9k into dritter-vcs_cleanup
2015-10-17 20:16:02 -07:00
Ben Hilburn
d459ec0983
Merge pull request #114 from alexlafroscia/add-nvm-prompt-segment
...
Add nvm prompt segment
2015-10-17 20:12:38 -07:00
Ben Hilburn
9f92995f61
Merge pull request #120 from partp/fix-virtualenv
...
Fixes `VIRTUAL_ENV_DISABLE_PROMPT` condition
2015-10-17 20:11:08 -07:00
rjorgenson
5add0daad0
added prompt segment for todo.txt task number
2015-10-17 11:30:55 -07:00
Parth Panchal
ae035e537a
Fixes VIRTUAL_ENV_DISABLE_PROMPT condition
2015-10-17 23:17:40 +05:30
Dominik Ritter
b04fae9173
Made whitespaces between segment separators customizable.
2015-10-16 20:42:21 +02:00
Dominik Ritter
86b460f06b
vi_mode segement more customizable.
2015-10-16 20:16:31 +02:00
Dominik Ritter
ab3577a795
Merge remote-tracking branch 'ben/next' into go_prompt
2015-10-16 19:55:44 +02:00
Dominik Ritter
cd7e8bea61
Merge remote-tracking branch 'ben/next' into ram_prompt
2015-10-16 19:54:13 +02:00
Dominik Ritter
5a0f330cd7
Merge remote-tracking branch 'ben/next' into color_detection
2015-10-16 19:51:04 +02:00
Dominik Ritter
3bb8cd4593
Merge remote-tracking branch 'ben/next' into vcs_cleanup
2015-10-16 19:47:30 +02:00
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
2015-10-13 19:08:36 -04:00
Dominik Ritter
f7e1f64b4c
Added handling for bright colors.
2015-10-13 23:42:46 +02:00
Dominik Ritter
6bf2869a1c
Cleanup of VCS-segment. Now vcs_info is only invoked, if the user configured to show the vcs segment.
2015-10-11 19:41:52 +02:00
Dominik Ritter
20447a22c9
Removed unnecessary literal escape sequences.
2015-10-11 16:22:01 +02:00
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.
2015-10-11 16:18:27 +02:00
John Koelndorfer
66b4194daf
Quote value of IS_BSD_SED.
...
If this isn't quoted, in can bleed through to stdout in certain
circumstances.
2015-10-06 10:30:14 -05:00
