Commit Graph

818 Commits

Author SHA1 Message Date
Yan Pritzker
d733d74c13 Merge pull request #270 from darylrobbins/master
User Git Config
2013-03-24 09:39:25 -07:00
Daryl Robbins
71da54518a Updated README to describe new user Git configuration. 2013-03-24 06:44:19 -04:00
Daryl Robbins
2ef4d93ce4 Added support for git user configuration. Gitconfig will now include the configuration from ~/.gitconfig.user, if it exists. The include is done at the end of gitconfig, so that it can override any of the default values. 2013-03-23 12:28:32 -04:00
Yan Pritzker
8d9f526d28 Merge pull request #269 from petRUShka/master
Add vim-plugin for opening files like this `vim Rakefile:110`
2013-03-22 07:13:01 -07:00
petRUShka
453de6d7d6 New: [VIM] added file-line plugin. Allows to open file and move to certain line like this vim Rakefile:110 2013-03-22 09:47:29 +04:00
Yan Pritzker
c2a4b2cf88 Merge pull request #266 from duhanebel/install_link_fix
Fix a bug that's causing the installer to overwrite backup files
2013-03-21 15:04:52 -07:00
Yan Pritzker
0f56becbfe Merge pull request #268 from chadkouse/env_shell
"uninitialized constant SHELL" in zsh install step
2013-03-21 15:04:31 -07:00
Chad Kouse
c7b16179c2 fixes #268 2013-03-21 14:24:12 -04:00
Fabio Gallonetto
660419b4ea Change duhanebel's forked repos to originals
Both powerline and syntastic on the default vundles.vim were
pointing to my own forks, which are not needed for the main repo.
2013-03-21 16:38:41 +00:00
Fabio Gallonetto
69e811ef6f Fix a bug that's causing the installer to overwrite backup files
When rake install/update is run for the second time, any .backup
file created by the first run it's going to be overwritten by
the new symlink even if the current file is the same as the one
we are going to write.

The rakefile now checks if the symlink we are going to create
points to the same target as the one already there and if that's
the case, doesn't overwrite any backup.
2013-03-21 16:35:50 +00:00
Fabio Gallonetto
c380422e21 Fix a typo on the Rakefile 2013-03-21 14:45:16 +00:00
Yan Pritzker
6f07653bcc Merge pull request #265 from duhanebel/zsh_install_check
Fix a bug that was causing rake to overwrite SHELL settings
2013-03-21 06:35:32 -07:00
Fabio Gallonetto
cf894af3eb Fix a bug that was causing rake to overwrite SHELL settings
The prezto install procedure now checks to make sure the user
doesn't have an alternative version of zsh installed before changing
the current shell preference with "chsh".
This may be the case when an user is already using zsh but on a
different version from the one shipped with OS X

Fixes #264
2013-03-21 13:02:25 +00:00
Fabio Gallonetto
e481d0ddf4 Fix a bug that was preventing a clean install
The installation of the plugin only happened during an update
because the code that checks out the vundle plugin was in the
wrong place.
2013-03-20 21:08:31 +00:00
Fabio Gallonetto
793aa0a0ae Change rake file to reuse methods in vundle.rb
Vundle::update_vundle can be reused inside the Rakefile
2013-03-17 17:32:06 +00:00
Fabio Gallonetto
186e701bbd Update zsh alias to support new yadr's commands
yrv -> deletes plugin
ylv -> lists plugins
2013-03-17 17:18:59 +00:00
Fabio Gallonetto
54863f2e1b Add yadr command line tools to remove/list plugins
Two new command line tools: yadr-vim-remove-plugin and
yadr-vim-list-plugin do what they're supposed to.
2013-03-17 17:12:22 +00:00
Fabio Gallonetto
1836070a54 Update yadr's binary to support Vundle
yadr-vim-add-plugin now supports adding vundle plugins
2013-03-17 17:11:11 +00:00
Fabio Gallonetto
5c3b05302e Update Rakefile to manage pathogen-to-vundle upgrade
The Rakefile now detects if pathogen is installed and in that case
it performs the following operations:
1. Moves vim/bundle to vim/bundle.old
2. Removes all the submodules from git config and cache
3. Initializes and updates the new submodules (zsh and bundle)
4. Runs the vundle installer that takes care of the rest
2013-03-16 17:09:54 +00:00
Fabio Gallonetto
990f8b35b3 Remove csapprox
Since we're now able to install Solarized on iTerm2, there's no
need for approximating the theme when using vim instead of
mvim. In fact, using csapprox on iTerm2 with solarized installed
breaks the theme completely.
2013-03-16 17:09:48 +00:00
Fabio Gallonetto
c3d44936c0 Move mapleader definition to vimrc
It seems that the mapleader has to be defined before vundle starts
to load the plugins. For this reason, I moved it from yadr-keymap
back into the vimrc. I'm sure it's not a big deal having the leader
mapped under the "general config" instead of inside settings.
2013-03-16 17:09:43 +00:00
Fabio Gallonetto
52407ac34c Change vimrc to use Vundle instead of pathogen 2013-03-16 17:09:38 +00:00
Fabio Gallonetto
d8472fc0d0 Add bundle to .gitignore
Bundles are now handled via Vundle so there's no need to monitor
the bundle directory as everything is done through the :Bundle
command
2013-03-16 17:09:33 +00:00
Fabio Gallonetto
bf42dc78d7 Remove all vim submodules 2013-03-16 17:09:15 +00:00
Yan Pritzker
9f9054f6f2 Merge pull request #259 from duhanebel/iterm_solarized
Add solarized themes for iTerm2
2013-03-14 05:50:00 -07:00
Fabio Gallonetto
7f8e2248fe Add solarized themes for iTerm2
Both solarized dark and light are now included in the subdir
iTerm2. They are copies from the original repo because it doesn't
seem worth to clone a ~10Mb repo just to keep in sync 2 files,
considering that solarized hasn't changed much in the past years.

