xinb/powerlevel10k
1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2026-09-28 15:54:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
489 Commits 8 Branches 33 Tags
36fa3f2277504c3092a2bcfa8725c7ea4cf11bf2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Hilburn e79a2ffff0 Merge pull request #149 from Tritlo/master 
Now allowing the RPROMPT to be on a newline.
 2015-11-18 10:54:21 -08:00
Ben Hilburn b83cfd7515 Merge pull request #143 from dritter/segment_deprecation_helpers 
Added segment deprecation helper
 2015-11-17 12:54:06 -08:00
Ben Hilburn 85fd338d36 Merge pull request #144 from dritter/changelog_additions 
Added the new rust segment and the changes to the rvm-segment to changelog
 2015-11-17 12:52:46 -08:00
Ben Hilburn 9b067ea29c Merge pull request #142 from dritter/rust_version 
Added Rust version segment.
 2015-11-16 09:10:58 -08:00
Ben Hilburn 77c31e17d1 Merge pull request #141 from dritter/improve_rvm_performance 
Huge performance improvement if you use `rvm` segment.
 2015-11-16 09:04:48 -08:00
Ben Hilburn 0673352e7e Merge branch 'master' into next 2015-11-13 09:49:39 -08:00
Ben Hilburn 6d3899b6e3 Merge pull request #139 from sdupille/master 
Get terminal capabilities using a zsh builtin for portability
 2015-11-13 09:48:53 -08:00
Ben Hilburn 2e8f00342a Merge pull request #112 from dritter/color_detection 
Moved many sub-functions out of main theme file. Also improved color detection.
 2015-11-13 09:47:17 -08:00
Ben Hilburn 04319d3a95 Merge pull request #136 from dritter/hotfix/131-key-fixes 
Issue #131: This fixes history-substring-search, home and end keys.
 2015-11-12 09:58:23 -08:00
Ben Hilburn 0ff3b3660e Merge pull request #134 from dritter/changelog_added 
Adding a CHANGELOG
 2015-11-04 11:13:31 -08:00
Ben Hilburn e8771a7039 Merge branch 'master' into next 2015-10-21 16:59:59 -07:00
Ben Hilburn b2e6beec51 Merge pull request #123 from martinpelikan/master 
Fixes #122, SI prefixes should be evaluated as strings.
 2015-10-21 16:54:10 -07:00
Ben Hilburn 84681d4cc1 Merge pull request #126 from rjorgenson/next 
added a prompt segment to display battery status on laptops
 2015-10-21 16:53:32 -07:00
Ben Hilburn 981c85af39 Merge pull request #127 from dritter/go_prompt 
Adding Go version segment.
 2015-10-21 16:51:44 -07:00
Ben Hilburn 43d8b34a21 Merge pull request #128 from DanielGGordon/master 
Rephrasing of error message when TERM not 256 color
 2015-10-21 16:50:38 -07:00
Ben Hilburn 15670379ed Merge pull request #129 from dritter/ram_prompt 
Breaking RAM and Swap out of load segment into their own segment.
 2015-10-21 16:50:03 -07:00
Ben Hilburn d46634a0a7 Merge branch 'master' into next 2015-10-17 21:46:09 -07:00
Ben Hilburn 38bccd1340 README: Updating second image to use @natemccurdy awesome gif. 2015-10-17 21:45:00 -07:00
Ben Hilburn ce1ea04c13 Merge pull request #118 from dritter/whitespace_customization 
Made whitespaces between segment separators customizable
 2015-10-17 20:33:16 -07:00
Ben Hilburn ee8c59806e README: Updating the docs about vi_mode segment. 2015-10-17 20:29:07 -07:00
Ben Hilburn 34add8aedf Merge pull request #117 from dritter/vi_customizations 
Make the vi_mode segement more customizable.
 2015-10-17 20:19:53 -07:00
Ben Hilburn c6f8184585 Merge branch 'dritter-vcs_cleanup' into next 2015-10-17 20:17:42 -07:00
Ben Hilburn 01b158c020 Merge branch 'vcs_cleanup' of https://github.com/dritter/powerlevel9k into dritter-vcs_cleanup 2015-10-17 20:16:02 -07:00
Ben Hilburn d459ec0983 Merge pull request #114 from alexlafroscia/add-nvm-prompt-segment 
Add nvm prompt segment
 2015-10-17 20:12:38 -07:00
