From 7603474dc496ea4541fe0b6c2ee497f502ba0e89 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Wed, 19 Jul 2023 21:50:11 -0400
Subject: [PATCH] Fix nix warnings

---
 nix/base-system/flake.nix |  5 +++--
 nix/base-system/init.lua  | 11 ++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 14027c6..ac56426 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -12,14 +12,13 @@
     jj-flake.url = "github:martinvonz/jj";
   };
   outputs = {
-    self,
-    nixpkgs,
     sile-flake,
     runwhen-flake,
     durnitisp-flake,
     rust-overlay-flake,
     jj-flake,
     agenix-flake,
+    ... # We don't use the self or nixpkgs args here so we just glob it.
   }: {
     systemModule = system: let
       runwhen = runwhen-flake.defaultPackage."${system}";
@@ -44,6 +43,7 @@
         environment.variables = {
           EDITOR="nvim";
           PAGER="less -R";
+		  OMNISHARP_BIN = "${pkgs.omnisharp-roslyn}/bin/run";
         };
 
         environment.etc."nvim.lua" = {
@@ -127,6 +127,7 @@
             rnix-lsp
             nil
             alloy6
+            omnisharp-roslyn
             (tlaplus.override {
               adoptopenjdk-bin = jdk;
             })
diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index 4524beb..6450f26 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -9,8 +9,14 @@ local lsconfig = require("lspconfig")
 -- Nix language server support
 lsconfig.nil_ls.setup{}
 
--- This needs a path to the omnisharp dll provided
-lsconfig.omnisharp.setup {}
+local vim_pid = vim.fn.pid()
+
+-- This needs a path to the omnisharp dll provided. We depend on the OMNISHARP_BIN environment variable being set to make this work.
+lsconfig.omnisharp.setup {
+    cmd = {
+        omnisharp_bin = { vim.env.OMNISHARP_BIN, '--languageserver', '--hostPID',  to_string(vim_pid) },
+    },
+}
 
 -- Java language server support
 lsconfig.java_language_server.setup{}
@@ -37,7 +43,6 @@ vim.api.nvim_create_autocmd('LspAttach', {
   end,
 })
 
-
 -- LSP Diagnostics Options Setup 
 local sign = function(opts)
   vim.fn.sign_define(opts.name, {