From 9a3c996d3d1937135f54e2164587ce8d72ba40c5 Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Tue, 24 Nov 2020 10:20:33 +0200
Subject: [PATCH 1/6] Add support for vagrant

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

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 28515c9..71e9e68 100755
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -249,6 +249,12 @@ let
       " Virtual Edit maaan
       set ve=block
 
+      " Read Vagrantfile as ruby source
+      augroup vagrant
+        au!
+        au BufRead,BufNewFile Vagrantfile set filetype=ruby
+      augroup END
+
       " Extra options
       ${extraOptions}
     '';

From 834b6e12f426360d92d8f3395e44f7d6e74e7460 Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Thu, 26 Nov 2020 11:14:35 +0200
Subject: [PATCH 2/6] Update neuron.vim for a fix

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

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 71e9e68..81f7de2 100755
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -73,8 +73,8 @@ let
     src = fetchFromGitHub {
       owner = "fiatjaf";
       repo = "neuron.vim";
-      rev = "c62b5daa9bc9d734eca9db74e7e0895c85ceb2b8";
-      sha256 = "03d4bnmmg49n6fi13lnf1z9jk0xyrnp86kgbmh1sdgnfnrna4178";
+      rev = "853fbe273f9f40defe69a9d50d267fee1bbc6b5a";
+      sha256 = "0l6qxmd1y67jam8np37ywks95nbs53bvmh51y4ak4078mz2n1nji";
     };
   };
   vim-lilypond = buildVimPluginFrom2Nix { # created by nix#NixDerivation

From af03f8b3d1f6386fc660783f10406a5928efcc73 Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Thu, 26 Nov 2020 11:20:48 +0200
Subject: [PATCH 3/6] Add a default for neuron_extension

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

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 81f7de2..197fdd5 100755
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -255,6 +255,9 @@ let
         au BufRead,BufNewFile Vagrantfile set filetype=ruby
       augroup END
 
+      " Neuron things
+      let g:neuron_extension = '.md'
+
       " Extra options
       ${extraOptions}
     '';

From 9dcdddb63d6ac1427d3c53838aacf975d944250c Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Thu, 26 Nov 2020 11:25:43 +0200
Subject: [PATCH 4/6] Fix neuron_extension again?

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

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 197fdd5..1cdd867 100755
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -256,7 +256,7 @@ let
       augroup END
 
       " Neuron things
-      let g:neuron_extension = '.md'
+      let neuron_extension = '.md'
 
       " Extra options
       ${extraOptions}

From 435506aa760097786c627e21eb5b79c716ce6fed Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Thu, 26 Nov 2020 14:34:42 +0200
Subject: [PATCH 5/6] Try removing stuff

---
 pkgs/vim/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 1cdd867..21bde62 100755
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -250,13 +250,10 @@ let
       set ve=block
 
       " Read Vagrantfile as ruby source
-      augroup vagrant
-        au!
-        au BufRead,BufNewFile Vagrantfile set filetype=ruby
-      augroup END
-
-      " Neuron things
-      let neuron_extension = '.md'
+      " augroup vagrant
+      "   au!
+      "   au BufRead,BufNewFile Vagrantfile set filetype=ruby
+      " augroup END
 
       " Extra options
       ${extraOptions}

From c97f15f0e86d03abec4e0d40ecdb573790674831 Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Thu, 26 Nov 2020 17:00:03 +0200
Subject: [PATCH 6/6] Fix the fix, that didn't fix anything

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

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 21bde62..81f7de2 100755
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -250,10 +250,10 @@ let
       set ve=block
 
       " Read Vagrantfile as ruby source
-      " augroup vagrant
-      "   au!
-      "   au BufRead,BufNewFile Vagrantfile set filetype=ruby
-      " augroup END
+      augroup vagrant
+        au!
+        au BufRead,BufNewFile Vagrantfile set filetype=ruby
+      augroup END
 
       " Extra options
       ${extraOptions}