Ver Fonte

Merge Vundle plugins into default vimrc, update Vundle path and version

Taddeus Kroes há 9 anos atrás
pai
commit
f27f56bcc7
5 ficheiros alterados com 21 adições e 19 exclusões
  1. 1 1
      .gitmodules
  2. 3 1
      bootstrap.bash
  3. 1 1
      vim/bundle/Vundle.vim
  4. 16 1
      vimrc
  5. 0 15
      vimrc_plugins

+ 1 - 1
.gitmodules

@@ -1,3 +1,3 @@
 [submodule "vim/bundle/Vundle.vim"]
 	path = vim/bundle/Vundle.vim
-	url = https://github.com/gmarik/Vundle.vim.git
+	url = https://github.com/VundleVim/Vundle.vim.git

+ 3 - 1
bootstrap.bash

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 sudo apt-get install -y git vim-nox
 
@@ -11,3 +11,5 @@ ln -sfT $DIR/vim ~/.vim
 ln -sf $DIR/gitconfig ~/.gitconfig
 
 source ~/.bashrc
+
+vim +PluginInstall +qall

+ 1 - 1
vim/bundle/Vundle.vim

@@ -1 +1 @@
-Subproject commit 0b28e334e65b6628b0a61c412fcb45204a2f2bab
+Subproject commit 88688fe453038ac1ac26e31646cfbec50fca2fb7

+ 16 - 1
vimrc

@@ -1,8 +1,23 @@
+" --------------
+" Vundle plugins
+" --------------
+
+set nocompatible
+filetype off
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+Plugin 'VundleVim/Vundle.vim'
+
+Plugin 'rust-lang/rust.vim'
+
+call vundle#end()
+filetype plugin indent on
+
 " -------------
 " General setup
 " -------------
 
-filetype plugin indent on
 syntax enable
 
 " Automatically remove all trailing whitespace

+ 0 - 15
vimrc_plugins

@@ -1,15 +0,0 @@
-set nocompatible
-filetype off
-
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-
-Plugin 'gmarik/Vundle.vim'
-
-Plugin 'rust-lang/rust.vim'
-
-call vundle#end()
-
-source ~/configs/vimrc
-
-let g:ycm_extra_conf_globlist = ['~/programming/*']