wip: claude code and avante

This may be a mistake. We'll see.

.hammerspoon/.mjolnir

@@ -1 +0,0 @@
-C:/Users/jwall/.mjolnir

.hammerspoon/init.lua

@@ -1,133 +0,0 @@
-local mash = {"cmd", "alt", "ctrl"}
-
-hs.hotkey.bind(mash, "R", function() mjolnir.reload() end)
-
--- Make the window fullscreen
-hs.hotkey.bind(mash, "F", function()
-  local win = hs.window.focusedWindow()
-  if win then win:maximize() end
-end)
-
--- Move the window to the right 5 pixels
-hs.hotkey.bind(mash, "L", function()
-  local win = hs.window.focusedWindow()
-  local screen = win:screen()
-  local scrfrm = screen:frame()
-  if win then
-     f = win:frame()
-     local nx = f.x + 5
-     if (f.w + nx) <= scrfrm.w then
-        f.x = nx
-        win:setFrame(f)
-     else
-        f.x = scrfrm.w
-     end
-  end
-end)
-
--- Move the window to the left 5 pixels
-hs.hotkey.bind(mash, "H", function()
-  local win = hs.window.focusedWindow()
-  local screen = win:screen()
-  local scrfrm = screen:frame()
-  if win then
-     f = win:frame()
-     local nx = f.x - 5
-     if nx >= scrfrm.x then
-        f.x = nx
-        win:setFrame(f)
-     else
-        f.x = scrfrm.x
-     end
-  end
-end)
-
--- Move the window down 5 pixels
-hs.hotkey.bind(mash, "J", function()
-  local win = hs.window.focusedWindow()
-  local screen = win:screen()
-  local scrfrm = screen:frame()
-  if win then
-     f = win:frame()
-     local ny = f.y + 5
-     if (ny + f.h) <= scrfrm.h then
-        f.y = ny
-        win:setFrame(f)
-     else
-        f.y = scrfrm.h
-     end
-  end
-end)
-
--- Move the window up 5 pixels
-hs.hotkey.bind(mash, "K", function()
-  local win = hs.window.focusedWindow()
-  local screen = win:screen()
-  local scrfrm = screen:frame()
-  if win then
-     f = win:frame()
-     local ny = f.y - 5
-     if ny >= scrfrm.y then
-        f.y = ny
-        win:setFrame(f)
-     else
-        f.y = scrfrm.y
-     end
-  end
-end)
-
--- Center the window
-hs.hotkey.bind(mash, "C", function()
-    local win = hs.window.focusedWindow()
-    if win then
-       win:centerOnScreen()
-    end
-end)
-
--- Move window all the way to the up
-hs.hotkey.bind(mash, "up", function()
-    local win = hs.window.focusedWindow()
-    local screen = win:screen()
-    local scrfrm = screen:frame()
-    if win then
-       f = win:frame()
-       f.y = 0
-       win:setFrame(f)
-    end
-end)
-
--- Move window all the way to the left
-hs.hotkey.bind(mash, "left", function()
-    local win = hs.window.focusedWindow()
-    local screen = win:screen()
-    local scrfrm = screen:frame()
-    if win then
-       f = win:frame()
-       f.x = 0
-       win:setFrame(f)
-    end
-end)
-
--- Move window all the way to the down
-hs.hotkey.bind(mash, "down", function()
-    local win = hs.window.focusedWindow()
-    local screen = win:screen()
-    local scrfrm = screen:frame()
-    if win then
-       f = win:frame()
-       f.y = scrfrm.h - f.h
-       win:setFrame(f)
-    end
-end)
-
--- Move window all the way to the right
-hs.hotkey.bind(mash, "right", function()
-    local win = hs.window.focusedWindow()
-    local screen = win:screen()
-    local scrfrm = screen:frame()
-    if win then
-       f = win:frame()
-       f.x = scrfrm.w - f.w
-       win:setFrame(f)
-    end
-end)

.luarc.json

@@ -1,5 +1,11 @@
 {
     "diagnostics.disable": [
         "missing-fields"
+    ],
+    "diagnostics.globals": [
+        "vim",
+        "make_avante_system_prompt",
+        "update_avante_system_prompt",
+        "get_server_list_prompt"
     ]
 }

Makefile

@@ -1,10 +1,5 @@
 %-darwin:
-	darwin-rebuild --flake ./nix/base-system $*
+	sudo darwin-rebuild --flake ./nix/base-system $*
 
-update-quint-%:
-	curl curl https://raw.githubusercontent.com/informalsystems/quint/$*/quint/package.json > nix/packages/quint/package.json 
-	cd nix/packages/quint; nix run "nixpkgs#node2nix" -- -18
-	#pactch the default.nix
-	sed -e 's#inherit nodeEnv;#inherit nodeEnv quint-src;#' -e 's/, system/, quint-src, system/' -i '' nix/packages/quint/default.nix
-	sed -e 's#src = \./\.#src = "$${quint-src}/quint"#' -e 's#nodeEnv, #quint-src, nodeEnv, #' -i '' nix/packages/quint/node-packages.nix
-	rm -f nix/packages/quint/package.json
+update-input-%:
+	nix flake update $* ./nix/base-system/

nix/base-system/darwin-configuration.nix

@@ -6,10 +6,11 @@ in
 
   nix = {
     package = pkgs.nix;
+    enable = true;
     # SEE: https://github.com/NixOS/nix/issues/4119#issuecomment-1734738812
     settings.sandbox = "relaxed";
     extraOptions = ''
-      experimental-features = nix-command flakes repl-flake
+      experimental-features = nix-command flakes
       extra-platforms = x86_64-darwin aarch64-darwin x86_64-linux
       trusted-users = root zaphar
     '';
@@ -44,6 +45,11 @@ in
   #  };
   #};
 
+  services.ollama = {
+    enable = true;
+    user="zaphar";
+  };
+  services.my-lorri.enable = true;
   services.durnitisp.enable = true;
   services.node-exporter.enable = true;
   services.prometheus.enable = true;
@@ -342,9 +348,6 @@ in
     vfkit
   ];
 
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-
   #services.spacebar.enable = true;
   #services.spacebar.package = "${pkgs.spacebar}";
 
@@ -360,6 +363,7 @@ in
         (allow file-read* file-write* process-exec mach-lookup (subpath "${builtins.storeDir}"))
       '';
     };
+    system.primaryUser = "zaphar";
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog
   system.stateVersion = 4;

nix/base-system/flake.nix

