From 969ba6477fc51502088000ca9e7215f8a0d53977 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Thu, 4 Mar 2021 14:48:23 +0100
Subject: [PATCH] feat(neovim): update config

---
 home/editors/neovim/default.nix          | 33 ++++--------------------
 home/editors/neovim/vim-surround-fix.vim |  3 ++-
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/home/editors/neovim/default.nix b/home/editors/neovim/default.nix
index 0b026fe..933367d 100644
--- a/home/editors/neovim/default.nix
+++ b/home/editors/neovim/default.nix
@@ -2,12 +2,12 @@
 
 let
   neovim-unwrapped = pkgs.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
-    version = "2020-12-24";
+    version = "2021-03-04";
     src = pkgs.fetchFromGitHub {
       owner = "neovim";
       repo = "neovim";
-      rev = "8c8cc35926f265bf4f048b83fd130bef3932851e";
-      sha256 = "1iswss5415n56cfxn9pylnpfnwafhfdnxfc1pk9z1m280i2whlyk";
+      rev = "df4440024bb1f1ce368f5e5844d8af925e264b63";
+      sha256 = "12mm9js8pry2hzv0znznqwkn1favzxclygwr24lhzdwfc7wd7p92";
     };
     nativeBuildInputs = oldAttrs.nativeBuildInputs
       ++ [ pkgs.utf8proc pkgs.tree-sitter ];
@@ -15,29 +15,6 @@ let
 
   buildVimPluginFrom2Nix = pkgs.vimUtils.buildVimPluginFrom2Nix;
 
-  completion-nvim = buildVimPluginFrom2Nix {
-    pname = "completion-nvim";
-    version = "2020-11-20";
-    src = pkgs.fetchFromGitHub {
-      owner = "nvim-lua";
-      repo = "completion-nvim";
-      rev = "936bbd17577101a4ffb07ea7f860f77dd8007d43";
-      sha256 = "1z399q3v36hx2ipj1fhxcc051pi4q0lifyglmclxi5zkbmm0z6a7";
-    };
-  };
-
-  # not very stable yet, no existing netcoredbg config
-  nvim-dap = buildVimPluginFrom2Nix {
-    pname = "nvim-dap";
-    version = "2020-12-20";
-    src = pkgs.fetchFromGitHub {
-      owner = "mfussenegger";
-      repo = "nvim-dap";
-      rev = "664a5598f77c8bfec7f81f03e29516583ddc194c";
-      sha256 = "0rw30cmqnxm9sdrqissppdkdgfk3h2l4vh9m7679k3vx26ahq3qx";
-    };
-  };
-
   vimLua = lua: ''
     lua << EOF
     ${lua}
@@ -76,14 +53,14 @@ in {
       wmgraphviz-vim
 
       nvim-lspconfig
-      nvim-dap
+      # nvim-dap
 
       completion-nvim
 
       vim-orgmode
     ];
     extraConfig = with builtins;
-      readFile ./init.vim + readFile ./vim-surround-fix.vim
+      readFile ./init.vim # + readFile ./vim-surround-fix.vim
       + readFile ./which-key.vim + readFile ./test.vim
       + vimLua (readFile ./lsp/extensions.lua) + readFile ./lsp/lsp.vim
       + vimLua (readFile ./lsp/lsp.lua);
diff --git a/home/editors/neovim/vim-surround-fix.vim b/home/editors/neovim/vim-surround-fix.vim
index d9e0d79..3cce18b 100644
--- a/home/editors/neovim/vim-surround-fix.vim
+++ b/home/editors/neovim/vim-surround-fix.vim
@@ -1,4 +1,5 @@
-" fix for vim-surround in neovim
+" fix for timeout issue with vim-surround in neovim
+" but it also breaks yss
 " https://github.com/tpope/vim-surround/issues/272
 
 let g:surround_no_mappings = 1