aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2011-03-01 12:37:24 +1300
committerTom Ryder <tom@sanctum.geek.nz>2011-03-01 12:37:24 +1300
commit4380845d3ea404feed2688c9f89dd5b66208624c (patch)
tree9f5fc55f23171e059f69f1932425da9e2852642d
parentAdded GUI vimrc (diff)
downloaddotfiles-4380845d3ea404feed2688c9f89dd5b66208624c.tar.gz
dotfiles-4380845d3ea404feed2688c9f89dd5b66208624c.zip
Some tweaks to the GUI file, added indent rules to the console one.
-rw-r--r--vim/gvimrc5
-rw-r--r--vim/vimrc8
2 files changed, 7 insertions, 6 deletions
diff --git a/vim/gvimrc b/vim/gvimrc
index 81148013..b11296f9 100644
--- a/vim/gvimrc
+++ b/vim/gvimrc
@@ -1,5 +1,2 @@
-try
- set guifont=Inconsolata\ 10
-catch
-endtry
+set guifont=Inconsolata\ 10
set guioptions=aci
diff --git a/vim/vimrc b/vim/vimrc
index 83f751b0..c4639677 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,8 +1,8 @@
" Colors
-if has("syntax") && (&t_Co > 15)
+if has("syntax") && ((&t_Co > 15) || has("gui_running"))
set background=dark
syntax enable
- if (&t_Co > 255)
+ if (&t_Co > 255) || has("gui_running")
colorscheme desert256
highlight Pmenu ctermfg=0 ctermbg=8
endif
@@ -33,6 +33,10 @@ if has("autocmd")
filetype indent on
endif
+" Indenting
+set autoindent
+set smartindent
+
" Leaders
nnoremap <leader>c :set cursorline! cursorcolumn!<CR>
nnoremap <leader>h :set hlsearch!<CR>