@@ -1,18 +1,19 @@
 {
   inputs = {
     # Default to sane nixpkgs versions
-    nixpkgs.url = "github:nixos/nixpkgs/24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/release-25.05";
     unstable.url = "nixpkgs";
-    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin";
+    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin";
     #lean4-flake = { 
     #  url = "github:leanprover/lean4/v4.4.0";
     #  inputs.nixpkgs.follows = "nixpkgs";
     #};
     darwin = {
-      url = "github:lnl7/nix-darwin";
+      url = "github:lnl7/nix-darwin/nix-darwin-25.05";
       # ensure that darwinSystem uses our nixpkgs version
       inputs.nixpkgs.follows = "nixpkgs-darwin";
     };
+    sheetsui-flake.url = "github:zaphar/sheetsui";
     sile-flake.url = "github:sile-typesetter/sile";
     durnitisp-flake.url = "github:zaphar/durnitisp";
     runwhen-flake.url = "github:zaphar/runwhen";
@@ -30,15 +31,15 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    neovim-flake = {
-        url = "github:neovim/neovim/stable?dir=contrib";
-        # NOTE(jeremy): Currently this needs a newer nixpkgs version
-        #inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    harpoon-src = {
-        url = "github:ThePrimeagen/harpoon/harpoon2";
-        flake = false;
+    #neovim-flake = {
+    #    url = "github:neovim/neovim/stable?dir=contrib";
+    #    # NOTE(jeremy): Currently this needs a newer nixpkgs version
+    #    #inputs.nixpkgs.follows = "nixpkgs";
+    #};
+    jujutsu-flake.url = "github:martinvonz/jj";
+    custom-flakes = {
+        url = "github:zaphar/nix-flakes";
+        inputs.nixpkgs.follows = "nixpkgs";
     };
     neogit-src = {
         url = "github:NeogitOrg/neogit";
@@ -48,82 +49,61 @@
         url = "github:terrastruct/d2-vim";
         flake = false;
     };
-    # We need to pin to this version of treesitter because it breaks after this revision
-    treesitter-context = {
-        url = "github:nvim-treesitter/nvim-treesitter-context/e6b743ccd4e780bc9cd85b707de67df72eea1a23";
-        flake = false;
-    };
     roslyn-lsp = {
         url = "github:zaphar/roslyn.nvim/main";
         flake = false;
     };
     heracles-flake.url = "github:zaphar/Heracles";
-    quint-src = {
-        url = "github:informalsystems/quint/v0.21.1";
-        flake = false;
-    };
+    mcphub-flake.url = "github:ravitemer/mcphub.nvim/v5.0.1";
   };
 
   outputs = {
     darwin,
     sile-flake,
+    jujutsu-flake,
     runwhen-flake,
     durnitisp-flake,
     rust-overlay-flake,
     agenix-flake,
     nil-flake,
     nurl-flake,
-    harpoon-src,
-    neogit-src,
-    d2-vim-src,
-    treesitter-context,
-    roslyn-lsp,
-    #lean4-flake,
+    custom-flakes,
     unstable,
     heracles-flake,
-    neovim-flake,
     clio-flake,
-    quint-src,
+    sheetsui-flake,
+    mcphub-flake,
     ... # We don't use the self or nixpkgs args here so we just glob it.
   }: 
   rec {
     vimModule = system: let
       nil-pkg = nil-flake.packages."${system}".default;
+      mcp-hub-binary = custom-flakes.packages."${system}".mcp-hub;
+      claude-code-binary = custom-flakes.packages."${system}".claude-code;
     in
     { config, pkgs, ...}: let
-        possession-nvim = pkgs.callPackage ./possession-nvim.nix {
-            inherit (pkgs.vimUtils) buildVimPlugin;
-			inherit (pkgs) fetchFromGitHub;
-        };
-        harpoon-nvim = pkgs.vimUtils.buildVimPlugin {
-          pname = "harpoon";
-          version = "2024-01-28";
-          src = harpoon-src;
-        };
-        neogit-nvim = pkgs.vimUtils.buildVimPlugin {
-          pname = "neogit";
-          version = "2024-05-16";
-          src = neogit-src;
-        };
-        d2-vim =  pkgs.vimUtils.buildVimPlugin {
-          pname = "d2-nvim";
-          version = "2024-01-28";
-          src = d2-vim-src;
-        };
-        nvim-treesitter-context = pkgs.vimUtils.buildVimPlugin {
-            name = "nvim-treesitter-context";
-            src = treesitter-context;
-        };
-        roslyn-nvim = pkgs.vimUtils.buildVimPlugin {
-            name = "roslyn-nvim";
-            src = roslyn-lsp;
-        };
-        nvim = neovim-flake.packages."${system}".neovim;
+        unstablePkgs = import unstable { inherit system; };
+        neogit-nvim = custom-flakes.packages."${system}".neogit-nvim;
+        d2-vim = custom-flakes.packages."${system}".d2-vim;
+        hunk-nvim = custom-flakes.packages."${system}".hunk-nvim;
+        # TODO(zaphar): Apparently this is a remote plugin so it needs some additional love.
+        #nvim-bnf = custom-flakes.packages."${system}".nvim-bnf;
+        roslyn-nvim = custom-flakes.packages."${system}".roslyn-nvim;
+        ionide-nvim = custom-flakes.packages."${system}".ionide-nvim;
+        claude-code-nvim = custom-flakes.packages."${system}".claude-code-nvim;
+        # TODO(zaphar): Until nixpkgs update to a newer version of tree-sitter the queries will be wrong
+        # for csharp
+        #tree-sitter-csharp = pkgs.callPackage ./nvim-treesitter-csharp.nix {
+        #  inherit (pkgs.neovimUtils) grammarToPlugin;
+		    #  inherit (pkgs.tree-sitter) buildGrammar;
+			  #  inherit (pkgs) fetchFromGitHub;
+        #};
         # 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;
-		#};
+		    #nvim-treesitter-powershell = pkgs.callPackage ./nvim-powershell.nix {
+		    #    inherit (pkgs.tree-sitter) buildGrammar;
+		    #	inherit (pkgs) fetchFromGitHub;
+		    #};
+        mcphub-nvim = mcphub-flake.packages."${system}".default;
     in {
       imports = [
         ./program-neovim.nix
@@ -137,96 +117,117 @@
      
         nixpkgs.overlays = [
             (final: prev: {
-                custom-neovim = nvim;
+                lorri = unstablePkgs.lorri;
             })
         ];
-        programs = with pkgs; {
+        programs = with unstablePkgs; {
           neovim.enable = true;
           neovim.vimAlias = true;
           neovim.viAlias = true;
-          neovim.package = pkgs.custom-neovim;
+          neovim.package = unstablePkgs.neovim-unwrapped;
           neovim.configure = {
-            customRC = "lua << EOF
+          customRC = "lua << EOF
 ${builtins.readFile ./init.lua}
 EOF";
-            packages.myVimPackage = {
-              start = (with pkgs.vimPlugins; [
-                vim-sile
-                nvim-tree-lua
-                nvim-lspconfig
-                packer-nvim
-                vim-ps1
-                vim-lsp
-                vim-vsnip
-                nvim-cmp
-                cmp-nvim-lua
-                cmp-nvim-lsp
-                cmp-vsnip
-                cmp-buffer
-                cmp-path
-                cmp-nvim-lsp-signature-help
-                nvim-dap # Debug Adapter Protocol support
-                #nvim-dap-ui
-                hoon-vim
-                nvim-treesitter
-                lean-nvim
-                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
-				nvim-treesitter-parsers.c_sharp
-                omnisharp-extended-lsp-nvim
-                #neotest-dotnet
-                nix-develop-nvim
-                trouble-nvim
-                nightfox-nvim
-                melange-nvim
-                telescope-nvim
-                telescope-lsp-handlers-nvim
-                plenary-nvim
-                vim-dadbod
-                vim-dadbod-ui
-                vim-dadbod-completion
-                vim-dasht
-              ]) ++ [ possession-nvim harpoon-nvim d2-vim neogit-nvim ];
-            };
+          packages.myVimPackage = {
+            start = (with pkgs.vimPlugins; [
+              copilot-lua
+              avante-nvim
+              vim-sile
+              nvim-tree-lua
+              nvim-lspconfig
+              packer-nvim
+              vim-ps1
+              vim-lsp
+              vim-vsnip
+              nvim-cmp
+              cmp-nvim-lua
+              cmp-nvim-lsp
+              cmp-vsnip
+              cmp-buffer
+              cmp-path
+              cmp-nvim-lsp-signature-help
+              nvim-dap # Debug Adapter Protocol support
+              #nvim-dap-ui
+              hoon-vim
+              nvim-treesitter
+              lualine-nvim
+              lualine-lsp-progress
+              lean-nvim
+              roslyn-nvim
+              ionide-nvim # Fsharp lsp support
+              nvim-treesitter-context
+              nvim-treesitter-textobjects
+				      nvim-treesitter-parsers.ini
+				      nvim-treesitter-parsers.ebnf
+				      nvim-treesitter-parsers.rust
+				      nvim-treesitter-parsers.c
+				      #nvim-treesitter-parsers.c_sharp # currently broken for some reason
+				      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.zig
+				      nvim-treesitter-parsers.hoon
+              #omnisharp-extended-lsp-nvim
+              #neotest-dotnet
+              nix-develop-nvim
+              trouble-nvim
+              nightfox-nvim
+              melange-nvim
+              telescope-nvim
+              telescope-lsp-handlers-nvim
+              plenary-nvim
+              vim-dadbod
+              vim-dadbod-ui
+              vim-dadbod-completion
+              vim-dasht
+              direnv-vim
+              mcphub-nvim
+              claude-code-nvim
+            ]) ++ [
+              d2-vim
+              hunk-nvim
+              neogit-nvim
+              # tree-sitter-csharp.neovim-plugin # Until nixpkgs updates their nvim-treesitter config the csharp queries will be broken
+            ];
+          };
           };
         };
         environment.systemPackages = (with pkgs; [
             terraform-ls
+            tinymist
             nodePackages.typescript-language-server
             nodePackages.jsdoc
             # TODO find a version of the julia package that will install
             # on darwin and add it as an overlay
             nil-pkg
-			lua-language-server
+			      lua-language-server
             rust-analyzer
             dasht
+            direnv
+            lorri
+            devenv
+            unstablePkgs.fq
+            mcp-hub-binary
+            claude-code-binary
         ]);
       };
     };
@@ -235,10 +236,12 @@ EOF";
       durnitisp = durnitisp-flake.defaultPackage."${system}";
       rust-overlay = rust-overlay-flake.overlays.default;
       sile = sile-flake.defaultPackage.${system};
+      jujutsu = jujutsu-flake.packages.${system}.jujutsu;
       age = agenix-flake.packages."${system}".default;
       nurl = nurl-flake.packages."${system}".default;
       clio = clio-flake.packages."${system}".default;
       unstablePkgs = import unstable { inherit system; };
+      sheetsui = sheetsui-flake.packages."${system}".default;
       #lean4Pkg = lean4-flake.defaultPackage."${system}";
     in { config, pkgs, ... }: {
       
@@ -263,7 +266,10 @@ EOF";
             gnumeric = prev.gnumeric.overrideAttrs(oldAttrs: {
                 meta.broken = false;
             });
-            quint = (pkgs.callPackage ../packages/quint/default.nix { inherit quint-src; }).package;
+            uv = unstablePkgs.uv;
+            quint = (pkgs.callPackage ../packages/quint/default.nix {})."@informalsystems/quint";
+            quint-lsp = (pkgs.callPackage ../packages/quint/default.nix {})."@informalsystems/quint-language-server";
+            ollama = unstablePkgs.ollama;
           })
           rust-overlay
         ];
@@ -280,7 +286,7 @@ EOF";
             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
             promptInit = "#noop";
-            interactiveShellInit = (builtins.readFile ./.zshrc);
+            interactiveShellInit = (builtins.readFile ./zshrc);
           };
 
           tmux = {
@@ -290,19 +296,17 @@ EOF";
           };
         };
         environment.systemPackages = (with pkgs; [
-            isabelle
+            sheetsui
             lean4
             quint
+            quint-lsp
             terraform # TODO(jeremy): Replace with opentofu when that is an option.
-            nomad
             oha
             nodejs
             gnumake
             # TODO(zaphar): find a version of the julia package that will install
             # on darwin and add it as an overlay
-            python310
-            python310Packages.pip
-            python310Packages.virtualenv
+            uv
             emacs
             git
             mercurial
@@ -349,6 +353,8 @@ EOF";
             victoriametrics
             # TODO add sonic-pi here if it supports the arch
             unstablePkgs.dbeaver-bin
+            postgresql
+            unstablePkgs.ollama
         ])
         #++ (with pkgs.ocamlPackages; [
         #    dune_3
