Permalink
Browse files

Rewritten using vundle

  • Loading branch information...
1 parent 8a05324 commit 145a696306b01c49de5b78e20d93d861db1f536f @swaroopch committed Jul 27, 2011
View
@@ -1,4 +1,4 @@
-Copyright 2010 Swaroop C H
+Copyright 2010-2011 Swaroop C H
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
View
@@ -1,28 +0,0 @@
-
-# My Vim setup
-
-# Installation
-
- if [[ "$OSTYPE" =~ "linux" ]] # Assumes Ubuntu
- then
- sudo apt-get install git curl subversion
- elif [[ "$OSTYPE" =~ "darwin" ]]
- then
- brew install git curl subversion
- else
- echo "Don't know how to install packages on $OSTYPE operating system"
- exit 1
- fi
-
- mkdir -p "$HOME/code/"
- cd "$HOME/code/"
-
- git clone git://github.com/swaroopch/dotvim.git
- cd dotvim
- git submodule update --init
-
- bash install.bash
-
- vim # Follow the instructions to download the Vim plugins
-
- bash post_install.bash
View
@@ -0,0 +1,8 @@
+h1. My Vim setup
+
+h2. Installation
+
+# Install "git":http://git-scm.com and "curl":http://curl.haxx.se
+# @git clone git://github.com/swaroopch/dotvim.git@
+# @cd dotvim@
+# @bash install.sh@
View
@@ -1,5 +1,5 @@
" Theme
-colorscheme koehler
+colorscheme solarized
" Logical size of GVim window
set lines=35 columns=99
@@ -12,7 +12,6 @@ set guioptions-=T
if has('mac')
set guifont=Monaco:h13
elseif has('unix')
- "let &guifont="Monospace 10"
let &guifont="DejaVu Sans Mono 10"
endif
@@ -1,2 +0,0 @@
-set ft=htmljinja
-call TagExpander()
@@ -1,27 +0,0 @@
-" Vim syntax file
-" Language: Jinja HTML template
-" Maintainer: Armin Ronacher <armin.ronacher@active-4.com>
-" Last Change: 2007 Apr 8
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-endif
-
-if !exists("main_syntax")
- let main_syntax = 'html'
-endif
-
-if version < 600
- so <sfile>:p:h/jinja.vim
- so <sfile>:p:h/html.vim
-else
- runtime! syntax/jinja.vim
- runtime! syntax/html.vim
- unlet b:current_syntax
-endif
-
-let b:current_syntax = "htmljinja"
View
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-
-## Check Bash Version
-
-if [ "$BASH_VERSION" = "" ]
-then
- echo "I work only with Bash"
- exit 1
-fi
-
-## Check Git is installed
-if [[ $(which git) == "" ]]
-then
- echo "Please ensure that git is installed"
- exit 1
-fi
-
-## Check OS
-
-if [[ "$OSTYPE" == "darwin10.0" ]]
-then
- export OS="mac"
- if [[ $(which brew) == "" ]]
- then
- echo "Please install brew ( http://mxcl.github.com/homebrew ) before proceeding."
- exit 1
- fi
-elif [[ "$OSTYPE" == "linux-gnu" ]]
-then
- export OS="linux"
-else
- echo "Don't know what to do with '$OSTYPE' operating system"
- exit 1
-fi
-
-# Assumption of directory location
-DOTVIM="$HOME/code/dotvim"
-cd $DOTVIM
-
-## Install vim files
-
-echo "Installing vimrc"
-ln -s -f "$DOTVIM/vimrc" "$HOME/.vimrc"
-ln -s -f "$DOTVIM/gvimrc" "$HOME/.gvimrc"
-
-# Put swap files in a specific location, to avoid Dropbox from spinning incessantly.
-mkdir -p "$HOME/.vim/swapfiles/"
-
-echo "Open Vim in a separate window NOW, keep pressing 'y' and return key until Vim exits. Press enter key in this window when done."
-
-unset OS
View
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# Git and Curl required
+if [[ $(which git) == "" ]]
+then
+ echo "Install git ( http://git-scm.com ) first"
+ exit 1
+fi
+if [[ $(which curl) == "" ]]
+then
+ echo "Install curl ( http://curl.haxx.se ) first"
+ exit 1
+fi
+
+# Download Vundle
+mkdir -p ~/.vim/bundle
+if [[ ! -d ~/.vim/bundle/vundle ]]
+then
+ git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
+fi
+
+# Download upstart.vim
+mkdir -p ~/.vim/syntax/
+curl http://bazaar.launchpad.net/~upstart-devel/upstart/trunk/download/head:/upstart.vim-20090708195914-1n7k3bcwobwm4ag7-7/upstart.vim -o ~/.vim/syntax/upstart.vim
+
+# vimrc, gvimrc
+ln -s -f $PWD/vimrc ~/.vimrc
+ln -s -f $PWD/gvimrc ~/.gvimrc
+
+vim -c "BundleInstall" -c "quit"
+
+# Command-T post-download installation
+if [[ -d ~/.vim/bundle/command-t ]]
+then
+ cd ~/.vim/bundle/command-t
+ rake make
+ cd -
+fi
+
+echo "Finished"
View
@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-
-## Check OS
-
-if [[ "$OSTYPE" == "darwin10.0" ]]
-then
- export OS="mac"
- if [[ $(which brew) == "" ]]
- then
- echo "Please install brew ( http://mxcl.github.com/homebrew ) before proceeding."
- exit 1
- fi
-elif [[ "$OSTYPE" == "linux-gnu" ]]
-then
- export OS="linux"
-else
- echo "Don't know what to do with '$OSTYPE' operating system"
- exit 1
-fi
-
-# Assumption of directory location
-DOTVIM="$HOME/code/dotvim"
-
-## Post Installation
-
-if [[ -d "$DOTVIM/snipMate" ]]
-then
- # FIXME Ugly but don't know how else to include custom snippets
- cat "$DOTVIM/snippets_more/eruby.snippets" >> "$DOTVIM/snipMate/snippets/eruby.snippets"
- cat "$DOTVIM/snippets_more/ruby.snippets" >> "$DOTVIM/snipMate/snippets/ruby.snippets"
- cat "$DOTVIM/snippets_more/python.snippets" >> "$DOTVIM/snipMate/snippets/python.snippets"
- cat "$DOTVIM/snippets_more/htmljinja.snippets" >> "$DOTVIM/snipMate/snippets/htmljinja.snippets"
-fi
-
-## Install dependencies
-
-# ack
-if [[ "$OS" == "linux" ]]
-then
- if [[ -z $(dpkg -l | fgrep -i ack-grep) ]]
- then
- sudo apt-get install ack-grep
- fi
- sudo ln -s -f /usr/bin/ack-grep /usr/bin/ack
-elif [[ "$OS" == "mac" ]]
-then
- brew install ack
-fi
-
-# command-t
-cd $DOTVIM/Command-T/ruby/command-t
-ruby extconf.rb
-make
-
-## Custom files
-
-# HACK for htmljinja
-mkdir -p "$HOME/.vim/syntax/"
-ln -s -i "$DOTVIM/htmljinja/htmljinja.vim" "$HOME/.vim/syntax/htmljinja.vim"
-mkdir -p "$HOME/.vim/ftplugin/"
-ln -s -i "$DOTVIM/htmljinja/htmldjango.vim" "$HOME/.vim/ftplugin/htmldjango.vim"
-
-## Cleanup
-
-if [[ "$OS" == "mac" ]]
-then
- brew cleanup
-fi
-
-unset OS
-
-echo "Finished. Open Vim now!"
@@ -1,4 +0,0 @@
-snippet %
- <% ${1} %>
-snippet %%
- <%= ${1} %>
@@ -1,20 +0,0 @@
-snippet %
- {% ${1} %}
-snippet {
- {{ ${1} }}
-snippet #
- {# ${1} #}
-snippet block
- {% block ${1:name} %}
-
- ${2}
-
- {% endblock $1 %}
-snippet if
- {% if ${1} %}
- ${2}
- {% endif %}
-snippet for
- {% for ${1} in ${2} %}
- ${3}
- {% endfor %}
@@ -1,3 +0,0 @@
-snippet echo
- from pprint import pformat #DEBUG
- app.logger.debug("|ZZZ| ${1:variable_name} => \n----\n%s\n----", pformat($1)) #DEBUG
@@ -1,3 +0,0 @@
-snippet echo
- puts "0xDEADBEEF" * 20 #DEBUG
- puts "${1:variable_name}=|#{$1.inspect}|" #DEBUG
Submodule vim-addon-manager deleted from bf54de
Oops, something went wrong. Retry.

0 comments on commit 145a696

Please sign in to comment.