diff options
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | home/default.nix | 8 | ||||
| -rw-r--r-- | lib/systems.nix | 1 |
3 files changed, 8 insertions, 6 deletions
@@ -4,17 +4,16 @@ self, nixpkgs, home-manager, - systems, pre-commit-hooks, flake-parts, ... }@inputs: let lib = nixpkgs.lib // home-manager.lib; - forAllSystems = lib.genAttrs (import inputs.systems); + systems = import inputs.systems; in flake-parts.lib.mkFlake { inherit inputs; } { - systems = builtins.attrNames (forAllSystems (system: system)); + systems = builtins.attrNames ((import ./lib/systems.nix { inherit lib systems; }) (system: system)); imports = [ ./home diff --git a/home/default.nix b/home/default.nix index 0580ac8..1475f01 100644 --- a/home/default.nix +++ b/home/default.nix @@ -6,8 +6,6 @@ ... }: let - forAllSystems = lib.genAttrs (import inputs.systems); - nixpkgsFor = forAllSystems (system: import inputs.nixpkgs { inherit system; }); secrets = import ../lib/secrets.nix { inherit self; }; in { @@ -15,9 +13,13 @@ in let username = "ebisu"; flakeDirectory = ".nixos-config"; + systems = import inputs.systems; in inputs.home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgsFor."${builtins.currentSystem}"; + pkgs = + ((import ../lib/systems.nix { inherit lib systems; }) ( + system: import inputs.nixpkgs { inherit system; } + ))."${builtins.currentSystem}"; modules = [ ./${username} diff --git a/lib/systems.nix b/lib/systems.nix new file mode 100644 index 0000000..21624a3 --- /dev/null +++ b/lib/systems.nix @@ -0,0 +1 @@ +{ lib, systems }: lib.genAttrs systems |