aboutsummaryrefslogtreecommitdiff
path: root/functions
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' ↵Dominik Ritter2018-06-071-0/+5
|\ \ | | | | | | | | | into staging_065
| * | add cog symbol to dir segment if folder is /etc*Tim Otlik2018-05-171-0/+5
| |/
* | Merge remote-tracking branch 'chhschou/master' into staging_065Dominik Ritter2018-06-071-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 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.
| * | #632: Indicate `Rust` or `(rust)` for rust_version segment only if icon is ↵Chris Chou2017-10-051-2/+2
| | | | | | | | | | | | unavailable
* | | Merge remote-tracking branch 'VanRoy/master' into staging_065Dominik Ritter2018-06-071-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Added a segment that shows the Java version.Julien Roy2018-03-241-0/+4
| | | |
* | | | Merge remote-tracking branch 'floor114/next' into staging_065Dominik Ritter2018-06-071-0/+15
|\ \ \ \
| * | | | Add vcs branch name truncating.Taras Shpachenko2018-04-121-0/+15
| | | | |
* | | | | Merge remote-tracking branch 'guicassolato/fix-wrapper-slowness' into ↵Dominik Ritter2018-06-071-15/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | staging_065 Conflicts were: - functions/vcs.zsh: Two commits avoided wrapper behaviour. #685 in grep, #797 in git.
| * | | | Fixes wrapper slowness in vcs segmentGuilherme Cassolato2018-04-111-15/+15
| | |_|/ | |/| |
* | | | Merge pull request #791 from dritter/local_variablesBen Hilburn2018-04-142-3/+4
|\ \ \ \ | |_|/ / |/| | | Make variables local
| * | | Make variables localDominik Ritter2018-03-272-3/+4
| | | |
* | | | add compatible to the list of fontconfigsTim Otlik2018-03-201-0/+5
| | | |
* | | | fixed missing icons for other fontconfigsTim Otlik2018-03-201-0/+15
| | | |
* | | | update icons for nerd-fonts 2.0.0Tim Otlik2018-03-202-14/+34
|/ / /
* | | **LARGE MERGE THAT TOUCHES LOTS OF THINGS.**Ben Hilburn2018-03-071-0/+76
|\ \ \ | | | | | | | | | | | | | | | | 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.
| * \ \ Merge branch 'dir_strategies' of ↵Ben Hilburn2018-03-071-0/+76
| |\ \ \ | | | | | | | | | | | | | | | https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-dir_strategies
| | * | | Fixed silly coding errorChristo Kotze2018-02-221-5/+3
| | | | | | | | | | | | | | | | | | | | Did `local 3=...` instead of `3=...`
| | * | | Update for TravisChristo Kotze2018-02-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While zsh accepts the following code: ``` local paths=(${(s:/:)${1//"~\/"/}}) ``` Travis fails unless it is ``` local paths=$1 paths=(${(s:/:)${paths//"~\/"/}}) ```
| | * | | Updated truncatePath()Christo Kotze2018-02-221-6/+7
| | | | | | | | | | | | | | | | | | | | Added variable `delim_len` with test when delim=""
| | * | | Another Travis testChristo Kotze2018-02-201-1/+2
| | | | |
| | * | | Another change to test TravisChristo Kotze2018-02-191-3/+3
| | | | |
| | * | | Changed path splitting to test TravisChristo Kotze2018-02-191-3/+3
| | | | |
| | * | | Updated path splitting lineChristo Kotze2018-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | Works in the console, but Travis doesn't like it.
| | * | | Added truncatePath to utilities.zshChristo Kotze2018-02-191-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #729 from Mikewl/usersudoBen Hilburn2018-03-071-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Added sudo state to prompt_user
| * | | | | add new icons and add remote_sudoMichael Louwrens2018-02-121-1/+4
| | | | | |
| * | | | | try out sudo icon changesMichael Louwrens2018-02-101-0/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #758 from sambadevi/nextBen Hilburn2018-03-074-2/+112
|\ \ \ \ \ | |_|/ / / |/| | | | Add icons for more distros in os_icon segment
| * | | | fix $OS variable for battery segmentTim Otlik2018-02-191-13/+1
| | | | |
| * | | | arch icon was missingTim Otlik2018-02-161-0/+4
| | | | |
| * | | | add missing icons to compat setTim Otlik2018-02-161-0/+48
| | | | |
| * | | | add check of /etc/os-release for linux distrosTim Otlik2018-02-164-27/+66
| | | | |
| * | | | added LINUX_*_ICON for several OSTim Otlik2018-02-162-1/+32
| |/ / /
* / / / Fix GIT and GITHUB nerdfont icon.Christian Höltje2018-02-151-2/+3
|/ / / | | | | | | | | | VCS_GIT_ICON and VCS_GIT_GITHUB_ICON were wrong.
* | | Merge pull request #681 from Stazer/tcolor-warningBen Hilburn2018-01-311-0/+4
|\ \ \ | | | | | | | | Added flag to ignore checking the term colors & lang settings
| * | | renamed POWERLEVEL9K_CHECK_TERM_COLORS to POWERLEVEL9K_IGNORE_TERM_COLORSJustus Flerlage2018-01-071-1/+1
| | | |
| * | | Added flag for checking the term colorsJustus Flerlage2018-01-071-0/+4
| | | |
* | | | Merge pull request #717 from onaforeignshore/date_segmentBen Hilburn2018-01-241-0/+10
|\ \ \ \ | | | | | | | | | | Added `prompt_date` and fixed segment comments
| * | | | Updates to `functions/icons.zsh`Christo Kotze2018-01-051-0/+10
| | | | | | | | | | | | | | | | | | | | Added date and time icons
* | | | | getColor() must always print resultChristian Höltje2018-01-201-1/+1
| |/ / / |/| | | | | | | | | | | This was causing colors specified as numbers to not be shown.
* | | | colors checking optimized and added tput for check the colorsCharles Peterson2017-12-311-0/+16
| | | | | | | | | | | | | | | | moved to colors functions, because it makes sense.
* | | | fix for colors since the terminals so not always render named colors when ↵Charles Peterson2017-12-161-267/+319
|/ / / | | | | | | | | | using parameter expansion.
* | | Merge branch 'master' into nextBen Hilburn2017-12-141-4/+4
|\ \ \ | | |/ | |/|
| * | Disable alias of grepKentaro Hayashi2017-11-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | If user defined alias of grep command with '-r' or '--recursive' option, it causes a slow response of command line. It is not unexpected behavior of vcs info. This commit explicitly disables alias of grep to suppress side effects.
* | | Merge pull request #688 from Stealthii/feature/stash-vcsBen Hilburn2017-12-051-0/+2
|\ \ \ | | | | | | | | Add Stash naming support for Bitbucket Server
| * | | Add Stash naming support for Bitbucket ServerDaniel Porter2017-11-301-0/+2
| |/ /
* | | Merge pull request #684 from Artistan/color_namesBen Hilburn2017-12-051-9/+258
|\ \ \ | | | | | | | | Use color names, plus fixes
| * | | color names and fixesCharles Peterson2017-11-251-9/+258
| |/ / | | | | | | | | | | | | | | | | | | - 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
* | | Merge branch 'master' into nextBen Hilburn2017-10-071-4/+4
|\| |