Permalink
Browse files

Add solarized vim theme, tweak colours

  • Loading branch information...
1 parent 2ee1f52 commit 00f288c717b55de157ae6fb7fe91e0748b479285 @j4mie committed Dec 20, 2011
Showing with 15 additions and 6 deletions.
  1. +3 −0 .gitmodules
  2. +4 −4 bashrc
  3. +1 −1 gvimrc
  4. +1 −0 vim/bundle/vim-colors-solarized
  5. +5 −0 vimrc
  6. +1 −1 virtualenvwrapper/postactivate
View
@@ -4,3 +4,6 @@
[submodule "vim/bundle/vim-coffee-script"]
path = vim/bundle/vim-coffee-script
url = https://github.com/kchmck/vim-coffee-script.git
+[submodule "vim/bundle/vim-colors-solarized"]
+ path = vim/bundle/vim-colors-solarized
+ url = https://github.com/altercation/vim-colors-solarized.git
View
@@ -26,7 +26,7 @@ export PIP_REQUIRE_VIRTUALENV=true
export GIT_PS1_SHOWDIRTYSTATE=1
JAMIES_DEFAULT_COLOR="[00m"
-JAMIES_GRAY_COLOR="[30m"
+JAMIES_CYAN_COLOR="[36m"
JAMIES_PINK_COLOR="[35m"
JAMIES_GREEN_COLOR="[32m"
JAMIES_ORANGE_COLOR="[33m"
@@ -48,9 +48,9 @@ function __pwd () {
}
export JAMIES_BASEPROMPT='\n\e${JAMIES_RED_COLOR}\u \
-\e${JAMIES_GRAY_COLOR}at \e${JAMIES_ORANGE_COLOR}\h \
-\e${JAMIES_GRAY_COLOR}in \e${JAMIES_GREEN_COLOR}`__pwd`\
-$(__git_ps1 " \e${JAMIES_GRAY_COLOR}on \e${JAMIES_PINK_COLOR}git:%s")\e${JAMIES_DEFAULT_COLOR}'
+\e${JAMIES_CYAN_COLOR}at \e${JAMIES_ORANGE_COLOR}\h \
+\e${JAMIES_CYAN_COLOR}in \e${JAMIES_GREEN_COLOR}`__pwd`\
+$(__git_ps1 " \e${JAMIES_CYAN_COLOR}on \e${JAMIES_PINK_COLOR}git:%s")\e${JAMIES_DEFAULT_COLOR}'
export PS1="${JAMIES_BASEPROMPT}
$ "
View
@@ -16,5 +16,5 @@ set showtabline=2
if exists('+colorcolumn')
autocmd FileType * set colorcolumn=
autocmd FileType python set colorcolumn=80|match ColorColumn '\%>80v.\+'
- highlight ColorColumn ctermbg=lightgrey guibg=grey95
+ highlight ColorColumn ctermbg=lightgray guibg=#073642
endif
View
@@ -26,6 +26,11 @@ set listchars=tab:>-,trail:·,extends:#,nbsp:.
set cursorcolumn
set cursorline
+"solarized theme
+syntax enable
+set background=dark
+colorscheme solarized
+
highlight SpecialKey guifg=lightgray ctermfg=lightgray
if &t_Co > 2 || has("gui_running")
@@ -12,7 +12,7 @@ if [ -d "$DIR" ]; then
fi
# Add virtualenv name to prompt
-PS1="$JAMIES_BASEPROMPT \033[30mworkon \033[31m\$(basename '${VIRTUAL_ENV}')\033[00m
+PS1="$JAMIES_BASEPROMPT \033[36mworkon \033[31m\$(basename '${VIRTUAL_ENV}')\033[00m
$ "
export OLDPYTHONPATH=$PYTHONPATH

0 comments on commit 00f288c

Please sign in to comment.