Commit graph

1050 commits

Author SHA1 Message Date
Dominik Ritter
d09a46f9e0 Mute errors when asking for java version 2018-06-17 22:47:43 +02:00
Tim Smith
3989834bfe Hide one-space indent at right margin
ZSH displays the right prompt indented one space from the right
margin. This can be tweaked with ZLE_RPROMPT_INDENT=0, but that
makes display problems very likely and I don't recommend it. But
all is not lost.

The %E prompt format does continue the current background color
through that last indent space. So it can *look* like our prompt
goes right up to the margin, if:
1) We remove the trailing space from the last segment, and
2) We add %E before clearing the background color
2018-06-15 00:42:48 -06:00
Dominik Ritter
51b53cd4b5
Fix rbenv segment after merge 2018-06-09 14:37:56 +02:00
Dominik Ritter
dc21b97335 Fix travis build 2018-06-07 02:36:30 +02:00
Dominik Ritter
a2d8cccd09 Add a Laravel version segment 2018-06-07 01:54:32 +02:00
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
40219759bb Merge branch 'fix_rprompt_newline' into staging_065 2018-06-07 01:29:04 +02:00
Dominik Ritter
47e2aed4b2 Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' into staging_065 2018-06-07 01:27:15 +02:00
Dominik Ritter
db76380563 Merge remote-tracking branch 'sambadevi/feature/hide-battery-segment' into staging_065 2018-06-07 01:25:24 +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
d3500625ca Merge remote-tracking branch 'TheDan64/master' into staging_065
Conflicts were:
- test/segments/rust_version.spec and powerlevel9k.zsh-theme. #826
removes grep from parsing the rust version on next; #703 changes color
names.
2018-06-07 01:00:57 +02:00
Dominik Ritter
e763fa14b0 Merge remote-tracking branch 'chhschou/master' into staging_065
Conflicts were:
- powerlevel9k.zsh-theme and test/segments/rust_version.spec:
rust_version Segment changed (#641) on master and colors got
names (#703) on next.
2018-06-07 00:44:47 +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
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
Yang Tang
9c4203bdf8 Add comments about the whitespace and coloring 2018-06-01 14:18:18 -04:00
Yang Tang
2f95fd04d9 Fix icons cut off in some terminal emulators 2018-06-01 11:49:23 -04:00
Dominik Ritter
37cbc9a02d Fix RPROMPT placement
This fixes #841
2018-05-26 00:27:36 +02:00
Tim Otlik
557f5993ea
add cog symbol to dir segment if folder is /etc* 2018-05-17 13:05:36 +02:00
Dominik Ritter
27bd1cd65d Fix test for rust segment 2018-05-12 23:17:49 +02:00
Tim Otlik
7ab9cb150e
add comment line above battery-threshold condition 2018-05-12 01:22:48 +02:00
Daniel Kolsoi
9b0e0c786a Removed 'Rust' text from test; Silenced missing rustc warning 2018-05-09 23:37:32 -04:00
Tim Otlik
238b231c3e
rename variable to POWERLEVEL9K_BATTERY_HIDE_ABOVE_THRESHOLD
Variable now holds an integer, if your battery status is greater or equal to this integer the
segment will be hidden
2018-05-09 10:21:13 +02:00
Tim Otlik
642034eef2
remove duplicate code in battery segment 2018-05-09 10:18:06 +02:00
Tim Otlik
3c27f14581
add new option "POWERLEVEL9K_BATTERY_HIDE_FULL"
Hides the battery segment if percentage hits 100%
2018-05-08 10:50:04 +02:00
Daniel Kolsoi
5fd171c334 Fixed prompt_rust_version to avoid grep aliases 2018-05-05 13:25:29 -04:00
Dan
fbb85e77e3
Merge branch 'master' into chruby_options 2018-04-30 11:07:55 -07:00
Dan
05f44b94bf Add options for customizing chruby segment 2018-04-30 10:52:15 -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
0d8bfb68f4
Merge pull request #773 from conradhaupt/fix_dir_nav
Fixed home abbreviation not being exclusive with circular navigation
2018-04-13 21:55:30 -04:00
Ryan Davidson
9f7b0b7404 #777 Add POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable to display prompt_rbenv if rbenv_version_name is the same as rbenv_global 2018-04-03 13:52:13 +01:00
Dominik Ritter
f066dc1cf7 Make _path variable local in anaconda segment 2018-03-28 17:37:50 +02:00
Dominik Ritter
9a895bc7e4 Make variables local 2018-03-27 01:33:21 +02:00
Christian Höltje
fe33c401ba workaround for ZSH status behavior
`$pipestatus` is returning all zeros when using `[[  ]]` expressions
that are false.

This works around it by using `$status` (A.K.A. `$?`) when `$pipestatus`
has only 1 items.

Fixes #749
2018-03-26 14:55:06 -04:00
Julien Roy
b260adbc1b Added a segment that shows the Java version. 2018-03-24 11:04:16 +01:00
Conrad Haupt
a761e3c28a Fixed home abbreviation not being exclusive with circular navigation 2018-03-12 14:28:17 +02: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
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
242bc34027
Merge pull request #743 from onaforeignshore/iterm2_integration
Fix iTerm2 integration with PowerLevel9k
2018-03-06 21:04:24 -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
9b7f8babe7 Updated testing for folder icons 2018-02-23 10:25:56 +04:00
Christo Kotze
5cec4d652a Added POWERLEVEL9K_DIR_PATH_ABSOLUTE to README.md 2018-02-23 10:21:02 +04:00
Christo Kotze
ddcdad77a7 Added new variable POWERLEVEL9K_DIR_PATH_ABSOLUTE
If user sets POWERLEVEL9K_DIR_PATH_ABSOLUTE to true, uses absolute paths
instead of home folder abbreviation, e.g. /Users/chris/... instead of
~/...
2018-02-23 10:08:43 +04:00
Christo Kotze
b723800b80 Fixed typo - ~= instead of != 2018-02-23 09:56:42 +04:00
Christo Kotze
99e62532bb Added test for root based folder to first&last 2018-02-23 09:53:36 +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
5fb3033d58 Update to truncate_absolute 2018-02-23 00:41:36 +04:00
Christo Kotze
1e29203563 Removed final SEDs and more comments 2018-02-23 00:36:12 +04:00
Christo Kotze
441fb277d9 Comments, trunc_to_last, trunc_absolute
Added comments throughout the code
Added `truncate_to_last` - displays only the current folder
Added `truncate_absolute` - displays only the last
POWERLEVEL9K_SHORTER_DIR_LENGTH characters - see #736
2018-02-22 23:34:25 +04:00
Christo Kotze
9ef8a2f1f9 Missed one variable name change
There's always that one pesky variable name you forget to change...
2018-02-22 22:51:28 +04:00
Christo Kotze
9c02c6e4d8 All code should now be functional
*Fingers crossed*
2018-02-22 22:46:53 +04:00
Christo Kotze
90d0fb1c32 Updated test for trunc_to_unique
Instead of testing for number of folders, now only tests if string is
longer than 1 character.
2018-02-22 22:42:01 +04:00
Logan Brown
58377b2766 feature: add custom number of newlines after prompt 2018-02-19 17:22:14 -07:00
Christo Kotze
a699393d58 Fixed error in coding
Shouldn't code when tired lol.
2018-02-19 22:12:16 +04:00
Christo Kotze
115b656790 Forgot to update code when creating new func 2018-02-19 22:08:06 +04:00
Christo Kotze
21b7749075 Added truncatePath to utilities.zsh
Added `function truncatePath()` to utilities.zsh to take care of
truncation. This is pure zsh code, without calls to `sed`. Parameters
are:
   * $1 Path: string - the directory path to be truncated
   * $2 Length: integer - length to truncate to
   * $3 Delimiter: string - the delimiter to use
   * $4 From: string - "right" | "middle". If omited, assumes right.

Cleaned up code to use the new function instead.
2018-02-19 22:00:15 +04:00
Christo Kotze
58342612eb Improved truncation code 2018-02-19 16:05:58 +04:00
Christo Kotze
fb09d75391 Updated truncate_to_unique 2018-02-18 22:56:52 +04:00
Christo Kotze
3b182d2eb6 Updated code for testing 2018-02-18 22:35:20 +04:00
Christo Kotze
9f87bd5654 Added / for non-home folders 2018-02-18 19:05:37 +04:00
Christo Kotze
38d7e60ae3 Rewrote trunc middle/right to use for loop 2018-02-18 18:36:18 +04:00
Christo Kotze
0acdc4e032 Fixed another typo - shouldn't code when sick :p 2018-02-18 16:58:06 +04:00
Christo Kotze
97d4e2877d Fixed typo 2018-02-18 16:56:32 +04:00
Christo Kotze
8180d724ef Added test for dir_length == trunc_length 2018-02-18 16:35:07 +04:00
Christo Kotze
b1b0ad949a Updated truncate_from_right test 2018-02-18 16:29:05 +04:00
Christo Kotze
4f1da4a64d Changed current_dir - Test Travis response 2018-02-18 16:22:59 +04:00
Christo Kotze
9a3dd6bf25 Fix issue with SHORTEN_DELIM
If `$POWERLEVEL9K_SHORTEN_DELIMITER` is a unicode escape sequence, its
length is 6 instead of 1. Added variable to hold actual character(s)
2018-02-17 21:09:27 +04:00
Christo Kotze
728aa0ec38 Updated previous test as Travis still fails 2018-02-17 20:42:35 +04:00
Christo Kotze
b73af072c1 Fixed truncate_from_right to incl length of delim
Updated length test to include delimiter length.
Added comments
2018-02-17 18:54:43 +04:00
Christo Kotze
29620f3d81 Accidentally deleted )) which threw an error 2018-02-17 18:39:39 +04:00
Christo Kotze
ad4b284e56 Fixed accidentally truncating current folder too 2018-02-17 18:26:11 +04:00
Christo Kotze
110f54f7e2 Added edge case tests for ~ and /
Fixed edge cases
2018-02-17 18:12:07 +04:00
Christo Kotze
64cbdaf4c2 Streamlined dir strategies
Removed sed from `truncate_middle`, `truncate_from_right` and partially
from `truncate_with_package_name`
2018-02-17 17:36:36 +04:00
Christo Kotze
c71e735c7d More code cleaning (extra %F calls) 2018-02-14 12:33:36 +04:00
Christo Kotze
9c6330624e Cleaned up DIR_PATH_HIGHLIGHT code
Removed double call to %F and changed $x variables to ${x} for
consistency.
2018-02-14 12:15:56 +04:00
Christo Kotze
2e417ec510 Explicitly test if DIR_OMIT_FIRST_CHARACTER = true
Changed ${POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER} to
"${(L)POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER}" == "true" Lines 876 & 882
2018-02-14 11:57:32 +04:00
Christo Kotze
7cca0876e2 Fixed = instead of == inside [[]] line 865
Missed an = inside the test for highlighting the last dir of the working
directory. Travis should work now *fingers crossed*
2018-02-14 11:48:14 +04:00
Christo Kotze
536549ea62 Parameter substitution instead of dirname/basename
Replaced external calls to `dirname` and `basename` with paramater
substitution.
2018-02-14 11:42:40 +04:00
Daniel Tam
eb1c6ec1fc
Refactor absolute char truncation 2018-02-13 22:18:26 +11:00
Michael Louwrens
7fff5bd7a6 add new icons and add remote_sudo 2018-02-12 11:28:00 +02:00
Christo Kotze
5491ee35c3 Updated logic in prompt_dir
Added a case where there is no last dir foreground, but still bold.
2018-02-11 17:49:09 +04:00
Christo Kotze
4ac02b0f1b Renamed $bd to $bld 2018-02-11 16:38:16 +04:00
Christo Kotze
4d71e217e9 Attempt to fix Travis error 2018-02-11 16:31:30 +04:00
Christo Kotze
e644ad640e Changed testing for bold last dir 2018-02-11 07:53:09 +04:00
Christo Kotze
1949fa7b9e Added set_default for bold dir segment
Added `set_default POWERLEVEL9K_DIR_PATH_HIGHLIGHT_BOLD false`
2018-02-11 07:48:22 +04:00
Christo Kotze
cd1387f530 Fixed reset bold on last dir missing.
Missed the `%b` on making the last dir bold which leaked into the
command prompt.
2018-02-11 07:17:50 +04:00
Michael Louwrens
3893785873 try out sudo icon changes 2018-02-10 21:24:06 +02:00
Michael Louwrens
0551854a9e fix typo 2018-02-10 21:01:09 +02:00
Michael Louwrens
06802647a1 change sudo detection method 2018-02-10 20:50:59 +02:00
Michael Louwrens
7b8656f8e7 add sudo status to context and user prompts 2018-02-10 19:46:31 +02:00
Christo Kotze
8b8dcb2066 Last dir bold - missed reset
Missed the bold reset code `%b` in the logic, which caused everthing
after the last dir to be bold, including the command line entry.
2018-02-10 15:41:40 +04: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
Christo Kotze
6d25e18779 Merged truncate_to_unique & state NOT_WRITABLE
Added `truncate_to_unique` and `NOT_WRITABLE` to @dritter's code.
2018-02-10 14:23:27 +04:00
Christo Kotze
085a78b9b8 Incorporated @dritter 's changes into next
These are the changes made by @dritter on `async_all_the_segments`
2018-02-10 13:54:05 +04:00
Christo Kotze
d841e1d0d0 Fix iTerm2 integration with PowerLevel9k
This fix allows the user to see the "little blue triangle" that is
created when iTerm2 shell integration is enabled.
2018-02-10 13:29:04 +04:00
Matthew Hoener
162caba19c Don't show segment if POWERLEVEL9K_VI_INSERT_MODE_STRING == '' 2018-02-07 16:51:12 -08:00
Matthew Hoener
c69d21016c Fix vi mode plugin 2018-02-07 14:56:48 -08:00
Daniel Tam
04850df750
Add absolute truncation option to dir segment 2018-02-03 20:14:52 +11:00
Ben Hilburn
fd3d234354
Merge pull request #681 from Stazer/tcolor-warning
Added flag to ignore checking the term colors & lang settings
2018-01-30 16:44:27 -05:00
Ben Hilburn
f994a7c349
Minor fix of copy/paste error 2018-01-30 16:41:34 -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
LeMarsu
3a94826ed1 fix: Remove dependency of bc for load widget 2018-01-15 08:58:05 +01:00
Justus Flerlage
f7aae86b78 added POWERLEVEL9K_IGNORE_TERM_LANG for disabling term_lang check 2018-01-07 21:35:33 +01:00
Justus Flerlage
3a605c7f62 renamed POWERLEVEL9K_CHECK_TERM_COLORS to POWERLEVEL9K_IGNORE_TERM_COLORS 2018-01-07 21:35:33 +01:00
Justus Flerlage
4db2eb0e16 Added flag for checking the term colors 2018-01-07 21:34:46 +01:00
Ben Hilburn
4718458c75
Merge pull request #677 from lemaral/POWERLEVEL9K_PUBLIC_IP_VPN_INTERFACE
Replace PUBLIC_IP_ICON with VPN_ICON if VPN is up
2018-01-06 15:28:05 -05:00
Ben Hilburn
58fc02f152 Merge branch 'Artistan-master' into next 2018-01-06 15:02:14 -05:00
Christo Kotze
550db296de Updates to prompt_date and prompt_time
Using `set_default` to set the defaults - makes the code shorter and more
readable and bypasses errors.
2018-01-05 13:15:52 +04:00
Christo Kotze
6d116ab24b Added prompt_date and fixed segment comments
Added separators for all segments (####)
Added descriptions for missing ones
2018-01-05 11:04:04 +04:00
Charles Peterson
0c943ac6d5 colors checking optimized and added tput for check the colors
moved to colors functions, because it makes sense.
2017-12-31 14:34:01 -06:00
lemaral
42a0125f4c
Fix newline issue 2017-12-31 14:18:49 +01:00
Charles Peterson
ef0f8f0ba4 make sure the default colors are encoded properly in case they are named... 2017-12-31 00:54:58 -06:00
Richard Tippl
5d645e07bf Add remote state to context prompt
Adds REMOTE state to color prompt with in case of a shell over ssh.
This state has lower priority than ROOT state to not lose the privilege
warning.
2017-12-23 15:06:33 +01: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
ea05b4ebe6 Merge branch 'master' into next 2017-12-14 15:20:02 -05:00
Ben Hilburn
c50eb9cdda
Merge pull request #686 from Corwynt/master
Fixed Issue with whitespaces in path.
2017-12-14 15:15:09 -05:00
Robin Rosenstock
f5f73f25e5 fixes #696 2017-12-11 22:40:06 +01:00
Torben Hartmann
02fbaf2c4b IFS Fix attemp 2017-12-05 17:30:49 +01:00
David Jetelina
ea062a1708
Fix of k8s shorter segment
My latest PR #676 seemed to have been incompatible with #661 - I did my PR on top of master instead of next. This one is done on top of next and should fix the current not so great state of next (prints nothing). Sorry!
2017-12-05 10:21:31 +01: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
efacc622a7
Merge pull request #680 from dinhnv/pyenv-patched
pyenv promt segment uses $PYENV_VERSION environment variable"
2017-12-04 19:20:53 -05:00
Ben Hilburn
b2d3c396c3 Merge branch 'master' into next 2017-12-04 19:15:33 -05:00
Torben Hartmann
6e931f6047 Fixed Issue with whitespaces in path. 2017-11-27 21:38:03 +01: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
dinhnv
bc8a83208f pyenv promt segment uses $PYENV_VERSION environment variable" 2017-11-22 11:30:24 +07:00
lemaral
7f9669d28a
Replace PUBLIC_IP_ICON with VPN_ICON if VPN is up
Replace PUBLIC_IP_ICON with VPN_ICON if $POWERLEVEL9K_PUBLIC_IP_VPN_INTERFACE is set and up
2017-11-14 22:23:19 +01:00
David Jetelina
b8afde5598
added forgotten $ 2017-11-14 19:01:20 +01:00
David Jetelina
37f24dcc5f
Kubernetes segment shorter if possible
Fixes #675
2017-11-14 18:58:16 +01:00
Ben Hilburn
9d59daf18d Merge branch 'master' into next 2017-11-10 10:33:37 -05: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
46fb03ed19
Updating variable name for always showing jobs count 2017-11-10 10:28:50 -05:00
Antons Kranga
82bc300c62 Add support for both AWS_PROFILE and AWS_DEFAULT_PROFILE 2017-11-07 11:30:23 +02:00
Parth Laxmikant Kolekar
7db892408f
Update powerlevel9k.zsh-theme
Allow showing the number of jobs even if there is <= 1 job present.
2017-11-05 14:33:23 +09:00
Ben Hilburn
eb2e1b0e96 Merge branch 'master' into next 2017-11-02 14:38:20 -04:00
Ben Hilburn
948e7f5bff
Merge pull request #660 from brianmoran/ISS-650-pythonpath-in-prompt
ISS-650 Fix PYTHONPATH appearing in prompt
2017-11-02 14:37:24 -04:00
Marc Hauptmann
47c7077cde declared variables as 'local'
Prevents warning messages from zsh
2017-10-31 16:48:49 +01:00
Derek Bassett
1c2774f592 Fix to unit tests. Also removed unneeded extra call to kubectl. 2017-10-27 11:55:21 -06:00
Brian Moran
43e766209b ISS-650 Fix PYTHONPATH appearing in prompt
- Modify prompt_dir function to set current_path based on pwd and
replace $HOME with ~
2017-10-27 12:11:48 -04:00
Jordan Taylor
e6d882ac47 Added functionality to parse the current namespace regardless of config settings 2017-10-18 21:57:31 -04:00
Ben Hilburn
f46617acd3 Merge branch 'master' into next 2017-10-17 21:33:40 -04:00
sbutler2901
20b69370a6 Bug fix for prompt_public_ip. The OSX date command does not have the -r option for getting the last modification time of a file. The stat command is being used instead 2017-10-12 02:02:45 -04:00
Ben Hilburn
ad74199822 Adding SIG to signal name, removing - sign. 2017-10-06 22:34:44 -04:00
Ben Hilburn
2a7f3966c2 Merge branch 'master' into next 2017-10-06 21:43:43 -04:00
Chris Chou
5657fe6ac7 #632: Indicate Rust or (rust) for rust_version segment only if icon is unavailable 2017-10-06 09:47:37 +13:00
Timothy Earley
985dac910c Don't show when dropbox is not running 2017-10-02 14:24:06 +02:00
Timothy Earley
81cbd65142 Added dropbox segment 2017-10-01 17:53:07 +02:00
Hal Gentz
ec47f1b583
These probably have similar bugs
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
2017-09-28 22:20:58 -06:00
Hal Gentz
f996d2d6ed
Fixes issue #619
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
2017-09-28 22:07:37 -06:00
Ben Hilburn
e9e60324cd Merge branch 'master' into next 2017-09-28 18:11:28 -04:00
Ben Hilburn
386a39671f Merge pull request #616 from trashbat/patch-2
Changed "less than" to "fewer than".
2017-09-28 17:33:22 -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
748f9868fc Final cleanup for new POWERLEVEL9K_RBENV_ALWAYS flag 2017-09-28 17:27:59 -04:00
Matt Nicholson
79a73ef4aa add ability to force rbenv being shown 2017-09-06 10:25:18 -04:00
trashbat
692335975c Changed "less than" to "fewer than". 2017-09-05 15:46:12 +01:00
Yann David
48b4bd1aa4
Fix prompt_kubecontext:local:1: not valid in this context: Version: 2017-08-31 14:15:11 -04:00
Richard Tippl
2c388b6c80 Fix average selection in load segment.
Removed duplicate code selecting which load average to use.
Fixed load average selection being in OSX/BSD part of if, making it not work
on non OSX/BSD systems.
Optimized actually getting the load average.
2017-08-27 22:42:52 +02: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
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
e464b4e2a5 Adding reference for truncate_to_unique code. 2017-08-12 13:49:50 -04:00
Ben Hilburn
02332d5962 Merge branch 'master' into next 2017-08-12 13:46:08 -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
Kaleb Elwert
99b7ec26b2 Add back the prompt_sp option for zsh >= 5.4.1
In 5.4.1, this option was reset between prompts, so to retain the
previous default behavior, this should be added back.
2017-08-10 11:56:12 -07:00
Richard Tippl
c4a1d91118 Added a default value for DIR_SHOW_WRITABLE.
Variable POWERLEVEL9K_DIR_SHOW_WRITABLE is now default set to false.
2017-08-10 17:49:42 +02:00
Richard Tippl
b567ab22c2 Implemented functionality from dir_writable to dir
When variable POWERLEVEL9K_DIR_SHOW_WRITABLE is set to true, dir prompt
will have new state NOT_WRITABLE.

This state will be set when user doesn't have permission to write in
current working directory as in prompt dir_writable.

When mode that allows icons is set, LOCK_ICON is used.
2017-08-10 17:14:13 +02:00
Ben Hilburn
93a1c4d2e8 Merge pull request #581 from docwhat/pr/show-signals
status: show signal name
2017-08-03 15:59:08 -04:00
Ben Hilburn
df9b99c2da Merge pull request #580 from sei40kr/master
Fixed Vi mode indicator issue
2017-08-02 11:56:10 -04:00
Seong Yong-ju
0b298e7df4 Fixed an issue of indicator of Vi mode
Fixed an issue that the indicator of Vi mode won't appear correctly at
first.
2017-07-29 13:45:11 +09: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
Christian Höltje
be6c032025 rvm: handle -head, etc. more gracefully.
Closes #575
2017-07-26 23:39:49 -04:00
Ben Hilburn
0bcef50e29 Merge pull request #573 from AdrienHorgnies/feature/status-cross-ok-option-set
Update `status` segment to provide additional configuration option, streamline settings flags.
2017-07-26 21:17:02 -04:00
Ben Hilburn
c7cd2d54cf Merge pull request #541 from golgoth31/next
vpn prompt: change "ip" to "ifconfig" to be used on OSX
2017-07-17 13:33:30 -04:00
AdrienHorgnies
a4f1ce990b change status segment option set 2017-07-15 21:28:27 +02:00
Ben Hilburn
c69d45cdcc Merge pull request #569 from docwhat/pr/home-folder-abbr-test
Added tests and replaced a sed call
2017-07-13 11:33:21 -04:00
Christian Höltje
8626d07d60 Merge remote-tracking branch 'origin/master' into pr/merge-master 2017-07-13 00:42:15 -04:00
Ben Hilburn
c88cea7f3f Merge pull request #562 from docwhat/pr/cleanup-directory-detection
Cleaned up installation directory detection
2017-07-12 10:13:01 -04:00
Christian Höltje
aca0f31eb0 Replaced a sed call with pure ZSH 2017-07-12 01:02:46 -04:00
Christian Höltje
3bf0f18e26 Cleaned up installation directory detection
- Used ZSH built-in magic to get the installation directory.
- Works with symlinks.
- No longer calls out to external program 'dirname'.
- Fixed issue with spaces in the path.
- No longer leak the variables 'filename' and 'script_location'.
2017-07-11 20:29:01 -04:00
Derek Bassett
3dddcf519d Resolves issue #553 where prompt hangs on kubectl version. 2017-06-26 13:51:41 -06:00
Pavel Peganov
65c770606b Fixed RVM segment for usernames with dashes
Having a username with a dash, such as mine, `d-side`, currently results in RVM segment displaying the wrong thing, e. g. `side/.rvm/rubies/ruby`. This fixes the issue.
2017-06-11 04:09:00 +03:00
David Sabatie
9a3d2e4ca1 vpn prompt: change "ip" to "ifconfig" to be used on OSX 2017-06-03 20:11:24 +02:00
Ben Hilburn
e09d4ae926 Merge branch 'next' into next 2017-06-02 12:09:35 -04:00
David Sabatie
5eec2e28d0 add vpn ip to prompt 2017-05-31 17:32:42 +02:00
Jason Hutchinson
6f0c809a7d empty namespace value is 'default' 2017-05-26 13:35:29 -05:00
Jason Hutchinson
932e4edeaf fix variable name typo 2017-05-26 13:29:06 -05:00
Jason Hutchinson
c11c3a55de use p9k print_icon for kubecontext segment 2017-05-26 13:27:17 -05:00
Jordan Taylor
d8d6c752fd added the current context prompt for your kubectl config 2017-05-26 09:02:14 -04:00
Jason Hutchinson
99c9ba9367 add Gopher icon to go_version segment 2017-05-25 16:38:14 -05:00
Ben Hilburn
92264124a9 Merge branch 'master' into next 2017-05-25 16:01:08 -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
cf806f097b updated render check logic 2017-05-23 19:14:52 +04:00
Ben Hilburn
b63bf00113 Merge pull request #473 from zikes/patch-1
Only show go_version segment if inside GOPATH
2017-05-22 21:55:49 -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
643e8372db Merge branch 'next' of github.com:bhilburn/powerlevel9k into next 2017-05-22 21:45:17 -04:00
Ben Hilburn
5beb77bdf4 Merge branch 'master' into next 2017-05-22 21:39:44 -04:00
Ben Hilburn
65f5f7a90f Merge pull request #531 from shibumi/next
swapped colors for virtualization detection
2017-05-22 21:34:42 -04:00
Ben Hilburn
6f7e88474d Merge pull request #526 from docwhat/pr/nvm-current
nvm: improve default detection
2017-05-22 21:32:41 -04:00
Ben Hilburn
a7409272ac Fixing typo in #525 to teardown RPROMPT 2017-05-22 21:20:56 -04:00
Ben Hilburn
c04c51bc8b Merge branch 'pr/teardown' of https://github.com/docwhat/powerlevel9k into docwhat-pr/teardown 2017-05-22 21:17:10 -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 Rebischke
e0a6246ecc
swapped colors for virtualization detection, black on yellow was pain for the eyes 2017-05-21 15:04:24 +02:00
Martin Moxon
1cc8c49137 Make Anaconda environment status match Virtualenv format 2017-05-17 20:49:27 +01:00
Christian Höltje
382c821539 teardown: reset PROMPT and RPROMPT 2017-05-12 22:15:26 -04:00
Christian Höltje
feb942d453 add function to disable powerlevel9k
Sometimes you have to disable your prompt. :-(
2017-05-12 22:15:26 -04:00
Christian Höltje
38d5f4d056 nvm: improve default detection
This is also (marginally) faster than before.
2017-05-12 22:14:44 -04:00
Christian Höltje
e9e3e9dc53 newline: support PROMPT_ON_NEWLINE
The newline segment will now show ├─ when using
`POWERLEVEL9K_PROMPT_ON_NEWLINE`

Note: This can be overridden via `POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX`
2017-05-12 22:14:01 -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
a0abc44ec7 Merge pull request #521 from guixxx/devel
Icons for Windows/Cygwin + Refixes 32-bit support
2017-05-09 21:55:54 -04:00
guixxx
e6c37b6bc5 Icons for Windows/Cygwin + Refixes 32-bit support 2017-05-07 10:34:54 -03:00
Ben Hilburn
d9969f6546 Merge branch 'master' into next 2017-05-03 15:38:03 -04:00
Kaleb Elwert
39eea0479d Make sure prompt_cr is set
Fixes #511
2017-05-03 11:58:18 -07: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
94ff40d2d1 Removed POWERLEVEL9K_ALWAYS_SHOW_CONTEXT 2017-04-27 22:16:20 +04:00
Christian Rebischke
dc2b5a833f
[detect-virt] quickfix for unnecessary information in prompt 2017-04-23 15:39:57 +02:00
Ben Hilburn
1dbaf43b98 Merge branch 'master' into next 2017-04-21 11:14:59 -04:00
Christo Kotze
59e64c9051 host and user segments 2017-04-21 00:06:28 +04:00
Kaleb Elwert
efac911431 Stop setting options in prompt setup which are thrown away 2017-04-20 00:03:44 -07:00
Kaleb Elwert
f46c1bc11b Add prompt_opts to prompt setup function 2017-04-19 17:40:41 -07:00
Kaleb Elwert
6f4c09ab99 Use method built in to zsh to read symlinks 2017-04-19 11:18:28 -07:00
Ben Hilburn
99e59bc83a Revert "Merge branch 'fix-pw3nage-exploit' of https://github.com/belak/powerlevel9k into belak-fix-pw3nage-exploit"
This reverts commit ae259ff594, reversing
changes made to 01a5c6a3a1.
2017-04-19 10:14:11 -04:00
Kaleb Elwert
769d82ce63 Fix double expansion of prompt variables 2017-04-18 19:30:54 -04:00
Ben Hilburn
ae259ff594 Merge branch 'fix-pw3nage-exploit' of https://github.com/belak/powerlevel9k into belak-fix-pw3nage-exploit 2017-04-18 19:26:08 -04:00
Kaleb Elwert
2817b45f05 Fix double expansion of prompt variables 2017-04-18 16:04:13 -07:00
Ben Hilburn
ddc425a840 Merge pull request #484 from shibumi/svn-debugging
[SVN] removed %b identifier to fix color encoding
2017-04-18 18:14:12 -04:00
Ben Hilburn
c70bb0d4ee Merge branch 'master' into next 2017-04-18 18:08:44 -04:00
Ben Hilburn
54a444535a Converting timer start time to hex 2017-04-18 18:02:37 -04:00
guixxx
ea2d02d08f Adds useful comment 2017-04-18 18:02:37 -04:00
guixxx
c403ad6cd7 Adds Android icon/battery plugin support
Plus fixes bhilburn/powerlevel9k#479, which was causing integer overflow on 32-bit CPUs
2017-04-18 18:02:37 -04:00
Christian Rebischke
2a8259e128
[SVN] removed %b identifier to fix color encoding 2017-04-16 16:53:48 +02:00
Henry Chang
18fc317cf7
Set tick to color name green instead of color code
So the tick will not be too bright in light background color scheme such
as Solarized Light.
2017-04-15 23:04:33 -07:00
Jason Hutchinson
21d8fc6378 Redirect stderr for GOPATH check to /dev/null
Accounts for instances where `go` binary is not installed.
2017-04-12 17:09:23 -05:00
Jason Hutchinson
f140104e4a only show go_version segment if inside GOPATH
As of Go v1.8 GOPATH need not be set, as it will default to $HOME/go. By using `go env GOPATH` to retrieve the value first, this technique will work regardless of whether GOPATH is currently set by the user.
2017-04-06 23:17:32 -05:00
Julien Falque
708705599d
Make home abbreviation configurable for dir prompt 2017-04-04 08:17:18 +02:00
Ben Liblit
9444e4c0c6 Gracefully handle echotc Co failure
In Emacs, `M-x shell` creates a shell buffer with very rudimentary
terminal capabilities.  `$TERM` is set to `dumb`, and `echotc Co`
fails after printing `echotc: no such capability: Co` to standard
error.  If our goal was to determine whether the terminal supports 256
colors, we really have no information to go on.  I recommend that we
trust the user and hope for the best.  That means we should (1)
discard any `echotc Co` error output, and (2) forego the warning
message about having fewer than 256 colors if `echotc Co` failed.
2017-03-31 23:23:27 -05:00
Raphaël Cohen
8be5fb62e4 Display available ram on BSD systems 2017-03-12 16:03:32 +01:00
Raphaël Cohen
3fe12dfe62 Improves ram prompt
For OS X display the sum of Pages free and Pages inactive
For Non BSD use MemAvailable instead of MemFree
2017-03-12 12:09:12 +01:00
Ben Hilburn
622c04eee3 Merge branch 'next' into truncate_composer_json 2017-03-08 15:01:53 -05:00
Dominik Ritter
17671d3ee3 Fix parsing package name from complex package.json files
when using `truncate_with_package_name` strategy.
2017-03-08 14:57:24 -05:00
Dominik Ritter
ec044c028a Add functionality to truncate via composer.json 2017-02-24 01:24:16 +01:00
Dominik Ritter
a0aa5ccbfc Fix parsing package name from complex package.json files
when using `truncate_with_package_name` strategy.
2017-02-23 23:30:55 +01:00
Felicia Hummel
554f8ed8ee Added support for customizable context segment 2017-02-18 22:25:33 -05:00
Ben Hilburn
95344af327 Setting new newline flag to false as default. 2017-02-18 22:15:22 -05:00
Johnny@Ash
ceba4bb7bf Adding option POWERLEVEL9K_PROMPT_ADD_NEWLINE to create a blank line before each prompt 2017-02-18 22:09:52 -05:00
Johnny@Ash
177474a489 Adding a \n before prompt 2017-02-18 22:09:52 -05:00
Dominik Ritter
875dec5dae Merge branch 'next' into execution_time 2017-02-14 21:42:41 +01:00
Dominik Ritter
674ae068b6 Use GMT as timezone for command_execution_time segment 2017-02-14 21:38:39 +01:00
Dominik Ritter
a202537dd7 Refactor command_execution_time segment
- Change internal precision to nanoseconds
- Let the user decide about desired precision
- Add tests
2017-02-14 21:32:41 +01:00
Ben Hilburn
c65e3217b5 context: fixing conditionals in for always showing $USER 2017-02-14 08:58:40 -05:00
Ben Hilburn
6512796afe Trying to enable always showing user, not working 2017-02-13 22:29:58 -05:00
Ben Hilburn
3de352b296 Adding ssh segment back with some minor changes. 2017-02-13 22:07:23 -05:00
Ben Hilburn
f68e055f3b Merging the ssh detection into context segment, resolving conflicts. 2017-02-13 21:50:37 -05:00
Ben Hilburn
5957aef79a Merge branch 'next' into shibumi-next 2017-02-13 21:07:10 -05:00
Ben Hilburn
36d74f34c2 Merge branch 'next' into dir_first_character 2017-02-13 20:21:33 -05:00
Dominik Ritter
0461b56f2a Fix wrong variable name 2017-02-14 01:24:32 +01:00
Dominik Ritter
e105118f39 Format command execution time human readable 2017-02-14 00:57:10 +01:00
Dominik Ritter
04e75a683d Reworked command_execution_time segment
- Add a visual identifier
- Fix a bug that the time was not reset
- Make calculation independent of segment (thx @rjorgenson)
2017-02-13 23:17:04 +01:00
Dominik Ritter
7e5bef14d7 Add command_execution_time segment 2017-02-13 00:56:32 +01:00
Dominik Ritter
f6c65e3cf7 Get rid of unreadable BSU-pattern
Now the current folder in `truncate_with_folder_marker` strategy is
truncated by cutting off the found folder from the beginning of $PWD.
2017-02-13 00:22:22 +01:00
Dominik Ritter
a4cb875615 Add documentation about mysterious 'BSUbfksu' pattern 2017-02-12 23:27:16 +01:00
Dominik Ritter
610fd4fbfd Merge branch 'next' into benoits_dir_segment 2017-02-12 18:59:21 +01:00
Ben Hilburn
1de14df11f Merge pull request #395 from dritter/benoits_dir_writable_segment
Benoits dir writable segment
2017-02-11 10:22:49 -05:00
Ben Hilburn
2397d02acc Merge pull request #391 from dritter/simplify_public_ip
Simplify `public_ip` segment
2017-02-11 10:18:53 -05:00
Ben Hilburn
da75345275 Merge pull request #387 from dritter/fix_truncate_with_package_name
Fix error with truncating package name if repo is symlinked
2017-02-11 10:12:17 -05:00
Christian Rebischke
7e25fa1e93
Added additional ssh identifier for the right statusbar. 2017-02-10 17:12:05 +01:00
Christian Rebischke
15cbe8dbc9
[SSH]: resolved merge conflict and merged with current next 2017-02-10 16:53:49 +01:00
Dominik Ritter
a8af89eeb7 Fix default dir truncation strategy 2017-02-04 08:51:52 +01:00
Dominik Ritter
268c3247c9 Do path expansion at first 2017-02-03 20:21:53 +01:00
Dominik Ritter
eb865664e4 Add comments to the dir segment 2017-02-02 00:31:04 +01:00
Dominik Ritter
052eba9c74 Rename dir_permissions segment to dir_writable
Additionally:
- Add changelog entry
- Add documentation
2017-01-31 23:57:59 +01:00
Benoit Averty
6927b0ca94 Add directory permission prompt segment 2017-01-31 23:54:03 +01:00
Benoit Averty
9f4772f993 More possibilities with truncate folder marker 2017-01-31 23:49:46 +01:00
Benoit Averty
5cc2d51b58 Fix bug when truncate root was set to direct subfolder of home or root 2017-01-31 23:49:13 +01:00
Benoit Averty
ebf808c533 Add dir_truncate_root option 2017-01-31 23:47:49 +01:00
Dominik Ritter
b379f03f14 Add ability to omit the first character in dir path 2017-01-30 21:10:09 +01:00
Dominik Ritter
06cb9bb43f Change order of public ip methods as it was before 2017-01-28 13:21:40 +01:00
Dominik Ritter
6c352c8d5c Simplify public_ip segment 2017-01-28 02:47:59 +01:00
Dominik Ritter
a576a15759 Fix error with truncating package name if repo is symlinked 2017-01-25 23:48:40 +01:00
Dominik Ritter
bcb0fed873 Avoid error if CLOBBER is not set
If the tempfile already exists and CLOBBER is not set, a file exists error occurrs. This commit avoids this problem.
2017-01-24 20:34:11 +01:00
Ben Hilburn
a58e8bdc8c Merge pull request #379 from dritter/fix_swift_segment
Fix swift segment
2017-01-24 10:11:02 -05:00
Ben Hilburn
7bd2585371 incorportaing feedback from review on hdd_usage segment 2017-01-21 21:34:55 -05:00
Dominik Ritter
b8e18d7108 Fix swift segment
The regex for the swift segment matches too much. Here I simplified it
to match the first number as this is probably the "main" version number.
2017-01-22 01:47:58 +01:00
Ben Hilburn
59b20b8f27 changing hdd_usage to actually show usage 2017-01-20 22:05:57 -05:00
Mikhaylov Anton
7f3677d22a Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
ea74c45d4f Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
92cb8d14d1 Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
934186df6d Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
cf8a94de01 Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
32708784b2 Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
41588e0d24 Change colors 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
46ef589b63 Add anion155's HDD segment 2017-01-20 22:05:32 -05:00
Owen McGill
e2b2e8e173 Change powerlevel9k_init to prompt_powerlevel_setup
Changed init/setup function name to be compatible with zsh promptinit, zsh prompt function only lists themes with prompt_*_setup init/setup functions
2017-01-20 20:44:24 -05:00
Ben Hilburn
e9af4aab4f Merge pull request #376 from jshort/next
Fix MacOS specific battery segment logic.
2017-01-20 20:36:19 -05:00
James Short
22540e04b8 Fix MacOS specific battery segment logic.
The case statement was causing it to never display that it was charging
and some of the awk statements had an off-by-one bug to grab the correct
values.
2017-01-18 16:05:38 -08:00
rjorgenson
108335f18f fixed typo
fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty .. i hope
2017-01-09 15:25:02 -07:00