neovim/.config/nvim/init.vim

@@ -25,7 +25,7 @@ nnoremap <leader>n :noh<cr>
 nnoremap <leader>k :m-2<cr>==
 nnoremap <leader>j :m+<cr>==
 ""Markdown
-autocmd Filetype markdown Goyo
+au FileType markdown Goyo
 let g:markdown_fenced_languages = ['cpp', 'python', 'java', 'sql']
 let g:vim_markdown_math=1
 ""Snippets
@@ -35,7 +35,7 @@ let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
 ""Vim-plug
 call plug#begin('~/.config/nvim/plugged')
 Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
-Plug 'junegunn/goyo.vim', {'for': 'markdown', 'on': 'Goyo' }
+Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
 Plug 'SirVer/ultisnips', { 'for': 'markdown' }
 Plug 'Raimondi/delimitMate'
 Plug 'cocopon/iceberg.vim'
@@ -50,6 +50,9 @@ set laststatus=0
 autocmd BufNewFile,BufRead /tmp/neomutt* set filetype=markdown
 ""Quit whether Goyo is active or not
 function! s:goyo_enter()
+  set noshowmode
+  set noshowcmd
+  set scrolloff=999
   let b:quitting = 0
   let b:quitting_bang = 0
   autocmd QuitPre <buffer> let b:quitting = 1
@@ -57,6 +60,9 @@ function! s:goyo_enter()
 endfunction
 
 function! s:goyo_leave()
+  set showmode
+  set showcmd
+  set scrolloff=5
   if b:quitting_bang
     qa!
   else