diff --git a/flake.lock b/flake.lock index 7a46a86..d8a1a73 100755 --- a/flake.lock +++ b/flake.lock @@ -57,6 +57,21 @@ "type": "github" } }, + "crane": { + "locked": { + "lastModified": 1758215636, + "narHash": "sha256-8nkzkPbdxze8CxWhKWlcLbJEU1vfLM/nVqRlTy17V54=", + "owner": "ipetkov", + "repo": "crane", + "rev": "a669fe77a8b0cd6f11419d89ea45a16691ca5121", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin-universal-src": { "flake": false, "locked": { @@ -272,6 +287,21 @@ "type": "github" } }, + "flake-compat_8": { + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -1740,6 +1770,7 @@ "waybar": "waybar", "wpaperd": "wpaperd", "yazi": "yazi", + "zed-editor": "zed-editor", "zen-browser": "zen-browser" } }, @@ -1827,6 +1858,27 @@ "type": "github" } }, + "rust-overlay_5": { + "inputs": { + "nixpkgs": [ + "zed-editor", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758508617, + "narHash": "sha256-kx2uELmVnAbiekj/YFfWR26OXqXedImkhe2ocnbumTA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d2bac276ac7e669a1f09c48614538a37e3eb6d0f", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sbt-derivation": { "inputs": { "flake-utils": "flake-utils_4", @@ -2268,6 +2320,29 @@ "type": "github" } }, + "zed-editor": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat_8", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_5" + }, + "locked": { + "lastModified": 1759521609, + "narHash": "sha256-hM4ww4jfIm8NvpYbsscEXxM/b/lG5ZcECgM4gsSMEII=", + "owner": "zed-industries", + "repo": "zed", + "rev": "4443f61c163d9a3e0a2275019a29cc360fe8dfed", + "type": "github" + }, + "original": { + "owner": "zed-industries", + "repo": "zed", + "type": "github" + } + }, "zen-browser": { "inputs": { "darwin-universal-src": "darwin-universal-src", diff --git a/flake.nix b/flake.nix index 03862fe..81a05c8 100755 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,10 @@ url = "gitlab:InvraNet/zen-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + zed-editor = { + url = "github:zed-industries/zed"; + inputs.nixpkgs.follows = "nixpkgs"; + }; upRootNutrition = { url = "git+ssh://git@gitlab.com/uprootnutrition/website.git"; }; diff --git a/modules/home/gui/apps/code/zed/config/userSettings/config/lsp/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/lsp/default.nix index b075435..cc9d0b8 100755 --- a/modules/home/gui/apps/code/zed/config/userSettings/config/lsp/default.nix +++ b/modules/home/gui/apps/code/zed/config/userSettings/config/lsp/default.nix @@ -30,7 +30,7 @@ haskell-language-server = { initialization_options = { haskell = { - formattingProvider = "ormolu"; + formattingProvider = "fourmolu"; }; }; }; diff --git a/modules/home/gui/apps/code/zed/default.nix b/modules/home/gui/apps/code/zed/default.nix index 4e42ae0..334113c 100755 --- a/modules/home/gui/apps/code/zed/default.nix +++ b/modules/home/gui/apps/code/zed/default.nix @@ -3,6 +3,7 @@ flake, lib, pkgs, + nixpkgs-stable, ... }: let @@ -23,10 +24,15 @@ in { programs.zed-editor = { enable = true; - # package = packagePath; + package = packagePath; extraPackages = extraPackagesPath; extensions = extensionsPath; userKeymaps = userKeymapsPath; userSettings = userSettingsPath; }; + home.packages = builtins.attrValues { + inherit (pkgs) + zed-discord-presence + ; + }; }