Commit graph

427 commits

Author SHA1 Message Date
Dominik Ritter
d9d9fb9b6b Merge remote-tracking branch 'ytang/fix-icons-cut-off' into staging_065
Conflicts were:
- test/segments/command_execution_time.spec and
test/segments/go_version.spec: All conflicts come from renaming color
names on next (#703) and adding a whitespace to the Visual Identifier
(#854) on master.
2018-06-07 01:51:16 +02:00
Dominik Ritter
3456af3aac Merge remote-tracking branch 'opes/chruby_options' into staging_065 2018-06-07 01:21:16 +02:00
Dominik Ritter
4c2f58bdbd Merge remote-tracking branch 'VanRoy/master' into staging_065
Conflicts were:
- functions/icons.zsh: The Java Segment was added on master, but on next
were added various Segments with icons in the meantime.
- powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox
Segment was added on next.
2018-06-07 00:11:15 +02:00
Dominik Ritter
154e923033 Merge remote-tracking branch 'floor114/next' into staging_065 2018-06-06 23:52:15 +02:00
Dominik Ritter
55473c450a Merge branch 'master' into staging_065
Conflicts were:
- README.md: Two commits targeted the brightness table. #781 from
14. April 2018 on master and #684 from 05. December 2017 on next.
- powerlevel9k.zsh-theme: Two commits targeted the rbenv segment. Both
achieve the same thing: To show the Ruby version number always. #795 on
next from 14. April 2018 and #610 on master from 28. September 2017. I
went with #795 here as this - although being newer - is the one on
master, and that should be more stable.
2018-06-06 23:40:37 +02:00
Dan
fbb85e77e3
Merge branch 'master' into chruby_options 2018-04-30 11:07:55 -07:00
Dan
75c6838a0d Alphabetize chruby documentation 2018-04-30 10:56:44 -07:00
Dan
05f44b94bf Add options for customizing chruby segment 2018-04-30 10:52:15 -07:00
Kevin Chandler
c36b47b007 Update default public ip file name 2018-04-24 16:07:20 -07:00
Ben Hilburn
13b0e383a0
Merge pull request #795 from ryandav/rbenv-prompt-option-always-displays-#777
Rbenv prompt option always displays #777
2018-04-13 22:04:50 -04:00
Ben Hilburn
356f05f0e5
Merge branch 'master' into master 2018-04-13 21:46:05 -04:00
Ben Hilburn
6e3ceb8882
Merge pull request #799 from noraj/patch-1
add rvm to README
2018-04-13 21:38:30 -04:00
lifehackett
cfda084eb8
Another table formatting fix 2018-04-13 08:13:15 -06:00
lifehackett
02d4e76eb4
Fix table formatting in README 2018-04-13 08:07:43 -06:00
Alexandre ZANNI
2eddce2f62
add rvm
see those files and look for `rvm`

+ https://github.com/bhilburn/powerlevel9k/blob/master/CHANGELOG.md
+ https://github.com/bhilburn/powerlevel9k/blob/master/powerlevel9k.zsh-theme
2018-04-12 22:54:34 +02:00
Taras Shpachenko
111d152d48 Add vcs branch name truncating. 2018-04-12 18:11:23 +03:00
Ryan Davidson
e85fb6c93d #777 update Readme with POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable description 2018-04-03 14:04:28 +01:00
Julien Roy
b260adbc1b Added a segment that shows the Java version. 2018-03-24 11:04:16 +01:00
Niklas Mollenhauer
4de4e8d9d7
Fix POWERLEVEL9k_BATTERY_STAGES Table 2018-03-22 01:05:35 +01:00
Niklas Mollenhauer
70fa74f631
Fix Brightness Table 2018-03-21 16:28:23 +01:00
Ben Hilburn
99f142de36 **LARGE MERGE THAT TOUCHES LOTS OF THINGS.**
From this point until the next tagged release, `next` will be in a state
of heavy flux as we make some significant and invasive changes.
2018-03-06 22:07:06 -05:00
Ben Hilburn
8c055f39d8 Moving documentation about newlines to the wiki. 2018-03-06 21:31:59 -05:00
Ben Hilburn
203d0839f7
Merge branch 'next' into newline-count 2018-03-06 21:24:53 -05:00
Ben Hilburn
cfbbd213cb
Merge pull request #729 from Mikewl/usersudo
Added sudo state to prompt_user
2018-03-06 21:18:05 -05:00
Ben Hilburn
27e256e8af
Merge pull request #736 from dualscyther/segments/dir/absolute-truncation
Add absolute truncation option to dir segment
2018-03-06 21:07:08 -05:00
Ben Hilburn
f17a715610
Merge branch 'next' into master 2018-03-06 20:58:12 -05:00
Ben Hilburn
b8a68dd4a8 Merge branch 'master' into next 2018-03-06 20:56:11 -05:00
Christo Kotze
5cec4d652a Added POWERLEVEL9K_DIR_PATH_ABSOLUTE to README.md 2018-02-23 10:21:02 +04:00
Christo Kotze
08432bf70c Added truncate_to_first_and_last strategy
Truncate middle directories from the path. How many directories will be
untouched is controlled by POWERLEVEL9K_SHORTER_DIR_LENGTH.
2018-02-23 09:28:56 +04:00
Christo Kotze
01f7261df4 Updated README dir truncation strategies
Added `truncate_to_last`
Added `truncate_absolute`
Moved `truncate_to_unique` before folder marker
2018-02-23 08:28:57 +04:00
Logan Brown
b31ad00218 refactor(readme): add variable settings for PROMPT_ADD_NEWLINE 2018-02-19 17:31:22 -07:00
Daniel Tam
d84420d950
Update readme 2018-02-13 22:21:15 +11:00
Daniel Tam
3da37c0eaf
Update README.md 2018-02-12 21:16:53 +11:00
Michael Louwrens
a4aacef7bc Add information to readme 2018-02-12 11:39:53 +02:00
Christo Kotze
ccba1cc823 PROMPT_DIR color/bold on last dir & color for sep.
You can now set the last dir to have a custom color with
`POWERLEVEL9K_DIR_PATH_HIGHLIGHT_FOREGROUND` and whether it will be bold
with `POWERLEVEL9K_DIR_PATH_HIGHLIGHT_BOLD=true`. You can also set a
custom separator color with `POWERLEVEL9K_DIR_PATH_SEPARATOR_FOREGROUND`.
2018-02-10 14:46:56 +04:00
Matthew Hoener
162caba19c Don't show segment if POWERLEVEL9K_VI_INSERT_MODE_STRING == '' 2018-02-07 16:51:12 -08:00
Ben Hilburn
afb7387abe Documenting missing field from #716. 2018-02-02 10:42:32 -05:00
Ben Hilburn
8090d13962
Merge pull request #717 from onaforeignshore/date_segment
Added `prompt_date` and fixed segment comments
2018-01-24 14:21:01 -05:00
Ben Hilburn
fabc473381 Merge branch 'master' into next 2018-01-06 15:40:16 -05:00
Ben Hilburn
28ff892a71 Some README cleanups 2018-01-06 15:30:16 -05:00
Christo Kotze
289df8a781 Added prompt_date to README.md 2018-01-05 13:25:28 +04:00
Sara Murray
d6a16bbebc
Corrected VPN IP command 2018-01-02 02:49:39 -06:00
Charles Peterson
4d18fdc6e9 fix for colors since the terminals so not always render named colors when using parameter expansion. 2017-12-15 15:42:35 -06:00
Ben Hilburn
786dc5b3f2
Merge pull request #697 from geniusupgrader/next
OpenFOAM support! (fixes #696)
2017-12-14 16:36:53 -05:00
Ben Hilburn
a62168b189
README Cleanup 2017-12-14 16:32:06 -05:00
Robin Rosenstock
fddb5a90e8 update readme for #696 and #697. OpenFOAM! 2017-12-14 22:12:18 +01:00
Ben Hilburn
ea05b4ebe6 Merge branch 'master' into next 2017-12-14 15:20:02 -05:00
Ben Hilburn
3d79ca1adc
Merge pull request #684 from Artistan/color_names
Use color names, plus fixes
2017-12-04 19:33:57 -05:00
Ben Hilburn
42b7242346
Updating build status to be master only. 2017-12-04 19:30:38 -05:00
Charles Peterson
264897a426 color names and fixes
- fix for packageName truncated by POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER
     - processing the pwd/HOME replacement ONCE.
     - fix tests for named colors
     - use color names by default to allow dark/light themes to adjust colors based on names
2017-11-25 12:46:45 -06:00
Ben Hilburn
3b2d47febd
Merge pull request #666 from ParthKolekar/patch-1
Allow showing the number of jobs even if there is <= 1 job present.
2017-11-10 10:31:32 -05:00
Ben Hilburn
698697a710
Minor README cleanup 2017-11-10 10:28:10 -05:00
Parth Kolekar
6243c2e72f Update README.md 2017-11-05 14:43:10 +09:00
Ben Hilburn
eb2e1b0e96 Merge branch 'master' into next 2017-11-02 14:38:20 -04:00
George D. Plymale II
3b2a2bb0cd remove weird glyphs in README.md 2017-10-24 02:00:11 -04:00
Ben Hilburn
f46617acd3 Merge branch 'master' into next 2017-10-17 21:33:40 -04:00
Ben Hilburn
1f88c289b5 Merge pull request #651 from claycephas/more-documentation
Add documentation for VCS hooks config
2017-10-17 19:38:14 -04:00
Clay Anderson
b582a60adc Add documentation for VCS hooks config 2017-10-17 14:55:51 -06:00
Térence Clastres
954faf2695 Fix incomplete vpn segment name
The segment function is called *prompt_vpn_ip()* thus the segment needs to be called "vpn_ip".
2017-10-07 19:16:06 +02:00
Timothy Earley
81cbd65142 Added dropbox segment 2017-10-01 17:53:07 +02:00
Ben Hilburn
e9e60324cd Merge branch 'master' into next 2017-09-28 18:11:28 -04:00
Ben Hilburn
9ab067bd62 Merge pull request #610 from sjoeboo/rbenv_always
Add ability to always show rbenv prompt
2017-09-28 17:30:03 -04:00
Ben Hilburn
095351cfe1 Cleaning up README language about new rbenv feature. 2017-09-28 17:24:39 -04:00
Matt Nicholson
79a73ef4aa add ability to force rbenv being shown 2017-09-06 10:25:18 -04:00
Ben Hilburn
c6c405955e README: Quick typo fix. 2017-08-27 12:50:22 -04:00
Ben Hilburn
17c069d25a README: Quick fix to MD formatting 2017-08-26 13:59:15 -04:00
Ben Hilburn
a4c3fbd76b Merge branch 'master' into next 2017-08-26 13:31:43 -04:00
Tadek Teleżyński
582edf200c Add average choice to load extension
This commit adds a functionality to choose if one wants to see 1, 5 or
15 minutes average.

Resolves issue #604
2017-08-17 21:54:26 +02:00
Varun Dey
a62fffa2b1 Updated braces for hyperlink 2017-08-14 16:08:50 +05:30
Ben Hilburn
9f4faf7f21 Merge pull request #596 from eumiro/truncate_to_unique
Add TRUNCATE_TO_UNIQUE shortening dir strategy
2017-08-12 13:52:10 -04:00
Ben Hilburn
5923aaf07d README: Slight change to new truncation strategy doc 2017-08-12 13:49:14 -04:00
Ben Hilburn
d784b1c8dc Cleaning up the dir docs in README 2017-08-12 13:15:29 -04:00
Miroslav Šedivý
73a9ee7c87 add TRUNCATE_TO_UNIQUE shortening dir strategy
This creates the shortest unique path elements that can be unambiguously expanded to the original path.
2017-08-11 22:44:18 +02:00
Richard Tippl
cefe984e3d Documented DIR_SHOW_WRITABLE in README.md 2017-08-10 19:08:33 +02:00
Ben Hilburn
41b469ed9b Quick fix to next exit code doc in README 2017-08-03 15:52:28 -04:00
Christian Höltje
f93ad073b7 status: show signal name
This makes signal exit status easy to understand.  Instead of just
showing exit code "137", you now see "KILL(-9)".

Based on #580 by @sei40kr (thanks!)
2017-07-27 22:36:11 -04:00
AdrienHorgnies
faa5ec9645 document status segment new option set 2017-07-15 21:29:10 +02:00
Ben Hilburn
3c3a86a42f Fixes for README and CHANGELOG re: vpn segment. 2017-06-02 12:15:38 -04:00
Ben Hilburn
e09d4ae926 Merge branch 'next' into next 2017-06-02 12:09:35 -04:00
Ben Hilburn
d6a14a9a01 Updating README and CHANGELOG 2017-06-02 11:59:30 -04:00
David Sabatie
5eec2e28d0 add vpn ip to prompt 2017-05-31 17:32:42 +02:00
Ben Hilburn
19fc709a16 Moving some parts of README to the Wiki. 2017-05-25 16:00:44 -04:00
Ben Hilburn
d9014c67a3 Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-host_user 2017-05-25 15:47:51 -04:00
Christo Kotze
de6a9388e9 updated to fix copy/paste 2017-05-23 19:16:46 +04:00
Ben Hilburn
44764285c3 Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-host_user 2017-05-22 21:46:17 -04:00
Ben Hilburn
325e01b9f2 Updating the README to add a note about teardown feature. 2017-05-22 21:23:52 -04:00
Ben Hilburn
e844fc4c72 Incorporating @dritter's feedback from #524. 2017-05-22 21:12:59 -04:00
Ben Hilburn
6486e62f14 Merge branch 'pr/newline' of https://github.com/docwhat/powerlevel9k into docwhat-pr/newline 2017-05-22 21:07:23 -04:00
Christian Höltje
161c995625 newline: can't work with right side 2017-05-12 22:14:01 -04:00
Christian Höltje
1619c74ad8 newline: add new segment 2017-05-12 22:14:01 -04:00
Christian Höltje
25a6c3a4a8 pipestatus: default to true (on) 2017-05-12 22:13:37 -04:00
Christian Höltje
543bd2f844 status: add option for support pipes
Added new option (POWERLEVEL9K_STATUS_SHOW_PIPESTATUS) that shows
the status for all piped commands, not just the right-most.

Closes #514
2017-05-12 21:51:36 -04:00
Ben Hilburn
0b2483cf6d Merge branch 'master' into next 2017-05-09 21:57:46 -04:00
Christian Höltje
ab8d6ae299 readme: typo 2017-05-04 02:47:55 -04:00
Ben Hilburn
cae2a7927d Updates to README and CHANGELOG for changes from #498. 2017-05-01 21:37:12 -04:00
Ben Hilburn
98a00d31a8 Merge branch 'battery' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-battery 2017-05-01 21:28:22 -04:00
Christo Kotze
61790bf242 Revised User segment in README.md 2017-04-27 22:19:17 +04:00
Christo Kotze
59e64c9051 host and user segments 2017-04-21 00:06:28 +04:00
Julien Falque
708705599d
Make home abbreviation configurable for dir prompt 2017-04-04 08:17:18 +02:00
Ben Hilburn
5a1d9ddb64 Updating README to use @V1rgul's screenshot.
Per #370
2017-04-03 20:18:16 -04:00