Commit Graph

776 Commits (e763fa14b0f7117071072d4ed174cb639e76526a)

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