X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=5f64fc389b5a36e616b67fab65d7fb1f92b5afce;hb=3716d53936d8dd3533f6bc48ca8e0c2fe4d38731;hp=496858e0599266281548e3311de6ba26ae4af050;hpb=b286ba313d2c69c2676e39241e6ae4ddfd888dc5;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 496858e..5f64fc3 100644
--- a/vimrc
+++ b/vimrc
@@ -4,10 +4,13 @@
 " Make sure Vim (and not Vi) settings are enabled.
 set nocompatible
 
-" Enable automatic filedection, plugin and indention load.
+
+" EDIT SETTINGS
+
+" Enable automatic file detection, plugin and indention.
 filetype plugin indent on
 
-" Use utf-8 file encoding for all files.
+" Use UTF-8 file encoding for all files.
 set fileencodings=utf-8
 
 " Wrap text after 78 characters.
@@ -25,20 +28,29 @@ set tabstop=8
 " Enable auto indention.
 set autoindent
 
-" Activate lines display.
-set number
-" Display the ruler with current line/file position.
-set ruler
-" Display partial commands in the status line.
-set showcmd
+" When joining lines only add one space after a sentence.
+set nojoinspaces
+
+" Allow backspacing over autoindent, line breaks and insert mode starts.
+set backspace=indent,eol,start
+
+" Start a comment when hitting enter after a commented line (r) and when using
+" o or O around a commented line (o).
+set formatoptions+=ro
+" Don't break a line if was already longer then 'textwidth' when insert mode
+" started.
+set formatoptions+=l
+
+" Already display matches while typing the search command. This makes spotting
+" errors easily.
+set incsearch
 
 " Activate syntax folding.
 set foldmethod=syntax
 set foldcolumn=2
 set foldlevel=99 " no folding at default
 
-" Use smartcase mode when searching; only check for case if the searched word
-" contains a capital character.
+" Only check for case if the searched word contains a capital character.
 set ignorecase
 set smartcase
 
@@ -46,11 +58,28 @@ set smartcase
 set spell
 set spelllang=en_us
 
-" When joining lines only add one space after a sentence.
-set nojoinspaces
 
-" Allow backspacing over autoindent, line breaks and insert mode starts.
-set backspace=indent,eol,start
+" DISPLAY SETTINGS
+
+" Use a dark background.
+set background=dark
+
+" Activate lines display.
+set number
+" Display the ruler with current line/file position.
+set ruler
+" Display partial commands in the status line.
+set showcmd
+
+" Visualize the line the cursor is currently in.
+set cursorline
+
+" Display tabs as "^I" and trailing space as "-".
+set list
+set listchars=trail:-
+
+
+" EDITOR SETTINGS
 
 " Don't use any modelines.
 set nomodeline
@@ -59,12 +88,8 @@ set nomodeline
 " possible files.
 set wildmode=longest,list
 
-" Visualize the line the cursor is currently in.
-set cursorline
-
-" Use a dark background.
-set background=dark
 
+" MAPPINGS
 
 " Use "," as my mapleader.
 let mapleader = ","
@@ -76,10 +101,15 @@ let NERDCreateDefaultMappings=0
 " Map toggle comment.
 map <Leader><Leader> <plug>NERDCommenterToggle
 
+" Maps to change spell language between English and German.
+map <Leader>se :set spelllang=en_us<CR>
+map <Leader>sd :set spelllang=de_de<CR>
+
 " I often type "W" instead of "w" when trying to save a file. Fix my mistake.
 cmap W w
 cmap Wq wq
-
+" Also fix my typo with "Q".
+cmap Q q
 
 " Disable Apple style movements in MacVim.
 if has("gui_macvim")
@@ -87,6 +117,8 @@ if has("gui_macvim")
 endif
 
 
+" SYNTAX SETTINGS
+
 " Activate syntax coloring.
 syntax enable