Ben Hilburn
5d31763a8e
Merge pull request #219 from rmad17/nodeenv-support
...
Adding `nodeenv` segment.
2016-02-26 09:37:34 -05:00
Dominik Ritter
9ac79bd3aa
Rename VCS default state to clean
2016-02-26 15:33:04 +01:00
Ben Hilburn
2260b83c98
Merge pull request #214 from dritter/fix_vcs_foreground_color
...
Allowing VCS Foreground Color to be over-rideable.
2016-02-26 08:01:29 -05:00
Dominik Ritter
e9953710f7
Clean up states in VCS segment
2016-02-26 13:51:39 +01:00
rmad17
8d0f4c9e1d
Fixed name issue
2016-02-26 18:02:05 +05:30
rmad17
06dd26a0bd
Added nodeenv support
2016-02-26 16:33:19 +05:30
rmad17
e0603314d5
Nodeenv work
2016-02-26 15:32:22 +05:30
Ben Hilburn
e93d053035
Merge pull request #216 from natemccurdy/issues/215
...
Improve the rbenv prompt by using `version-name`
2016-02-20 15:28:44 -08:00
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
2016-02-19 14:56:09 -08:00
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.
2016-02-18 18:27:32 +01:00
Dominik Ritter
7efc6e4187
Fix go test
...
If no GO is available, there should be no output.
2016-02-17 18:41:46 +01:00
Ben Hilburn
4bbff138fb
Merging @theminor's changes from PR #204
2016-02-05 10:59:33 -08:00
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 exit
s. 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
Dominik Ritter
d436c60f24
Merge branch 'ram_prompt' of github.com:dritter/powerlevel9k into ram_prompt
2015-10-01 00:38:02 +02:00
Dominik Ritter
be8bb63fc3
Merge branch 'next' into go_prompt
2015-09-30 19:36:50 +02:00
Dominik Ritter
e8a53c253b
Merge branch 'next' into ram_prompt
2015-09-30 19:36:23 +02:00
v1rgul
7394608d56
Font Awesome fontconfig new icons (fixed errors)
2015-09-29 01:35:17 +02:00
v1rgul
60fc0cae70
Font Awesome fontconfig new icons
2015-09-29 00:43:06 +02:00
Ben Hilburn
5c09cf3e27
Minor comment addition for system load prompt segment.
2015-09-28 11:42:20 -07:00
Ben Hilburn
6a0eb2fb11
Cleaning up comments around font icon settings.
2015-09-28 11:37:43 -07:00
Ben Hilburn
b96c5a18c1
Merge pull request #106 from V1rgul/master
...
Added awesome-fontconfig support
2015-09-28 10:46:13 -07:00
Ben Hilburn
f18c92d766
Merge pull request #104 from dritter/vi_mode_cleanup
...
VI-mode cleanup
2015-09-28 10:43:30 -07:00
Ben Hilburn
163a373847
Merge pull request #103 from dritter/status_segment_cleanup
...
status vs longstatus cleanup
2015-09-28 10:42:59 -07:00
v1rgul
4fa3228900
Added awesome fontconfig support
2015-09-27 12:17:27 +02:00
Dominik Ritter
6d24f93760
Alphabetical order.
2015-09-26 12:51:08 +02:00
Dominik Ritter
f52a7f2570
Corrected calculation of used swap under linux.
2015-09-26 12:33:14 +02:00
Dominik Ritter
c760d3a505
Better compatibility with shellcheck.net.
2015-09-23 18:29:42 +02:00
Dominik Ritter
ffc0d9e162
KEYMAP may be "main" or "viins" in VI-Mode.
2015-09-23 18:26:27 +02:00
Dominik Ritter
fc59f06f39
code more readable.
2015-09-22 18:35:42 +02:00
Dominik Ritter
b31d0ff395
Made VI-Mode plugin working again.
2015-09-22 18:30:59 +02:00
Dominik Ritter
2e7d0f14d2
Shellcheck-support for vi_mode segment & alphabetical order of prompts.
2015-09-21 18:34:43 +02:00
Dominik Ritter
1a5edebae7
Added a segment that shows the current GO version number.
2015-09-21 18:27:03 +02:00
Dominik Ritter
58d5f9a078
Added subsegments in flat-mode.
2015-09-20 21:28:22 +02:00
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.
2015-09-20 21:24:37 +02:00
Dominik Ritter
43a6079d83
Ram as own prompt.
2015-09-20 20:34:43 +02:00
Dominik Ritter
2809000f9c
printHumanReadableSize should be able to process floats.
2015-09-20 20:33:50 +02:00
Ben Hilburn
6deb3fe094
Merge pull request #98 from christian-schulze/vi-mode-segment
...
Add vi-mode segment
2015-09-19 16:30:37 -07:00
Gilad Goldberg
958b11b77e
Make docs reflect difference between status and longstatus
2015-09-19 21:39:03 +03:00
Christian Schulze
665ed59e6a
$0 suffixes for color customization
2015-09-19 13:48:23 +10:00
Christian Schulze
c08a209e20
add vi-mode segment
2015-09-19 13:35:11 +10:00
Ben Hilburn
bc1b5a4c0b
Reverting merge of PR #91
2015-09-17 10:42:49 -07:00
Ben Hilburn
692e6a7130
Revert "Merge pull request #91 from tusharsrivastava/master"
...
This reverts commit 2a2dfdfa29
, reversing
changes made to 1390fbdea5
.
2015-09-17 10:24:52 -07:00
Dominik Ritter
87fab65609
Corrected ZSH option names.
2015-09-16 00:52:16 +02:00
Dominik Ritter
689b6d8f8c
Shellcheck.net: Quote variables.
2015-09-16 00:46:46 +02:00
Dominik Ritter
2384b6aaba
Merge remote-tracking branch 'ben/next' into shellcheck_fixes
2015-09-16 00:42:15 +02:00
Ben Hilburn
6b45e84b2e
Merge branch 'master' into next
...
Fixed conflict caused by PR #91 .
2015-09-15 15:39:00 -07:00
Dominik Ritter
d7e3cb31b8
Merge remote-tracking branch 'ben/next' into icon_protection2
2015-09-14 18:23:45 +02:00
Dominik Ritter
43dc8f853d
Merge remote-tracking branch 'ben/next' into shellcheck_fixes
2015-09-14 09:27:07 +02:00
Ben Hilburn
32398beab8
Merge pull request #87 from dritter/improve_same_color_segments
...
Add a color separater between segments of the same color.
2015-09-13 13:57:23 -07:00
Dominik Ritter
08c3649c6a
Obey shellcheck.net: Quote the rhs of != in [[ ]] to prevent glob matching
2015-09-13 00:18:02 +02:00
Dominik Ritter
dfe4c109bd
Double quote to prevent globbing and word splitting in git-aheadbehind.
2015-09-13 00:01:06 +02:00
Dominik Ritter
1c91430aa4
Explicit setopt
2015-09-12 23:58:56 +02:00
Dominik Ritter
22c29b1253
Moved the icon definitions to the top, for better structure.
2015-09-12 23:52:20 +02:00
Dominik Ritter
c8e41ad4ee
Simplified the way the build-prompt-functions are called. Before it was quite obscure how and when ZSH called the right functions. It was a matter of a complex quote syntax. Now, by adding a new precmd-hook, the use of the quotes in the PROMPT and RPROMPT-variables is much simpler.
2015-09-12 23:46:46 +02:00
Dominik Ritter
d133680704
Changed code to comply with www.shellcheck.net.
2015-09-12 22:50:52 +02:00
Tushar Srivastava
a21c5615ec
updated some icons
2015-09-12 18:12:39 +05:30
Tushar Srivastava
7e6616f590
Updated with new Icons
2015-09-12 17:49:18 +05:30
Dominik Ritter
1eec2257fb
The longstatus-Segment should deactivate the foreground color after it is finished printing the content.
2015-09-08 00:27:07 +02:00
Dominik Ritter
ef72eca288
Better structure: The right prompt should deactivate the foreground color, after it is finished printing the content.
2015-09-08 00:18:02 +02:00
Dominik Ritter
3da637cfd6
Added documentation.
2015-09-08 00:13:57 +02:00
Dominik Ritter
4e29538306
Character protection if the user set LANG=C.
2015-09-08 00:09:33 +02:00
Ben Hilburn
fd191a5894
Merge pull request #80 from dritter/dritter/icon_customization_documentation
...
Added documentation and a little helper function for icon customization.
2015-09-05 15:04:20 -07:00
Ben Hilburn
a3b61e92fb
Merge branch 'next' of github.com:bhilburn/powerlevel9k into next
2015-09-05 15:02:03 -07:00
Ben Hilburn
8fffb04dcd
Merging @dritter's new system stats segments.
2015-09-05 15:01:06 -07:00
Ben Hilburn
65c44d6141
Merge pull request #89 from dritter/php_version_segment
...
Added `php_version` segment.
2015-09-05 14:52:48 -07:00
Ben Hilburn
f0e8b992dc
Merge pull request #85 from dritter/home_icon_whitespace_quickfix
...
Fix extra whitespace in `dir` segment.
2015-09-05 14:50:31 -07:00
Ben Hilburn
8ce144423b
Resolving conflicts from PR #86
2015-09-05 14:48:18 -07:00
Ben Hilburn
790f7e724d
Merge branch 'master' into next
2015-09-05 14:45:41 -07:00
Dominik Ritter
26a41f14b8
Added a segment that shows the PHP version.
2015-09-05 18:03:06 +02:00
Dominik Ritter
88abe431ec
Merge remote-tracking branch 'ben/next' into dritter/icon_customization_documentation
2015-09-04 19:55:26 +02:00
Dominik Ritter
adbf9947b2
Removed pointless changing of foreground color.
2015-09-04 19:26:05 +02:00
Dominik Ritter
9a814720db
Removed unnecessary whitespace in git actionformats.
...
This fixes #78
2015-09-04 19:24:07 +02:00
Dominik Ritter
5a8a6c8012
The foreground color of the longstatus
segment should be white.
2015-09-04 18:32:44 +02:00
Dominik Ritter
9191d29c96
In case that two subsequent segments have the same background color, now a small separator is displayed. Before this commit, no segment separator was shown and the two segments looked like one.
2015-09-04 18:30:04 +02:00
Dominik Ritter
c72cfb155a
Display a warning message, if the terminal supports less than 256 colors.
2015-09-04 17:20:00 +02:00
Dominik Ritter
f7a05fcd2c
Display of free RAM is now configurable.
2015-09-04 17:04:39 +02:00
Dominik Ritter
b8b82eee21
Use the new defined
function to test if a network interface was specified.
2015-09-04 16:39:28 +02:00
Dominik Ritter
b5e5ac98f9
Whitespaces should belong to the Icon as they form an entity. Therefore the home-icon in the awesome-patched mode should define its whitespace, so that in normal mode no extra whitespace is shown.
2015-09-04 11:31:34 +02:00
Dominik Ritter
0f30504362
Merge remote-tracking branch 'ben/next' into dritter/system_stats
2015-09-04 00:24:45 +02:00
Dominik Ritter
227958cb04
Merge remote-tracking branch 'ben/master' into dritter/system_stats
2015-09-04 00:19:37 +02:00
Ben Hilburn
6e4d24f50d
Theme code: Cleanup of comments
2015-09-03 12:33:18 -07:00
Ben Hilburn
a6f7d573ed
Merge branch 'master' into next
...
Resolved conflicts from 2eea3ae
and 1a1cb8f
.
2015-09-03 12:12:36 -07:00
John Koelndorfer
378b910af6
Use defined to check if ICON_USER_VARIABLE is defined.
2015-09-01 18:55:14 -05:00
John Koelndorfer
893bfe243d
Use defined to set right, left prompt elements.
2015-09-01 18:50:18 -05:00
John Koelndorfer
b19de85c16
Use set_default to set VCS foreground and dark foreground.
2015-09-01 18:49:41 -05:00
John Koelndorfer
f42242d34c
Implement defined, set_default functions.
2015-09-01 18:40:11 -05:00
Luís Bianchin
e90e353b0a
Fix format for git-svn
...
When the repository backend is like git-svn or git-hg, there was a conflict with `zstyle` `formats` from `functions/VCS_INFO_formats`. Now it applies the format to all backends starting with `git` or `svn`.
2015-08-31 20:53:31 -07:00
Dominik Ritter
ae77fc17d8
Under OSX the output of sysctl vm.loadavg
may be localized. With german locale it will print an comma as separator..
2015-08-31 18:13:28 +02:00
Dominik Ritter
dca00112ad
Reworked the IP segment. It now tries to get a IP address from all up network interfaces.
2015-08-29 16:55:31 +02:00
Dominik Ritter
d8c55a2592
Added documentation and a little helper function for icon customization.
2015-08-29 14:36:33 +02:00
Dominik Ritter
7535f62746
Added a new Icon to the dir-segment.
2015-08-27 18:45:02 +02:00
Dominik Ritter
b443c9be4a
Moved print_icon
to top in its own section "utility functions".
2015-08-27 18:44:06 +02:00
Dominik Ritter
dd745634e8
Merge remote-tracking branch 'ben/next' into dritter/improve_shorten_dir_length
2015-08-27 18:43:56 +02:00
Dominik Ritter
3e0547a9cb
Merge branch 'next' into dritter/improve_shorten_dir_length
2015-08-27 18:31:10 +02:00
Dominik Ritter
69fc4d295c
Bugfix: load segment changes the color reliably and is customizable.
2015-08-27 18:24:27 +02:00
Dominik Ritter
61daa647f1
IP is now customizable. By default we try to get the ip of en1
(on OSX) and eth0
on all other systems.
2015-08-26 19:56:49 +02:00
Dominik Ritter
730697893e
Grep statement simplified.
2015-08-26 18:26:53 +02:00
Dominik Ritter
fccc3d5e64
Better descriptions for Stats and Network segements.
2015-08-26 18:08:38 +02:00
John Koelndorfer
2eea3aec56
Set RETVAL for left prompt also.
2015-08-26 10:59:57 -05:00
Dominik Ritter
b73366f039
Added a segment that displays the current IP address.
2015-08-26 17:36:04 +02:00
Dominik Ritter
2bc5a60c7a
Added a new Icon to the dir-segment.
2015-08-26 17:35:25 +02:00
Dominik Ritter
f3d2a0755e
Added a segment that displays the 5 min load average and the free RAM.
2015-08-26 17:34:09 +02:00
Dominik Ritter
66877efade
Moved print_icon
to top in its own section "utility functions".
2015-08-26 17:24:23 +02:00
Dominik Ritter
1005a7c6fb
Better Icons for Apple and Linux.
2015-08-26 17:22:42 +02:00
Dominik Ritter
0d62451f57
Merge branch 'dritter/improve_shorten_dir_length' into dritter/system_stats
2015-08-26 13:33:15 +02:00
Dominik Ritter
823c52b3ec
All Unicode-escape-characters should begin with an lowercase \u
in the default-icons.
...
The outgoing/incoming changes should use the `print_icon` function.
Renamed VCS-Incoming/Outgoing icon variables.
2015-08-19 23:55:32 +02:00
Dominik Ritter
5795442dbc
Set icon-Array as global variable, so that it is visible in later functions. This is important to make the icon-override mechanism work in antigen.
2015-08-18 23:44:21 +02:00
Dominik Ritter
0831fa1041
Issue #74 : Changed escape sequences for UTF-8 characters to lowercase for compatible
and default mode.
2015-08-15 16:09:31 +02:00
Dominik Ritter
44db352e35
Issue #64 : Now the theme detects on OSX which sed is to use.
2015-08-15 15:49:22 +02:00
Dominik Ritter
329f60f19f
Node icon should be customizable too.
2015-08-07 18:59:49 +02:00
Dominik Ritter
754b648f37
Changed the default behaviour to truncate whole directories.
2015-08-05 00:21:09 +02:00
Dominik Ritter
9efe519dc5
Merge branch 'dritter/improve_shorten_dir_length' of github.com:dritter/powerlevel9k into dritter/improve_shorten_dir_length
2015-08-05 00:06:06 +02:00
Dominik Ritter
33dba0f19f
Define multiline icons as escape sequence.
2015-08-05 00:00:29 +02:00
Dominik Ritter
b1dba08c93
Multiline-Icons should be treated as icons as well.
2015-08-04 23:53:36 +02:00
Dominik Ritter
5777b7bb54
Code cleanup. We don't need to define all icons for every mode any more.
2015-08-04 18:47:44 +02:00
Dominik Ritter
2257026f9c
Reworked icons to a zsh array. That way we can easily print out all icons for debugging purposes. Also it opens up some clean up possibilities.
2015-08-04 18:25:03 +02:00
Ben Hilburn
6925e35cb8
Merge branch 'dritter/dritter/minimize_dependencies' into next
2015-08-01 15:10:50 -07:00
Dominik Ritter
bb3fbb793c
test -n
seems to read the whole string. For performance issues we just analyze the first line by stripping the output of cat to the first line with sed q
.
2015-07-30 23:30:47 +02:00
Dominik Ritter
df7f853c8d
Less dependencies. If sed q | wc -l
is just for testing if the string is empty or not, we can do that with just ZSH. Trusting that the implentation of test -n
is intelligent enough to abort if a character is found.
2015-07-30 00:18:48 +02:00
Dominik Ritter
99504d4ad4
Add an indicator that directories were truncated.
2015-07-29 23:46:06 +02:00
Dominik Ritter
1edc606665
Added OpenBSD and DragonFly again.
2015-07-29 10:30:58 +02:00
Ben Hilburn
4ef5294d0b
os_icon: Combining OS detection and icon setting into one case statement
2015-07-28 19:56:46 -07:00
Dominik Ritter
8a6b9fe09d
Whitespace fix.
2015-07-28 19:50:53 +02:00
Dominik Ritter
e025a6cdd4
The VCS-Branch icon is broken, if we use Unicode-characters with uppercase \U.
2015-07-28 11:14:46 +02:00
Dominik Ritter
850702b115
Reworked OS-Icons to fit in our general scheme.
2015-07-28 11:09:55 +02:00
Dominik Ritter
1b7240ca2f
Merge branch 'master' into dritter/os_detection
2015-07-27 09:23:30 +02:00
Ben Hilburn
c37e4a8fa0
Merge remote-tracking branch 'dritter/dritter/disable_rprompt'
...
Allows disabling of the right prompt
Conflicts:
powerlevel9k.zsh-theme
2015-07-26 16:22:29 -07:00
Dominik Ritter
504a64996b
Uhm. It seems to make a difference, whether you print unicode characters with lowercase \u or uppercase \U. Some of them only work with uppercase \U. Therefore I changed all of them to the uppercase variant.
...
Try `echo $'\u1F427' $'\U1F427'`. Only the latter one should work. The first one prints some gibberish.
2015-07-27 00:35:39 +02:00
Dominik Ritter
c116ead6aa
Determine the right OS-Icon only once.
2015-07-27 00:20:40 +02:00
Dominik Ritter
5a6b6ef604
Merge branch 'master' into dritter/os_detection
2015-07-26 23:49:40 +02:00
Dominik Ritter
e8dc33bb07
Added possibility to disable the RPROMPT completly.
2015-07-25 11:22:24 +02:00
Dominik Ritter
9e1f0639cf
Whitespace fixes.
2015-07-25 10:59:25 +02:00
Dominik Ritter
2bc3b09963
Implemented different ways to truncate the directory path.
2015-07-25 01:34:11 +02:00
Dominik Ritter
84dfa02a89
Updated the os-icon prompt to newest coding guidelines.
2015-07-25 00:02:32 +02:00
Dominik Ritter
880a715b9c
Merge branch 'master' into dritter/os_detection
2015-07-25 00:00:01 +02:00
Dominik Ritter
30c4acd249
Strip the whitespace of OSX wc
with pure zsh. No need to install coreutils
.
2015-07-20 23:37:57 +02:00
Ben Hilburn
7f83bac947
Revert "We don't need tr
, as we strip whitespace directly with zsh."
...
This reverts commit 10c5b28859
.
Conflicts:
powerlevel9k.zsh-theme
2015-07-19 17:55:10 -07:00
Ben Hilburn
3927f055fe
Merge remote-tracking branch 'dritter/dritter/minimize_dependencies'
...
Using the `translate` program does not appear to be necessary.
2015-07-19 12:29:07 -07:00
Ben Hilburn
8e19cc05aa
Merge pull request #59 from dritter/dritter/multiline_improvements
...
Multiline icons are now customizable
2015-07-19 12:23:00 -07:00
Ben Hilburn
97cd46a347
Merge pull request #58 from dritter/dritter/customizable_context
...
Made the `context` segment customizable.
2015-07-19 12:15:26 -07:00
Ben Hilburn
1f69d67c2a
Merging dritter/remote_icon_space_names
...
Optimizing VCS icon spacing for different configurations.
2015-07-19 12:11:43 -07:00
Dominik Ritter
cb20e0e0d9
Made Multiline-Icons customizable.
2015-07-19 14:57:17 +02:00
Dominik Ritter
eed0c84273
Made the context
segment customizable.
2015-07-19 14:32:13 +02:00
Dominik Ritter
b82e19f073
Merge branch 'master' into dritter/minimize_dependencies
2015-07-19 14:11:55 +02:00
Ben Hilburn
20cb4a245e
Merging @dritter's work to allow shortened dir segment.
...
This is PR #54 .
Merge remote-tracking branch 'dritter/dritter/shorten_dir_path'
2015-07-12 18:07:59 -07:00
Dominik Ritter
50bca4bf25
Merge branch 'master' into dritter/shorten_dir_path
2015-07-12 11:01:13 +02:00
Dominik Ritter
505a55b61c
Updated node-prompt.
2015-07-11 14:29:48 +02:00
Dominik Ritter
bc7c01648f
Merge branch 'master' into dritter/nvm
2015-07-11 14:26:05 +02:00
Ben Hilburn
767d4c75b0
Merge branch 'dritter/developers_guide'
2015-07-10 20:39:56 -07:00
Ben Hilburn
c9e6cc6cd0
Merge pull request #52 from dritter/dritter/mercurial_dirty_fix
...
Must always resolve changeset to show Hg repository status.
Resolves bug #51 .
2015-07-10 20:29:31 -07:00
Ben Hilburn
48d4ebac10
Merge pull request #50 from dritter/dritter/vim_modelines_improvement
...
Add VIM default settings: "expandtab", encoding = "utf8"
2015-07-10 20:26:33 -07:00