@@ -363,6 +369,7 @@ EOF";
             durnitisp
             age
             nurl
+            jujutsu
         ];
       };
     };
@@ -375,6 +382,8 @@ EOF";
         ./modules/darwin-monitor.nix
         ./modules/victoria-logs.nix
         ./modules/vector.nix
+        ./modules/lorri.nix
+        ./modules/ollama.nix
         ./darwin-configuration.nix
       ];
     };

nix/base-system/init.lua

@@ -16,6 +16,14 @@ vim.opt.mouse = ""
 vim.opt.tabstop = 4
 vim.opt.shiftwidth = 4
 --vim.opt.smarttab = false
+vim.opt.fileformats = "unix,dos"
+-- Recommended by Avante docs
+-- views can only be fully collapsed with the global statusline
+vim.opt.laststatus = 3
+-- formatexpr defaulted to the lsp provider by default recently
+-- which breaks `gq` and company paragraph formatting in non lsp
+-- contexts.
+vim.opt.formatexpr = ""
 
 vim.g.BASH_AuthorName = 'Jeremy Wall'
 vim.g.BASH_AuthorRef = 'jw'
@@ -28,6 +36,34 @@ vim.cmd("noswapfile")
 vim.cmd("syntax on")
 vim.cmd("filetype plugin on")
 
+vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
+    pattern = { "*.qnt" },
+    callback = function(args)
+        vim.lsp.start({
+            name = 'quint',
+            cmd = { 'quint-language-server', '--stdio' },
+            root_dir = vim.fs.dirname(vim.uri_from_bufnr(args.buf))
+        })
+    end,
+})
+
+vim.api.nvim_create_autocmd({ "BufNewfile", "BufRead" }, {
+    callback = function(args)
+        -- If treesitter supports this filetype then use the treesitter fold expression
+        local ft = vim.bo.filetype
+        if ft and ft ~= "" then
+            -- Safely check if a parser exists for this filetype
+            local has_parser = pcall(function() return vim.treesitter.language.inspect(ft) end)
+            if has_parser then
+                vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+                vim.wo.foldmethod = 'expr'
+                vim.wo.foldlevel = 10
+            end
+        end
+    end,
+})
+
+
 vim.cmd([[
 au BufNewFile,BufRead *Makefile,*.mk set noexpandtab
 ]])
