enable all features for cargo

It isnt quite ready for prime time yet. diagnostics
arent getting handled.

.luarc.json

@@ -0,0 +1,5 @@
+{
+    "diagnostics.disable": [
+        "missing-fields"
+    ]
+}

nix/base-system/.zshrc

@@ -1,3 +1,4 @@
+set -o vi
 export PROMPT='%F{green}[%T] %F{cyan}(%n@%m) %F{lightgrey}(%y) %F{cyan} %~
 %F{white}%(!.>>.$>) '
 

nix/base-system/flake.lock

@@ -512,9 +512,28 @@
         "nil-flake": "nil-flake",
         "nixpkgs": "nixpkgs_5",
         "nurl-flake": "nurl-flake",
+        "roslyn-lsp": "roslyn-lsp",
         "runwhen-flake": "runwhen-flake",
         "rust-overlay-flake": "rust-overlay-flake",
-        "sile-flake": "sile-flake"
+        "sile-flake": "sile-flake",
+        "treesitter-context": "treesitter-context"
+      }
+    },
+    "roslyn-lsp": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704752101,
+        "narHash": "sha256-eWKAdrKfuBqSoOW70BSqcANrGQ+NwbmCL8C1jLXdNt8=",
+        "owner": "zaphar",
+        "repo": "roslyn.nvim",
+        "rev": "f1301be34ff786036867137228f3d9f65a3434af",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zaphar",
+        "ref": "non_nightly",
+        "repo": "roslyn.nvim",
+        "type": "github"
       }
     },
     "runwhen-flake": {
@@ -689,6 +708,23 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "treesitter-context": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693236978,
+        "narHash": "sha256-B6BXeFEWxTFf46JrlatsxEQcC6+/hPIDBb5cIcJpLZg=",
+        "owner": "nvim-treesitter",
+        "repo": "nvim-treesitter-context",
+        "rev": "e6b743ccd4e780bc9cd85b707de67df72eea1a23",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-treesitter",
+        "repo": "nvim-treesitter-context",
+        "rev": "e6b743ccd4e780bc9cd85b707de67df72eea1a23",
+        "type": "github"
+      }
     }
   },
   "root": "root",

nix/base-system/flake.nix

@@ -23,6 +23,11 @@
         url = "github:nvim-treesitter/nvim-treesitter-context/e6b743ccd4e780bc9cd85b707de67df72eea1a23";
         flake = false;
     };
