Commit Graph

218 Commits

Author SHA1 Message Date
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
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
Dominik Ritter fe5ef3cee8 All top-level usages of "local" removed. That variables need to be global for antigen and prezto to work correctly. 2015-06-13 00:27:27 +02:00
Dominik Ritter 1e7105918d Added a reference to the test-vm folder 2015-06-11 19:50:30 +02:00
Dominik Ritter 2821a0deee Updated TOC. 2015-06-11 18:24:55 +02:00
Dominik Ritter e97c216c7b More Documentation. 2015-06-11 18:24:16 +02:00
Dominik Ritter 966bf5fe74 Global variables need to be global, so that antigen and prezto see them.. 2015-06-11 18:09:57 +02:00
Dominik Ritter 3e13603557 It makes no sense, to clone the powerlevel9k-theme in all frameworks. Instead, we can simply use the one, which is mounted in /vagrant_data.. 2015-06-11 00:58:46 +02:00
Dominik Ritter 494714049a Added provisioning for all frameworks. 2015-06-10 02:38:36 +02:00
Dominik Ritter 4ad6080d31 Added a testing environment in form of a virtual machine. 2015-06-10 02:31:36 +02:00
Dominik Ritter 1e31869e13 Merge branch 'master' into dritter/prezto 2015-06-09 17:08:09 +02:00
Ben Hilburn c78bdf9504 README: Updating picture location 2015-06-08 13:47:39 -07:00
Ben Hilburn 7376602a7b Merging support for Awesome-Patched-Powerline fonts. 2015-06-08 13:42:50 -07:00
Ben Hilburn 5592c90041 Removing the VCS_BRAND_INDICATOR by default 2015-06-08 13:42:03 -07:00
Dominik Ritter 891f5567fd Limit to whole folders, not just characters. 2015-06-07 01:48:02 +02:00
Dominik Ritter fea1d7ec5e Added documentation. 2015-06-07 01:11:06 +02:00
Dominik Ritter 291bcddd10 Shorten dir path, if POWERLEVEL9K_SHORTEN_PWD_LENGTH is set. 2015-06-07 01:06:26 +02:00
Dominik Ritter 5bd4f439e4 Added NodeJS icon. 2015-06-06 23:05:31 +02:00