From 906f41da4d1bbeef37ed44b17cf68f18c70da441 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Sat, 14 Nov 2020 11:18:13 +0100
Subject: [PATCH] feat(neovim): update config

---
 home/editors/lsp.nix            |  4 ++--
 home/editors/neovim/default.nix | 10 +++++-----
 home/editors/neovim/lsp/lsp.lua |  2 +-
 home/editors/neovim/scripts.vim |  2 +-
 home/editors/neovim/test.vim    |  2 ++
 home/felschr-rpi4.nix           |  4 +---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/home/editors/lsp.nix b/home/editors/lsp.nix
index fe98791..bb27bff 100644
--- a/home/editors/lsp.nix
+++ b/home/editors/lsp.nix
@@ -3,12 +3,12 @@
 let
   omnisharp-roslyn = pkgs.omnisharp-roslyn.overrideAttrs (oldAttrs: rec {
     pname = "omnisharp-roslyn";
-    version = "1.37.1";
+    version = "1.37.3";
 
     src = pkgs.fetchurl {
       url =
         "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
-      sha256 = "04pyychzwhhcv0js0qyramz6nd0wz03qqqgvz1j9m9wxyiz0dv3c";
+      sha256 = "x0TRswtwlWWukx7fqjlfaV7/xF5ZMc0JT7zfzHX3BCY=";
     };
   });
 in {
diff --git a/home/editors/neovim/default.nix b/home/editors/neovim/default.nix
index a811fa7..bc07d86 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-09-30";
+    version = "2020-11-03";
     src = pkgs.fetchFromGitHub {
       owner = "neovim";
       repo = "neovim";
-      rev = "e5d98d85693245fec811307e5a2ccfdea3a350cd";
-      sha256 = "119537lcrqn84n3sqj917jql4nrczk85idj27yqhp0dafc21raa8";
+      rev = "432f3240f171e857beb3d1a554cbd8a649bb38ae";
+      sha256 = "1drgaxnaazbv086pmy63254xm2madh8gl50kaynhbdwrrkxwcfzh";
     };
     nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.utf8proc ];
   });
@@ -21,8 +21,8 @@ let
     src = pkgs.fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "d3af0f3b470ee8a46aabb3837b97193dc16046e0";
-      sha256 = "0j09i8hhls8y5xd57vp4sbpp0gvdmwd6wmb355w5j2cda84xagmd";
+      rev = "59b312e95d7ee60bf66bbe199cfc168c62808d54";
+      sha256 = "0jvdrmgspgcs48zyfpwmywldjjpx539hdlibfjq6bdc1a8x8vis7";
     };
   };
 
diff --git a/home/editors/neovim/lsp/lsp.lua b/home/editors/neovim/lsp/lsp.lua
index 897d5b9..bb73fca 100644
--- a/home/editors/neovim/lsp/lsp.lua
+++ b/home/editors/neovim/lsp/lsp.lua
@@ -25,7 +25,7 @@ nvim_lsp.terraformls.setup{}
 nvim_lsp.hls.setup{}
 
 -- based on: https://github.com/mikew/vimrc/blob/master/src/nvim/coc-settings.json
--- multiple LSP's currently not supported: https://github.com/neovim/neovim/issues/12755
+-- TODO breaks auto-completion when using with other lsp
 -- nvim_lsp.diagnosticls.setup{
 --   on_attach = diagnosticls_on_attach;
 --   filetypes = {
diff --git a/home/editors/neovim/scripts.vim b/home/editors/neovim/scripts.vim
index 3e4cfb3..a65f6a6 100644
--- a/home/editors/neovim/scripts.vim
+++ b/home/editors/neovim/scripts.vim
@@ -2,7 +2,7 @@ if did_filetype()
   finish
 endif
 if getline(1) =~ '^#!.*nix-shell'
-  let s:matches = matchlist(getline(2), '^#!.*nix-shell -i \([^ \t\n]\+\)')
+  let s:matches = matchlist(getline(2), '^#!.*nix-shell .*-i \([^ \t\n]\+\)')
   let s:command = s:matches[1]
   echo s:command
   if s:command != ''
diff --git a/home/editors/neovim/test.vim b/home/editors/neovim/test.vim
index eb2a586..9c0b072 100644
--- a/home/editors/neovim/test.vim
+++ b/home/editors/neovim/test.vim
@@ -1 +1,3 @@
+let g:test#strategy = 'neovim'
 let g:test#csharp#runner = 'dotnettest'
+" let test#csharp#dotnettest#options = '-v q'
diff --git a/home/felschr-rpi4.nix b/home/felschr-rpi4.nix
index a99d60e..76471e9 100644
--- a/home/felschr-rpi4.nix
+++ b/home/felschr-rpi4.nix
@@ -20,9 +20,7 @@
 
   programs.gpg.enable = true;
 
-  home.sessionVariables = with pkgs; {
-    EDITOR = "nvim";
-  };
+  home.sessionVariables = with pkgs; { EDITOR = "nvim"; };
   programs.neovim.enable = true;
   programs.neovim.viAlias = true;
   programs.neovim.vimAlias = true;