Commit Graph

933 Commits (44e5b8bcc161cde396da514154a7b3749d305d21)

Author SHA1 Message Date
Dominik Ritter aca20ae463 Merge branch 'add_tests' into prepare_066 6 years ago
Christian Höltje 7f6ac8dbac Use SUDO_COMMAND to check for sudo
`sudo -n true` only checks that we _could_ use `sudo`, not if we are in
a sudo session.

closes #852
6 years ago
Ben Hilburn 571a859413
Merge pull request #912 from brandon14/laravel_pormpt_fix
[Bugfix] Fix error in laravel_version when artisan is not present
7 years ago
Brandon Clothier 9739c68894
Missed a parenthesis here. 7 years ago
Ben Hilburn e70ce43809
Merge pull request #915 from onaforeignshore/fix_truncate_to_unique
[Bugfix] Fix for "truncate_to_unique" strategy
7 years ago
Dominik Ritter 7a7b4ee13a Merge remote-tracking branch 'ben/master' into add_tests 7 years ago
Dominik Ritter 671f826a40 Set background color of vi_mode segment to white in insert mode 7 years ago
Dominik Ritter 7a3aa9d3d1 Change swap segment to take an optional root prefix for testability 7 years ago
Dominik Ritter e99c7549fb Change ram segment to take an optional root prefix for testability 7 years ago
Dominik Ritter 04168cc5c0 Change load segment to accept an optional root prefix for testability 7 years ago
Dominik Ritter 43272410c9 Change ip segment so that the tests can be executed on OSX as well
Change regular expressions to a more compatible format.
7 years ago
Dominik Ritter b61d021abd Simplify detect_virt segment 7 years ago
Dominik Ritter 629d52a7d5 Add visual identifier to custom segments 7 years ago
Christo Kotze dd25b5db12 truncate_to_unique - simplified the code 7 years ago
Brandon Clothier ef1f29a5cb
Drop grep usage in favor of zsh regex test 7 years ago
Christo Kotze 38c8519f10 Changed getUniqueHomeFolder to use $HOME
It is a Posix specification that $HOME be set, so we can use that.
See http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
7 years ago
Alexara Wu cff11d2e82
Fix `pyenv` segment 7 years ago
Christo Kotze 29c85be8d9 Fix for "truncate_to_unique" strategy 7 years ago
Dominik Ritter 802af322ff Add tests for battery segment
Additionally
- Add a fourth parameter to prompt_battery for better testability. This
  parameter is the root prefix, so we can use our own test batteries.
