dotfiles/.bash_prompt

@@ -54,9 +54,9 @@ elif [[ "${HOSTNAME}" == "bespin" ]]; then
 elif [[ "${HOSTNAME}" == "dorky" ]]; then
     userStyle="${yellow}"
 elif [[ "${HOSTNAME}" == "emmett" ]]; then
-    userStyle="${green}"
+    userStyle="${yellow}"
 elif [[ "${HOSTNAME}" == "dudley" ]]; then
-    userStyle="${cyan}"
+    userStyle="${orange}"
 elif [[ "${HOSTNAME}" == "lars" ]]; then
     userStyle="${white}"
 else

dotfiles/.gvimrc

@@ -1,3 +1,6 @@
+" Use the Solarized Dark theme
+set background=dark
+colorscheme solarized
 " Use 14pt Monaco
 set guifont=Monaco:h14
 " Don’t blink cursor in normal mode

dotfiles/.vimrc

@@ -217,10 +217,6 @@ function! DisableIndentY()
         set indentexpr&
 endfunction
 
-" Javascript
-" -------------------------
-au BufRead,BufNewFile *.js,*.javascript set tabstop=2 shiftwidth=2 softtabstop=2 nowrap
-
 
 
 " ------------------------
@@ -550,13 +546,40 @@ function! BgToggle()
 endfunction
 nnoremap <F5> :call BgToggle()<cr>
 
+" to install vim-colors-solarized plugin:
+" git clone git://github.com/altercation/vim-colors-solarized.git ~/.vim/bundle/vim-colors-solarized
+"
+let g:solarized_termcolors=256
+
+"" If the following line is commented out,
+"" F5/background toggle will change from
+"" dark to light. If the line is enabled,
+"" the background color will remain the same
+"" dark default terminal backgorund color.
+"let g:solarized_termtrans = 1
+"
+let g:solarized_degrade = 0
+let g:solarized_bold = 1
+let g:solarized_underline = 1
+let g:solarized_italic = 1
+let g:solarized_contrast = "normal"
+let g:solarized_visibility= "normal"
+
+" install solarized by getting the
+" solarized color scheme in vim format
+" (solarized.vim) from here:
+"
+" wget https://raw.githubusercontent.com/altercation/vim-colors-solarized/master/colors/solarized.vim -O ~/.vim/colors/solarized.vim
+"
+" put it in ~/.vim/colors/solarized.vim
+colorscheme solarized
 
 " more color schemes:
 "colorscheme blue
 "colorscheme darkblue
 "colorscheme default
 "colorscheme delek
-colorscheme desert " <-- old standby
+"colorscheme desert " <-- old standby
 "colorscheme elflord
 "colorscheme evening
 "colorscheme industry
@@ -587,14 +610,6 @@ nnoremap <S-L> :join<CR>
 map <S-j> 7j
 map <S-k> 7k
 
-" Bubble text up/down
-" Single line:
-nmap <C-k> ddkP
-nmap <C-j> ddp
-" Multiple lines:
-vmap <C-k> xkP`[V`]
-vmap <C-j> xp`[V`]
-
 " -----------------------------
 " Jedi Autocomplete Plugin
 " -----------------------------