+    # We need to pin to this version of treesitter because it breaks after this revision
+    roslyn-lsp = {
+        url = "github:zaphar/roslyn.nvim/non_nightly";
+        flake = false;
+    };
   };
   outputs = {
     sile-flake,
@@ -35,6 +40,7 @@
     nurl-flake,
     harpoon-src,
     treesitter-context,
+    roslyn-lsp,
     nixpkgs,
     ... # We don't use the self or nixpkgs args here so we just glob it.
   }: {
@@ -44,41 +50,27 @@
     in
     { config, ...}: let
         pkgs = nixPkgs;
-		nvim-treesitter-csharp = pkgs.callPackage ./nvim-treesitter-csharp.nix {
-		    inherit (pkgs.tree-sitter) buildGrammar;
-			inherit (pkgs) fetchFromGitHub;
-		};
         possession-nvim = pkgs.callPackage ./possession-nvim.nix {
             inherit (pkgs.vimUtils) buildVimPlugin;
 			inherit (pkgs) fetchFromGitHub;
         };
         harpoon-nvim = pkgs.callPackage ./harpoon-nvim.nix {
-            inherit (pkgs.vimUtils) buildVimPluginFrom2Nix;
+            inherit (pkgs.vimUtils) buildVimPlugin;
 			harpoonSrc = harpoon-src;
         };
-        nvim-treesitter-context = pkgs.vimUtils.buildVimPluginFrom2Nix {
+        nvim-treesitter-context = pkgs.vimUtils.buildVimPlugin {
             name = "nvim-treesitter-context";
             src = treesitter-context;
         };
+        roslyn-nvim = pkgs.vimUtils.buildVimPlugin {
+            name = "roslyn-nvim";
+            src = roslyn-lsp;
+        };
         # TODO(jwall): When this actually builds we should use it.
 		#nvim-treesitter-powershell = pkgs.callPackage ./nvim-powershell.nix {
 		#    inherit (pkgs.tree-sitter) buildGrammar;
 		#	inherit (pkgs) fetchFromGitHub;
 		#};
-		expected-parsers = (pkgs.lib.attrVals [
-		  "tree-sitter-rust"
-          "tree-sitter-lua"
-          "tree-sitter-toml"
-          "tree-sitter-yaml"
-          "tree-sitter-json"
-          "tree-sitter-html"
-          "tree-sitter-css"
-          "tree-sitter-nix"
-          "tree-sitter-latex"
-          "tree-sitter-ocaml"
-          "tree-sitter-tlaplus"
-          "tree-sitter-julia"
-        ] pkgs.tree-sitter.builtGrammars) ++ [nvim-treesitter-csharp]; 
     in {
       imports = [
         ./program-neovim.nix
@@ -118,11 +110,36 @@ EOF";
                 #nvim-dap-ui
                 vimagit
                 hoon-vim
-                (nvim-treesitter.withPlugins (_: expected-parsers))
+                nvim-treesitter
+                roslyn-nvim
                 nvim-treesitter-context
+                nvim-treesitter-textobjects
 				nvim-treesitter-parsers.ini
+				nvim-treesitter-parsers.rust
+				nvim-treesitter-parsers.c
+				nvim-treesitter-parsers.c_sharp
+				nvim-treesitter-parsers.cpp
+				nvim-treesitter-parsers.clojure
+				nvim-treesitter-parsers.latex
 				nvim-treesitter-parsers.terraform
 				nvim-treesitter-parsers.hcl
+				nvim-treesitter-parsers.yaml
+				nvim-treesitter-parsers.lua
+				nvim-treesitter-parsers.vim
+				nvim-treesitter-parsers.go
+				nvim-treesitter-parsers.toml
+				nvim-treesitter-parsers.tlaplus
+				nvim-treesitter-parsers.typescript
+				nvim-treesitter-parsers.starlark
+				nvim-treesitter-parsers.python
+				nvim-treesitter-parsers.sql
+				nvim-treesitter-parsers.javascript
+				nvim-treesitter-parsers.ocaml
+				nvim-treesitter-parsers.haskell
+				nvim-treesitter-parsers.css
+				nvim-treesitter-parsers.promql
+				nvim-treesitter-parsers.nix
+				nvim-treesitter-parsers.hoon
                 omnisharp-extended-lsp-nvim
                 #neotest-dotnet
                 nix-develop-nvim
@@ -148,6 +165,7 @@ EOF";
             nil-pkg
 			lua-language-server
             rust-analyzer
+            omnisharp-roslyn
         ]);
       };
     };
@@ -180,22 +198,30 @@ EOF";
           source = ./init.lua;
         };
 
