dnvm: for dotnet

.bashrc

@@ -42,8 +42,10 @@ function re_source() {
 
 export PAGER="less -R"
 
-export PATH=/Users/jwall/.local/bin/luna-studio:$PATH
-
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+if [ -f "$HOME/Library/Application Support/dnvm/env" ]; then
+    . "$HOME/Library/Application Support/dnvm/env"
+fi

.profile

@@ -4,3 +4,7 @@ export PATH="/Users/jwall/Library/Application Support/edgedb/bin:$PATH"
 
 # added by Snowflake SnowSQL installer v1.2
 export PATH=/Applications/SnowSQL.app/Contents/MacOS:$PATH
+
+if [ -f "$HOME/Library/Application Support/dnvm/env" ]; then
+    . "$HOME/Library/Application Support/dnvm/env"
+fi

nix/base-system/.zshrc

@@ -9,4 +9,6 @@ bindkey '^R' history-incremental-search-backward
 [[ ! -r ~/.opam/opam-init/init.zsh ]] || source ~/.opam/opam-init/init.zsh  > /dev/null 2> /dev/null
 
 # dotnet stuff
-[[ ! -d /usr/local/share/dotnet ]] || DOTNET_ROOT=/usr/local/share/dotnet PATH=$PATH:/usr/local/share/dotnet 
+if [ -f "$HOME/Library/Application Support/dnvm/env" ]; then
+    . "$HOME/Library/Application Support/dnvm/env"
+fi

nix/base-system/flake.nix

@@ -40,6 +40,7 @@
     };
     roslyn-lsp = {
         url = "github:zaphar/roslyn.nvim/non_nightly";
+        #url = "github:jmederosalvarado/roslyn.nvim";
         flake = false;
     };
     heracles-flake.url = "github:zaphar/Heracles";
@@ -297,6 +298,7 @@ EOF";
             mkcert
             kubo
             #dotnet-sdk_7
+            #dotnet-sdk_8
             #netcoredbg
             powershell
             unstablePkgs.ocaml

nix/base-system/init.lua

@@ -136,45 +136,45 @@ lspconfig.nil_ls.setup {
     capabilities = caps,
 }
 
---require('roslyn').setup({
---    on_attach = function (client, _)
---        --vim.notify(vim.inspect(client))
---    end,
---    capabilities = caps,
---    log_level = "Trace",
---});
+require('roslyn').setup({
+    on_attach = function (client, _)
+        --vim.notify(vim.inspect(client))
+    end,
+    capabilities = caps,
+    log_level = "Trace",
+});
 
 local vim_pid = vim.fn.getpid()
 
 -- "FormatterOptions:EnableEditorConfigSupport=true"
-local omnisharp_cmd = { 'omnisharp', '--languageserver', '-v', '--hostPID', tostring(vim_pid), }
+--local omnisharp_cmd = { 'omnisharp', '--languageserver', '-v', '--hostPID', tostring(vim_pid), }
 
 local function toSnakeCase(str)
     return string.gsub(str, "%s*[- ]%s*", "_")
 end
 
-lspconfig.omnisharp.setup {
-    cmd = omnisharp_cmd,
-    enable_roslyn_analyzers = true,
-    enable_editorconfig_support = true,
-    enable_import_completion = true,
-    -- Omnisharp has issues with the semanticTokens feature we need to massage it a bit.
-    on_attach = function(client, bufnr)
-        -- https://github.com/OmniSharp/omnisharp-roslyn/issues/2483#issuecomment-1492605642
-        local tokenModifiers = client.server_capabilities.semanticTokensProvider.legend.tokenModifiers
-        for i, v in ipairs(tokenModifiers) do
-            tokenModifiers[i] = toSnakeCase(v)
-        end
-        local tokenTypes = client.server_capabilities.semanticTokensProvider.legend.tokenTypes
-        for i, v in ipairs(tokenTypes) do
-            tokenTypes[i] = toSnakeCase(v)
-        end
-    end,
-    handlers = {
-        ["textDocument/definition"] = require('omnisharp_extended').handler,
-    },
-    capabilities = caps,
-}
+--lspconfig.omnisharp.setup {
+--    cmd = omnisharp_cmd,
+--    enable_roslyn_analyzers = true,
+--    enable_editorconfig_support = true,
+--    enable_import_completion = true,
+--    -- Omnisharp has issues with the semanticTokens feature we need to massage it a bit.
+--    on_attach = function(client, bufnr)
+--        -- https://github.com/OmniSharp/omnisharp-roslyn/issues/2483#issuecomment-1492605642
+--        local tokenModifiers = client.server_capabilities.semanticTokensProvider.legend.tokenModifiers
+--        for i, v in ipairs(tokenModifiers) do
+--            tokenModifiers[i] = toSnakeCase(v)
+--        end
+--        local tokenTypes = client.server_capabilities.semanticTokensProvider.legend.tokenTypes
+--        for i, v in ipairs(tokenTypes) do
+--            tokenTypes[i] = toSnakeCase(v)
+--        end
+--    end,
+--    handlers = {
+--        ["textDocument/definition"] = require('omnisharp_extended').handler,
+--    },
+--    capabilities = caps,
+--}
 
 --ocaml
 lspconfig.ocamllsp.setup {

nix/base-system/modules/darwin-monitor.nix

@@ -26,7 +26,7 @@ with lib;
     };
     
     options.services.durnitisp = {
-        enable = mkEnableOption "Enable the heracles server";
+        enable = mkEnableOption "Enable the durnitisp server";
         listen = mkOption {
             description = "[host]:port to listen on for the durnitisp metrics server";
             default = "localhost:9002";
@@ -138,7 +138,11 @@ with lib;
                     "--listenHost=${config.services.durnitisp.listen}"
                 ];
 
-                KeepAlive = true;
+                KeepAlive = {
+                    NetworkState = true;
+                };
+                #StandardOutPath = "/var/log/durnitisp.log";
+                #StandardErrorPath = "var/log/durnitisp.err.log";
                 RunAtLoad = true;
             };
         };