Modified .vimrc

.vimrc

@@ -10,7 +10,6 @@ set showcmd                " Show (partial) command in bottom-right.
 set expandtab              " Use spaces instead of tabs for indentation.
 set smarttab               " Backspace removes 'shiftwidth' worth of spaces.
 set number                 " Show line numbers.
-set nowrap                 " Don't wrap long lines.
 set laststatus=2           " Always show the statusline.
 set ruler                  " Show the ruler in the statusline.
 set textwidth=80           " Wrap at n characters.
@@ -22,7 +21,13 @@ set shiftwidth=2          " Use same value as 'tabstop'.
 set softtabstop=2          " Use same value as 'shiftwidth'.
 set encoding=utf-8         " Set encoding
 color smyck                " Colorscheme see https://github.com/hukl/Smyck-Color-Scheme
-set list listchars=tab:»·,trail:·" Show trailing spaces and highlight hard tabs
+set list listchars=tab:»⤍·,trail:·,eol:¤,nbsp:˽ " Show invisible chars
+" set colorcolumn=80         " Highlight the 80th collumn
+set wrap linebreak nolist  " Softwrap long lines at window border, don't break words
+set showbreak=             " Intend softwrapped lines with unbreakable space
+
+" Highlight the line the cursor is on in markdown files
+autocmd FileType markdown set cursorline
 
 " Go to the last cursor location when opening a file.
 augroup jump
@@ -41,12 +46,15 @@ endfun
 command! TrimWhitespace call s:trim_whitespace()
 
 " Highlight characters behind the 80 chars margin
-:au BufWinEnter * let w:m2=matchadd('ColumnMargin', '\%>80v.\+', -1)
+" :au BufWinEnter * let w:m2=matchadd('ColumnMargin', '\%>80v.\+', -1)
 
 " Directories for swp files
 set backupdir=~/.vim/backups
 set directory=~/.vim/backups
 
+" Treat all .md files as markdown
+autocmd BufNewFile,BufRead *.md set filetype=markdown
+
 " make uses real tabs
 au FileType make set noexpandtab