From 97cea08fbc586b8518a1af25880f231efb42881b Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 17 May 2024 23:55:35 -0400 Subject: [PATCH] remove nixosModules.default --- flake.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index 35656a7..70e0c4d 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,17 @@ }; }; - mods = + in + { + formatter = forAllSystems (system: + nixpkgs.legacyPackages.${system}.nixpkgs-fmt); + + lib = { + gen-ssh-config = import lib/gen-ssh-config.nix lib; + ssh-keys = import lib/ssh-keys.nix; + }; + + nixosModules = { inherit pins; inherit (impermanence.nixosModules) impermanence; @@ -46,21 +56,9 @@ }) (builtins.readDir ./modules); - in - { - formatter = forAllSystems (system: - nixpkgs.legacyPackages.${system}.nixpkgs-fmt); - - lib = { - gen-ssh-config = import lib/gen-ssh-config.nix lib; - ssh-keys = import lib/ssh-keys.nix; - }; - - nixosModules = mods // { default.imports = builtins.attrValues mods; }; - nixosConfigurations = builtins.mapAttrs (_: lib.nixosSystem) - (import ./hosts self.nixosModules.default); + (import ./hosts { imports = builtins.attrValues self.nixosModules; }); packages = forAllSystems (system: mypkgs nixpkgs.legacyPackages.${system});