diff --git a/nvim/markdown.vimrc b/nvim/markdown.vimrc
new file mode 100644
index 0000000..5e74649
--- /dev/null
+++ b/nvim/markdown.vimrc
@@ -0,0 +1,17 @@
+let g:vim_markdown_conceal = 2
+let g:vim_markdown_conceal_code_blocks = 0
+let g:vim_markdown_math = 1
+let g:vim_markdown_toml_frontmatter = 1
+let g:vim_markdown_frontmatter = 1
+let g:vim_markdown_strikethrough = 1
+let g:vim_markdown_autowrite = 1
+let g:vim_markdown_edit_url_in = 'tab'
+let g:vim_markdown_follow_anchor = 1
+
+augroup CustomMarkdown
+  autocmd BufNewFile,BufRead *.md set filetype=markdown
+  autocmd FileType markdown Goyo
+  autocmd FileType markdown setlocal linebreak
+  autocmd FileType markdown setlocal nocursorline
+  autocmd FileType markdown setlocal nocursorcolumn
+augroup END
diff --git a/nvim/plugins.vimrc b/nvim/plugins.vimrc
index 3e71276..cf0717b 100644
--- a/nvim/plugins.vimrc
+++ b/nvim/plugins.vimrc
@@ -3,6 +3,7 @@ Plug 'cespare/vim-toml'
 Plug 'ctrlpvim/ctrlp.vim'
 Plug 'honza/vim-snippets'
 Plug 'jiangmiao/auto-pairs'
+Plug 'junegunn/goyo.vim'
 Plug 'leafgarland/typescript-vim'
 Plug 'mileszs/ack.vim'
 Plug 'posva/vim-vue'
@@ -32,6 +33,10 @@ Plug 'preservim/nerdtree' |
   \ Plug 'ryanoasis/vim-devicons' |
   \ Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
 
+" Vim-Markdown
+Plug 'godlygeek/tabular' |
+  \ Plug 'plasticboy/vim-markdown'
+
 " sonokai colorscheme + supporting plugins
 Plug 'sainnhe/sonokai' |
   \ Plug 'rmolin88/pomodoro.vim' |
diff --git a/vimrc b/vimrc
index d1d247a..618dca7 100644
--- a/vimrc
+++ b/vimrc
@@ -12,11 +12,12 @@ set encoding=utf-8
 set expandtab
 set exrc
 set fillchars=vert:▐
+set foldlevelstart=1
 set hidden
 set history=50
 set incsearch
 set laststatus=2
-set list listchars=tab:»·,trail:·,nbsp:·
+set listchars=tab:▸\ ,eol:¬,nbsp:␣,trail:•,space:.,extends:→,precedes:← 
 set modelines=0
 set mouse=a
 set nobackup
@@ -27,12 +28,14 @@ set nowritebackup
 set number
 set numberwidth=5
 set ruler
+set scrolloff=12
 set shiftround
 set shiftwidth=2
 set shortmess+=c
 set showbreak=··
 set showcmd
 set signcolumn=yes
+set smartcase
 set splitbelow
 set splitright
 set tabstop=2
@@ -44,11 +47,6 @@ set ttyfast
 set updatetime=300
 set vb t_vb=
 
-if has("nvim-0.5.0") || has("patch-8.1.1564")
-  " Recently vim can merge signcolumn and number column into one
-  set signcolumn=number
-endif
-
 syntax enable
 syntax sync minlines=128 maxlines=512
 
@@ -104,6 +102,11 @@ if filereadable(expand("~/.config/nvim/test.vimrc"))
   source ~/.config/nvim/test.vimrc
 endif
 
+" Goyo setup
+if filereadable(expand("~/.config/nvim/markdown.vimrc"))
+  source ~/.config/nvim/markdown.vimrc
+endif
+
 " Color setup
 if filereadable(expand("~/.config/nvim/colors.vimrc"))
   source ~/.config/nvim/colors.vimrc