Permalink
Browse files

Merge branch 'ctrlp'

* ctrlp:
  Command-Shift-t to open a new tab
  Remap Command-T if ctrlp plugin is enabled
  Remove hammer, which requires some gems installed, which is not possible for everyone.
  Add a TODO
  We dont need rvm and rbenv with this setup
  Add CtrlP settings
  Remove CommandT settings
  Add CtrlP
  Remove CommandT

Conflicts:
	README.md
  • Loading branch information...
2 parents da9584d + 2eb22cd commit ba2c49d63401645a639f041009be12d4917dbdac @kalbasit kalbasit committed Jan 10, 2012
View
@@ -107,12 +107,6 @@
[submodule "janus/vim/tools/surround"]
path = janus/vim/tools/surround
url = https://github.com/tpope/vim-surround.git
-[submodule "janus/vim/tools/hammer"]
- path = janus/vim/tools/hammer
- url = https://github.com/robgleeson/hammer.vim.git
-[submodule "janus/vim/tools/command-t"]
- path = janus/vim/tools/command-t
- url = https://github.com/wincent/Command-T.git
[submodule "janus/vim/tools/snipmate"]
path = janus/vim/tools/snipmate
url = https://github.com/garbas/vim-snipmate.git
@@ -167,3 +161,6 @@
[submodule "janus/vim/tools/rename2"]
path = janus/vim/tools/rename2
url = https://github.com/vim-scripts/Rename2.git
+[submodule "janus/vim/tools/ctrlp"]
+ path = janus/vim/tools/ctrlp
+ url = https://github.com/kien/ctrlp.vim.git
View
@@ -1 +0,0 @@
-system
View
1 .rvmrc
@@ -1 +0,0 @@
-rvm use system
View
@@ -41,10 +41,9 @@ users should install `gvim`, OSX users should install
[MacVim](http://code.google.com/p/macvim/), the recommended way of
installing MacVim is using
[Homebrew](http://mxcl.github.com/homebrew/), but before installing
-MacVim you need to use system-wide Ruby and Python:
+MacVim you need to use system-wide Python (If you are using python that
+is):
-* If you're using **rvm**: do `rvm use system`
-* If you're using **rbenv**: do `rbenv shell system`
* If you're using **pythonbrew**: do `pythonbrew off`
```bash
@@ -247,15 +246,6 @@ You can learn more about it with :help Ack
**Customizations**: Janus rebinds command-shift-f (`<D-F>`) to bring up
`:Ack `.
-## [Command-T](https://wincent.com/products/command-t)
-
-Command-T provides a mechanism for searching for a file inside the
-current working directory. It behaves similarly to command-t in
-Textmate.
-
-**Customizations**: Janus rebinds command-t (`<D-t>`) to bring up this
-plugin. It defaults to `<Leader>t`.
-
## [NERDCommenter](http://github.com/ddollar/nerdcommenter)
NERDCommenter allows you to wrangle your code comments, regardless of
View
@@ -1,14 +1,3 @@
-# Source RVM so janus .rvmrc takes effect
-[[ -s /usr/local/rvm/scripts/rvm ]] && source /usr/local/rvm/scripts/rvm
-[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
-
-# Source Rbenv so janus .rbenv-version takes effect
-if ! type rbenv &> /dev/null; then
- if [[ -s $HOME/.rbenv/bin/rbenv ]]; then
- eval "`$HOME/.rbenv/bin/rbenv init -`"
- fi
-fi
-
function die()
{
echo "${@}"
View
@@ -27,6 +27,7 @@ def install_gem(gem_name)
# Install the gem only if it can't be found
if find_gem(gem_name).length == 0
+ # XXX: We should not run sudo if we do not need to!
sudo "gem install #{gem_name}"
end
rescue RubyGemsNotFoundError
View
@@ -2,9 +2,9 @@ if filereadable(expand("~/.gvimrc.before"))
source ~/.gvimrc.before
endif
-" Command-T OS-X Menu remapping
-if janus#is_plugin_enabled('command-t') && has("gui_macvim")
- macmenu &File.New\ Tab key=<nop>
+" CtrlP OS-X Menu remapping
+if janus#is_plugin_enabled('ctrlp') && has("gui_macvim")
+ macmenu &File.New\ Tab key=<D-S-t>
endif
if filereadable(expand("~/.gvimrc.after"))
Submodule command-t deleted from 18686a
Submodule ctrlp added at f04196
Submodule hammer deleted from 8cf247
@@ -1,20 +0,0 @@
-if has("gui_macvim")
- call janus#add_mapping('command-t', 'map', '<D-t>', ':CommandT<CR>')
- call janus#add_mapping('command-t', 'imap', '<D-t>', '<ESC>:CommandT<CR>')
-
- call janus#add_mapping('command-t', 'map', '<D-A-t>', ':CommandTFlush<CR>')
- call janus#add_mapping('command-t', 'imap', '<D-A-t>', '<ESC>:CommandTFlush<CR>')
-else
- call janus#add_mapping('command-t', 'map', '<C-t>', ':CommandT<CR>')
- call janus#add_mapping('command-t', 'imap', '<C-t>', '<ESC>:CommandT<CR>')
-
- call janus#add_mapping('command-t', 'map', '<C-A-t>', ':CommandTFlush<CR>')
- call janus#add_mapping('command-t', 'imap', '<C-A-t>', '<ESC>:CommandTFlush<CR>')
-endif
-
-call janus#add_mapping('command-t', 'map', '<A-t>', ':CommandTBuffer<CR>')
-call janus#add_mapping('command-t', 'imap', '<A-t>', '<ESC>:CommandTBuffer<CR>')
-
-if janus#is_plugin_enabled("command-t")
- let CommandTMaxHeight = 10
-endif
@@ -0,0 +1,11 @@
+if janus#is_plugin_enabled("ctrlp")
+ let g:ctrlp_map = ''
+endif
+
+if has("gui_macvim")
+ call janus#add_mapping('ctrlp', 'map', '<D-t>', ':CtrlP<CR>')
+ call janus#add_mapping('ctrlp', 'imap', '<D-t>', '<ESC>:CtrlP<CR>')
+else
+ call janus#add_mapping('ctrlp', 'map', '<C-t>', ':CtrlP<CR>')
+ call janus#add_mapping('ctrlp', 'imap', '<C-t>', '<ESC>:CtrlP<CR>')
+endif
@@ -1,8 +0,0 @@
-install_vim_plugin "tools", "command-t" do |module_loaded|
- if module_loaded
- Dir.chdir "#{vim_path}/tools/command-t/ruby/command-t" do
- sh "ruby extconf.rb"
- sh "make clean && make"
- end
- end
-end
@@ -1,4 +0,0 @@
-install_vim_plugin "tools", "hammer" do |module_loaded|
- install_gem 'github-markup' if module_loaded
- install_gem 'redcarpet' if module_loaded
-end

0 comments on commit ba2c49d

Please sign in to comment.