Commit graph

847 commits

Author SHA1 Message Date
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