Permalink
Browse files

I have switched to Antigen.

I think I also made some changes to my Vim.
  • Loading branch information...
1 parent f9d24e1 commit e797b0723a8cb0c6c68d1e25f57eeda25c87e64a Chris Miller committed Nov 6, 2012
Showing with 31 additions and 46 deletions.
  1. +3 −6 .gitmodules
  2. +19 −17 vim/vimrc.symlink
  3. +1 −0 zsh/antigen
  4. +0 −1 zsh/oh-my-zsh/custom/plugins/zsh-syntax-highlighting.symlink
  5. +8 −22 zsh/zshrc.symlink
View
@@ -1,9 +1,6 @@
-[submodule "zsh/oh-my-zsh/custom/plugins/zsh-syntax-highlighting.symlink"]
- path = zsh/oh-my-zsh/custom/plugins/zsh-syntax-highlighting.symlink
- url = git@github.com:zsh-users/zsh-syntax-highlighting.git
-[submodule "vim/janus.symlink/vim-nerdtree-tabs"]
- path = vim/janus.symlink/vim-nerdtree-tabs
- url = git@github.com:jistr/vim-nerdtree-tabs.git
[submodule "vim/vim.symlink/bundle/vundle"]
path = vim/vim.symlink/bundle/vundle
url = https://github.com/gmarik/vundle.git
+[submodule "zsh/antigen"]
+ path = zsh/antigen
+ url = https://github.com/zsh-users/antigen.git
View
@@ -1,6 +1,3 @@
-" -*- mode: vimscript -*-
-" vi: set ft=vimscript :
-
" Environment {
" Basics {
set nocompatible " be viMproved
@@ -33,10 +30,11 @@
" General { general purpose library of vimscript
Bundle 'tomtom/tlib_vim'
- " mah theme! or not mine, specifically, but the one that I use,
- " plus hax
- Bundle 'NSError/vim-tomorrow-theme'
- Bundle 'noahfrederick/Hemisu'
+ " Themes {
+ Bundle 'NSError/vim-tomorrow-theme'
+ Bundle 'noahfrederick/Hemisu'
+ Bundle 'nanotech/jellybeans.vim'
+ " }
" ensures that there's only ever one NERDTree, which is the behavior
" that I want
Bundle 'jistr/vim-nerdtree-tabs'
@@ -45,6 +43,7 @@
Bundle 'scrooloose/nerdtree'
" i tried living without this, doc, but it just don't work
Bundle 'ervandew/supertab'
+ Bundle 'jdonaldson/vim-addon-local-vimrc'
let NERDTreeHijackNetrw = 0
" something I need to learn to use more often
@@ -65,6 +64,8 @@
Bundle 'tpope/vim-git'
" hit <C-O> and then everything goes away! it's so zen!
Bundle 'vim-scripts/ZoomWin'
+ " super-cool tab-based stuff
+ Bundle 'godlygeek/tabular'
" }
" Programming {
@@ -131,10 +132,10 @@
" theme bollocks {
syntax on
if has('gui_running')
- colorscheme hemisu
- set background=light
+ colorscheme jellybeans
+ set background=dark
else
- colorscheme hemisu
+ colorscheme jellybeans
set background=dark
endif
" }
@@ -144,12 +145,6 @@
au VimResized * wincmd =
endif
- " enable spelling in gui mode, which has nice underlining, but don't do it
- " in console mode, which doesn't have nice underlining (that i've seen)
- if has('gui_running')
- set spell
- endif
-
" vundle wants this; not totally sure why
filetype plugin indent on
@@ -232,7 +227,7 @@
function s:UpdateNERDTree(...)
let stay = 0
- if(exists("a:1"))
+ if exists("a:1")
let stay = a:1
end
@@ -299,6 +294,13 @@
set listchars+=precedes:< " The character to show in the last column when wrap is
" }
+ " Syntastic {
+ let g:syntastic_enable_signs=1
+ let g:syntastic_error_symbol='✗'
+ let g:syntastic_warning_symbol='⚠'
+ let g:syntastic_enable_balloons=1
+ " }
+
" Searching {
set hlsearch " highlight matches
set incsearch " incremental searching
Submodule antigen added at f1387e
Submodule zsh-syntax-highlighting.symlink deleted from 732b7d
View
@@ -29,22 +29,16 @@ else
fi
# #################################### #
-# OH-MY-ZSH - Because ZSH is cool, and #
-# Oh-My-Zsh gets some nice #
-# configurations without a #
-# lot of work #
+# ANTIGEN - like oh-my-zsh, only more #
+# modular #
# #################################### #
-ZSH=$HOME/.oh-my-zsh
-
-ZSH_THEME="agnoster"
-DEFAULT_USER=cmiller # hides the user@hostname
-# ZSH_THEME="juanghurtado" # used to be kardan, which I like
-COMPLETION_WAITING_DOTS="true"
-plugins=(zsh-syntax-highlighting git)
-
-# load Oh-My-Zsh!
-source $ZSH/oh-my-zsh.sh
+source ~/.antigen/antigen.zsh
+antigen-lib
+antigen-bundle git
+antigen-bundle zsh-users/zsh-syntax-highlighting
+antigen-bundle kennethreitz/autoenv
+antigen-theme candy
# #################################### #
# EDITORS - I love me my editors #
@@ -68,14 +62,6 @@ export RBXOPT='-Xrbc.db=/tmp' # kills all the little .rbx directories all over y
# in a while, but seriously... I don't care.
if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
-# #################################### #
-# AUTOENV - Requires that you install #
-# autoenv with homebrew #
-# #################################### #
-
-source /usr/local/Cellar/autoenv/0.1.0/activate.sh
-
-
# disable FU***CKZING autocorrect
# bundle exec vagrant up
# WOULD U LIEK ME 2 INCORRECTLY THINK YOU MEANT .vagrant??? PLZ?

0 comments on commit e797b07

Please sign in to comment.