From cdb41c2b4c8cf0ca0e0238760c375bc3b860d680 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <Jeremy@marzhillstudios.com>
Date: Mon, 16 Jun 2025 18:46:56 -0400
Subject: [PATCH] cleanup: makefile sudo and unused flakes and packages

---
 Makefile                   |  2 +-
 nix/base-system/flake.lock | 18 ------------------
 nix/base-system/flake.nix  |  7 +------
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index b26e9ef..f77f7c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 %-darwin:
-	darwin-rebuild --flake ./nix/base-system $*
+	sudo darwin-rebuild --flake ./nix/base-system $*
 
 update-input-%:
 	nix flake lock --update-input $* ./nix/base-system/
diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock
index f24ad9f..0331a44 100644
--- a/nix/base-system/flake.lock
+++ b/nix/base-system/flake.lock
@@ -1218,7 +1218,6 @@
         "rust-overlay-flake": "rust-overlay-flake",
         "sheetsui-flake": "sheetsui-flake",
         "sile-flake": "sile-flake",
-        "treesitter-context": "treesitter-context_2",
         "unstable": "unstable"
       }
     },
@@ -1710,23 +1709,6 @@
         "type": "github"
       }
     },
-    "treesitter-context_2": {
-      "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"
-      }
-    },
     "unstable": {
       "locked": {
         "lastModified": 1747312588,
diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 8f6c6de..5895fd9 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -50,10 +50,6 @@
         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;
@@ -92,7 +88,6 @@
         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;
-        nvim-treesitter-context = custom-flakes.packages."${system}".nvim-treesitter-context;
         roslyn-nvim = custom-flakes.packages."${system}".roslyn-nvim;
         ionide-nvim = custom-flakes.packages."${system}".ionide-nvim;
         # TODO(zaphar): Until nixpkgs update to a newer version of tree-sitter the queries will be wrong
@@ -218,9 +213,9 @@ EOF";
         };
         environment.systemPackages = (with pkgs; [
             terraform-ls
+            tinymist
             nodePackages.typescript-language-server
             nodePackages.jsdoc
-            python312Packages.jedi-language-server
             # TODO find a version of the julia package that will install
             # on darwin and add it as an overlay
             nil-pkg