The rakefile has been updated to trigger the automatic installation
of these two themes only if OS == OSX. The user will still have
to set the themes for his/her current profile manually (but that's
explained at the end of the installation process).
2013-03-14 13:35:55 +01:00
Yan Pritzker
628cd5f5a7 Revert "Added ,mm to switch to mailer while in view"
Conflicted with showmarks in an ugly way
This reverts commit 44a2cd79d0.
2013-03-08 10:00:38 -06:00
Yan Pritzker
44a2cd79d0 Added ,mm to switch to mailer while in view 2013-03-08 09:18:30 -06:00
Yan Pritzker
d6249fe3ae Updated subprojects 2013-03-08 09:14:39 -06:00
Yan Pritzker
467d47bb3a Merge pull request #250 from kmees/issue_249
Renamed vim/plugion/settings/fugitive.git to vim/plugin/settings/fugitiv...
2013-03-07 09:15:47 -08:00
Yan Pritzker
91547f9bed Removed unused plugin ruby_focused_unit_test 2013-03-07 10:43:22 -06:00
Kevin Mees
76be5af82c Renamed vim/plugion/settings/fugitive.git to vim/plugin/settings/fugitive.vim. Fixes issue #249 2013-02-28 15:55:03 +01:00
Yan Pritzker
15f2d9dd92 Readme cleanup 2013-02-27 08:58:48 -06:00
Yan Pritzker
2696f6670a Removed unused / not working ,,f ,,F aliases 2013-02-27 08:43:56 -06:00
Yan Pritzker
6edbee2994 Merge pull request #247 from irrationalfab/vim-gitgutter
Add gitgutter
2013-02-26 06:39:07 -08:00
Fabio Pelosin
e8e5d18e93 Add gitgutter 2013-02-26 08:56:49 +01:00
Yan Pritzker
9792c00385 Remove gitgutter; causes errors 2013-02-21 09:31:16 -06:00
Yan Pritzker
564f67e41a Upgrade plugins 2013-02-21 09:16:14 -06:00
Yan Pritzker
fb7ebe7ecf Merge pull request #246 from irrationalfab/vim-gitgutter
Added vim-gitgutter, which shows git diff in the gutter
2013-02-21 07:11:18 -08:00
Yan Pritzker
90d48a37a8 Upgrade plugins 2013-02-21 09:11:00 -06:00
Fabio Pelosin
00247530eb Added vim-gitgutter, which shows git diff in the gutter 2013-02-21 13:56:32 +01:00
Yan Pritzker
8124d50657 Remove arpeggio; unused 2013-02-15 20:24:03 -06:00
Yan Pritzker
719b3b48fc Improved sass colors 2013-02-15 20:22:09 -06:00
Yan Pritzker
0211376153 Vim plugins and prezto updated 2013-02-06 15:20:21 -06:00
Yan Pritzker
57ab4337b2 Merge pull request #243 from gonzedge/submodules-init
Remove unused submodules directories.
2013-02-06 08:45:40 -08:00
Edgar Gonzalez
7d05f27fd7 Remove unused submodules directories.
Running `rake install`, runs the `:submodule_init` task,
which in turn runs the following command:

    git submodule update --init --recursive

This fails with the following couple of errors (separately):

    No submodule mapping found in .gitmodules for path 'vim/bundle/mattn-zencoding-vim'
    No submodule mapping found in .gitmodules for path 'vim/bundle/skwp-vim-indexed-search'

This was introduced by 3d60f721dd
which removed the 'mattn/zencoding-vim' and 'skwp/vim-indexed-search'
submodules from the `.gitmodules`.
2013-02-05 03:46:46 -04:00
Yan Pritzker
8b318412cd Revert "Add quickfixsigns module - shows which lines changed"
This reverts commit ae8946dbb2.
2013-02-04 09:25:03 -06:00
Yan Pritzker
940ad7010b Merge pull request #241 from calavera/skip-homebrew-install
Skip homebrew install if it's already in the path
2013-02-04 07:16:17 -08:00
Yan Pritzker
a70b10d8b8 Merge pull request #237 from rafaelregis/aliases_cleanup
Aliases cleanup
2013-02-04 07:15:59 -08:00
Yan Pritzker
033009fa0b Merge pull request #239 from lfilho/master
Removing duplicated vim plugins
2013-02-04 07:15:30 -08:00