aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #52 from dritter/dritter/mercurial_dirty_fixBen Hilburn2015-07-111-4/+0
|\ | | | | | | | | Must always resolve changeset to show Hg repository status. Resolves bug #51.
| * simple-mode deactivated. With that option on, vcs_info doesn't detect the ↵Dominik Ritter2015-07-101-4/+0
| | | | | | | | repository state correctly.
* | Merge pull request #50 from dritter/dritter/vim_modelines_improvementBen Hilburn2015-07-111-1/+1
|\ \ | | | | | | Add VIM default settings: "expandtab", encoding = "utf8"
| * | When opening this file in VIM set "expanded tabs"-option and set encoding to ↵Dominik Ritter2015-07-101-1/+1
| |/ | | | | | | "utf8".
* | Merge pull request #49 from dritter/dritter/branch_icon_fixesBen Hilburn2015-07-112-17/+17
|\ \ | | | | | | | | | | | | Fix the branch icon in the VCS segment. Resolves bug #49.
| * | Fix the branch icon and whitespaces in the vcs segment.Dominik Ritter2015-07-102-17/+17
| |/
* | Merge Vagrant VM support for development.Ben Hilburn2015-07-117-0/+203
|\ \ | |/ |/|
| * Merge pull request #44 from dritter/dritter/vagrant-vmBen Hilburn2015-07-091-3/+4
| |\ | | | | | | Fixed oh-my-zsh test installation in vagrant VM.
| | * Fixed oh-my-zsh test installation.Dominik Ritter2015-07-071-3/+4
| |/
| * Merging Vagrant test VM from dritter/preztoBen Hilburn2015-06-297-0/+202
| |
* | README: Updating for branch icon, ToCBen Hilburn2015-07-091-4/+7
| |
* | Merge pull request #46 from dritter/dritter/branch_iconBen Hilburn2015-07-092-9/+13
|\ \ | | | | | | Add flag to enable / disable branch icon in VCS prompt. Defaults to `off`.
| * | Make branch icon configurable.Dominik Ritter2015-07-082-9/+13
| | |
* | | Merge pull request #45 from dritter/dritter/symfony2_versionBen Hilburn2015-07-092-0/+13
|\ \ \ | | | | | | | | Added a segment that shows the Symfony2 version number.
| * | | Added a segment that shows the Symfony2 version number.Dominik Ritter2015-07-072-0/+13
| |/ /
* | | Merge pull request #43 from martinpelikan/masterBen Hilburn2015-07-091-9/+3
|\ \ \ | |/ / |/| | Correctly set VCS dirty status on first invocation.
| * | Correctly set VCS dirty status on first invocation.Martin Pelikan2015-07-081-9/+3
|/ / | | | | | | | | The precmd hook seems to not get called on first invocation, and gets called recursively for every subsequent invocation.
* | README: Silly missing comma.Ben Hilburn2015-07-011-1/+1
| |
* | README: Adding note about theme inspiration.Ben Hilburn2015-07-011-3/+10
| |
* | Merge pull request #40 from dsager/update-readmeBen Hilburn2015-06-291-1/+4
|\ \ | |/ |/| README: Fixed info for antigen install
| * updated info for antigen install optionDaniel Sager2015-06-291-1/+4
|/
* README: Updating to reflect new system supportBen Hilburn2015-06-291-32/+68
|
* README: Removing reference to un-merged Vagrant test VMBen Hilburn2015-06-291-3/+0
|
* Merging Antigen and Prezto support from `dritter/prezto`Ben Hilburn2015-06-293-63/+115
|\ | | | | | | Not pulling in support for the Vagrant test VM in this branch.
| * All top-level usages of "local" removed. That variables need to be global ↵Dominik Ritter2015-06-131-5/+5
| | | | | | | | for antigen and prezto to work correctly.
| * Added a reference to the test-vm folderDominik Ritter2015-06-111-0/+3
| |
| * Updated TOC.Dominik Ritter2015-06-111-0/+4
| |
| * More Documentation.Dominik Ritter2015-06-111-25/+26
| |
| * Global variables need to be global, so that antigen and prezto see them..Dominik Ritter2015-06-111-1/+0
| |
| * It makes no sense, to clone the powerlevel9k-theme in all frameworks. ↵Dominik Ritter2015-06-115-15/+10
| | | | | | | | Instead, we can simply use the one, which is mounted in /vagrant_data..
| * Added provisioning for all frameworks.Dominik Ritter2015-06-101-4/+4
| |
| * Added a testing environment in form of a virtual machine.Dominik Ritter2015-06-108-0/+208
| |
| * Merge branch 'master' into dritter/preztoDominik Ritter2015-06-092-111/+417
| |\ | |/ |/|
* | README: Updating picture locationBen Hilburn2015-06-081-5/+6
| |
* | Merging support for Awesome-Patched-Powerline fonts.Ben Hilburn2015-06-082-57/+106
|\ \
| * | Removing the VCS_BRAND_INDICATOR by defaultBen Hilburn2015-06-081-8/+13
| | |
| * | Reordering code.Dominik Ritter2015-06-061-8/+8
| | |
| * | Updated TOC.Dominik Ritter2015-06-061-2/+5
| | |
| * | Merge remote-tracking branch 'ben/dritter/font_mode' into dritter/font_modeDominik Ritter2015-06-062-30/+69
| |\ \
| | * | Minor changes to docs in README and theme file.Ben Hilburn2015-06-062-5/+9
| | | |
| | * | README: Changes / reorg regarding new font optionsBen Hilburn2015-06-061-27/+62
| |/ / |/| |
| * | Cleaned up whitespaces: Now the whitespaces are controlled by the functions ↵Dominik Ritter2015-06-061-9/+11
|/ / | | | | | | that draw the segments (except vcs). This makes it more flexible, and you don't get unwanted whitespaces, when flipping segments from one side to another.
* | Added more Icons, that work in `compatible` mode.Dominik Ritter2015-06-052-13/+13
| |
* | Merge branch 'master' into dritter/font_modeDominik Ritter2015-06-051-1/+9
|\ \
| * \ Merge pull request #34 from dritter/dritter/multiline_rprompt_fixBen Hilburn2015-06-051-1/+9
| |\ \ | | | | | | | | Put RPROMPT on first line of dual-lined prompts.
| | * | Formatting.Dominik Ritter2015-06-051-6/+6
| | | |
| | * | Fix for Issue #33. Now the RPROMPT is on the first line.Dominik Ritter2015-06-051-1/+9
| |/ /
* | | Added variable for completeness.Dominik Ritter2015-06-051-0/+1
| | |
* | | Added `compatible` iconsDominik Ritter2015-06-051-14/+14
| | |
* | | Formatting.Dominik Ritter2015-06-051-2/+1
| | |