Skip to content

Commit 0d13352

Browse files
committed
🎉 use official zed flake
1 parent e76bf5f commit 0d13352

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

.github/workflows/update-zed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: DeterminateSystems/update-flake-lock@main
1818
with:
1919
pr-title: "Update Zed Flake Input"
20-
inputs: chaotic
20+
inputs: zed
2121
token: ${{ secrets.NIX_UPDATE_FLAKE_LOCK_ACTION }}
2222
branch: update-zed-action
2323
git-author-name: Github Actions

flake.nix

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
# tmp fix for nvidia-docker until it's working in nixos-unstable
4444
nixpkgs-23_11.url = "github:nixos/nixpkgs/nixos-23.11";
4545

46-
#zed = {
47-
# url = "github:zed-industries/zed";
48-
#};
46+
zed = {
47+
url = "github:zed-industries/zed";
48+
};
4949

5050
# chaotic provides a bunch of bleeding edge packages
5151
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
@@ -64,10 +64,6 @@
6464
url = "github:NixOs/nixpkgs?rev=2d068ae5c6516b2d04562de50a58c682540de9bf";
6565
};
6666

67-
nixpkgs-zed = {
68-
url = "github:NixOs/nixpkgs?rev=39b98eae0a643db212439f7198f4901d3b12cbd6";
69-
};
70-
7167
anyrun = {
7268
url = "github:anyrun-org/anyrun";
7369
# inputs.nixpkgs.follows = "nixpkgs";
@@ -87,8 +83,7 @@
8783
stylix,
8884
nixvim,
8985
sops-nix,
90-
nixpkgs-zed,
91-
chaotic,
86+
zed,
9287
...
9388
} @ inputs: let
9489
system = "x86_64-linux";
@@ -109,10 +104,6 @@
109104
inherit system;
110105
};
111106

112-
zedNixPkgs = import inputs.nixpkgs-zed {
113-
inherit system;
114-
};
115-
116107
users = {
117108
dan = {
118109
isNormalUser = true;
@@ -210,7 +201,7 @@
210201
inherit pkgs;
211202
extraSpecialArgs = {
212203
# these args are passed to the other home-manager modules
213-
inherit user inputs vsCodeExtensionsPythonPinnedPkgs zedNixPkgs;
204+
inherit user inputs vsCodeExtensionsPythonPinnedPkgs;
214205
host-settings = import ./modules/settings/${host};
215206
userConfig = user-configs.${user};
216207
};

modules/home-manager/programs/editors/zed.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
inputs,
33
pkgs,
4-
zedNixPkgs,
54
...
65
}: {
76
home.packages = with pkgs; [
@@ -26,7 +25,7 @@
2625
];
2726
programs.zed-editor = {
2827
enable = true;
29-
package = inputs.chaotic.packages.x86_64-linux.zed-editor_git;
28+
package = inputs.zed.packages.x86_64-linux.default;
3029
extensions = [
3130
"catppuccin"
3231
"catppuccin-icons"

0 commit comments

Comments
 (0)