Commit graph

191 commits

Author SHA1 Message Date
Keith Miyake
f9d2f3a3a5 Merge remote-tracking branch 'upstream/next' into nerdfont
* upstream/next: (41 commits)
  vcs icons: fixing branch spacing and remote icon in fontawesome
  same deal for the "FAIL_ICON"!
  fixing the "OK_ICON" in 'awesome-fontconfig' which somehow got broken
  Change powerlevel9k_init to prompt_powerlevel_setup
  Fix MacOS specific battery segment logic.
  Minor fix-up to the README.
  Adding license note about the new logo.
  more typos
  Adding the new logo to the README!
  fixed typo fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty .. i hope
  fixed typo
  reverted testing value to default value
  added link to segemnt documenation in README
  fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty for real
  fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty
  added README section for public_ip segment
  added the ability to specify and only attempt a particular method
  Add Changelog for v0.5.0
  added configurable string when there is no IP
  updated some comments changed some offline behavior
  ...
2017-01-21 13:40:51 -08:00
Ben Hilburn
9ead1c1548 Merge branch 'master' into next 2017-01-20 22:47:29 -05:00
Ben Hilburn
d2c0a62445 vcs icons: fixing branch spacing and remote icon in fontawesome 2017-01-20 22:45:35 -05:00
Ben Hilburn
ea648d003e Moving HDD_ICON definition to consistent spot. 2017-01-20 22:05:57 -05:00
Mikhaylov Anton
46ef589b63 Add anion155's HDD segment 2017-01-20 22:05:32 -05:00
Ben Hilburn
353cb7a497 Merge branch 'master' into next 2017-01-20 22:04:36 -05:00
Ben Hilburn
c8cc891045 same deal for the "FAIL_ICON"! 2017-01-20 22:04:16 -05:00
Ben Hilburn
d44c336eeb Merge branch 'master' into next 2017-01-20 22:00:34 -05:00
Ben Hilburn
95f0c3c6ec fixing the "OK_ICON" in 'awesome-fontconfig' which somehow got broken 2017-01-20 21:59:59 -05:00
rjorgenson
fa21bfff45 reverted trailing space edit 2016-12-30 14:10:43 -07:00
rjorgenson
29233c1963 added public IP segment for review/discussion 2016-12-30 14:04:18 -07:00
Ben Hilburn
3a3238444d Merge pull request #360 from davidmpaz/icon_by_repo
Display different icons depending on remote type in VCS segment.
2016-12-21 10:22:13 -05:00
David Paz
f2cac2273a Assign git service icon depending on repo origin
Check git origin url to search for well know services. Return
proper icon if service found, if not return "git" icon from
font-awesome icon set
2016-12-15 13:08:21 +01:00
David Paz
528e648c04 Add service icon definition on Powerline-Patched Fonts
Add configuration for service icons in section "Powerline-Patched Font".
2016-12-15 13:07:15 +01:00
David Paz
e7ab1e9eed Add service icon definition on fa-regular
Add configuration for icons on section 'awesome-fontconfig'.
2016-12-15 13:06:32 +01:00
David Paz
81f7175f76 Add service icon definition for fa-patched
Add configuration for icon definitions on 'flat'|'awesome-patched'
section.
2016-12-15 13:05:23 +01:00
Keith Miyake
82aa37d230 Add nerdfont icons 2016-12-08 21:23:58 -08:00
Ben Hilburn
7a49c9704d Merge pull request #347 from thomaspaulmann/swift
Add prompt for current installed swift version
2016-12-05 18:32:55 -05:00
Thomas Paul Mann
21a5cbd988 Add prompt for current installed swift version 2016-12-01 21:21:05 +01:00
Ben Hilburn
352ad4d608 Merge branch 'master' into next 2016-10-27 11:00:18 -04:00
Ben Hilburn
fd9c998f02 Merge pull request #333 from eviltak/dir-truncate-right-with-delim-len
Consider delimiter length while right truncating directories
2016-10-27 10:59:55 -04:00
Arav Singhal
1edb74ba91 Consider delimiter length in dir truncate right
Truncating the path from the right now takes in account the delimiter
length, so that directories with names shorter than truncated name +
delimiter are displayed properly.

