diff --git a/modules/common.nix b/modules/common.nix index f999dfb..2fedfdf 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -1,10 +1,11 @@ { ... -}: { - defaultSSHKeys = [ - "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box" - "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNsmP15vH8BVKo7bdvIiiEjiQboPGcRPqJK0+bH4jKD harald@lenovo.fritz.box" - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEd2N6QSpuAXOXmSN5p2MPKyWe+oT5ayMBoRN3rCz/FS6ZI8PG2tntEte8+hkW7X0vA2dtB3aj2jWbqUJoQ8wKs= s22@termux" - ]; +}: +{ + defaultSSHKeys = [ + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box" + "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNsmP15vH8BVKo7bdvIiiEjiQboPGcRPqJK0+bH4jKD harald@lenovo.fritz.box" + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEd2N6QSpuAXOXmSN5p2MPKyWe+oT5ayMBoRN3rCz/FS6ZI8PG2tntEte8+hkW7X0vA2dtB3aj2jWbqUJoQ8wKs= s22@termux" + ]; } diff --git a/modules/darwin/user/default.nix b/modules/darwin/user/default.nix index 74c0596..ffeffb2 100644 --- a/modules/darwin/user/default.nix +++ b/modules/darwin/user/default.nix @@ -7,14 +7,14 @@ with lib; with lib.metacfg; let - common = import ../../common.nix {}; + common = import ../../common.nix { }; cfg = config.metacfg.user; is-linux = pkgs.stdenv.isLinux; is-darwin = pkgs.stdenv.isDarwin; in { - options.metacfg.user = with types; { + options.metacfg.user = with types; { name = mkOpt types.str "harald" "The user account."; fullName = mkOpt types.str "Harald Hoyer" "The full name of the user."; diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix index 807cca4..1880ab1 100644 --- a/modules/nixos/user/default.nix +++ b/modules/nixos/user/default.nix @@ -8,7 +8,7 @@ with lib; with lib.metacfg; let - common = import ../../common.nix {}; + common = import ../../common.nix { }; cfg = config.metacfg.user; defaultIconFileName = "profile.jpg"; defaultIcon = pkgs.stdenvNoCC.mkDerivation {