stonewareslord/sync
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of 98.26.78.121:stonewareslord/Sync

Browse Source
This commit is contained in:
Austen Adler 2014-08-01 02:39:23 -04:00
commit abc4b59716
2 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bashrc
View File

@ -160,9 +160,13 @@ function cinitify(){
git remote add oOrigin git@10.0.1.200:$1/$2.git
git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git
git remote -v
while getopts ":r" VALUE "$@"; do
if [ ! "$VALUE" = "r" ] ; then
echo -n "Pull from: "
read from
git pull $FROM
fi
done
git co master
}
export -f cinitify
@ -174,9 +178,13 @@ function initify(){
git remote add oOrigin git@10.0.1.200:$1/$2.git
git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git
git remote -v
while getopts ":r" VALUE "$@"; do
if [ ! "$VALUE" = "r" ] ; then
echo -n "Pull from: "
read from
git pull $FROM
fi
done
git co master
}
export -f initify

40
vimrc
View File

@ -201,39 +201,71 @@ call vundle#rc()
"Bundle 'msanders/snipmate.vim'
"Bundle 'vim-scripts/YankRing.vim'
"Bundle 'majutsushi/tagbar'
"Bundle 'mbbill/undotree'
Bundle 'gmarik/vundle'
"Required: manages all bundles | https://github.com/gmarik/vundle
Bundle 'Chiel92/vim-autoformat'
"Adds autoformat command | https://github.com/Chiel92/vim-autoformat
Bundle 'tpope/vim-surround'
"Surround selection in ({\"' or HTML tags | https://github.com/tpope/vim-surround
Bundle 'scrooloose/syntastic'
"Syntax checker | https://github.com/scrooloose/syntastic
Bundle 'Shougo/neocomplcache.vim'
"Tab complete everything | https://github.com/Shougo/neocomplcache.vim
Bundle 'nathanaelkane/vim-indent-guides'
"Indentation guides | https://github.com/nathanaelkane/vim-indent-guides
Bundle 'elzr/vim-json'
"JSON highlighting | https://github.com/elzr/vim-json
Bundle 'groenewege/vim-less'
"LESS highlighting | https://github.com/groenewege/vim-less
Bundle 'pangloss/vim-javascript'
"JS syntax and indentation | https://github.com/pangloss/vim-javascript
Bundle 'briancollins/vim-jst'
"Actually, I do not know what this does | https://github.com/briancollins/vim-jst
Bundle 'kchmck/vim-coffee-script'
"Coffeescript syntax | https://github.com/kchmck/vim-coffee-script
Bundle 'Lokaltog/powerline-fonts'
"Better powerline fonts | https://github.com/Lokaltog/powerline-fonts
Bundle 'bling/vim-airline'
"Bottom status bar | https://github.com/bling/vim-airline
Bundle 'terryma/vim-multiple-cursors'
"Multicursor functionality like Coda | https://github.com/terryma/vim-multiple-cursors
Bundle 'scrooloose/nerdtree'
"File browser | https://github.com/scrooloose/nerdtree
Bundle 'altercation/vim-colors-solarized'
"Theme | https://github.com/altercation/vim-colors-solarized
Bundle 'spf13/vim-colors'
"Theme pack | https://github.com/spf13/vim-colors
Bundle 'spf13/PIV'
"PHP tools | https://github.com/spf13/PIV
Bundle 'vim-scripts/AutoTag'
"Generates taglist with ctags | https://github.com/vim-scripts/AutoTag
Bundle 'Lokaltog/vim-easymotion'
"Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion
Bundle 'sjl/gundo.vim'
"Visual undo | https://github.com/sjl/gundo.vim
Bundle 'tommcdo/vim-exchange'
"Exchange two selections of text | https://github.com/tommcdo/vim-exchange
Bundle 'tpope/vim-repeat'
"Repeat last tpope command with . | https://github.com/tpope/vim-repeat
Bundle 'tpope/vim-commentary'
Bundle 'mbbill/undotree'
"Comment selection | https://github.com/tpope/vim-commentary
Bundle 'vim-php/vim-php-refactoring'
"PHP refactoring | https://github.com/vim-php/vim-php-refactoring
Bundle 'tpope/vim-fugitive'
"Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive
Bundle 'tpope/vim-unimpaired'
"Bracket shortcuts | https://github.com/tpope/vim-unimpaired
Bundle 'kien/ctrlp.vim'
Bundle 'godlygeek/tabular'
Bundle 'tpope/vim-abolish'
"Fuzzy file search | https://github.com/kien/ctrlp.vim
Bundle 'tacahiroy/ctrlp-funky'
"Fuzzy function search | https://github.com/tacahiroy/ctrlp-funky
Bundle 'godlygeek/tabular'
"Quickly make tables in vim | https://github.com/godlygeek/tabular
Bundle 'tpope/vim-abolish'
"Better abbrivation | https://github.com/tpope/vim-abolish
Bundle 'godlygeek/csapprox'
"256 color vim in terminal | https://github.com/godlygeek/csapprox
filetype plugin indent on
if exists("+undofile")
if isdirectory($HOME . '/.vim/undo')==0
@ -261,6 +293,6 @@ else
endif
"colorscheme torte
endif
colorscheme fruity
silent! colorscheme fruity
nnoremap <Leader>W :%s/\s\+$//<cr>:let @/=''<cr>
nnoremap <Leader>H *<C-O>:AckFromSearch!<CR>