@@ -60,6 +96,14 @@ vim.cmd([[
 au BufNewFile,BufRead *.hrl filetype indent off
 ]])
 
+vim.cmd([[
+au BufNewFile,BufRead *.nix set tabstop=2 nosmarttab
+]])
+
+vim.cmd([[
+au BufNewFile,BufRead *.ebnf set filetype=ebnf
+]])
+
 
 -- Telelscope Imports
 local telescope = require('telescope')
@@ -124,21 +168,30 @@ local caps = vim.tbl_deep_extend(
 
 local lspconfig = require("lspconfig")
 
+local configure_lsp = function(name, config)
+    vim.lsp.enable(name)
+    vim.lsp.config(name, config)
+end
+
+-- Typst
+configure_lsp('tinymist', {
+    capabilities = caps,
+    settings = {
+        exportPdf = "onSave",
+    },
+})
+
 -- Terraform lsp setup
-lspconfig.terraformls.setup {}
+configure_lsp('terraformls', {})
 
 -- Nix language server support
-lspconfig.nil_ls.setup {
-    --single_file_support = true,
-    --on_attach = function(client, bufnr)
-    --    -- disable the semanticTokens because it has issues.
-    --    -- client.server_capabilities.semanticTokensProvider = nil
-    --end,
+configure_lsp('nil_ls', {
     capabilities = caps,
-}
+})
 
 require('roslyn').setup({
-    on_attach = function (client, _)
+    --                    client, bufnr
+    on_attach = function(_, _)
         --vim.notify(vim.inspect(client))
     end,
     sdk_framework = "net8.0",
@@ -146,55 +199,14 @@ require('roslyn').setup({
     log_level = "Trace",
 });
 
-local vim_pid = vim.fn.getpid()
-
--- "FormatterOptions:EnableEditorConfigSupport=true"
---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,
---}
-
---ocaml
-lspconfig.ocamllsp.setup {
-    capabilities = caps
-}
-
--- Java language server support
-lspconfig.java_language_server.setup {
-    capabilities = caps
-}
-
 -- Typescript language server support
-lspconfig.tsserver.setup {
+configure_lsp('tsserver', {
+    cmd = { 'typescript-language-server', '--stdio' },
     capabilities = caps
-}
+})
 
 -- Rust language server support
-lspconfig.rust_analyzer.setup {
+configure_lsp('rust_analyzer', {
     settings = {
         -- https://github.com/rust-lang/rust-analyzer/blob/master/docs/user/generated_config.adoc
         ['rust-analyzer'] = {
@@ -202,10 +214,11 @@ lspconfig.rust_analyzer.setup {
         }
     },
     capabilities = caps
-}
+})
 
 -- lua language server setup.
-lspconfig.lua_ls.setup {
+configure_lsp('lua_ls', {
+    cmd = { 'lua-language-server' },
     settings = {
         Lua = {
             runtime = { version = 'LuaJIT', },
@@ -225,7 +238,13 @@ lspconfig.lua_ls.setup {
         },
     },
     capabilities = caps
-}
+})
+
+configure_lsp('ty', {
+  cmd = { 'ty', 'server' },
+  filetypes = { 'python' },
+  root_markers = { 'ty.toml', 'pyproject.toml', '.git' },
+})
 
 -- lsp configuration
 vim.api.nvim_create_autocmd('LspAttach', {
@@ -237,18 +256,22 @@ vim.api.nvim_create_autocmd('LspAttach', {
         vim.keymap.set({ "n", "v" }, "<Leader>a", vim.lsp.buf.code_action, opts)
         vim.keymap.set("n", "<Leader>f", vim.lsp.buf.format, opts)
         local client = vim.lsp.get_client_by_id(args.data.client_id)
----@diagnostic disable-next-line: undefined-field
+        ---@diagnostic disable-next-line: undefined-field
         if client and client.server_capabilities.codelens then
             vim.lsp.codelens.refresh()
         end
+        -- formatexpr defaulted to the lsp provider by default recently
+        -- which breaks `gq` and company paragraph formatting in non lsp
+        -- contexts.
+        vim.bo[args.buf].formatexpr = ""
     end,
 })
 
 vim.api.nvim_create_autocmd({ 'BufEnter', 'InsertLeave', 'CursorHold' }, {
     callback = function(args)
-        local clients = vim.lsp.get_clients({bufnr=args.buf})
+        local clients = vim.lsp.get_clients({ bufnr = args.buf })
         for cid = 1, #clients do
----@diagnostic disable-next-line: undefined-field
+            ---@diagnostic disable-next-line: undefined-field
             if clients[cid].server_capabilities.codelens then
                 vim.lsp.codelens.refresh()
                 break
@@ -258,22 +281,8 @@ vim.api.nvim_create_autocmd({ 'BufEnter', 'InsertLeave', 'CursorHold' }, {
 })
 
 -- LSP Diagnostics Options Setup
-local sign = function(opts)
-    vim.fn.sign_define(opts.name, {
-        texthl = opts.name,
-        text = opts.text,
-        numhl = ''
-    })
-end
-
-sign({ name = 'DiagnosticSignError', text = '🔥' })
-sign({ name = 'DiagnosticSignWarn', text = '⚠️' })
-sign({ name = 'DiagnosticSignHint', text = '➡️' })
-sign({ name = 'DiagnosticSignInfo', text = '🗒️' })
-
 vim.diagnostic.config({
     virtual_text = false,
-    signs = true,
     update_in_insert = true,
     underline = true,
     severity_sort = false,
@@ -283,6 +292,14 @@ vim.diagnostic.config({
         header = '',
         prefix = '',
     },
+    signs = {
+        text =  {
+            [vim.diagnostic.severity.ERROR] = '🔥',
+            [vim.diagnostic.severity.WARN] = '⚠️',
+            [vim.diagnostic.severity.HINT] = '➡️',
+            [vim.diagnostic.severity.INFO] = '🗒️',
+        },
+    }
 })
 
 vim.cmd([[
@@ -323,31 +340,55 @@ require('nvim-treesitter.configs').setup {
         extended_mode = true,
         max_file_lines = nil,
     },
-    --textobjects = {
-    --  enable = true,
-    --  select = {
-    --    enable = true,
-    --    lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
-    --    keymaps = {
-    --      -- You can use the capture groups defined in textobjects.scm
-    --      ['aa'] = '@parameter.outer',
-    --      ['ia'] = '@parameter.inner',
-    --      ['af'] = '@function.outer',
-    --      ['if'] = '@function.inner',
-    --      ['ac'] = '@class.outer',
-    --      ['ic'] = '@class.inner',
-    --    },
-    --  },
-    --},
-    --incremental_selection = {
-    --  enable = true,
-    --  keymaps = {
-    --    init_selection = '<Leader>c',
-    --    node_incremental = '<Leader>c',
-    --    scope_incremental = '<Leader>ci',
-    --    node_decremental = '<Leader>cx',
-    --  },
-    --},
+    textobjects = {
+      move = {
+        enable = true,
+        set_jumps = true, -- whether to set jumps in the jumplist
+        goto_next_start = {
+          ["]m"] = "@function.outer",
+          ["]]"] = { query = "@class.outer", desc = "Next class start" },
+          --
+          -- You can use regex matching (i.e. lua pattern) and/or pass a list in a "query" key to group multiple queries.
+          ["]o"] = "@loop.*",
+          -- ["]o"] = { query = { "@loop.inner", "@loop.outer" } }
+          --
+          -- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
+          -- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
+          ["]s"] = { query = "@local.scope", query_group = "locals", desc = "Next scope" },
+          ["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
+        },
+        goto_next_end = {
+          ["]M"] = "@function.outer",
+          ["]["] = "@class.outer",
+        },
+        goto_previous_start = {
+          ["[m"] = "@function.outer",
+          ["[["] = "@class.outer",
+        },
+        goto_previous_end = {
+          ["[M"] = "@function.outer",
+          ["[]"] = "@class.outer",
+        },
+        -- Below will go to either the start or the end, whichever is closer.
+        -- Use if you want more granular movements
+        -- Make it even more gradual by adding multiple queries and regex.
+        goto_next = {
+          ["]d"] = "@conditional.outer",
+        },
+        goto_previous = {
+          ["[d"] = "@conditional.outer",
+        }
+      },
+    },
+    incremental_selection = {
+      enable = true,
+      keymaps = {
+        init_selection = '<Leader>c',
+        node_incremental = '<Leader>c',
+        scope_incremental = '<Leader>ci',
+        node_decremental = '<Leader>cx',
+      },
+    },
 }
 
 require 'treesitter-context'.setup {
@@ -470,33 +511,6 @@ vim.keymap.set("n", "<Leader>ga", function()
     vim.cmd("!git add %")
 end)
 
-require('possession').setup {
-    commands = {
-        save = 'SSave',
-        load = 'SLoad',
-        delete = 'SDelete',
-        list = 'SList',
-    },
-    autosave = {
-        current = true,
-        on_load = true,
-        on_quit = true,
-    },
-    telescope = {
-        list = {
-            default_action = 'load',
-            mappings = {
-                save = { n = '<c-x>', i = '<c-x>' },
-                load = { n = '<c-v>', i = '<c-v>' },
-                delete = { n = '<c-t>', i = '<c-t>' },
-                rename = { n = '<c-r>', i = '<c-r>' },
-            },
-        },
-    },
-}
-
-
-telescope.load_extension('possession')
 -- https://github.com/nvim-telescope/telescope.nvim
 telescope.setup({
     defaults = {
@@ -518,27 +532,24 @@ telescope.setup({
     },
 })
 
-local harpoon = require('harpoon')
-
-harpoon:setup()
 
 local lean = require 'lean'
 
 lean.setup {
     lsp = {
-        on_attach = function(client, bufnr)
+        --                    client, bufnr
+        on_attach = function(_, bufnr)
             local opts = { buffer = bufnr }
             vim.keymap.set({ "n", "v" }, "<Leader>ti", function() vim.cmd("LeanInfoviewToggle") end, opts)
             vim.keymap.set({ "n", "v" }, "<Leader>sg", function() vim.cmd("LeanGoal") end, opts)
             vim.keymap.set({ "n", "v" }, "<Leader>stg", function() vim.cmd("LeanTermGoal") end, opts)
-            vim.api.nvim_set_option_value('omnifunc', 'v:lua.vim.lsp.omnifunc', {scope = "local", buf=bufnr})
+            vim.api.nvim_set_option_value('omnifunc', 'v:lua.vim.lsp.omnifunc', { scope = "local", buf = bufnr })
         end
     },
     mappings = true,
 }
 
 -- telescope keymaps
-vim.keymap.set("n", "<Leader>pl", telescope.extensions.possession.list)
 -- TODO(zaphar): Remove this once my muscle memory has set in.
 vim.keymap.set("n", "<Leader>nff", telescope_builtins.fd)
 vim.keymap.set("n", "<Leader>ff", telescope_builtins.fd)
@@ -547,16 +558,13 @@ vim.keymap.set("n", "<Leader>rn", vim.lsp.buf.rename)
 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)
+vim.keymap.set("n", "<Leader>bl", function()
+    telescope_builtins.buffers({
+    })
+end)
 vim.keymap.set("n", "<leader>lds", telescope_builtins.lsp_document_symbols, { desc = "[D]ocument [S]ymbols" })
 vim.keymap.set("n", "<leader>lws", telescope_builtins.lsp_dynamic_workspace_symbols, { desc = "[W]orkspace [S]ymbols" })
 
--- 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)
@@ -566,6 +574,77 @@ vim.keymap.set("n", "<Leader>tdb", function()
     vim.cmd("DBUIToggle")
 end)
 
+require('lualine').setup {
+    icons_enabled = false,
+    disabled_filetypes = {
+        statusline = {},
+        winbar = {},
+    },
+    sections = {
+        -- left side
+        lualine_a = { 'mode' },
+        lualine_b = { 'filename' },
+        lualine_c = { 'encoding', 'fileformat', 'filetype' },
+        -- right side
+        lualine_x = { 'diagnostics' },
+        lualine_y = { 'progress', 'lsp_progress' },
+        lualine_z = { 'location' }
+    }
+}
+
+-- Hunk diff tree viewer and editor. Replacement for Meld and company
+local hunk = require("hunk")
+hunk.setup({
+    keys = {
+        global = {
+            quit = { "q" },
+            accept = { "<leader><Cr>" },
+            focus_tree = { "<leader>e" },
+        },
+
+        tree = {
+            expand_node = { "l", "<Right>" },
+            collapse_node = { "h", "<Left>" },
+
+            open_file = { "<Cr>" },
+
+            toggle_file = { "a" },
+        },
+
+        diff = {
+            toggle_line = { "a" },
+            toggle_hunk = { "A" },
+        },
+    },
+
+    ui = {
+        tree = {
+            -- Mode can either be `nested` or `flat`
+            mode = "nested",
+            width = 35,
+        },
+        --- Can be either `vertical` or `horizontal`
+        layout = "vertical",
+    },
+
+    icons = {
+        selected = "󰡖",
+        deselected = "",
+        partially_selected = "󰛲",
+
+        folder_open = "",
+        folder_closed = "",
+    },
+
+    -- Called right after each window and buffer are created.
+    --hooks = {
+    --  ---@param _context { buf: number, tree: NuiTree, opts: table }
+    --  on_tree_mount = function(_context) end,
+    --  ---@param _context { buf: number, win: number }
+    --  on_diff_mount = function(_context) end,
+    --},
+})
+
 local dap = require('dap')
 dap.adapters.lldb = {
     type = "executable",
@@ -603,3 +682,128 @@ dap.configurations.cs = {
         end,
     },
 }
+
+local mcphub = require("mcphub")
+
+mcphub.setup({
+    -- This sets vim.g.mcphub_auto_approve to false by default (can also be toggled from the HUB UI with `ga`)
+    config = vim.fn.expand("~/.config/mcphub/servers.json"),
+    auto_approve = true,
+    auto_toggle_mcp_servers = true, -- Let LLMs start and stop MCP servers automatically
+    extensions = {
+        avante = {
+            make_slash_commands = true, -- make /slash commands from MCP server prompts
+        },
+    },
+    cmd = "mcp-hub",
+})
+
+function get_server_list_prompt(hub_instance)
+    -- returns a list of mcp-servers with a `name` and a list of tools with `name`
+    local mcp_tool_prompt = "# MCP SERVERS\n\nThe Model Context Protocol (MCP) enables communication between the system and locally running MCP servers that provide additional tools and resources to extend your capabilities.\n\n# Connected MCP Servers\n\nWhen a server is connected, you can use the server's tools via the `use_mcp_tool` tool, and access the server's resources via the `access_mcp_resource` tool.\nNote: Server names are case sensitive and you should always use the exact full name like `Firecrawl MCP` or `src/user/main/time-mcp` etc\n\n"
+
+    if not hub_instance then
+        return ""
+    end
+
+    local servers = hub_instance:get_servers()
+    if not servers or #servers == 0 then
+        return ""
+    end
+
+    for _, server in ipairs(servers) do
+        mcp_tool_prompt = mcp_tool_prompt .. "## server name: `" .. server.name .. "`\n\n"
+
+        if server.capabilities and server.capabilities.tools and #server.capabilities.tools > 0 then
+            mcp_tool_prompt = mcp_tool_prompt .. "Available tools:\n\n"
+            for _, tool in ipairs(server.capabilities.tools) do
+                mcp_tool_prompt = mcp_tool_prompt .. "- tool name: `" .. tool.name .. "`\n"
+                if tool.description then
+                    mcp_tool_prompt = mcp_tool_prompt .. "  - Description: " .. tool.description .. "\n"
+                end
+            end
+            mcp_tool_prompt = mcp_tool_prompt .. "\n"
+        end
+    end
+
+    return mcp_tool_prompt
+end
+
+function make_avante_system_prompt(hub_instance)
+    return hub_instance and get_server_list_prompt(hub_instance) or ""
+end
+
+function update_avante_system_prompt()
+    local hub_instance = mcphub.get_hub_instance();
+    local system_prompt = make_avante_system_prompt(hub_instance)
+    if system_prompt then
+      require("avante.config").override({system_prompt = system_prompt})
+    end
+end
+
+vim.keymap.set("n", "<Leader>ab", function() require('avante').get().file_selector:add_buffer_files() end)
+vim.keymap.set("n", "<Leader>af", function() require('avante').get().file_selector:add_current_buffer() end)
+
+get_root_dir = function()
+    -- First try to get the root path from LSP
+    local bufnr = vim.api.nvim_get_current_buf()
+    local clients = vim.lsp.get_clients({ bufnr = bufnr })
+    
+    -- Check if we have an active LSP client with a root_dir
+    for _, client in ipairs(clients) do
+        if client.config and client.config.root_dir then
+            return client.config.root_dir
+        end
+    end
+    
+    -- Fall back to file-based detection
+    local root_file = vim.fs.find(function(name, path)
+        return name:match('(pyproject.toml|.sln|Cargo.toml|.git)$')
+    end, { upward = true })[1]
+    
+    return root_file and vim.fs.dirname(root_file) or vim.fn.getcwd()
+end
+
+require('copilot').setup({
+    root_dir = get_root_dir,
+})
+
+require('avante').setup({
+    provider = "claude",
+    mode = "planning",
+    cursor_applying_provider = nil, -- default to whatever provider is configured
+    claude = {
+        endpoint = "https://api.anthropic.com",
+        model = "claude-3-7-sonnet-20250219",
+        timeout = 30000, -- Timeout in milliseconds
+        temperature = 0,
+        max_tokens = 20480,
+    },
+    copilot = {
+        model = "claude-3.7-sonnet",
+    },
+    behavior = {
+        enable_cursor_planning_mode = true,
+    },
+    windows = {
+        ask = {
+            start_insert=false,
+            focus_on_apply="theirs",
+        },
+    },
+    system_prompt = make_avante_system_prompt(mcphub.get_hub_instance()),
+    custom_tools = { require("mcphub.extensions.avante").mcp_tool() },
+    -- Disable these because we'll use the mcphub versions instead
+    --disabled_tools = {
+    --    "list_files",    -- Built-in file operations
+    --    "search_files",
+    --    "read_file",
+    --    "create_file",
+    --    "rename_file",
+    --    "delete_file",
+    --    "create_dir",
+    --    "rename_dir",
+    --    "delete_dir",
+    --    "bash",         -- Built-in terminal access
+    --},
+})

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

@@ -15,8 +15,8 @@ let
                     -- \
                     ${pkgs.durnitisp}/bin/durnitisp \
                     --listenHost=${config.services.durnitisp.listen} \
-                    --stunHosts=stun.ekiga.net:3478,stun.schlund.de:3478,stun.voipbuster.com:3478,stun.voipstunt.com:3478,stun.xten.com:3478" \
-                    --pingHosts=google.com,prod.actual.battle.net"
+                    --stunHosts="stun.ekiga.net:3478,stun.schlund.de:3478,stun.voipbuster.com:3478,stun.voipstunt.com:3478,stun.xten.com:3478" \
+                    --pingHosts="google.com,prod.actual.battle.net"
     '';
 in
 {

nix/base-system/modules/lorri.nix

@@ -0,0 +1,26 @@
+{pkgs, lib, config, ...}:
+with lib;
+let
+    mkLauncher = import ../../packages/darwin-launcher.nix { inherit pkgs; };
+    lorriLauncher = mkLauncher ''
+                    source ${config.system.build.setEnvironment}
+                    exec ${pkgs.lorri}/bin/lorri daemon
+    '';
+in
+{
+    options.services.my-lorri = {
+        enable = mkEnableOption "Enable the lorri agent";
+    };
+
+    config = {
+        launchd.user.agents.lorri = mkIf config.services.my-lorri.enable {
+            serviceConfig = {
+                ProgramArguments = [
+                    "${lorriLauncher}"
+                ];
+                RunAtLoad = true;
+                KeepAlive = true;
+            };
+        };
+    };
+}

nix/base-system/modules/ollama.nix

@@ -0,0 +1,56 @@
+{pkgs, lib, config, ...}:
+with lib;
+let
+    mkLauncher = import ../../packages/darwin-launcher.nix { inherit pkgs; };
+    ollamaLauncher = mkLauncher ''
+                    exec ${pkgs.clio}/bin/clio \
+                    --out-path=${config.services.ollama.stdoutPath} \
+                    --err-path=${config.services.ollama.stdoutPath} \
+                    --pid-file=${config.services.ollama.pidPath} \
+                    --paranoid \
+                    -- \
+                    ${pkgs.ollama}/bin/ollama \
+                    serve
+    '';
+in
+{
+    options.services.ollama = {
+        enable = mkEnableOption "Enable the ollama agent";
+        stdoutPath = mkOption {
+            default = "/Users/${config.services.ollama.user}/config/ollama/out.log";
+        };
+        stderrPath = mkOption {
+            default = "/Users/${config.services.ollama.user}/config/ollama/err.log";
+        };
+        pidPath = mkOption {
+            default = "/Users/${config.services.ollama.user}/config/ollama/ollama.pid";
+        };
+        user = mkOption {
+          default="zaphar";
+        };
+    };
+
+    config = {
+        
+        launchd.user.agents.ollama = mkIf config.services.ollama.enable {
+            serviceConfig = {
+                ProgramArguments = [
+                    "${ollamaLauncher}"
+                ];
+                EnvironmentVariables = {
+                  "OLLAMA_HOST" = "127.0.0.1:11434";
+                  "OLLAMA_MODELS" = "/Users/${config.services.ollama.user}/config/ollama/";
+                };
+                RunAtLoad = true;
+            };
+        };
+        
+        environment.etc."newsyslog.d/org.nixos.ollama.conf" = mkIf config.services.ollama.enable {
+            text = ''
+            # logfilename                          [owner:group]  mode  count  size  when  flags [/pid_file]       [sig_num]
+            ${config.services.ollama.stdoutPath}   zaphar:staff   644   10     1000  *     BJ  ${config.services.ollama.pidPath} 1
+            ${config.services.ollama.stderrPath}   zaphar:staff   644   10     1000  *     BJ  ${config.services.ollama.pidPath} 1
+            '';
+        };
+    };
+}

nix/base-system/nvim-treesitter-csharp.nix

@@ -1,11 +1,16 @@
-{ buildGrammar, fetchFromGitHub, pkgs, }:
-buildGrammar {
-    language = "c-sharp";
-    version = "0.20.0-master";
+{ buildGrammar, fetchFromGitHub, grammarToPlugin, }:
+let grammar = buildGrammar {
+    language = "c_sharp";
+    version = "0.23.1-master";
     src = fetchFromGitHub {
-        owner = "tree-sitter";
-        repo = "tree-sitter-c-sharp";
-        rev = "1648e21b4f087963abf0101ee5221bb413107b07";
-        hash = "sha256-WvkHtw8t14UNqiJvmS9dbGYQSVVzHS9mcWzxq+KLMnU=";
-    };
+		  owner = "tree-sitter";
+		  repo = "tree-sitter-c-sharp";
+		  rev = "b27b091bfdc5f16d0ef76421ea5609c82a57dff0";
+		  hash = "sha256-kSbMv6fKELB5CTSevD1umUgKfb3rsucEnAVYHFiAHss=";
+		};
+};
+in
+{
+	inherit grammar;
+  neovim-plugin = grammarToPlugin grammar;
 }

nix/base-system/zshrc

@@ -22,7 +22,8 @@ function root_shell() {
 }
 
 function wrkspc() {
-    local wd=$(pwd)
+    local wd=${1:-$(pwd)}
+    cd ${wd}
     local session=$(basename $wd)
     tmux new -A -s $session
 }
@@ -40,3 +41,14 @@ function disk_usage() {
     local path=${1:-.}
     /run/current-system/sw/bin/du --max-depth=1 -h "${path}" 2>/dev/null
 }
+
+# TODO(zaphar): Figure out why this thing doesn't come up or dies
+function restart_durnitisp() {
+    sudo launchctl bootout system/org.nixos.durnitisp
+    sudo launchctl bootstrap system /Library/LaunchDaemons/org.nixos.durnitisp.plist org.nixos.durnitisp
+}
+
+eval "$(direnv hook zsh)"
+
+export ANTHROPIC_API_KEY="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"
+export OPENAI_API_KEY="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"

nix/packages/quint/default.nix

@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, quint-src, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
 
 let
   nodeEnv = import ./node-env.nix {
@@ -13,5 +13,5 @@ let
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
-  inherit nodeEnv quint-src;
+  inherit nodeEnv;
 }

nix/packages/quint/node-env.nix

@@ -109,7 +109,7 @@ let
     );
 
   # Recursively composes the dependencies of a package
-  composePackage = { name, packageName, src, dependencies ? [], ... }:
+  composePackage = { name, packageName, src, dependencies ? [], ... }@args:
     builtins.addErrorContext "while evaluating node package '${packageName}'" ''
       installPackage "${packageName}" "${src}"
       ${includeDependencies { inherit dependencies; }}
@@ -194,7 +194,7 @@ let
   # dependencies in the package.json file to the versions that are actually
   # being used.
 
-  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }:
+  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
     ''
       if [ -d "${packageName}" ]
       then

nix/packages/quint/node-packages.json

@@ -0,0 +1,4 @@
+[
+	"@informalsystems/quint",
+	"@informalsystems/quint-language-server"
+]

nix/packages/quint/node-packages.nix

@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.11.1. Do not edit!
 
-{quint-src, nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -22,6 +22,15 @@ let
         sha512 = "AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==";
       };
     };
+    "@informalsystems/quint-0.20.0" = {
+      name = "_at_informalsystems_slash_quint";
+      packageName = "@informalsystems/quint";
+      version = "0.20.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@informalsystems/quint/-/quint-0.20.0.tgz";
+        sha512 = "q3jxvzVw0hw4yxOJcGzAMIguGfcyScs/BP5efqCxQeVMDxLsqy+SAgLH5CnM7UNJFXLawwuyRaCbIvq9+2BXRg==";
+      };
+    };
     "@js-sdsl/ordered-map-4.4.2" = {
       name = "_at_js-sdsl_slash_ordered-map";
       packageName = "@js-sdsl/ordered-map";
@@ -256,13 +265,13 @@ let
         sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
       };
     };
-    "antlr4ts-0.5.0-dev" = {
+    "antlr4ts-0.5.0-alpha.4" = {
       name = "antlr4ts";
       packageName = "antlr4ts";
-      version = "0.5.0-dev";
+      version = "antlr4ts-0.5.0-alpha.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/antlr4ts/-/antlr4ts-0.5.0-dev.tgz";
-        sha512 = "FXZRGC53ZejWLOMzxJ6IpgmGYNzBYeaoN5FBQe2Y6+iEA+JFNZz+J67TF84ajksmzVX8BUi+Ytx7oih+BWtA8A==";
+        url = "https://registry.npmjs.org/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz";
+        sha512 = "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==";
       };
     };
     "bignumber.js-9.1.2" = {
@@ -355,13 +364,13 @@ let
         sha512 = "Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg==";
       };
     };
-    "escalade-3.1.2" = {
+    "escalade-3.2.0" = {
       name = "escalade";
       packageName = "escalade";
-      version = "3.1.2";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz";
-        sha512 = "ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==";
+        url = "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz";
+        sha512 = "WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==";
       };
     };
     "fs-minipass-2.1.0" = {
@@ -634,6 +643,60 @@ let
         sha512 = "yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==";
       };
     };
+    "vscode-jsonrpc-6.0.0" = {
+      name = "vscode-jsonrpc";
+      packageName = "vscode-jsonrpc";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz";
+        sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==";
+      };
+    };
+    "vscode-languageserver-7.0.0" = {
+      name = "vscode-languageserver";
+      packageName = "vscode-languageserver";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz";
+        sha512 = "60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==";
+      };
+    };
+    "vscode-languageserver-protocol-3.16.0" = {
+      name = "vscode-languageserver-protocol";
+      packageName = "vscode-languageserver-protocol";
+      version = "3.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz";
+        sha512 = "sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==";
+      };
+    };
+    "vscode-languageserver-textdocument-1.0.12" = {
+      name = "vscode-languageserver-textdocument";
+      packageName = "vscode-languageserver-textdocument";
+      version = "1.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz";
+        sha512 = "cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==";
+      };
+    };
+    "vscode-languageserver-types-3.16.0" = {
+      name = "vscode-languageserver-types";
+      packageName = "vscode-languageserver-types";
+      version = "3.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz";
+        sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==";
+      };
+    };
+    "vscode-uri-3.0.8" = {
+      name = "vscode-uri";
+      packageName = "vscode-uri";
+      version = "3.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz";
+        sha512 = "AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==";
+      };
+    };
     "wrap-ansi-7.0.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -689,11 +752,16 @@ let
       };
     };
   };
