Skip to content

Commit

Permalink
remove a few unused plugins; modified murphy colourscheme; various ot…
Browse files Browse the repository at this point in the history
…her little bits
  • Loading branch information
ehg committed May 6, 2012
1 parent 12de184 commit 372d2a1
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.DS_Store
.netrwhist
15 changes: 0 additions & 15 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
[submodule "bundle/command-t"]
path = bundle/command-t
url = git://git.wincent.com/command-t.git
[submodule "bundle/endwise"]
path = bundle/endwise
url = https://github.com/tpope/vim-endwise.git
[submodule "bundle/ragtag"]
path = bundle/ragtag
url = https://github.com/tpope/vim-ragtag.git
[submodule "bundle/rails"]
path = bundle/rails
url = https://github.com/tpope/vim-rails.git
Expand All @@ -28,15 +22,6 @@
[submodule "bundle/markdown"]
path = bundle/markdown
url = https://github.com/plasticboy/vim-markdown.git
[submodule "bundle/rooter"]
path = bundle/rooter
url = https://github.com/airblade/vim-rooter.git
[submodule "bundle/tagbar"]
path = bundle/tagbar
url = git://github.com/majutsushi/tagbar.git
[submodule "bundle/delmitmate"]
path = bundle/delmitmate
url = git://github.com/Raimondi/delimitMate.git
[submodule "bundle/snipmate"]
path = bundle/snipmate
url = git://github.com/msanders/snipmate.vim.git
1 change: 0 additions & 1 deletion bundle/delmitmate
Submodule delmitmate deleted from 39b829
1 change: 0 additions & 1 deletion bundle/endwise
Submodule endwise deleted from 86e1d4
1 change: 0 additions & 1 deletion bundle/ragtag
Submodule ragtag deleted from bdc8b5
1 change: 0 additions & 1 deletion bundle/tagbar
Submodule tagbar deleted from 3c0756
41 changes: 41 additions & 0 deletions colors/murphy2.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
" local syntax file - set colors on a per-machine basis:
" vim: tw=0 ts=4 sw=4
" Vim color file
" Maintainer: Ron Aaron <[email protected]>
" Last Change: 2003 May 02

hi clear
set background=dark
if exists("syntax_on")
syntax reset
endif
let g:colors_name = "murphy2"

hi Normal ctermbg=None ctermfg=lightgreen guibg=Black guifg=lightgreen
hi Comment term=bold ctermfg=LightRed guifg=Orange
hi Constant term=underline ctermfg=LightGreen guifg=White gui=NONE
hi Identifier term=underline ctermfg=LightCyan guifg=#00ffff
hi Ignore ctermfg=black guifg=bg
hi PreProc term=underline ctermfg=LightBlue guifg=Wheat
hi Search term=reverse guifg=white guibg=Blue
hi Special term=bold ctermfg=LightRed guifg=magenta
hi Statement term=bold ctermfg=Yellow guifg=#ffff00 gui=NONE
hi Type ctermfg=LightGreen guifg=grey gui=none
hi Error term=reverse ctermbg=Red ctermfg=White guibg=Red guifg=White
hi Todo term=standout ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow
" From the source:
hi Cursor guifg=Orchid guibg=fg
hi Directory term=bold ctermfg=LightCyan guifg=Cyan
hi ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White
hi IncSearch term=reverse cterm=reverse gui=reverse
hi LineNr term=underline ctermfg=Yellow guifg=Yellow
hi ModeMsg term=bold cterm=bold gui=bold
hi MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen
hi NonText term=bold ctermfg=Blue gui=bold guifg=Blue
hi Question term=standout ctermfg=LightGreen gui=bold guifg=Cyan
hi SpecialKey term=bold ctermfg=LightBlue guifg=Cyan
hi StatusLine term=reverse,bold cterm=reverse gui=NONE guifg=White guibg=darkblue
hi StatusLineNC term=reverse cterm=reverse gui=NONE guifg=white guibg=#333333
hi Title term=bold ctermfg=LightMagenta gui=bold guifg=Pink
hi WarningMsg term=standout ctermfg=LightRed guifg=Red
hi Visual term=reverse cterm=reverse gui=NONE guifg=white guibg=darkgreen
1 change: 1 addition & 0 deletions ftplugin/python.vim
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
setlocal sw=4
setlocal ts=4
noremap <buffer> <LocalLeader>py o/**************<CR><CR>/<Esc>
let python_space_errors = 1
11 changes: 7 additions & 4 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ set ignorecase " Case-insensitive searching.
set smartcase " But case-sensitive if expression contains a capital letter.

set number " Show line numbers.
set nuw=3
set ruler " Show cursor position.
set autoindent

set incsearch " Highlight matches as you type.
set hlsearch " Highlight matches.
Expand All @@ -42,14 +44,13 @@ set directory=$HOME/.vim/tmp//,. " Keep swap files in one location
" UNCOMMENT TO USE
set tabstop=2 " Global tab width.
set shiftwidth=2 " And again, related.
"set expandtab " Use spaces instead of tabs
set expandtab " Use spaces instead of tabs

set laststatus=2 " Show the status line all the time
" Useful status information at bottom of screen
set statusline=[%n]\ %<%.99f\ %h%w%m%r%y\ %{fugitive#statusline()}%{exists('*CapsLockStatusline')?CapsLockStatusline():''}%=%-16(\ %l,%c-%v\ %)%P

" Or use vividchalk
colorscheme vividchalk
colorscheme murphy2

" Tab mappings.
map <leader>tt :tabnew<cr>
Expand Down Expand Up @@ -81,7 +82,9 @@ nnoremap : ;
vnoremap ; :
vnoremap : ;
set pastetoggle=<F2>
map <F2> :mksession! ~/.vim/session <cr>
map <F3> :source ~/.vim/session <cr>
" Automatic fold settings for specific files. Uncomment to use.
" autocmd FileType ruby setlocal foldmethod=syntax
" autocmd FileType css setlocal foldmethod=indent shiftwidth=2 tabstop=2
Expand Down

0 comments on commit 372d2a1

Please sign in to comment.