diff --git a/flake.lock b/flake.lock index 33f2225b..6eb7390e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,9 +2,7 @@ "nodes": { "agenix": { "inputs": { - "darwin": [ - "nixDarwin" - ], + "darwin": [], "home-manager": [ "homeManager" ], @@ -220,22 +218,6 @@ "type": "github" } }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flakeUtils": { "inputs": { "systems": [ @@ -274,9 +256,7 @@ }, "gitHooks": { "inputs": { - "flake-compat": [ - "flakeCompat" - ], + "flake-compat": [], "flake-utils": [ "flakeUtils" ], @@ -389,9 +369,7 @@ }, "nix-alien": { "inputs": { - "flake-compat": [ - "flakeCompat" - ], + "flake-compat": [], "flake-utils": [ "flakeUtils" ], @@ -450,26 +428,6 @@ "type": "github" } }, - "nixDarwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1712791164, @@ -537,16 +495,12 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": [ - "flakeCompat" - ], + "flake-compat": [], "flake-parts": "flake-parts", "home-manager": [ "homeManager" ], - "nix-darwin": [ - "nixDarwin" - ], + "nix-darwin": [], "nixpkgs": [ "nixpkgs" ], @@ -572,13 +526,11 @@ "inputs": { "agenix": "agenix", "dragonXplr": "dragonXplr", - "flakeCompat": "flakeCompat", "flakeUtils": "flakeUtils", "gitHooks": "gitHooks", "homeManager": "homeManager", "logo": "logo", "nix-alien": "nix-alien", - "nixDarwin": "nixDarwin", "nixpkgs": "nixpkgs_2", "nixpkgsAntoraLunrExtension": "nixpkgsAntoraLunrExtension", "nixpkgsBuildEnv": "nixpkgsBuildEnv", @@ -597,9 +549,7 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": [ - "flakeCompat" - ], + "flake-compat": [], "gnome-shell": "gnome-shell", "home-manager": [ "homeManager" diff --git a/flake.nix b/flake.nix index 66e1b11b..68f1011a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { agenix = { inputs = { - darwin.follows = "nixDarwin"; + darwin.follows = ""; home-manager.follows = "homeManager"; nixpkgs.follows = "nixpkgs"; systems.follows = "systems"; @@ -18,12 +18,6 @@ url = "github:sayanarijit/dragon.xplr"; }; - # This input ensures consistent versioning across inputs. - flakeCompat = { - flake = false; - url = "github:edolstra/flake-compat"; - }; - flakeUtils = { inputs.systems.follows = "systems"; url = "github:numtide/flake-utils"; @@ -31,7 +25,7 @@ gitHooks = { inputs = { - flake-compat.follows = "flakeCompat"; + flake-compat.follows = ""; flake-utils.follows = "flakeUtils"; nixpkgs-stable.follows = "gitHooks/nixpkgs"; nixpkgs.follows = "nixpkgs"; @@ -65,19 +59,13 @@ # > # > -- https://github.com/thiagokokada/nix-alien/blob/75c0c2d5eb1fdd2c5187c49888cab40b060605fa/README.md#nixos-installation-with-flakes inputs = { - flake-compat.follows = "flakeCompat"; + flake-compat.follows = ""; flake-utils.follows = "flakeUtils"; }; url = "github:thiagokokada/nix-alien"; }; - # This input ensures consistent versioning across inputs. - nixDarwin = { - inputs.nixpkgs.follows = "nixpkgs"; - url = "github:lnl7/nix-darwin"; - }; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # TODO: Replace this fork with Nixpkgs once [1] is merged. @@ -100,9 +88,9 @@ nixvim = { inputs = { - flake-compat.follows = "flakeCompat"; + flake-compat.follows = ""; home-manager.follows = "homeManager"; - nix-darwin.follows = "nixDarwin"; + nix-darwin.follows = ""; nixpkgs.follows = "nixpkgs"; pre-commit-hooks.follows = "gitHooks"; }; @@ -112,7 +100,7 @@ stylix = { inputs = { - flake-compat.follows = "flakeCompat"; + flake-compat.follows = ""; home-manager.follows = "homeManager"; nixpkgs.follows = "nixpkgs"; };