diff --git a/.config/nvim/ftplugin/agda.vim b/.config/nvim/ftplugin/agda.vim
index 74a49940..3c80e715 100644
--- a/.config/nvim/ftplugin/agda.vim
+++ b/.config/nvim/ftplugin/agda.vim
@@ -150,26 +150,7 @@ imap <buffer> \Chi Χ
 imap <buffer> \Psi Ψ
 imap <buffer> \Omega Ω
 
-" autoload
-function! CornelisLoadWrapper()
-  if exists(":CornelisLoad") ==# 2
-    CornelisLoad
-  endif
-endfunction
-
-au BufReadPre *.agda call CornelisLoadWrapper()
-au BufReadPre *.lagda* call CornelisLoadWrapper()
-
-au BufRead,BufNewFile *.agda call AgdaFiletype()
-au BufRead,BufNewFile *.lagda* call AgdaFiletype()
-au QuitPre *.agda :CornelisCloseInfoWindows
-au QuitPre *.lagda* :CornelisCloseInfoWindows
-
-" autoreload at file write
-au BufWritePost *.agda execute "normal! :CornelisLoad\<CR>"
-au BufWritePost *.lagda* execute "normal! :CornelisLoad\<CR>"
-
-" default cornelis config
+" default cornelis mapping
 nnoremap <buffer> <leader>l :CornelisLoad<CR>
 nnoremap <buffer> <leader>r :CornelisRefine<CR>
 nnoremap <buffer> <leader>d :CornelisMakeCase<CR>
diff --git a/.config/nvim/plugin/cornelis.vim b/.config/nvim/plugin/cornelis.vim
new file mode 100644
index 00000000..27930283
--- /dev/null
+++ b/.config/nvim/plugin/cornelis.vim
@@ -0,0 +1,17 @@
+" agda related autocommands
+
+function! CornelisLoadWrapper()
+  if exists(":CornelisLoad") ==# 2
+    CornelisLoad
+  endif
+endfunction
+
+au BufReadPre *.agda call CornelisLoadWrapper()
+au BufReadPre *.lagda* call CornelisLoadWrapper()
+
+au QuitPre *.agda :CornelisCloseInfoWindows
+au QuitPre *.lagda* :CornelisCloseInfoWindows
+
+" autoreload at file write
+au BufWritePost *.agda execute "normal! :CornelisLoad\<CR>"
+au BufWritePost *.lagda* execute "normal! :CornelisLoad\<CR>"