Skip to content

Commit da7091f

Browse files
committed
feat(iso): apply suggestions from code review
1 parent 04b6f18 commit da7091f

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Installation without impermanence/disko can be done normally from the NixOS Live
114114

115115
### Installing with Custom ISO
116116

117-
You can generate a universal installer ISO that includes all your host configurations:
117+
From this repo, you can generate a universal installer ISO that includes all the available host configurations:
118118

119119
```bash
120120
just build-iso
@@ -131,6 +131,8 @@ Boot from the ISO, then:
131131
sudo disko-install --flake /etc/iso-config#HOSTNAME --disk main /dev/DEVICE
132132
```
133133
134+
Don't forget to apply the post-installation steps described in the next section (password file).
135+
134136
**For standard hosts:**
135137
```bash
136138
# Partition manually, then install any host:
@@ -177,7 +179,6 @@ sudo nixos-enter --root /mnt
177179
You can generate Proxmox-ready VMA images for your VM hosts:
178180
179181
```bash
180-
# Build a Proxmox image for a specific host
181182
just build-proxmox nixos-kimsufi-01
182183
```
183184

justfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ build-proxmox host:
5252
@echo "Building Proxmox image for {{host}}"
5353
nix build .#proxmox-{{host}} --print-out-paths
5454

55-
build-all-proxmox:
56-
@echo "Building all Proxmox images"
57-
nix build .#proxmox-nixos-kimsufi-01 .#proxmox-nixos-kimsufi-02 .#proxmox-nixos-kimsufi-03 .#proxmox-nixos-era-01
58-
5955
first-install-disko host target:
6056
@echo "Installing host {{host}} on target disk {{target}}"
6157
sudo nix run 'github:nix-community/disko/latest#disko-install' -- --flake .#{{host}} --disk main {{target}} --show-trace

modules/disko/encrypted-btrfs-impermanence.nix

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
{ hostName, lib, ... }:
1+
{
2+
hostName,
3+
lib,
4+
config,
5+
...
6+
}:
27
{
38
options = {
49
disko.mainDisk = lib.mkOption {
@@ -14,7 +19,7 @@
1419
disk = {
1520
main = {
1621
type = "disk";
17-
device = lib.mkDefault "/dev/nvme0n1";
22+
device = config.disko.mainDisk;
1823
content = {
1924
type = "gpt";
2025
partitions = {

0 commit comments

Comments
 (0)