summaryrefslogtreecommitdiff
path: root/vimrc
diff options
context:
space:
mode:
Diffstat (limited to 'vimrc')
-rw-r--r--vimrc18
1 files changed, 10 insertions, 8 deletions
diff --git a/vimrc b/vimrc
index 57a2a76..3f3f30e 100644
--- a/vimrc
+++ b/vimrc
@@ -1,10 +1,8 @@
-let g:inkpot_black_background = 1
-
if &term =~ 'screen'
set t_Co=256
endif
-colorscheme inkpot
+colorscheme mop
filetype on
syntax on
@@ -20,11 +18,11 @@ set showcmd
set ttyfast
set autoindent
-set shiftwidth=4
-set softtabstop=4
-set tabstop=4
+set shiftwidth=8
+set softtabstop=8
+set tabstop=8
"set textwidth=79
-set cinoptions=(s,U1
+set cinoptions=(s,U1,l1,:0
set ignorecase
set incsearch
@@ -35,4 +33,8 @@ set foldenable
autocmd FileType haml setlocal sw=2 sts=2 ts=2 et
autocmd FileType ruby setlocal sw=2 sts=2 ts=2 et
-autocmd FileType sh setlocal et
+autocmd FileType javascript setlocal inde= cin cino+=J1
+
+let g:c_syntax_for_h = 1
+let g:ruby_indent_assignment_style = 'variable'
+let g:ruby_indent_hanging_elements = 0