Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 108 additions & 1 deletion flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@
"https://cache.garnix.io"
"https://install.determinate.systems"
"https://noctalia.cachix.org"
"https://zed.cachix.org"
];
extra-trusted-public-keys = [
# "kclejeune:u0sa4anVXC4bKlzEsijdSlLyWVaEkApu6KWyDbbJMkk="
"kclejeune.cachix.org-1:fOCrECygdFZKbMxHClhiTS6oowOkJ/I/dh9q9b1I4ko="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM="
"noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="
"zed.cachix.org-1:/pHQ6dpMsAZk2DiP4WCL0p9YDNKWj2Q5FL20bNmw1cU="
];
};

Expand Down Expand Up @@ -76,6 +78,14 @@
# once the change is merged.
noctalia.url = "github:kclejeune/noctalia-shell/kcl/restart-auth-support";
noctalia.inputs.nixpkgs.follows = "nixos-unstable";

# Zed editor — pulled from upstream to track the preview channel
# (the flake's `default` package is built from main, ahead of the
# stable channel in nixpkgs). Follows `nixos-unstable` to match
# upstream's own pin (their flake points `nixpkgs` at
# `nixos-unstable`), avoiding drift between the channel Zed expects
# and the one we hand it.
zed.url = "github:zed-industries/zed";
};

outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
Expand Down
1 change: 1 addition & 0 deletions modules/home/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ in
flakeCfg.flake.homeModules.tldr
flakeCfg.flake.homeModules.tmux
flakeCfg.flake.homeModules.yazi
flakeCfg.flake.homeModules.zed-editor
flakeCfg.flake.homeModules.nixpkgs
];

Expand Down
21 changes: 21 additions & 0 deletions modules/home/zed-editor.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
_: {
# Linux-only: Zed preview build from the upstream flake input (see
# `modules/overlays.nix`). macOS gets Zed via Homebrew cask in
# `modules/darwin/brew.nix` ("zed@preview"), so this module no-ops
# there. Gated on `desktop.enable` so headless Linux hosts skip it.
flake.homeModules.zed-editor =
{
config,
pkgs,
lib,
...
}:
{
config = lib.mkIf (config.desktop.enable && pkgs.stdenvNoCC.isLinux) {
programs.zed-editor = {
enable = true;
package = pkgs.zed-preview;
};
};
};
}
1 change: 0 additions & 1 deletion modules/nixos/desktop-base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ in
pkgs.vscode
pkgs.yubikey-manager
pkgs.yubioath-flutter
pkgs.zed-editor
pkgs.zoom-us

# Standalone GNOME apps — usable without gnome-shell. Picked to
Expand Down
1 change: 1 addition & 0 deletions modules/overlays.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
determinate-nixd = inputs.determinate.packages.${system}.default;
nix = inputs.determinate.inputs.nix.packages.${system}.default;
nh = inputs.nh.packages.${system}.default;
zed-preview = inputs.zed.packages.${system}.default;

# 0.8.0 introduced the Tempo module (clock + weather + calendar);
# nixpkgs-unstable still has 0.7.0 at this rev. Pin until upstream
Expand Down
Loading