diff --git a/README.md b/README.md
index 4862023..fefbd5e 100644
--- a/README.md
+++ b/README.md
@@ -113,12 +113,14 @@ the latest and greatest nix3 flake-enabled command UX.
 
 ## User password and secrets
 
-For people fresh from installation: Unless you used `--no-root-passwd`,
-`nixos-install` prompted you for a root password. Use it to log into the root
-account, set your own account's password imperatively with `passwd`, and
-disable root login (`sudo passwd -l root`). You can also use `--no-root-passwd`
-and instead set `initialPassword` for your user, for a temporary password upon
-install.
+You have basically two ways of setting up default passwords:
+- By default, you'll be prompted for a root password when installing with
+  `nixos-install`. After you reboot, be sure to add a password to your own
+  account and lock root using `sudo passwd -l root`.
+- Alternatively, you can specify `initialPassword` for your user. This will
+  give your account a default password, be sure to change it after rebooting!
+  If you do, you should pass `--no-root-passwd` to `nixos-install`, to skip
+  setting a password on the root account.
 
 If you don't want to set your password imperatively, you can also use
 `passwordFile` for safely and declaratively setting a password from a file
diff --git a/flake.nix b/flake.nix
index 3105515..4f4619d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,7 +41,7 @@
       # Accessible via 'nixos-rebuild'
       nixosConfigurations = {
         # FIXME: Replace with your hostname
-        replace-me = nixosSystem {
+        your-hostname = nixosSystem {
           system = "x86_64-linux";
 
           modules = [
@@ -61,9 +61,9 @@
       # Accessible via 'home-manager'
       homeConfigurations = {
         # FIXME: Replace with your username@hostname
-        "replace-me@me-too-please" = homeManagerConfiguration rec {
+        "your-name@your-hostname" = homeManagerConfiguration rec {
           # FIXME: Replace with your username
-          username = "replace-me-daddy";
+          username = "your-name";
           homeDirectory = "/home/${username}";
           system = "x86_64-linux";
 
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 4c57f00..7262593 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -45,7 +45,7 @@
   # FIXME: Add the rest of your current configuration
 
   # TODO: Set your hostname
-  networking.hostName = "cool-computer";
+  networking.hostName = "your-hostname";
 
   # TODO: This is just an example, be sure to use whatever bootloader you prefer
   boot.loader.systemd-boot.enable = true;
@@ -53,7 +53,11 @@
   # TODO: Configure your system-wide user settings (groups, etc), add more users as needed.
   users.users = {
     # FIXME: Replace with your username
-    you = {
+    your-name = {
+      # TODO: You can set an initial password for your user.
+      # If you do, you can skip setting a root password by passing '--no-root-passwd' to nixos-install.
+      # Be sure to change it (using passwd) after rebooting!
+      # initialPassword = "correcthorsebatterystaple";
       isNormalUser = true;
       openssh.authorizedKeys.keys = [
         # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect
diff --git a/shell.nix b/shell.nix
index 5736b9e..3b33b7e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -6,7 +6,7 @@
       if builtins.pathExists ./flake.lock
       then
       # If we have a lock, fetch locked nixpkgs
-        let lock = builtins.fromJSON (builtins.readFile ./flake.lock).nodes.nixpkgs.locked;
+        let lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
         in
         fetchTarball {
           url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";