Ben Hilburn 9f92995f61 Merge pull request #120 from partp/fix-virtualenv 
Fixes `VIRTUAL_ENV_DISABLE_PROMPT` condition
 2015-10-17 20:11:08 -07:00
Ben Hilburn 95d8b62e65 README: changing name of todo.txt segment to todo 2015-10-17 20:08:22 -07:00
Ben Hilburn 19caa39333 Merge pull request #109 from jkoelndorfer/next 
Fixing issue where BSD detection can bleed info to stdout.
 2015-10-12 12:45:17 -07:00
Ben Hilburn 3e7caf5ca6 Merge pull request #108 from V1rgul/next 
Added awesome fontconfig for next icons
 2015-09-28 16:39:54 -07:00
Ben Hilburn b96c5a18c1 Merge pull request #106 from V1rgul/master 
Added awesome-fontconfig support
 2015-09-28 10:46:13 -07:00
Ben Hilburn f18c92d766 Merge pull request #104 from dritter/vi_mode_cleanup 
VI-mode cleanup
 2015-09-28 10:43:30 -07:00
Ben Hilburn 163a373847 Merge pull request #103 from dritter/status_segment_cleanup 
status vs longstatus cleanup
 2015-09-28 10:42:59 -07:00
Ben Hilburn 0733bb380c Merge pull request #102 from dritter/flat_subsegments 
Added subsegments in flat-mode.
 2015-09-28 10:42:37 -07:00
Ben Hilburn 6cec4ce400 Merge branch 'master' into next 2015-09-19 16:33:29 -07:00
Ben Hilburn 6deb3fe094 Merge pull request #98 from christian-schulze/vi-mode-segment 
Add vi-mode segment
 2015-09-19 16:30:37 -07:00
Ben Hilburn bba9fb7993 Merge pull request #92 from dritter/shellcheck_fixes 
Reducing 'lintian'-like warnings according to spellcheck.net report.
 2015-09-19 16:29:52 -07:00
Ben Hilburn d75cdf34d5 Merge pull request #99 from giladgo/master 
README: propely reflect difference between status and longstatus
 2015-09-19 16:27:47 -07:00
Ben Hilburn 2a2dfdfa29 Merge pull request #91 from tusharsrivastava/master 
Updated some of the Awesome Powerline Icons.
 2015-09-15 15:34:48 -07:00
Ben Hilburn f26dcf3a87 Merge pull request #90 from dritter/icon_protection2 
Preserve Icon Settings Across Locales.

Fixes #56.
 2015-09-15 15:32:35 -07:00
Ben Hilburn 32398beab8 Merge pull request #87 from dritter/improve_same_color_segments 
Add a color separater between segments of the same color.
 2015-09-13 13:57:23 -07:00
Ben Hilburn fd191a5894 Merge pull request #80 from dritter/dritter/icon_customization_documentation 
Added documentation and a little helper function for icon customization.
 2015-09-05 15:04:20 -07:00
Ben Hilburn a3b61e92fb Merge branch 'next' of github.com:bhilburn/powerlevel9k into next 2015-09-05 15:02:03 -07:00
Ben Hilburn 3693a3bfa7 Merge branch 'dritter-dritter/system_stats' into next 2015-09-05 15:01:44 -07:00
Ben Hilburn 8fffb04dcd Merging @dritter's new system stats segments. 2015-09-05 15:01:06 -07:00
Ben Hilburn 65c44d6141 Merge pull request #89 from dritter/php_version_segment 
Added `php_version` segment.
 2015-09-05 14:52:48 -07:00
Ben Hilburn f0e8b992dc Merge pull request #85 from dritter/home_icon_whitespace_quickfix 
Fix extra whitespace in `dir` segment.
 2015-09-05 14:50:31 -07:00
Ben Hilburn 8ce144423b Resolving conflicts from PR #86 2015-09-05 14:48:18 -07:00
Ben Hilburn 7df9254c9f Merge pull request #86 from dritter/color_warning 
Display a warning if the terminal supports less than 256 colors.
 2015-09-05 14:47:00 -07:00
Ben Hilburn 790f7e724d Merge branch 'master' into next 2015-09-05 14:45:41 -07:00
Ben Hilburn 1390fbdea5 Merge pull request #88 from dritter/vcs_merge_whitespace_fix 
vcs segment: fix extra whitespace in actionformat, remove redundant color setting
 2015-09-05 14:44:43 -07:00
