From 22b4a4128ba89fcaa06531fc6920915b21566a9f Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Tue, 31 Mar 2020 11:23:08 +0300
Subject: [PATCH 1/4] Enable editorconfig for vim

---
 pkgs/vim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 6f94fce..05ac19f 100755
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -57,6 +57,7 @@ let
       start = [
         calendar-vim
         dhall-vim
+        editorconfig-vim
         fzf-vim
         fzfWrapper
         gundo

From 57eab85b445cbdbb89112e555b41219a3d74503c Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Tue, 7 Apr 2020 16:13:50 +0300
Subject: [PATCH 2/4] Set .md files to use markdown filetype

---
 pkgs/vim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 05ac19f..5924021 100755
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -195,6 +195,7 @@ let
         \{'path': '~/vimwiki/personal.wiki'}
       \]
       au BufRead,BufNewFile *.wiki set filetype=vimwiki
+      au BufRead,BufNewFile *.md set filetype=markdown
       :autocmd FileType vimwiki map <leader>d :VimwikiMakeDiaryNote
       function! ToggleCalendar()
         execute ":Calendar"

From a3f54fb6aed6583ba8c6efb2c5674c6a3b617cc8 Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Tue, 7 Apr 2020 16:38:45 +0300
Subject: [PATCH 3/4] Second try on markdown

---
 pkgs/vim/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 5924021..94f63fd 100755
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -195,7 +195,6 @@ let
         \{'path': '~/vimwiki/personal.wiki'}
       \]
       au BufRead,BufNewFile *.wiki set filetype=vimwiki
-      au BufRead,BufNewFile *.md set filetype=markdown
       :autocmd FileType vimwiki map <leader>d :VimwikiMakeDiaryNote
       function! ToggleCalendar()
         execute ":Calendar"
@@ -212,6 +211,9 @@ let
       endfunction
       :autocmd FileType vimwiki map <leader>c :call ToggleCalendar()
 
+      " Still, edit md as markdown
+      au BufRead,BufNewFile *.md set filetype=markdown
+
       " Thx Mats for the following
       :cnoremap <C-A> <Home>
       :cnoremap <C-B> <Left>

From 1a110d252ddaf0ebf557239f19e0548b47056a66 Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Wed, 8 Apr 2020 16:52:17 +0300
Subject: [PATCH 4/4] No markdown for wiki

---
 pkgs/vim/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 94f63fd..502bd6a 100755
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -191,10 +191,9 @@ let
       let g:vimwiki_conceallevel = 0
       let g:vimwiki_auto_chdir = 1
       let g:vimwiki_list = [
-        \{'path': '~/zk/', 'syntax': 'markdown', 'ext': '.md'},
+        \{'path': '~/zk/'},
         \{'path': '~/vimwiki/personal.wiki'}
       \]
-      au BufRead,BufNewFile *.wiki set filetype=vimwiki
       :autocmd FileType vimwiki map <leader>d :VimwikiMakeDiaryNote
       function! ToggleCalendar()
         execute ":Calendar"
@@ -211,9 +210,6 @@ let
       endfunction
       :autocmd FileType vimwiki map <leader>c :call ToggleCalendar()
 
-      " Still, edit md as markdown
-      au BufRead,BufNewFile *.md set filetype=markdown
-
       " Thx Mats for the following
       :cnoremap <C-A> <Home>
       :cnoremap <C-B> <Left>