From 68c62f6bad3c0e6ef99a723d73c1afa54a862d69 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Fri, 13 Mar 2020 19:49:18 +0100
Subject: [PATCH] feat: split off omnisharp from dotnet config

---
 home/dotnet.nix            | 23 -----------------------
 home/editors/default.nix   |  1 +
 home/editors/omnisharp.nix | 30 ++++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 home/editors/omnisharp.nix

diff --git a/home/dotnet.nix b/home/dotnet.nix
index a974754..a67058b 100644
--- a/home/dotnet.nix
+++ b/home/dotnet.nix
@@ -8,21 +8,8 @@ let
   dotnetBinary = "${dotnetRoot}/dotnet";
 in
 {
-  nixpkgs.overlays = [
-    (self: super: {
-      omnisharp-roslyn = super.omnisharp-roslyn.overrideAttrs (oldAttrs: rec {
-          version = "1.34.11";
-          src = fetchurl {
-            url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
-            sha256 = "0j55jrji7ya0pm91hfmyd9s6lkl35xbybr81a1gka90mlyp0gx63";
-          };
-      });
-    })
-  ];
-  
   home.packages = [
     dotnet-combined
-    omnisharp-roslyn
   ];
 
   home.sessionVariables = {
@@ -30,14 +17,4 @@ in
     MSBuildSdksPath = "${dotnetSdk}/$(${dotnetBinary} --version)/Sdks";
     MSBUILD_EXE_PATH = "${dotnetSdk}/$(${dotnetBinary} --version)/MSBuild.dll";
   };
-
-  home.file.".omnisharp/omnisharp.json" = {
-    text = ''
-      {
-        "RoslynExtensionsOptions": {
-          "EnableAnalyzersSupport": true
-        }
-      }
-    '';
-  };
 }
diff --git a/home/editors/default.nix b/home/editors/default.nix
index 15d86d1..0b503f2 100644
--- a/home/editors/default.nix
+++ b/home/editors/default.nix
@@ -5,6 +5,7 @@
     ./neovim.nix
     ./emacs.nix
     ./vscode.nix
+    ./omnisharp.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home/editors/omnisharp.nix b/home/editors/omnisharp.nix
new file mode 100644
index 0000000..c14d405
--- /dev/null
+++ b/home/editors/omnisharp.nix
@@ -0,0 +1,30 @@
+{ config, pkgs, ... }:
+
+with pkgs;
+{
+  nixpkgs.overlays = [
+    (self: super: {
+      omnisharp-roslyn = super.omnisharp-roslyn.overrideAttrs (oldAttrs: rec {
+          version = "1.34.11";
+          src = fetchurl {
+            url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
+            sha256 = "0j55jrji7ya0pm91hfmyd9s6lkl35xbybr81a1gka90mlyp0gx63";
+          };
+      });
+    })
+  ];
+  
+  home.packages = [
+    omnisharp-roslyn
+  ];
+
+  home.file.".omnisharp/omnisharp.json" = {
+    text = ''
+      {
+        "RoslynExtensionsOptions": {
+          "EnableAnalyzersSupport": true
+        }
+      }
+    '';
+  };
+}