Ben Hilburn 60d92135cc Merge pull request #82 from labianchin/patch-1 
Fix VCS string print format for git-* (e.g., git-svn)
 2015-09-03 12:10:36 -07:00
Ben Hilburn 1a1cb8fdd2 Merge pull request #77 from jkoelndorfer/left-prompt-retval 
Set RETVAL for left prompt also.
 2015-08-26 19:51:40 -07:00
Ben Hilburn 857527083d Merge pull request #75 from dritter/dritter/utf8_codepoints_fix 
Issue #74: Changed escape sequences for UTF-8 characters to lowercase
 2015-08-19 11:41:24 -07:00
Ben Hilburn aa57f02378 Merge pull request #72 from dritter/dritter/more_troubleshooting 
Added some hints about troubleshooting missing fonts
 2015-08-13 15:35:57 -07:00
Ben Hilburn 1c08efafa3 Merge pull request #69 from dritter/dritter/little_improvements 
README: Updated URLs of agnoster repository and powerline repository
 2015-08-05 17:05:29 -07:00
Ben Hilburn 6925e35cb8 Merge branch 'dritter/dritter/minimize_dependencies' into next 2015-08-01 15:10:50 -07:00
Ben Hilburn c044ae78a5 Merge OS detection & segment into next 2015-08-01 15:08:47 -07:00
Ben Hilburn 4ef5294d0b os_icon: Combining OS detection and icon setting into one case statement 2015-07-28 19:56:46 -07:00
Ben Hilburn fb9dbe86f7 Merge branch 'dritter/os_detection' of local staging. 2015-07-28 19:39:32 -07:00
Ben Hilburn 0dc7c5bf38 Merge branch 'dritter/os_detection' into dritter-os-icon 2015-07-26 16:30:04 -07:00
Ben Hilburn c37e4a8fa0 Merge remote-tracking branch 'dritter/dritter/disable_rprompt' 
Allows disabling of the right prompt

Conflicts:
	powerlevel9k.zsh-theme
 2015-07-26 16:22:29 -07:00
Ben Hilburn 961598e66b Merge branch 'dritter-various-improvements' 2015-07-26 14:43:33 -07:00
Ben Hilburn 143aac50fb README: Cleanup 2015-07-26 14:43:16 -07:00
Ben Hilburn 0654832da4 Merge remote-tracking branch 'dritter/dritter/various_improvements' into staging 2015-07-26 14:32:36 -07:00
Ben Hilburn 0395709fa0 Merge remote-tracking branch 'dritter/dritter/os_detection' into staging 2015-07-26 14:18:02 -07:00
Ben Hilburn 925e6752f7 Merge pull request #62 from dritter/dritter/minimize_dependencies 
Strip the whitespace of OSX `wc` with pure zsh. No need to install `coreutils`.
 2015-07-22 13:06:44 -07:00
Ben Hilburn 7f83bac947 Revert "We don't need tr, as we strip whitespace directly with zsh." 
This reverts commit 10c5b28859.

Conflicts:
	powerlevel9k.zsh-theme
 2015-07-19 17:55:10 -07:00
Ben Hilburn c853be57e7 README: markdown syntax derp 2015-07-19 12:42:00 -07:00
Ben Hilburn 71f5be368e README: Updating introduction to the theme. 2015-07-19 12:40:59 -07:00
Ben Hilburn 3927f055fe Merge remote-tracking branch 'dritter/dritter/minimize_dependencies' 
Using the `translate` program does not appear to be necessary.
 2015-07-19 12:29:07 -07:00
Ben Hilburn ea2af79042 README: simple cleanup 2015-07-19 12:24:21 -07:00
Ben Hilburn 8e19cc05aa Merge pull request #59 from dritter/dritter/multiline_improvements 
Multiline icons are now customizable
 2015-07-19 12:23:00 -07:00
Ben Hilburn d17fecbf81 README: bit of cleanup in color customization docs 2015-07-19 12:20:04 -07:00
Ben Hilburn 97cd46a347 Merge pull request #58 from dritter/dritter/customizable_context 
Made the `context` segment customizable.
 2015-07-19 12:15:26 -07:00
Ben Hilburn 1f69d67c2a Merging dritter/remote_icon_space_names 
Optimizing VCS icon spacing for different configurations.
 2015-07-19 12:11:43 -07:00
