diff --git a/flake.lock b/flake.lock index 5cb3b08..f114674 100644 --- a/flake.lock +++ b/flake.lock @@ -45,6 +45,21 @@ "type": "github" } }, + "crane": { + "locked": { + "lastModified": 1725409566, + "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -155,6 +170,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "zed", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1726554553, + "narHash": "sha256-xakDhIS1c1VgJc/NMOLj05yBsTdlXKMEYz6wC8Hdshc=", + "owner": "nix-community", + "repo": "fenix", + "rev": "1f59d7585aa06d2c327960d397bea4067d8fee98", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -231,6 +268,21 @@ "type": "github" } }, + "flake-compat_6": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -708,6 +760,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixstable": { "locked": { "lastModified": 1725930920, @@ -845,7 +913,25 @@ "nixvimunstable": "nixvimunstable", "nurpkgs": "nurpkgs", "vsext": "vsext", - "wsl": "wsl" + "wsl": "wsl", + "zed": "zed" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1726443025, + "narHash": "sha256-nCmG4NJpwI0IoIlYlwtDwVA49yuspA2E6OhfCOmiArQ=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "94b526fc86eaa0e90fb4d54a5ba6313aa1e9b269", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" } }, "systems": { @@ -1021,6 +1107,28 @@ "repo": "NixOS-WSL", "type": "github" } + }, + "zed": { + "inputs": { + "crane": "crane", + "fenix": "fenix", + "flake-compat": "flake-compat_6", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1727300391, + "narHash": "sha256-DcSlsBwZW2RhzX74eNi0+VBwnxYLl22CbCbZrEOSiFQ=", + "owner": "zed-industries", + "repo": "zed", + "rev": "25e2e9c6727ba9b77415588cfa11fd969612adb7", + "type": "github" + }, + "original": { + "owner": "zed-industries", + "ref": "v0.154.2", + "repo": "zed", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 39e239e..15d5cb0 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,7 @@ url = "github:nix-community/NixOS-WSL"; inputs.nixpkgs.follows = "nixunstable"; }; + zed.url = "github:zed-industries/zed/v0.154.x"; }; outputs = { @@ -60,6 +61,7 @@ local_overlay nurpkgs.overlay vsext.overlays.default + (_: _: { zed-editor = inputs.zed.packages.x86_64-linux.default; } ) ]; in { diff --git a/home/modules/development.nix b/home/modules/development.nix index fbbda8b..90f5f2b 100644 --- a/home/modules/development.nix +++ b/home/modules/development.nix @@ -3,6 +3,7 @@ let packages = with pkgs; [ bruno # but let's not talk about it cargo + gh-copilot mariadb nix-eval-jobs nix-fast-build @@ -12,6 +13,7 @@ let nixpkgs-review nodejs process-compose + zed-editor ]; in with lib; { options.greg.development = mkEnableOption "Setup necessary development packages";