-  args = {
+in
+{
+  "@informalsystems/quint" = nodeEnv.buildNodePackage {
     name = "_at_informalsystems_slash_quint";
     packageName = "@informalsystems/quint";
     version = "0.21.1";
-    src = "${quint-src}/quint";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/@informalsystems/quint/-/quint-0.21.1.tgz";
+      sha512 = "kqXHC4a+6N1L0UDFzHknryLmOGwEuLk5pQyiirAKyCvkSHGn6QmnZTdn0jJI2bUppA0BS1lANTLrC2UQOGdKQg==";
+    };
     dependencies = [
       sources."@grpc/grpc-js-1.11.1"
       sources."@grpc/proto-loader-0.7.13"
@@ -723,7 +791,7 @@ let
       sources."@types/seedrandom-3.0.8"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
-      sources."antlr4ts-0.5.0-dev"
+      sources."antlr4ts-0.5.0-alpha.4"
       sources."bignumber.js-9.1.2"
       sources."buffer-from-1.1.2"
       sources."chalk-4.1.2"
@@ -734,7 +802,7 @@ let
       sources."deprecation-2.3.1"
       sources."emoji-regex-8.0.0"
       sources."eol-0.9.1"
-      sources."escalade-3.1.2"
+      sources."escalade-3.2.0"
       (sources."fs-minipass-2.1.0" // {
         dependencies = [
           sources."minipass-3.3.6"
@@ -789,23 +857,114 @@ let
     bypassCache = true;
     reconstructLock = true;
   };
-in
-{
-  args = args;
-  sources = sources;
-  tarball = nodeEnv.buildNodeSourceDist args;
-  package = nodeEnv.buildNodePackage args;
-  shell = nodeEnv.buildNodeShell args;
-  nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
-    src = stdenv.mkDerivation {
-      name = args.name + "-package-json";
-      src = nix-gitignore.gitignoreSourcePure [
-        "*"
-        "!package.json"
-        "!package-lock.json"
-      ] args.src;
-      dontBuild = true;
-      installPhase = "mkdir -p $out; cp -r ./* $out;";
+  "@informalsystems/quint-language-server" = nodeEnv.buildNodePackage {
+    name = "_at_informalsystems_slash_quint-language-server";
+    packageName = "@informalsystems/quint-language-server";
+    version = "0.14.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/@informalsystems/quint-language-server/-/quint-language-server-0.14.4.tgz";
+      sha512 = "ZM8sCj5JsyWnI/Z9fspnwofuYpekcu3ke3A1wtrMndH4Vs2AHaJAiCGNy5wINLQho87LuvLL5eOGERbARgct/Q==";
     };
-  });
+    dependencies = [
+      sources."@grpc/grpc-js-1.11.1"
+      sources."@grpc/proto-loader-0.7.13"
+      sources."@informalsystems/quint-0.20.0"
+      sources."@js-sdsl/ordered-map-4.4.2"
+      sources."@octokit/endpoint-9.0.5"
+      sources."@octokit/openapi-types-22.2.0"
+      sources."@octokit/request-8.4.0"
+      sources."@octokit/request-error-5.1.0"
+      sources."@octokit/types-13.5.0"
+      sources."@protobufjs/aspromise-1.1.2"
+      sources."@protobufjs/base64-1.1.2"
+      sources."@protobufjs/codegen-2.0.4"
+      sources."@protobufjs/eventemitter-1.1.0"
+      sources."@protobufjs/fetch-1.1.0"
+      sources."@protobufjs/float-1.0.2"
+      sources."@protobufjs/inquire-1.1.0"
+      sources."@protobufjs/path-1.1.2"
+      sources."@protobufjs/pool-1.1.0"
+      sources."@protobufjs/utf8-1.1.0"
+      sources."@sweet-monads/either-3.2.0"
+      sources."@sweet-monads/interfaces-3.3.0"
+      sources."@sweet-monads/maybe-3.2.0"
+      sources."@types/line-column-1.0.2"
+      sources."@types/lodash-4.17.7"
+      sources."@types/lodash.clonedeep-4.5.0"
+      sources."@types/node-22.5.1"
+      sources."@types/seedrandom-3.0.8"
+      sources."ansi-regex-5.0.1"
+      sources."ansi-styles-4.3.0"
+      sources."antlr4ts-0.5.0-alpha.4"
+      sources."bignumber.js-9.1.2"
+      sources."buffer-from-1.1.2"
+      sources."chalk-4.1.2"
+      sources."chownr-2.0.0"
+      sources."cliui-8.0.1"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
+      sources."deprecation-2.3.1"
+      sources."emoji-regex-8.0.0"
+      sources."eol-0.9.1"
+      sources."escalade-3.2.0"
+      (sources."fs-minipass-2.1.0" // {
+        dependencies = [
+          sources."minipass-3.3.6"
+        ];
+      })
+      sources."get-caller-file-2.0.5"
+      sources."has-flag-4.0.0"
+      sources."immutable-4.3.7"
+      sources."is-fullwidth-code-point-3.0.0"
+      sources."isarray-1.0.0"
+      sources."isobject-2.1.0"
+      sources."json-bigint-1.0.0"
+      sources."line-column-1.0.2"
+      sources."lodash-4.17.21"
+      sources."lodash.camelcase-4.3.0"
+      sources."lodash.clonedeep-4.5.0"
+      sources."lodash.isequal-4.5.0"
+      sources."long-5.2.3"
+      sources."minipass-5.0.0"
+      (sources."minizlib-2.1.2" // {
+        dependencies = [
+          sources."minipass-3.3.6"
+        ];
+      })
+      sources."mkdirp-1.0.4"
+      sources."once-1.4.0"
+      sources."protobufjs-7.4.0"
+      sources."require-directory-2.1.1"
+      sources."seedrandom-3.0.5"
+      sources."source-map-0.6.1"
+      sources."source-map-support-0.5.21"
+      sources."string-width-4.2.3"
+      sources."strip-ansi-6.0.1"
+      sources."supports-color-7.2.0"
+      sources."tar-6.2.1"
+      sources."undici-types-6.19.8"
+      sources."universal-user-agent-6.0.1"
+      sources."vscode-jsonrpc-6.0.0"
+      sources."vscode-languageserver-7.0.0"
+      sources."vscode-languageserver-protocol-3.16.0"
+      sources."vscode-languageserver-textdocument-1.0.12"
+      sources."vscode-languageserver-types-3.16.0"
+      sources."vscode-uri-3.0.8"
+      sources."wrap-ansi-7.0.0"
+      sources."wrappy-1.0.2"
+      sources."y18n-5.0.8"
+      sources."yallist-4.0.0"
+      sources."yargs-17.7.2"
+      sources."yargs-parser-21.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Language Server for the Quint specification language";
+      homepage = "https://github.com/informalsystems/quint#readme";
+      license = "Apache 2.0";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
 }