From 157937a087d856886257858e2543507ad5c87539 Mon Sep 17 00:00:00 2001 From: Philip Peterson <1326208+philip-peterson@users.noreply.github.com> Date: Sat, 16 Nov 2024 00:04:48 -0900 Subject: [PATCH] dynamicfy some keys --- nixos/keys/known_hosts/one.nix | 1 - nixos/keys/known_hosts/one.pub | 1 + nixos/keys/known_hosts/{three.nix => three.pub} | 0 nixos/keys/known_hosts/{two.nix => two.pub} | 0 nixos/system/home/shared.nix | 2 +- nixos/system/users.nix | 6 +----- 6 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 nixos/keys/known_hosts/one.nix create mode 100644 nixos/keys/known_hosts/one.pub rename nixos/keys/known_hosts/{three.nix => three.pub} (100%) rename nixos/keys/known_hosts/{two.nix => two.pub} (100%) diff --git a/nixos/keys/known_hosts/one.nix b/nixos/keys/known_hosts/one.nix deleted file mode 100644 index 9d9f7fc..0000000 --- a/nixos/keys/known_hosts/one.nix +++ /dev/null @@ -1 +0,0 @@ -"github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl" \ No newline at end of file diff --git a/nixos/keys/known_hosts/one.pub b/nixos/keys/known_hosts/one.pub new file mode 100644 index 0000000..ac7b3de --- /dev/null +++ b/nixos/keys/known_hosts/one.pub @@ -0,0 +1 @@ +github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl \ No newline at end of file diff --git a/nixos/keys/known_hosts/three.nix b/nixos/keys/known_hosts/three.pub similarity index 100% rename from nixos/keys/known_hosts/three.nix rename to nixos/keys/known_hosts/three.pub diff --git a/nixos/keys/known_hosts/two.nix b/nixos/keys/known_hosts/two.pub similarity index 100% rename from nixos/keys/known_hosts/two.nix rename to nixos/keys/known_hosts/two.pub diff --git a/nixos/system/home/shared.nix b/nixos/system/home/shared.nix index e79560a..1ea7e34 100644 --- a/nixos/system/home/shared.nix +++ b/nixos/system/home/shared.nix @@ -32,7 +32,7 @@ dir = builtins.toString ../../keys/known_hosts; files = builtins.attrNames (builtins.readDir dir); - pubKeys = map (file: import (dir + "/" + file)) files; + pubKeys = map (file: builtins.readFile (dir + "/" + file)) files; joinedString = lib.concatStringsSep " " pubKeys; in { imports = [ diff --git a/nixos/system/users.nix b/nixos/system/users.nix index 462ea73..10f47d1 100644 --- a/nixos/system/users.nix +++ b/nixos/system/users.nix @@ -53,11 +53,7 @@ "wheel" "docker" ]; - authorizedKeys = [ - (builtins.readFile ../keys/authorized_keys/macbookpro.pub) - (builtins.readFile ../keys/authorized_keys/macbookpro-intel.pub) - (builtins.readFile ../keys/authorized_keys/monolith.pub) - ]; + authorizedKeys = authorizedKeys; homeConfig = import ./home/ironmagma.nix { username = "ironmagma"; inherit config pkgs nix-index-database lib;