diff --git a/flake.lock b/flake.lock index 13715b9..8525132 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,7 @@ "nodes": { "agenix": { "inputs": { - "darwin": "darwin_2", + "darwin": "darwin", "nixpkgs": [ "ragenix", "nixpkgs" @@ -53,26 +53,6 @@ } }, "darwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, - "darwin_2": { "inputs": { "nixpkgs": [ "ragenix", @@ -165,6 +145,26 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1700559156, @@ -224,10 +224,10 @@ }, "root": { "inputs": { - "darwin": "darwin", "flake-compat": "flake-compat", "flake-utils": "flake-utils", "home-manager": "home-manager", + "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "ragenix": "ragenix", diff --git a/flake.nix b/flake.nix index e4c856d..625a727 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - darwin = { + nix-darwin = { url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -99,7 +99,7 @@ }; - outputs = { self, nixpkgs, flake-utils, home-manager, darwin, ... }@inputs: + outputs = { self, nixpkgs, flake-utils, home-manager, nix-darwin, ... }@inputs: let systems = [ "aarch64-darwin" @@ -136,7 +136,7 @@ in hostDrvs // default; }) // { - darwinConfigurations.darwinOdyssey = darwin.lib.darwinSystem { + darwinConfigurations.darwinOdyssey = nix-darwin.lib.darwinSystem { system = "aarch64-darwin"; modules = [ home-manager.darwinModules.home-manager