diff --git a/vimrc b/vimrc
index 0fd972a..6bcda24 100644
--- a/vimrc
+++ b/vimrc
@@ -30,8 +30,8 @@ Plugin 'itchyny/lightline.vim'
 Plugin 'townk/vim-autoclose'
 Plugin 'tpope/vim-fugitive'
 Plugin 'travitch/hasksyn'
-Plugin 'tpope/vim-markdown'
-Plugin 'jgertm/nix.vim'
+Plugin 'plasticboy/vim-markdown'
+Plugin 'LnL7/vim-nix'
 Plugin 'ervandew/supertab'
 Plugin 'majutsushi/tagbar'
 Plugin 'scrooloose/syntastic'
@@ -57,6 +57,7 @@ set mouse=a                             " Enable mouse support
 set showcmd                             " Show command while writing it
 set ruler                               " Show line/column position
 set novb                                " Disable visual beep
+set nofoldenable                        " Disable folding
 
 set nobackup                            " Disable ~backup
 set noswapfile                          " Disable swap files
@@ -71,7 +72,6 @@ set ffs=unix                            " Use UNIX file format
 set clipboard=unnamed                   " Clipboard integration
 set ttyfast                             " Improve redrawing in xterm
 filetype indent plugin on               " Identify file type
-filetype on                             "
 set wildignore+=*/tmp/*,*.so,*.swp      " Files to ignore
 
 set shiftwidth=4                        " Tab