1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-09-21 19:10:08 +00:00
Commit graph

239 commits

Author SHA1 Message Date
Ben Hilburn 0654832da4 Merge remote-tracking branch 'dritter/dritter/various_improvements' into staging 2015-07-26 14:32:36 -07:00
Dominik Ritter 69096e02c9 Added a better example for the custom Time format. 2015-07-25 14:25:29 +02:00
Dominik Ritter 9789afd142 Added Troubleshooting-hint for wrong TERM. 2015-07-25 11:00:07 +02:00
Dominik Ritter 9e1f0639cf Whitespace fixes. 2015-07-25 10:59:25 +02: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
Dominik Ritter 30c4acd249 Strip the whitespace of OSX wc with pure zsh. No need to install coreutils. 2015-07-20 23:37:57 +02: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
Dominik Ritter cb20e0e0d9 Made Multiline-Icons customizable. 2015-07-19 14:57:17 +02:00
Dominik Ritter 3076c72f2e Merge branch 'master' into dritter/multiline_improvements 2015-07-19 14:45:48 +02:00
Dominik Ritter eed0c84273 Made the context segment customizable. 2015-07-19 14:32:13 +02:00
Dominik Ritter b82e19f073 Merge branch 'master' into dritter/minimize_dependencies 2015-07-19 14:11:55 +02: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
Dominik Ritter 50bca4bf25 Merge branch 'master' into dritter/shorten_dir_path 2015-07-12 11:01:13 +02:00
Dominik Ritter 505a55b61c Updated node-prompt. 2015-07-11 14:29:48 +02:00
Dominik Ritter bc7c01648f Merge branch 'master' into dritter/nvm 2015-07-11 14:26:05 +02: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
Dominik Ritter 114470ea43 simple-mode deactivated. With that option on, vcs_info doesn't detect the repository state correctly. 2015-07-10 19:44:20 +02:00
Dominik Ritter 59cd8a71fa When opening this file in VIM set "expanded tabs"-option and set encoding to "utf8". 2015-07-10 00:58:35 +02:00
Dominik Ritter 0226f871f6 Fix the branch icon and whitespaces in the vcs segment. 2015-07-10 00:43:10 +02:00
Dominik Ritter 008512cc79 Merge branch 'master' into dritter/developers_guide 2015-07-09 19:11:03 +02: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
Martin Pelikan 5a9695dcd4 Correctly set VCS dirty status on first invocation.
The precmd hook seems to not get called on first invocation, and gets
called recursively for every subsequent invocation.
2015-07-07 19:53:11 -07:00
Dominik Ritter 2538e5579b Make branch icon configurable. 2015-07-08 00:44:52 +02:00
Dominik Ritter f1b5b783d3 Added a segment that shows the Symfony2 version number. 2015-07-07 20:34:46 +02:00
Dominik Ritter c35a1c3f45 Fixed oh-my-zsh test installation. 2015-07-07 20:08:06 +02: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
Daniel Sager d2a0346bf1 updated info for antigen install option 2015-06-29 07:54:56 +02:00
Ben Hilburn 686b351adb Merging Vagrant test VM from dritter/prezto 2015-06-28 18:07:55 -07:00