vimrc: indent with tabs; enabled numbering; removed bad key mappings

1 files changed, 21 insertions, 20 deletions

diff --git a/vimrc b/vimrc
index 93e5be2..5c10287 100644
--- a/vimrc
+++ b/vimrc
@@ -11,47 +11,49 @@ set ignorecase		" case-insensitive searching
 set background=dark	" color scheme for dark background
 set title		" set terminal title
 set ruler		" show line/column of cursor in status line
-set softtabstop=4	" (soft) indent tabs with 4 spaces
-set shiftwidth=4	" (auto)indent with 4 spaces (> <)
-set expandtab		" expand tabs to spaces
+set tabstop=4		" display a tab as 4 spaces
+"set softtabstop=4	" (soft) indent tabs with 4 spaces
+"set shiftwidth=4	" (auto)indent with 4 spaces (> <)
+set noexpandtab		" don't expand tabs to spaces
 set nobackup		" don't keep backup files
 set showtabline=2	" always show tab line
 set hidden		" change buffers without saving
 set cursorline		" highlight current cursor line
 set scrolloff=4		" keep 4 lines context when scrolling
-set laststatus=2        " always show status line
-set ttimeoutlen=50      " faster switch from insert to normal mode
-set noshowmode          " don't show current mode (done by airline)
+set laststatus=2	" always show status line
+set ttimeoutlen=50	" faster switch from insert to normal mode
+set noshowmode		" don't show current mode (done by airline)
+set encoding=utf-8	" use utf8 by default
+syntax on		" enable syntax highlighting
 filetype plugin indent on
 
+set directory=~/.vim/swap,.,~/tmp,/var/tmp,/tmp		" directory where to save/search swap files
+set viminfo+=n~/.vim/viminfo				" different location for viminfo file
+
 " make indentation and trailing whitespaces visible
-set listchars=tab:\ \ ,trail:·
-set list
-highlight SpecialKey ctermfg=239
+set list listchars=tab:\ \ ,trail:·
 
 " different indentation
 autocmd FileType python setlocal tabstop=4 softtabstop=0
 autocmd FileType c      setlocal tabstop=4 softtabstop=0 noexpandtab
 autocmd FileType perl   setlocal tabstop=4 softtabstop=4 expandtab
+autocmd Syntax * setlocal number
 
+
+" highlighting settings
 if (&t_Co == 88)
     highlight CursorLine cterm=NONE ctermbg=81
 elseif (&t_Co == 256)
     highlight CursorLine cterm=NONE ctermbg=236
     highlight Folded cterm=NONE ctermbg=239
     highlight SignColumn ctermbg=234
+    highlight LineNr ctermfg=lightyellow ctermbg=234
+    highlight SpecialKey ctermfg=darkgray
 else
     highlight CursorLine cterm=NONE ctermbg=darkgray
 endif
 
 
-syntax on		" enable syntax highlighting
-set encoding=utf-8	" use utf8 by default
-
-set directory=~/.vim/swap,.,~/tmp,/var/tmp,/tmp	    " directory where to save/search swap files
-set viminfo+=n~/.vim/viminfo			    " different location for viminfo file
-
-
 " file browser
 let g:netrw_liststyle=3		" tree style listing
 let g:netrw_banner=0		" suppress banner on top
@@ -61,12 +63,10 @@ let g:netrw_list_hide='^\..*$'	" don't show hidden files
 
 " key mappings
 nnoremap <silent> <CR>		:nohlsearch<CR>
-nmap <C-t>			:tabnew<CR>
 nmap tn				:tabnew<CR>
 nmap tc				:tabclose<CR>
-noremap <silent> <F3>           :BufExplorerHorizontalSplit<CR>
+noremap <silent> <F3>		:BufExplorerHorizontalSplit<CR>
 nnoremap <silent> <F4>		:TagbarToggle<CR>
-noremap <F11>                   :set list!<CR>
 
 
 " different keycodes in urxvt
@@ -75,7 +75,7 @@ nmap    <ESC>[6^    <C-PageDown>
 
 " folding settings;  disabled for now because of performance problems
 "set foldmethod=syntax		" fold automatically by syntax rules
-"set foldlevel=0			" fold from top level
+"set foldlevel=0		" fold from top level
 "set foldnestmax=1		" fold only 1 level
 "let perl_fold=1
 "let perl_nofold_packages=0
@@ -86,6 +86,7 @@ let g:bufExplorerSplitVertSize=40
 let g:bufExplorerDefaultHelp=0
 let g:bufExplorerShowNoName=1
 
+" airline settings
 let g:airline_theme='wombat'
 let g:airline#extensions#whitespace#enabled=0