diff --git a/README.md b/README.md
index 7af9679..e4e3e5c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Claude-Vm
+# Claude-VM
 
 Shamelessly stole and refactored from <https://github.com/solomon-b/claude-vm>.
 
@@ -39,7 +39,7 @@ in {
 }
 ```
 
-## Development Shell (Direnv)
+## Development Shell
 
 ```bash
 # First time setup
diff --git a/default.nix b/default.nix
index fe16220..b928859 100644
--- a/default.nix
+++ b/default.nix
@@ -23,32 +23,34 @@ let
         {
           imports = [ "${modulesPath}/virtualisation/qemu-vm.nix" ];
 
-          # virtualisation
-          virtualisation.graphics = false;
-          virtualisation.memorySize = 4096;
-          virtualisation.cores = 4;
+          virtualisation = {
+            graphics = false;
+            memorySize = 4096;
+            cores = 4;
 
-          virtualisation.sharedDirectories = {
-            workspace = {
-              source = ''"$WORKSPACE_DIR"'';
-              target = "/workspace";
-              securityModel = "none";
-            };
-            config = {
-              source = ''"$CLAUDE_VM_CONFIG_DIR"'';
-              target = "/mnt/claude-vm-config";
-              securityModel = "none";
+            sharedDirectories = {
+              workspace = {
+                source = ''"$WORKSPACE_DIR"'';
+                target = "/workspace";
+                securityModel = "none";
+              };
+              config = {
+                source = ''"$CLAUDE_VM_CONFIG_DIR"'';
+                target = "/mnt/claude-vm-config";
+                securityModel = "none";
+              };
             };
           };
 
-          # boot / console
-          boot.kernelParams = [ "console=ttyS0" ];
-          boot.loader.grub.enable = false;
-          boot.initrd.kernelModules = [
-            "9p"
-            "9pnet_virtio"
-          ];
-          # user
+          boot = {
+            kernelParams = [ "console=ttyS0" ];
+            loader.grub.enable = false;
+            initrd.kernelModules = [
+              "9p"
+              "9pnet_virtio"
+            ];
+          };
+
           users.users.claude = {
             isNormalUser = true;
             home = "/home/claude";
@@ -56,7 +58,6 @@ let
           };
 
           services.getty.autologinUser = "claude";
-          # Disable unnecessary services:
           services.udisks2.enable = false;
           programs.command-not-found.enable = false;