diff --git a/flake.nix b/flake.nix index 2cf17aa..e2673f5 100644 --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,7 @@ }); darwinHosts = mapModules ./hosts/darwin (hostPath: lib.my.mkHostAttrs hostPath { - system = "aarch64-darwin"; + system = "x86_64-darwin"; modules = lib.my.mapModulesRec' (toString ./modules/darwin) import; }); @@ -80,7 +80,7 @@ digga.nixosModules.bootstrapIso digga.nixosModules.nixConfig home-manager.nixosModules.home-manager - sops-nix.nixosModules.sops + sops-nix.nixosModule.sops ] ++ lib.my.mapModulesRec' (toString ./modules/shared) import; }; diff --git a/lib/nixos.nix b/lib/nixos.nix index 4e82cdd..2bd1066 100644 --- a/lib/nixos.nix +++ b/lib/nixos.nix @@ -16,6 +16,7 @@ in { networking.hostName = mkDefault (removeSuffix ".nix" (baseNameOf path)); } (filterAttrs (n: v: !elem n [ "system" "modules" ]) attrs) + ../. # /default.nix (import path) ] ++ modules; };