From db6b531adab3317e6510ad44973da8ceee25cb6a Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Tue, 24 Dec 2024 00:29:25 -0600
Subject: [PATCH] Use zed from nixpkgs instead of upstream zed

---
 home/hosts/exodus/default.nix   |  3 ++-
 home/hosts/jude/default.nix     |  1 +
 home/modules/baseline/xonsh.nix |  1 -
 home/modules/default.nix        |  1 +
 home/modules/zed.nix            | 20 ++++++++++++++++++++
 5 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 home/modules/zed.nix

diff --git a/home/hosts/exodus/default.nix b/home/hosts/exodus/default.nix
index ff9ec07..0e9be1d 100644
--- a/home/hosts/exodus/default.nix
+++ b/home/hosts/exodus/default.nix
@@ -2,10 +2,11 @@
 
 {
   greg = {
-    vscodium = true;
     development = true;
     gnome = true;
     gui = true;
+    vscodium = true;
+    zed = true;
   };
   home.packages = with pkgs; [
     cargo
diff --git a/home/hosts/jude/default.nix b/home/hosts/jude/default.nix
index 218def5..e008399 100644
--- a/home/hosts/jude/default.nix
+++ b/home/hosts/jude/default.nix
@@ -7,6 +7,7 @@
     sway = false;
     gnome = false;
     vscodium = true;
+    zed = true;
   };
 
   home = {
diff --git a/home/modules/baseline/xonsh.nix b/home/modules/baseline/xonsh.nix
index 6f7bcbe..bf98f36 100644
--- a/home/modules/baseline/xonsh.nix
+++ b/home/modules/baseline/xonsh.nix
@@ -62,7 +62,6 @@
       gh-personal = "$GH_CONFIG_DIR=\"${config.home.homeDirectory}/.config/gh/personal\" gh";
       ls = "ls --color";
       ll = "ls -l --color";
-      zed = "nix run \"github:zed-industries/zed/v0.164.x\"";
 
       # Tailscale related ones
       tsup = "sudo tailscale up";
diff --git a/home/modules/default.nix b/home/modules/default.nix
index e170b71..96463d1 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -10,5 +10,6 @@
     ./sway.nix
     ./vscodium.nix
     ./xonsh.nix
+    ./zed.nix
   ];
 }
diff --git a/home/modules/zed.nix b/home/modules/zed.nix
new file mode 100644
index 0000000..442bca2
--- /dev/null
+++ b/home/modules/zed.nix
@@ -0,0 +1,20 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.greg.zed;
+in
+{
+  options.greg.zed = lib.mkEnableOption "Whether to install the Zed editor";
+
+  config = lib.mkIf cfg {
+    home.packages = with pkgs; [
+      nil
+      zed-editor
+    ];
+  };
+}