3 files changed, 10 insertions, 48 deletions
diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix
index ce36fcf..21f06f7 100644
--- a/hosts/atlas/default.nix
+++ b/hosts/atlas/default.nix
@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }: {
@@ -33,35 +32,21 @@
     hostName = "atlas";
   };
 
-  nix.settings = {
-    extra-platforms = lib.mkForce "";
-    trusted-users = ["bob"];
-  };
-
-  system.stateVersion = "22.11";
+  nix.settings.allowed-users = ["bob"];
 
-  users.users = let
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMPV9wiDwXVyoVh347CAulkdGzG7+1m/rZ1aV5fk3BHM atlas [email protected]"
-    ];
-  in {
-    root = {inherit openssh;};
+  system.stateVersion = "23.05";
 
+  users.users = {
     atlas = {
       extraGroups = ["wheel"];
       isNormalUser = true;
       shell = pkgs.bash;
       passwordFile = config.age.secrets.userPassword.path;
-      inherit openssh;
     };
 
     bob = {
       isNormalUser = true;
       shell = pkgs.bash;
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOtbxHjDADxqsG+AgCoiDq0uCsgcnJCIH+9rB6K5pIi9 p-body@p-body"
-        "ssh-ed25519 aaaac3nzac1lzdi1nte5aaaaimpv9widwxvyovh347caulkdgzg7+1m/rz1av5fk3bhm atlas [email protected]"
-      ];
     };
   };
 
diff --git a/hosts/p-body/buildMachines.nix b/hosts/p-body/buildMachines.nix
index c2b65b6..f58c455 100644
--- a/hosts/p-body/buildMachines.nix
+++ b/hosts/p-body/buildMachines.nix
@@ -1,24 +1,10 @@
-{
-  config,
-  self,
-  ...
-}: let
-  inherit (config.networking) hostName;
-in {
-  age.secrets = {
-    "${hostName}2atlas" = {
-      file = "${self}/secrets/hosts/${hostName}/${hostName}2atlas.age";
-      mode = "600";
-    };
-  };
-
+_: {
   nix = {
     buildMachines = [
       {
         hostName = "atlas";
         maxJobs = 4;
         sshUser = "bob";
-        sshKey = config.age.secrets."${hostName}2atlas".path;
         supportedFeatures = ["benchmark" "big-parallel" "gccarch-armv8-a" "kvm" "nixos-test"];
         systems = ["aarch64-linux" "x86_64-linux" "i686-linux"];
       }
diff --git a/hosts/p-body/default.nix b/hosts/p-body/default.nix
index ea03d42..47a77c3 100644
--- a/hosts/p-body/default.nix
+++ b/hosts/p-body/default.nix
@@ -45,22 +45,13 @@
     }
   ];
 
-  system.stateVersion = "22.11";
+  system.stateVersion = "23.11";
 
-  users.users = let
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOeEbjzzzwf9Qyl0JorokhraNYG4M2hovyAAaA6jPpM7 seth@glados"
-    ];
-  in {
-    root = {inherit openssh;};
-
-    p-body = {
-      extraGroups = ["wheel"];
-      isNormalUser = true;
-      shell = pkgs.bash;
-      passwordFile = config.age.secrets.userPassword.path;
-      inherit openssh;
-    };
+  users.users.p-body = {
+    extraGroups = ["wheel"];
+    isNormalUser = true;
+    shell = pkgs.bash;
+    passwordFile = config.age.secrets.userPassword.path;
   };
 
   zramSwap.enable = true;