-        programs = with pkgs; {
+        programs = {
-          zsh.enable = true;  # default shell on catalina
+          zsh = {
+            enable = true;  # default shell on catalina
           # This is a total hack but we don't want the default clobbering it which it does if it's an empty string or null
-          zsh.promptInit = "#noop";
+            promptInit = "#noop";
-          zsh.interactiveShellInit = (builtins.readFile ./.zshrc);
+            interactiveShellInit = (builtins.readFile ./.zshrc);
+          };
+
+          tmux = {
+            enable = true;
+            enableVim = true;
+            extraConfig = (builtins.readFile ./tmux.conf);
+          };
         };
         environment.systemPackages = (with pkgs; [
             args.pkgs.isabelle
             args.pkgs.terraform # TODO(jeremy): Replace with opentofu when that is an option.
+            tmux-sessionizer
             consul
             consul-template
             nomad
             postgresql
             oha
             nodejs
-            tmux
             gnumake
             # TODO find a version of the julia package that will install
             # on darwin and add it as an overlay

nix/base-system/harpoon-nvim.nix

@@ -1,5 +1,5 @@
-{buildVimPluginFrom2Nix, harpoonSrc, ...}:
+{buildVimPlugin, harpoonSrc, ...}:
-buildVimPluginFrom2Nix {
+buildVimPlugin {
     name = "harpoon";
     src = harpoonSrc;
 }

nix/base-system/init.lua

@@ -111,8 +111,6 @@ cmp.setup({
 --vim.lsp.set_log_level('trace')
 --vim.lsp.log.set_format_func(vim.inspect)
 
-local roslyn_lsp_dll = vim.fs.normalize("~/bin/Microsoft.CodeAnalysis.LanguageServer.dll")
-
 local caps = vim.tbl_deep_extend(
     'force',
     vim.lsp.protocol.make_client_capabilities(),
@@ -122,6 +120,9 @@ local caps = vim.tbl_deep_extend(
     { workspace = { didChangeWatchedFiles = { dynamicRegistration = true } } },
     { window = { progress = false } }
 );
+
+vim.lsp.set_log_level(vim.log.levels.TRACE)
+
 local lspconfig = require("lspconfig")
 
 -- Terraform lsp setup
@@ -137,6 +138,14 @@ lspconfig.nil_ls.setup{
     capabilities = caps,
 }
 
+--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"
@@ -186,6 +195,12 @@ lspconfig.tsserver.setup{
 
 -- Rust language server support
 lspconfig.rust_analyzer.setup {
+    settings = {
+        -- https://github.com/rust-lang/rust-analyzer/blob/master/docs/user/generated_config.adoc
+      ['rust-analyzer'] = {
+        cargo = { features = "all" }
+      }
+    },
     capabilities = caps
 }
 
@@ -335,8 +350,8 @@ require('nvim-treesitter.configs').setup {
 
 require 'treesitter-context'.setup {
     enable = true,         -- Enable this plugin (Can be enabled/disabled later via commands)
-  max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
+    max_lines = 5,         -- How many lines the window should span. Values <= 0 mean no limit.
-  min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
+    min_window_height = 45, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
     line_numbers = true,
     multiline_threshold = 20, -- Maximum number of lines to collapse for a single context line
     trim_scope = 'outer',  -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
@@ -490,10 +505,8 @@ local harpoon = require('harpoon')
 
 harpoon:setup()
 
-vim.keymap.set("n", "<leader>ha", function() harpoon:list():append() end)
+-- telescope keymaps
-vim.keymap.set("n", "<leader>he", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+vim.keymap.set("n", "<Leader>pl", telescope.extensions.possession.list)
-
-vim.keymap.set("n", "<leader>pl", telescope.extensions.possession.list)
 vim.keymap.set("n", "<Leader>nff", telescope_builtins.fd)
 vim.keymap.set("n", "<Leader>rl", telescope_builtins.lsp_references)
 vim.keymap.set("n", "<Leader>rn", vim.lsp.buf.rename)
@@ -501,8 +514,17 @@ vim.keymap.set("n", "<Leader>sl", telescope_builtins.lsp_workspace_symbols)
 vim.keymap.set("n", "<Leader>dl", telescope_builtins.diagnostics)
 vim.keymap.set("n", "<Leader>rg", telescope_builtins.live_grep)
 vim.keymap.set("n", "<Leader>bl", function() telescope_builtins.buffers({}) end)
+
+-- harpoon keymaps
+vim.keymap.set("n", "<Leader>ha", function() harpoon:list():append() end)
+vim.keymap.set("n", "<Leader>he", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+vim.keymap.set("n", "<Leader>hj", function() harpoon:list():prev() end)
+vim.keymap.set("n", "<Leader>hk", function() harpoon:list():next() end)
+
+-- codelens keymaps
 vim.keymap.set("n", "<Leader>rr", vim.lsp.codelens.run)
 
+-- debugging DAP keymaps
 vim.keymap.set("n", "<Leader>tdb", function()
     vim.cmd("DBUIToggle")
 end)
@@ -544,4 +566,3 @@ dap.configurations.cs = {
         end,
     },
 }
-

nix/base-system/tmux.conf

@@ -17,7 +17,7 @@ set -g default-terminal "screen-256color"
 ### example of some useful key-bindings
 #bind-key "~" split-window "exec htop"
 
-bind-key "R" source-file ~/.tmux.conf
+bind-key C-c copy-mode
 #bind-key "a" select-window -l
 #bind-key "C-a" select-window -l
 

nix/darwin/darwin-configuration.nix

@@ -6,7 +6,8 @@
     # SEE: https://github.com/NixOS/nix/issues/4119#issuecomment-1734738812
     settings.sandbox = "relaxed";
     extraOptions = ''
-      experimental-features = nix-command flakes
+      experimental-features = nix-command flakes repl-flake
+      extra-platforms = x86_64-darwin aarch64-darwin x86_64-linux
     '';
   };
 
@@ -53,6 +54,9 @@
   # programs.bash.enable = true;  # default shell on catalina
   # programs.fish.enable = true;
 
+   system.defaults = {
+     finder.AppleShowAllExtensions = true;
+   };
    system.systemBuilderArgs = lib.mkIf (config.nix.settings.sandbox == "relaxed") {
       sandboxProfile = ''
         (allow file-read* file-write* process-exec mach-lookup (subpath "${builtins.storeDir}"))

nix/darwin/flake.lock

@@ -7,11 +7,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1690228878,
+        "lastModified": 1694793763,
-        "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
+        "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
+        "rev": "572baca9b0c592f71982fca0790db4ce311e3c75",
         "type": "github"
       },
       "original": {
@@ -29,6 +29,7 @@
         "nil-flake": "nil-flake",
         "nixpkgs": "nixpkgs_5",
         "nurl-flake": "nurl-flake",
+        "roslyn-lsp": "roslyn-lsp",
         "runwhen-flake": "runwhen-flake",
         "rust-overlay-flake": "rust-overlay-flake",
         "sile-flake": "sile-flake",
@@ -36,12 +37,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-h8APs3KV8oU8sWYFEpSpqFjqJ/QY2a2L90BDfad5VUo=",
+        "narHash": "sha256-Uat1zSsHZfJ0lf1Ya9aW8r0mjBNtbt8woaSmHNyDGRA=",
-        "path": "/nix/store/0jd7ginq0vz1gglni90j5bzj4bk4ly7q-source/nix/base-system",
+        "path": "/nix/store/4kzm062qwsfzq1vza029ic4lx9zpdy8p-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/0jd7ginq0vz1gglni90j5bzj4bk4ly7q-source/nix/base-system",
+        "path": "/nix/store/4kzm062qwsfzq1vza029ic4lx9zpdy8p-source/nix/base-system",
         "type": "path"
       }
     },
@@ -324,11 +325,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1693791390,
+        "lastModified": 1694797768,
-        "narHash": "sha256-FnT7/iDcGLWSmzwDfD7RQwr7z5+U2j7YOqhR3UM3zrg=",
+        "narHash": "sha256-CA9AQ+lvgbCOfH++A0rHKguTBBn0EEcVRLMAmkDecQo=",
         "owner": "martinvonz",
         "repo": "jj",
-        "rev": "e3c85d6ecc20ee4240cdf3ed80107ce7dc268abe",
+        "rev": "e288a152d052a531e0ccb25ae27ce07412d65447",
         "type": "github"
       },
       "original": {
@@ -549,11 +550,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1695751852,
+        "lastModified": 1701273941,
-        "narHash": "sha256-4jG+8LPHteAAEfUOtlwK0piK79fQsAMp/SA6Lpob+JQ=",
+        "narHash": "sha256-MwDKOU2JZRHObIJLFbge+XS3ov54dAlDGtzWPtq7/PE=",
         "owner": "nix-community",
         "repo": "nurl",
-        "rev": "715246bc9748cf196dafc7795812dec825e30b4b",
+        "rev": "caf9e815a036eec02eac877798ebc9b379adc810",
         "type": "github"
       },
       "original": {
@@ -568,6 +569,23 @@
         "darwin": "darwin_2"
       }
     },
+    "roslyn-lsp": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704752101,
+        "narHash": "sha256-eWKAdrKfuBqSoOW70BSqcANrGQ+NwbmCL8C1jLXdNt8=",
+        "owner": "zaphar",
+        "repo": "roslyn.nvim",
+        "rev": "f1301be34ff786036867137228f3d9f65a3434af",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zaphar",
+        "ref": "non_nightly",
+        "repo": "roslyn.nvim",
+        "type": "github"
+      }
+    },
     "runwhen-flake": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -624,11 +642,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693793487,
+        "lastModified": 1694743934,
-        "narHash": "sha256-MS6CDyAC0sJMTE/pRYlfrhBnhlAPvEo43ipwf5ZNzHg=",
+        "narHash": "sha256-4pn0x+OiOFWefBpgyufFVaAeG+LwfVUI/HMCma8xdHU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f179280eed5eb93759c94bf3231fbbda28f894b7",
+        "rev": "6a26dd6da9b4f28d9b4c397bd22b5df4bec8f78a",
         "type": "github"
       },
       "original": {
@@ -673,11 +691,11 @@
         "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1692759315,
+        "lastModified": 1694595810,
-        "narHash": "sha256-nRA6Oad/CwUdMXlHpv1wW1IY5Pp100BJvIscd1AlYbI=",
+        "narHash": "sha256-tqeteJwXs77NOoSw3jwQu4ImP8wH+omEwNq6MZycrDM=",
         "owner": "sile-typesetter",
         "repo": "sile",
-        "rev": "fa84d15c902df4859caff8af8325097022b62f3e",
+        "rev": "770d2b9f68297bb5e9ce75182bf6e57ae1cce3b9",
         "type": "github"
       },
       "original": {