From 4f4f49a217fa43f590bb59f30522767715aceafb Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 5 Jan 2023 11:42:14 +0800
Subject: [PATCH] fix root password auto setting

---
 README                  | 2 +-
 final/configuration.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 74bac04..a2a49b1 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ mount /dev/disk/by-label/boot /mnt/boot
 nixos-generate-config --root /mnt
 # copy configuration to /mnt/etc/nixos
 nix-env -iA nixos.git
-nixos-install --flake /mnt/etc/nixos#artiq
+nixos-install --no-root-password --flake /mnt/etc/nixos#artiq
 reboot
 # run memtest86
 
diff --git a/final/configuration.nix b/final/configuration.nix
index ba507fe..8dc0482 100644
--- a/final/configuration.nix
+++ b/final/configuration.nix
@@ -98,8 +98,8 @@
   programs.command-not-found.enable = false;  # broken with flakes, https://github.com/NixOS/nixpkgs/issues/39789
   users.mutableUsers = true;
   users.defaultUserShell = pkgs.fish;
+  users.users.root.initialPassword = "rabi";
   users.extraGroups.plugdev = { };
-  users.extraUsers.root.initialPassword = "rabi";
   users.extraUsers.rabi = {
     isNormalUser = true;
     extraGroups = ["networkmanager" "wheel" "plugdev" "dialout" "wireshark"];