diff --git a/flake.lock b/flake.lock index 7ad1735..ff28656 100644 --- a/flake.lock +++ b/flake.lock @@ -784,6 +784,7 @@ "schizofox": "schizofox", "systems": "systems_3", "watt": "watt" + "zedless": "zedless" } }, "rust-overlay": { @@ -959,6 +960,25 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zedless": { + "inputs": { + "flake-compat": "flake-compat_4", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1750451783, + "narHash": "sha256-Cst6zLi5bbn9xSbQJN/+bib+fAFhfXMDntoVDl4ZZ3k=", + "owner": "zedless-editor", + "repo": "zed", + "rev": "58b4818deff58508f590b074efae1660adca9319", + "type": "github" + }, + "original": { + "owner": "zedless-editor", + "repo": "zed", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d4c330a..9db913f 100644 --- a/flake.nix +++ b/flake.nix @@ -83,5 +83,8 @@ url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; + zedless = { + url = "github:zedless-editor/zed"; + }; }; } diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 3761c0d..76dcd9f 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -1,9 +1,32 @@ -{pkgs, ...}: { +{ + inputs, + pkgs, + ... +}:let + +# a newer nil version, for pipes support. +newer-nil = pkgs.nil.overrideAttrs (_: { + version = "unstable-02-06-2025"; + + src = pkgs.fetchFromGitHub { + owner = "oxalica"; + repo = "nil"; + rev = "577d160da311cc7f5042038456a0713e9863d09e"; + hash = "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c="; + }; + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { + inherit (newer-nil) src; + hash = "sha256-uZsLlFU9GKLvFllF7Kf5Q7HfN26KQojf4rvOb9p7Rjs="; + }; +}); + +in { environment.systemPackages = builtins.attrValues { inherit (pkgs) abook aerc + alejandra aichat alsa-utils anki @@ -79,5 +102,7 @@ xournalpp zathura ; + inherit (inputs.zedless.packages.${pkgs.stdenv.system}) zed-editor; + inherit newer-nil; }; }