For example, if SHORTEN_DIR_LENGTH is 4 and the delimiter is "..",
"../tests/.." and "../custom/.." are not incorrectly "truncated" to
"../test../.." and "../cust../..", both of which are longer or the same
length as the original.
2016-10-27 13:01:02 +05:30
Ben Hilburn
3326353b10 Merge branch 'master' into next 2016-10-26 11:08:53 -04:00
Ben Hilburn
790230e1c7 Merge pull request #326 from mtraynham/fix_svn_detect_changes
Fix '+vi-svn-detect-changes:local:1: not valid in this context'
2016-10-26 09:49:33 -04:00
Matt Traynham
bddbdd62e8 Fix '+vi-svn-detect-changes:local:1: not valid in this context' 2016-10-19 09:35:23 -04:00
bsidhipong
ef1e2c99b6 Changed \u and \U to reflect number of hex digits to follow
Some unicode icon strings were set with \uHHHHH which showed the wrong
characters on some implementations of zsh (linux and macOS).  Changed
\uHHHHH to \UHHHHH and conversely changed \UHHHH to \uHHHH.
2016-10-16 22:28:43 -05:00
Ben Hilburn
3f1f11a1f1 bugfix: typo in "POWERLEVEL9K" broke the VCS tag display 2016-09-26 13:54:43 -04:00
Ben Hilburn
c4fdc8f708 Improved speed of prompt_vcs by 50%-66%. 2016-08-31 10:35:05 -04:00
Ben Hilburn
683ca10e36 vcs: adding detection of unstaged / staged for svn repos 2016-08-30 20:44:07 -04:00
Christian Rebischke
3b0da2c348 fixed svn-detect-changes().. the svn prompt has now the same behaviour as the git prompt.. 2016-08-30 20:41:51 -04:00
Christian Rebischke
e134c70bc1 swapped half and full dirty in svn-detect-changes 2016-08-30 20:41:51 -04:00
Christian Rebischke
62e41ada1f added vi-svn-detect-changes() in functions/vcs.zsh 2016-08-30 20:41:51 -04:00
Ben Hilburn
3291b4d476 Merging ability to hide tags from VCS segment. 2016-07-12 20:28:01 -04:00
Ben Hilburn
b893d66a46 Merge branch 'next' of https://github.com/Xetius/powerlevel9k into xetius-vcs-hide-tags 2016-07-12 20:17:25 -04:00
Chris Hudson
ef2d01a2aa Added POWERLEVEL9K_VCS_HIDE_TAGS variable to control displaying of vcs tags in segment 2016-07-07 22:40:26 +01:00
Marin Gilles
f50ac9edd8 Changed python icon to snake 2016-06-23 07:51:02 +02:00
Thuan (Duong Tien)
ec25e3b3af [ADD] PYTHON_ICON 2016-05-04 21:16:16 +07:00
Ben Hilburn
511bbcf124 Merge pull request #247 from orhanbalci/next
rust icon added to rust segment
2016-04-19 15:23:43 -04:00
orhanbalci
67dce19024 whitespace fix 2016-04-19 22:08:11 +03:00
orhanbalci
c991553fb2 empty rust icon for patched mode 2016-04-17 21:51:34 +03:00
Dominik Ritter
7b2e995299 Fix truncation of changeset in detached tag mode 2016-04-17 18:03:31 +02:00
orhanbalci
72315fdc59 rust icon added 2016-04-16 23:46:32 +03:00
Ben Hilburn
a09eda6774 Fixing comments in vi-git
-tagname
2016-04-12 10:54:10 -04:00
Ben Hilburn
0f4e3e7588 git-tagname: Now showing hash/branchname when sitting on a tag 2016-04-12 10:43:34 -04:00
Ben Hilburn
6fde7bf3fd git-tagname: reducing conditionals in logic 2016-04-12 10:42:34 -04:00
Ben Hilburn
3ee1f419c7 Merge branch 'next' of https://github.com/nmaggioni/powerlevel9k into nmaggioni-next 2016-04-12 08:53:25 -04:00
Niccolò Maggioni
14e213bd68
Weird conditions handling
Become a programmer, they said. It'll be fun, they said.
2016-04-11 23:02:58 +02:00
Niccolò Maggioni
ce16b087c6
Avoid tag/branch duplication if same value 2016-04-11 21:37:28 +02:00
Ben Hilburn
aec9d95295 Merge pull request #229 from alexlafroscia/add-package-name-shortening-strategy
Add shortening strategy based on package.json name
2016-04-11 15:16:37 -04:00
Niccolò Maggioni
1ab41d9a6c
Better DETACHED_HEAD detection 2016-03-25 10:51:33 +01:00
Niccolò Maggioni
4fdf5df258
Documentation 2016-03-22 18:24:34 +01:00
Alex LaFroscia
4ca6938801 Apply max dir length to package name shortener 2016-03-22 13:14:10 -04:00
Niccolò Maggioni
89fefbdf6e
DETACHED_HEAD handling 2016-03-22 17:51:01 +01:00
Niccolò Maggioni
b46a96a7ce
Git tag not replacing branch 2016-03-22 17:29:34 +01:00
sabricot
3c95feb0bd Add a docker machine segment 2016-03-06 18:25:17 +01:00
Dominik Ritter
cb5d33affb Fix untracked state of the vcs segment 2016-02-26 15:53:14 +01:00
Dominik Ritter
a1ef6548d5 Fix dynamic coloring of VCS segment
The VCS segment had a lot of own color definitions. Now they are all
gone, so that the only color definitions are when the segment gets
printed.
2016-02-18 18:27:32 +01:00
Ben Hilburn
94c87a4d23 Reflect submodule status in VCS prompty by default. 2016-02-17 17:09:54 -08:00
Ben Hilburn
64d81a2b36 Merge pull request #212 from dritter/unit_testing
Adding Unit Tests, supported  by Travis-CI
2016-02-17 15:39:55 -08:00
Dominik Ritter
d7a0f49391 Add documentation for printSizeHumanReadable 2016-02-12 01:18:35 +01:00
Sebastien Varrette
52982e3f63 mention to git_compare_version
Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
2016-02-09 14:22:47 +01:00
Sebastien Varrette
0fd9d277f9 correct half-dirty detection -- restrict to untracked files
Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
2016-02-09 14:09:33 +01:00
Sebastien Varrette
56bc1b3f47 dirty check even in subdirs
Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
2016-02-08 17:14:28 +01:00
Dominik Ritter
e9da3d5146 Fix joining segments 2016-02-06 20:07:42 +01:00
Ben Hilburn
4bbff138fb Merging @theminor's changes from PR #204 2016-02-05 10:59:33 -08:00
Ben Hilburn
4897c795fa Merge branch 'master' into next 2016-02-05 10:57:56 -08:00
Ben Hilburn
25bf6d60a0 Merge pull request #181 from dritter/split_up_ram_segment
Split up `ram` segment into `ram` and `swap`.
2016-02-05 10:37:28 -05:00
theminor
3b7dfff7ea Add VCS_WORKDIR_HALF_DIRTY vrbl for unstaged files 2016-01-26 17:20:20 -05:00
Dominik Ritter
15665a4f95 Joining conditional segments now work as expected. If between the last
printed segment is a full but conditional segment, the joined one gets
promoted.
This fixes #186
2016-01-23 01:45:39 +01:00
Dominik Ritter
ed28b8d26f Use explicit word splitting. No need to set SH_WORD_SPLIT 2016-01-23 01:45:39 +01:00
Dominik Ritter
6763826c4e More space for the Beanstalk-Icon. 2016-01-23 01:34:48 +01:00
James Bowman
af119c9406 Adding command prompt for AWS Elastic Beanstalk environment name. 2016-01-23 01:34:01 +01:00
Dominik Ritter
6aadf76397 Split up ram segment into ram and swap. 2016-01-23 01:27:05 +01:00
rjorgenson
f1486620e7 added space to end of RVM icon 2016-01-16 18:03:31 -07:00
Kayant
cf921fb90c Add sub folder icon when in home subdirectories
Big thanks to @dritter for guidance, @rjorgenson for great explanation.
And @bhilburn for further guidance and encouragement.
See http://i.imgur.com/2Vncypo.png for a presentation of how it looks.
2016-01-16 01:08:52 +00:00
MrTuxHdb
a97fa07cc5 [FIX] RUBY_ICON should be $'\UF219' 2016-01-14 13:05:07 -08:00
Dominik Ritter
b9cb32f4a7 Removed whitespace before git tag. 2016-01-07 22:17:21 +01:00
Dominik Ritter
ac4502ca1f Added the "visual identifier" concept to the vcs segment. 2015-12-18 00:47:37 +01:00
Dominik Ritter
46aafc797a Some icons are visual identifiers now, so they shouldn't control the
margin to the text (which is whitespace).
2015-12-15 02:34:23 +01:00
Dominik Ritter
7151036198 Removed unecessary variable. 2015-12-15 01:59:46 +01:00
Dominik Ritter
a09a4b8dd5 Added a folder icon for "awesome-fontconfig" mode. Thx to @tritlo 2015-11-28 10:57:50 +01:00
Dominik Ritter
c10bac90ba In Awesome-Mode either print a home-icon or a folder icon, depending in which directory the user is. 2015-11-28 00:03:07 +01:00
Matthías Páll Gissurarson
231cfda809 added icon to be able to set the end of the prompt explicitly 2015-11-19 01:04:52 +01:00
Dominik Ritter
f9957ca559 Used typeset to define the local array. This does the trick on linux. 2015-11-17 18:34:18 +01:00
Dominik Ritter
ce7b99cdaf Added a mechanism to make deprecated segments visible to the user. 2015-11-17 01:39:49 +01:00
Dominik Ritter
0fa635275c Extracted color functions to a separate file. 2015-10-24 01:05:37 +02:00
Dominik Ritter
2b8cb5b9a4 Extracted VCS-hooks into a separate file. 2015-10-24 00:05:15 +02:00
Dominik Ritter
d6584e13da Extracted icons into a separate file. 2015-10-23 23:42:59 +02:00
Dominik Ritter
fbd1b99bab Renamed "power-utilities.zsh" to just "utilities.zsh". 2015-10-23 23:39:50 +02:00
Dominik Ritter
23f86afeb3 Merge branch 'next' into color_detection 2015-10-22 10:10:15 +02:00
Dominik Ritter
5addfdc9e0 Moved utility-functions to "functions/power-utilities.zsh". 2015-10-19 17:37:18 +02:00