Update readme

.gitignore

@@ -3,4 +3,3 @@
 result
 result-*
 
-nixos-efi-vars.fd

README.md

@@ -1,15 +1,9 @@
 # nixos
 
-## Set up virtual machine ([`disko`](https://github.com/nix-community/disko/blob/master/docs/interactive-vm.md))
+My NixOS config
-
-1. Build the virtual machine
 
 ```
-nix run -L '.#nixosConfigurations.vm.config.system.build.vmWithDisko'
+git clone https://git.hektormisplon.xyz/hektor/nix.git
-```
+cd nix
-
+sudo nix run 'github:nix-community/disko/latest#disko-install' -- --flake .#vm --disk root /dev/vda
-2. Run the virtual machine
-
-```
-QEMU_KERNEL_PARAMS=console=ttyS0 ./result/bin/run-nixos-vm -nographic; reset
 ```

flake.lock

@@ -44,11 +44,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759580034,
+        "lastModified": 1759439645,
-        "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=",
+        "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318",
+        "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,32 +3,23 @@
     nixpkgs = {
       url = "github:nixos/nixpkgs?ref=nixos-25.05";
     };
-    disko = {
-      url = "github:nix-community/disko/latest";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     home-manager = {
       url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    disko = {
+      url = "github:nix-community/disko/latest";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs =
+  outputs = { self, nixpkgs, disko, home-manager }: {
-    {
+    nixosConfigurations.vm = nixpkgs.lib.nixosSystem {
-      self,
-      nixpkgs,
-      disko,
-      home-manager,
-    }:
-    {
-      nixosConfigurations = {
-        vm = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-            disko.nixosModules.disko
         ./hosts/vm/configuration.nix
-            home-manager.nixosModules.home-manager
+        disko.nixosModules.disko
-            {
+        home-manager.nixosModules.home-manager {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.users.h = ./hosts/vm/home.nix;
@@ -36,5 +27,4 @@
       ];
     };
   };
-    };
 }

hosts/vm/configuration.nix

@@ -3,7 +3,8 @@
 {
   system.stateVersion = "25.05";
 
-  imports = [
+  imports =
+    [
       ./hard.nix
       ./disk.nix
       ../../modules/bootloader.nix
@@ -15,23 +16,24 @@
       ../../modules/x.nix
     ];
 
-  nix.settings.experimental-features = [
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    "nix-command"
-    "flakes"
-  ];
 
+  # These are needed for ZFS
 
-  disko.devices.disk.main.device = "/dev/vda";
+  networking.hostId = "25698a58";
+  # https://discourse.nixos.org/t/zfs-with-disko-faluire-to-import-zfs-pool/61988/3
+  boot = {
+    zfs = {
+        devNodes = "/dev/disk/by-uuid";
+      };
+  };
 
   programs.git.enable = true;
   programs.firefox.enable = true;
 
   nixpkgs.config.allowUnfree = true;
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ neovim ];
-    neovim
-    kitty
-  ];
 
   services.spice-vdagentd.enable = true;
   services.openssh = {

hosts/vm/disk.nix

@@ -1,42 +1 @@
-# USAGE in your configuration.nix.
+import ../../modules/disko.zfs-encrypted-root.nix
-# Update devices to match your hardware.
-# {
-#  imports = [ ./disko-config.nix ];
-#  disko.devices.disk.main.device = "/dev/sda";
-# }
-{
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        content = {
-          type = "gpt";
-          partitions = {
-            boot = {
-              size = "1M";
-              type = "EF02"; # for grub MBR
-            };
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              size = "100%";
-              content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/";
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

hosts/vm/hard.nix

@@ -1,26 +1,14 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
-    "ahci"
-    "xhci_pci"
-    "virtio_pci"
-    "sr_mod"
-    "virtio_blk"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];

modules/networking.nix

@@ -2,11 +2,7 @@
 
 {
   networking.hostName = "nixos";
-  networking.wireless = {
+  networking.wireless = { iwd = { enable = true; }; };
-    iwd = {
-      enable = true;
-    };
-  };
   networking.firewall = {
     enable = true;
     allowedTCPPorts = [ 22 ];