Ben Hilburn 8358489470 README: Updating with minor fixes. 2015-07-12 18:10:33 -07:00
Ben Hilburn 20cb4a245e Merging @dritter's work to allow shortened dir segment. 
This is PR #54.
Merge remote-tracking branch 'dritter/dritter/shorten_dir_path'
 2015-07-12 18:07:59 -07:00
Ben Hilburn 6144225330 Merging @dritter's Node.js segment support. 
This is PR #53.
Merge remote-tracking branch 'dritter/dritter/nvm'
 2015-07-12 18:05:18 -07:00
Ben Hilburn 79499dbb00 README: Fixing symbol table headers 2015-07-10 20:43:06 -07:00
Ben Hilburn 767d4c75b0 Merge branch 'dritter/developers_guide' 2015-07-10 20:39:56 -07:00
Ben Hilburn 3a857c276d README: Moving Dev Guide to Github wiki 2015-07-10 20:39:27 -07:00
Ben Hilburn c9e6cc6cd0 Merge pull request #52 from dritter/dritter/mercurial_dirty_fix 
Must always resolve changeset to show Hg repository status.

Resolves bug #51.
 2015-07-10 20:29:31 -07:00
Ben Hilburn 48d4ebac10 Merge pull request #50 from dritter/dritter/vim_modelines_improvement 
Add VIM default settings: "expandtab", encoding = "utf8"
 2015-07-10 20:26:33 -07:00
Ben Hilburn 0d9fe3d60f Merge pull request #49 from dritter/dritter/branch_icon_fixes 
Fix the branch icon in the VCS segment.

Resolves bug #49.
 2015-07-10 20:24:33 -07:00
Ben Hilburn 7519b5292a Merge Vagrant VM support for development. 2015-07-10 20:22:22 -07:00
Ben Hilburn 772c9ab85d README: Updating for branch icon, ToC 2015-07-08 18:52:30 -07:00
Ben Hilburn b455526ecc Merge pull request #46 from dritter/dritter/branch_icon 
Add flag to enable / disable branch icon in VCS prompt. Defaults to `off`.
 2015-07-08 18:50:07 -07:00
Ben Hilburn 4bbbefd500 Merge pull request #45 from dritter/dritter/symfony2_version 
Added a segment that shows the Symfony2 version number.
 2015-07-08 18:46:10 -07:00
Ben Hilburn c4cac7eaa8 Merge pull request #44 from dritter/dritter/vagrant-vm 
Fixed oh-my-zsh test installation in vagrant VM.
 2015-07-08 18:45:22 -07:00
Ben Hilburn 24d7ba584a Merge pull request #43 from martinpelikan/master 
Correctly set VCS dirty status on first invocation.
 2015-07-08 18:44:50 -07:00
Ben Hilburn 558d137bfa README: Silly missing comma. 2015-06-30 14:40:42 -07:00
Ben Hilburn 8950a0a6e3 README: Adding note about theme inspiration. 2015-06-30 14:40:01 -07:00
Ben Hilburn 60b84cc6e9 Merge pull request #40 from dsager/update-readme 
README: Fixed info for antigen install
 2015-06-29 09:28:46 -07:00
Ben Hilburn 686b351adb Merging Vagrant test VM from dritter/prezto 2015-06-28 18:07:55 -07:00
Ben Hilburn f84a144194 README: Updating to reflect new system support 2015-06-28 17:57:28 -07:00
Ben Hilburn 5bbe8aa6ff README: Removing reference to un-merged Vagrant test VM 2015-06-28 17:19:22 -07:00
Ben Hilburn 103a295433 Merging Antigen and Prezto support from dritter/prezto 
Not pulling in support for the Vagrant test VM in this branch.
 2015-06-28 17:14:24 -07:00
Ben Hilburn f7cb946898 Merge pull request #34 from dritter/dritter/multiline_rprompt_fix 
Put RPROMPT on first line of dual-lined prompts.
 2015-06-05 10:08:02 -07:00
Ben Hilburn b7169d57d2 Merge pull request #31 from dritter/dritter/more_debugging 
More debugging hints added.
 2015-06-01 11:58:52 -07:00
Ben Hilburn f7af54cdf2 Merge pull request #28 from dritter/trim_whitespace 
Trim unwanted whitespaces.
 2015-05-20 10:06:32 -07:00
Ben Hilburn a73c3a5a66 Merge pull request #25 from dritter/dritter/readme_fixes 
Typo corrected in README
 2015-04-10 15:14:22 -07:00