diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock index 1b39ed0..f3664ab 100644 --- a/templates/ed/flake.lock +++ b/templates/ed/flake.lock @@ -3,7 +3,6 @@ "fran": { "inputs": { "nixpkgs": [ - "nvimConfig", "rixpkgs" ] }, @@ -39,7 +38,9 @@ }, "nvimConfig": { "inputs": { - "fran": "fran", + "fran": [ + "fran" + ], "nixpkgs": [ "nixpkgs" ], @@ -114,6 +115,7 @@ }, "root": { "inputs": { + "fran": "fran", "nixpkgs": "nixpkgs", "nvimConfig": "nvimConfig", "rixpkgs": "rixpkgs" diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index aa6af64..a35780a 100644 --- a/templates/ed/flake.nix +++ b/templates/ed/flake.nix @@ -1,26 +1,12 @@ { description = "Project Editor"; - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; - rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-26"; - nvimConfig = { - url = "github:dwinkler1/nvimConfig"; - inputs = { - rixpkgs.follows = "rixpkgs"; - nixpkgs.follows = "nixpkgs"; - }; - }; - }; - outputs = { self, nixpkgs, nvimConfig, ... } @ inputs: let - systems = nixpkgs.lib.systems.flakeExposed; - forAllSystems = nixpkgs.lib.genAttrs systems; projectSettings = {pkgs}: { cats = { clickhouse = false; @@ -103,6 +89,8 @@ }; }; + systems = nixpkgs.lib.systems.flakeExposed; + forAllSystems = nixpkgs.lib.genAttrs systems; overlays = [inputs.nvimConfig.overlays.dependencies]; in { packages = forAllSystems (system: let @@ -124,4 +112,23 @@ }; }); }; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-26"; + fran = { + url = "github:dwinkler1/fran"; + inputs = { + nixpkgs.follows = "rixpkgs"; + }; + }; + nvimConfig = { + url = "github:dwinkler1/nvimConfig"; + inputs = { + rixpkgs.follows = "rixpkgs"; + nixpkgs.follows = "nixpkgs"; + fran.follows = "fran"; + }; + }; + }; }