7 years ago
Ben Hilburn 22a761208d
Merge pull request #900 from AlexaraWu/patch/pyenv
Fix `pyenv` segment
7 years ago
Brandon Clothier 48b264f564
Fix error in laravel_version when artisan is not present 7 years ago
Alexara Wu 45fe401dc2
Improve conditions in `rbenv` & `pyenv` 7 years ago
Alexara Wu 9f09547ad1
Improve `rbenv` as well 7 years ago
Alexara Wu 25e2064f0e
Improve command check 7 years ago
Ben Hilburn a7b3f310d3
Merge pull request #905 from robobenklein/robobenklein/defined-variable-performance-hotfix
[performance] Defined function 2-20 times speedup
7 years ago
Dominik Ritter 8cd39beaad FIx status segment 7 years ago
Ben Klein 002f7b81a1
Replace [[-v with `defined`
For zsh 5.1 compatibility.
7 years ago
Alexara Wu fc39d9d6b8
Fix `pyenv` segment 7 years ago
Dominik Ritter d031b3e035 Fix kubernetes segment 7 years ago
Ben Hilburn 579887d294 Merge branch 'master' into next 7 years ago
Kevin McBride 534ec66466
kubecontext: fix context, namespace comparison 7 years ago
Dominik Ritter bda3171237 Fix java_version segment 7 years ago
Dominik Ritter 08a3801c81 Merge remote-tracking branch 'softmoth/clean-right-margin' into staging_065 7 years ago
Dominik Ritter d09a46f9e0 Mute errors when asking for java version 7 years ago
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
7 years ago
Dominik Ritter 51b53cd4b5
Fix `rbenv` segment after merge 7 years ago
Dominik Ritter dc21b97335 Fix travis build 7 years ago
Dominik Ritter a2d8cccd09 Add a Laravel version segment 7 years ago
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.
7 years ago
Dominik Ritter 40219759bb Merge branch 'fix_rprompt_newline' into staging_065 7 years ago
Dominik Ritter 47e2aed4b2 Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' into staging_065 7 years ago
Dominik Ritter db76380563 Merge remote-tracking branch 'sambadevi/feature/hide-battery-segment' into staging_065 7 years ago
Dominik Ritter 3456af3aac Merge remote-tracking branch 'opes/chruby_options' into staging_065 7 years ago
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.
7 years ago
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.
7 years ago
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.
7 years ago
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.
7 years ago
Yang Tang 9c4203bdf8 Add comments about the whitespace and coloring 7 years ago
Yang Tang 2f95fd04d9 Fix icons cut off in some terminal emulators 7 years ago
Dominik Ritter 37cbc9a02d Fix RPROMPT placement
This fixes #841
7 years ago
Tim Otlik 557f5993ea
add cog symbol to dir segment if folder is /etc* 7 years ago
Dominik Ritter 27bd1cd65d Fix test for rust segment 7 years ago
Tim Otlik 7ab9cb150e
add comment line above battery-threshold condition 7 years ago
Daniel Kolsoi 9b0e0c786a Removed 'Rust' text from test; Silenced missing rustc warning 7 years ago
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
7 years ago
Tim Otlik 642034eef2
remove duplicate code in battery segment 7 years ago
Tim Otlik 3c27f14581
add new option "POWERLEVEL9K_BATTERY_HIDE_FULL"
Hides the battery segment if percentage hits 100%
7 years ago
Daniel Kolsoi 5fd171c334 Fixed prompt_rust_version to avoid grep aliases 7 years ago
Dan fbb85e77e3
Merge branch 'master' into chruby_options 7 years ago
Dan 05f44b94bf Add options for customizing `chruby` segment 7 years ago
Ben Hilburn 13b0e383a0
Merge pull request #795 from ryandav/rbenv-prompt-option-always-displays-#777
Rbenv prompt option always displays #777
7 years ago
Ben Hilburn 0d8bfb68f4
Merge pull request #773 from conradhaupt/fix_dir_nav
Fixed home abbreviation not being exclusive with circular navigation
7 years ago
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 7 years ago
Dominik Ritter f066dc1cf7 Make _path variable local in anaconda segment 7 years ago
Dominik Ritter 9a895bc7e4 Make variables local 7 years ago
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
7 years ago
Julien Roy b260adbc1b Added a segment that shows the Java version. 7 years ago
Conrad Haupt a761e3c28a Fixed home abbreviation not being exclusive with circular navigation 7 years ago
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.
7 years ago
Ben Hilburn 203d0839f7
Merge branch 'next' into newline-count 7 years ago
Ben Hilburn cfbbd213cb
Merge pull request #729 from Mikewl/usersudo
Added sudo state to prompt_user
7 years ago
Ben Hilburn 27e256e8af
Merge pull request #736 from dualscyther/segments/dir/absolute-truncation
Add absolute truncation option to dir segment
7 years ago
Ben Hilburn 242bc34027
Merge pull request #743 from onaforeignshore/iterm2_integration
Fix iTerm2 integration with PowerLevel9k
7 years ago
Ben Hilburn f17a715610
Merge branch 'next' into master 7 years ago
Ben Hilburn b8a68dd4a8 Merge branch 'master' into next 7 years ago
Christo Kotze 9b7f8babe7 Updated testing for folder icons 7 years ago
Christo Kotze 5cec4d652a Added POWERLEVEL9K_DIR_PATH_ABSOLUTE to README.md 7 years ago
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
~/...
7 years ago
Christo Kotze b723800b80 Fixed typo - ~= instead of != 7 years ago
Christo Kotze 99e62532bb Added test for root based folder to first&last 7 years ago
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.
7 years ago
Christo Kotze 5fb3033d58 Update to truncate_absolute 7 years ago
Christo Kotze 1e29203563 Removed final SEDs and more comments 7 years ago
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
7 years ago
Christo Kotze 9ef8a2f1f9 Missed one variable name change
There's always that one pesky variable name you forget to change...
7 years ago
Christo Kotze 9c02c6e4d8 All code should now be functional
*Fingers crossed*
7 years ago
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.
7 years ago
Logan Brown 58377b2766 feature: add custom number of newlines after prompt 7 years ago
Christo Kotze a699393d58 Fixed error in coding
Shouldn't code when tired lol.
7 years ago
Christo Kotze 115b656790 Forgot to update code when creating new func 7 years ago
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.
7 years ago
Christo Kotze 58342612eb Improved truncation code 7 years ago
Christo Kotze fb09d75391 Updated truncate_to_unique 7 years ago
Christo Kotze 3b182d2eb6 Updated code for testing 7 years ago
Christo Kotze 9f87bd5654 Added / for non-home folders 7 years ago
Christo Kotze 38d7e60ae3 Rewrote trunc middle/right to use for loop 7 years ago
Christo Kotze 0acdc4e032 Fixed another typo - shouldn't code when sick :p 7 years ago
Christo Kotze 97d4e2877d Fixed typo 7 years ago
Christo Kotze 8180d724ef Added test for dir_length == trunc_length 7 years ago
Christo Kotze b1b0ad949a Updated truncate_from_right test 7 years ago
Christo Kotze 4f1da4a64d Changed current_dir - Test Travis response 7 years ago
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)
7 years ago
Christo Kotze 728aa0ec38 Updated previous test as Travis still fails 7 years ago
Christo Kotze b73af072c1 Fixed truncate_from_right to incl length of delim
Updated length test to include delimiter length.
Added comments
7 years ago
Christo Kotze 29620f3d81 Accidentally deleted )) which threw an error 7 years ago
Christo Kotze ad4b284e56 Fixed accidentally truncating current folder too 7 years ago
Christo Kotze 110f54f7e2 Added edge case tests for ~ and /
Fixed edge cases
7 years ago
Christo Kotze 64cbdaf4c2 Streamlined dir strategies
Removed sed from `truncate_middle`, `truncate_from_right` and partially
from `truncate_with_package_name`
7 years ago
Christo Kotze c71e735c7d More code cleaning (extra %F calls) 7 years ago
Christo Kotze 9c6330624e Cleaned up DIR_PATH_HIGHLIGHT code
Removed double call to %F and changed $x variables to ${x} for
consistency.
7 years ago
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
7 years ago
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*
7 years ago
Christo Kotze 536549ea62 Parameter substitution instead of dirname/basename
Replaced external calls to `dirname` and `basename` with paramater
substitution.
7 years ago
Daniel Tam eb1c6ec1fc
Refactor absolute char truncation 7 years ago
Michael Louwrens 7fff5bd7a6 add new icons and add remote_sudo 7 years ago
Christo Kotze 5491ee35c3 Updated logic in prompt_dir
Added a case where there is no last dir foreground, but still bold.
7 years ago
Christo Kotze 4ac02b0f1b Renamed $bd to $bld 7 years ago
Christo Kotze 4d71e217e9 Attempt to fix Travis error 7 years ago
Christo Kotze e644ad640e Changed testing for bold last dir 7 years ago
Christo Kotze 1949fa7b9e Added set_default for bold dir segment
Added `set_default POWERLEVEL9K_DIR_PATH_HIGHLIGHT_BOLD false`
7 years ago
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.
7 years ago
Michael Louwrens 3893785873 try out sudo icon changes 7 years ago
Michael Louwrens 0551854a9e fix typo 7 years ago
Michael Louwrens 06802647a1 change sudo detection method 7 years ago
Michael Louwrens 7b8656f8e7 add sudo status to context and user prompts 7 years ago
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.
7 years ago
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`.
7 years ago
Christo Kotze 6d25e18779 Merged `truncate_to_unique` & state `NOT_WRITABLE`
Added `truncate_to_unique` and `NOT_WRITABLE` to @dritter's code.
7 years ago
Christo Kotze 085a78b9b8 Incorporated @dritter 's changes into next
These are the changes made by @dritter on `async_all_the_segments`
7 years ago
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.
7 years ago
Matthew Hoener 162caba19c Don't show segment if POWERLEVEL9K_VI_INSERT_MODE_STRING == '' 7 years ago
Matthew Hoener c69d21016c Fix vi mode plugin 7 years ago
Daniel Tam 04850df750
Add absolute truncation option to dir segment 7 years ago
Ben Hilburn fd3d234354
Merge pull request #681 from Stazer/tcolor-warning
Added flag to ignore checking the term colors & lang settings
7 years ago
Ben Hilburn f994a7c349
Minor fix of copy/paste error 7 years ago
Ben Hilburn 8090d13962
Merge pull request #717 from onaforeignshore/date_segment
Added `prompt_date` and fixed segment comments
7 years ago
LeMarsu 3a94826ed1 fix: Remove dependency of bc for load widget 7 years ago
Justus Flerlage f7aae86b78 added POWERLEVEL9K_IGNORE_TERM_LANG for disabling term_lang check 7 years ago
Justus Flerlage 3a605c7f62 renamed POWERLEVEL9K_CHECK_TERM_COLORS to POWERLEVEL9K_IGNORE_TERM_COLORS 7 years ago
Justus Flerlage 4db2eb0e16 Added flag for checking the term colors 7 years ago
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
7 years ago
Ben Hilburn 58fc02f152 Merge branch 'Artistan-master' into next 7 years ago
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.
7 years ago
Christo Kotze 6d116ab24b Added `prompt_date` and fixed segment comments
Added separators for all segments (####)
Added descriptions for missing ones
7 years ago
Charles Peterson 0c943ac6d5 colors checking optimized and added tput for check the colors
moved to colors functions, because it makes sense.
7 years ago
lemaral 42a0125f4c
Fix newline issue 7 years ago
Charles Peterson ef0f8f0ba4 make sure the default colors are encoded properly in case they are named... 7 years ago
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.
7 years ago
Charles Peterson 4d18fdc6e9 fix for colors since the terminals so not always render named colors when using parameter expansion. 7 years ago
Ben Hilburn 786dc5b3f2
Merge pull request #697 from geniusupgrader/next
OpenFOAM support! (fixes #696)
7 years ago