Commit Graph

4285 Commits (master)
 

Author SHA1 Message Date
Dominik Ritter 30c4acd249 Strip the whitespace of OSX `wc` with pure zsh. No need to install `coreutils`. 9 years ago
Ben Hilburn 7f83bac947 Revert "We don't need `tr`, as we strip whitespace directly with zsh."
This reverts commit 10c5b28859.

Conflicts:
	powerlevel9k.zsh-theme
9 years ago
Ben Hilburn c853be57e7 README: markdown syntax derp 9 years ago
Ben Hilburn 71f5be368e README: Updating introduction to the theme. 9 years ago
Ben Hilburn 3927f055fe Merge remote-tracking branch 'dritter/dritter/minimize_dependencies'
Using the `translate` program does not appear to be necessary.
9 years ago
Ben Hilburn ea2af79042 README: simple cleanup 9 years ago
Ben Hilburn 8e19cc05aa Merge pull request #59 from dritter/dritter/multiline_improvements
Multiline icons are now customizable
9 years ago
Ben Hilburn d17fecbf81 README: bit of cleanup in color customization docs 9 years ago
Ben Hilburn 97cd46a347 Merge pull request #58 from dritter/dritter/customizable_context
Made the `context` segment customizable.
9 years ago
Ben Hilburn 1f69d67c2a Merging dritter/remote_icon_space_names
Optimizing VCS icon spacing for different configurations.
9 years ago
Dominik Ritter cb20e0e0d9 Made Multiline-Icons customizable. 9 years ago
Dominik Ritter 3076c72f2e Merge branch 'master' into dritter/multiline_improvements 9 years ago
Dominik Ritter eed0c84273 Made the `context` segment customizable. 9 years ago
Dominik Ritter b82e19f073 Merge branch 'master' into dritter/minimize_dependencies 9 years ago
Ben Hilburn 8358489470 README: Updating with minor fixes. 9 years ago
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'
9 years ago
Ben Hilburn 6144225330 Merging @dritter's Node.js segment support.
This is PR #53.
Merge remote-tracking branch 'dritter/dritter/nvm'
9 years ago
Dominik Ritter 50bca4bf25 Merge branch 'master' into dritter/shorten_dir_path 9 years ago
Dominik Ritter 505a55b61c Updated node-prompt. 9 years ago
Dominik Ritter bc7c01648f Merge branch 'master' into dritter/nvm 9 years ago
Ben Hilburn 79499dbb00 README: Fixing symbol table headers 9 years ago
Ben Hilburn 767d4c75b0 Merge branch 'dritter/developers_guide' 9 years ago
Ben Hilburn 3a857c276d README: Moving Dev Guide to Github wiki 9 years ago
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.
9 years ago
Ben Hilburn 48d4ebac10 Merge pull request #50 from dritter/dritter/vim_modelines_improvement
Add VIM default settings: "expandtab", encoding = "utf8"
9 years ago
Ben Hilburn 0d9fe3d60f Merge pull request #49 from dritter/dritter/branch_icon_fixes
Fix the branch icon in the VCS segment.

Resolves bug #49.
9 years ago
Ben Hilburn 7519b5292a Merge Vagrant VM support for development. 9 years ago
Dominik Ritter 114470ea43 simple-mode deactivated. With that option on, vcs_info doesn't detect the repository state correctly. 9 years ago
Dominik Ritter 59cd8a71fa When opening this file in VIM set "expanded tabs"-option and set encoding to "utf8". 9 years ago
Dominik Ritter 0226f871f6 Fix the branch icon and whitespaces in the vcs segment. 9 years ago
Dominik Ritter 008512cc79 Merge branch 'master' into dritter/developers_guide 9 years ago
Ben Hilburn 772c9ab85d README: Updating for branch icon, ToC 9 years ago
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`.
9 years ago
Ben Hilburn 4bbbefd500 Merge pull request #45 from dritter/dritter/symfony2_version
Added a segment that shows the Symfony2 version number.
9 years ago
Ben Hilburn c4cac7eaa8 Merge pull request #44 from dritter/dritter/vagrant-vm
Fixed oh-my-zsh test installation in vagrant VM.
9 years ago
Ben Hilburn 24d7ba584a Merge pull request #43 from martinpelikan/master
Correctly set VCS dirty status on first invocation.
9 years ago
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.
9 years ago
Dominik Ritter 2538e5579b Make branch icon configurable. 9 years ago
Dominik Ritter f1b5b783d3 Added a segment that shows the Symfony2 version number. 9 years ago
Dominik Ritter c35a1c3f45 Fixed oh-my-zsh test installation. 9 years ago
Ben Hilburn 558d137bfa README: Silly missing comma. 9 years ago
Ben Hilburn 8950a0a6e3 README: Adding note about theme inspiration. 9 years ago
Ben Hilburn 60b84cc6e9 Merge pull request #40 from dsager/update-readme
README: Fixed info for antigen install
9 years ago
Daniel Sager d2a0346bf1 updated info for antigen install option 9 years ago
Ben Hilburn 686b351adb Merging Vagrant test VM from dritter/prezto 9 years ago
Ben Hilburn f84a144194 README: Updating to reflect new system support 9 years ago
Ben Hilburn 5bbe8aa6ff README: Removing reference to un-merged Vagrant test VM 9 years ago
Ben Hilburn 103a295433 Merging Antigen and Prezto support from `dritter/prezto`
Not pulling in support for the Vagrant test VM in this branch.
9 years ago
Dominik Ritter fe5ef3cee8 All top-level usages of "local" removed. That variables need to be global for antigen and prezto to work correctly. 9 years ago
Dominik Ritter 1e7105918d Added a reference to the test-vm folder 9 years ago