diff options
| -rw-r--r-- | flake.lock | 50 | ||||
| -rw-r--r-- | flake.nix | 10 | ||||
| -rw-r--r-- | systems/default.nix | 6 | ||||
| -rw-r--r-- | users/default.nix | 2 |
4 files changed, 34 insertions, 34 deletions
@@ -194,6 +194,26 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-root": { "locked": { "lastModified": 1692742795, @@ -269,7 +289,7 @@ "type": "github" } }, - "hm": { + "home-manager": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -294,7 +314,7 @@ "crane": "crane", "flake-compat": [], "flake-parts": [ - "parts" + "flake-parts" ], "flake-utils": [ "pre-commit", @@ -469,26 +489,6 @@ "type": "github" } }, - "parts": { - "inputs": { - "nixpkgs-lib": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "pre-commit": { "inputs": { "flake-compat": "flake-compat", @@ -538,8 +538,9 @@ "darwin": "darwin", "deploy": "deploy", "firefox-addons": "firefox-addons", + "flake-parts": "flake-parts", "getchvim": "getchvim", - "hm": "hm", + "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", @@ -548,7 +549,6 @@ "nixpkgs-stable": "nixpkgs-stable", "nu-scripts": "nu-scripts", "openwrt-imagebuilder": "openwrt-imagebuilder", - "parts": "parts", "pre-commit": "pre-commit", "teawiebot": "teawiebot", "terranix": "terranix" @@ -635,7 +635,7 @@ "nixpkgs" ], "parts": [ - "parts" + "flake-parts" ], "pre-commit": [ "pre-commit" @@ -9,7 +9,7 @@ outputs = inputs: let inherit ((import ./modules/flake).flake) flakeModules; in - inputs.parts.lib.mkFlake {inherit inputs;} { + inputs.flake-parts.lib.mkFlake {inherit inputs;} { imports = [ ./lib ./modules @@ -43,7 +43,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - parts = { + flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; @@ -91,7 +91,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hm = { + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -101,7 +101,7 @@ inputs = { nixpkgs.follows = "nixpkgs"; flake-compat.follows = ""; - flake-parts.follows = "parts"; + flake-parts.follows = "flake-parts"; flake-utils.follows = "pre-commit/flake-utils"; pre-commit-hooks-nix.follows = "pre-commit"; }; @@ -145,7 +145,7 @@ url = "github:getchoo/teawiebot"; inputs = { nixpkgs.follows = "nixpkgs"; - parts.follows = "parts"; + parts.follows = "flake-parts"; pre-commit.follows = "pre-commit"; }; }; diff --git a/systems/default.nix b/systems/default.nix index 7160c96..0f0bc7d 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -7,9 +7,9 @@ nixos = { builder = inputs.nixpkgs.lib.nixosSystem; - modules = [ - inputs.agenix.nixosModules.default - inputs.hm.nixosModules.home-manager + modules = with inputs; [ + agenix.nixosModules.default + home-manager.nixosModules.home-manager ]; systems = { diff --git a/users/default.nix b/users/default.nix index dcfc285..a9a61b5 100644 --- a/users/default.nix +++ b/users/default.nix @@ -1,7 +1,7 @@ {inputs, ...}: { configurations = { home = { - builder = inputs.hm.lib.homeManagerConfiguration; + builder = inputs.home-manager.lib.homeManagerConfiguration; pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; users = { |