diff --git a/flake.lock b/flake.lock index ebb4391..ba8dcbb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,8 +2,12 @@ "nodes": { "agenix": { "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", + "darwin": [ + "nix-darwin" + ], + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ] @@ -25,12 +29,16 @@ "attic": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat", + "flake-compat": [ + "flake-compat" + ], "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1689457600, @@ -48,7 +56,9 @@ }, "catppuccin": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": [ + "flake-compat" + ], "nixpkgs": [ "nixpkgs" ] @@ -97,28 +107,6 @@ "type": "github" } }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -156,22 +144,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -188,27 +160,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -264,29 +215,14 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1685004253, - "narHash": "sha256-AbVL1nN/TDicUQ5wXZ8xdLERxz/eJr7+o8lqkIOVuaE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e01645c40b92d29f3ae76344a6d654986a91a91", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", "attic": "attic", "catppuccin": "catppuccin", "fenix": "fenix", - "home-manager": "home-manager_2", + "flake-compat": "flake-compat", + "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index 15c523e..5fb3ada 100644 --- a/flake.nix +++ b/flake.nix @@ -16,11 +16,15 @@ attic = { url = "github:zhaofengli/attic"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; + inputs.flake-compat.follows = "flake-compat"; }; agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + inputs.darwin.follows = "nix-darwin"; }; fenix = { @@ -31,6 +35,12 @@ catppuccin = { url = "github:Stonks3141/ctp-nix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-compat.follows = "flake-compat"; + }; + + flake-compat = { + url = "github:edolstra/flake-compat"; + flake = false; }; };