docs: document amd-hybrid profile and new driver module

- Add amd-hybrid to profile lists in README/WARP/cheatsheets
- Note Bus ID consumption and kernel pin via nvidia-amd-hybrid module
- Update manual rebuild examples to include amd-hybrid
This commit is contained in:
Don Williams 2025-09-18 17:11:48 -04:00
commit b802b830f2
8 changed files with 12 additions and 12 deletions

View file

@ -238,7 +238,7 @@ git add .
nixos-generate-config --show-hardware-config > hosts/<nombre-del-host>/hardware.nix
```
7. Ejecuta esto para habilitar flakes e instalar, reemplazando hostname por el perfil (p. ej. `intel`, `nvidia`, `nvidia-laptop` o `vm`):
7. Ejecuta esto para habilitar flakes e instalar, reemplazando hostname por el perfil (p. ej. `intel`, `nvidia`, `nvidia-laptop`, `amd-hybrid` o `vm`):
```
NIX_CONFIG="experimental-features = nix-command flakes"

View file

@ -254,7 +254,7 @@ nixos-generate-config --show-hardware-config > hosts/<your-desired-hostname>/har
```
7. Run this to enable flakes and install the flake replacing hostname with
profile. I.e. `intel`, `nvidia` `nvidia-laptop`, or `vm`
profile. I.e. `intel`, `nvidia`, `nvidia-laptop`, `amd-hybrid`, or `vm`
```
NIX_CONFIG="experimental-features = nix-command flakes"

View file

@ -36,7 +36,7 @@ Common commands
- ./upgrade-2.3-to-2.4.sh --revert
Notes on profiles and hosts
- Profiles represent hardware targets: amd, intel, nvidia, nvidia-laptop (hybrid), vm.
- Profiles represent hardware targets: amd, intel, nvidia, nvidia-laptop (intel+NVIDIA hybrid), amd-hybrid (AMD+NVIDIA hybrid), vm.
- Use the profile in flake targets like .#vm or .#nvidia, or via nh’s --hostname.
- Host-specific settings live under hosts/<hostname>/; variables.nix holds UX and feature toggles.
@ -47,7 +47,7 @@ High-level architecture (big picture)
- Each configuration imports profiles/<profile>.
- profiles/<profile>/default.nix
- Imports host and stacks: ../../hosts/${host}, ../../modules/drivers, ../../modules/core.
- Toggles drivers and VM guest services per profile; the nvidia-laptop profile consumes Bus IDs from host variables.
- Toggles drivers and VM guest services per profile; the nvidia-laptop and amd-hybrid profiles consume Bus IDs from host variables.
- hosts/<hostname>/
- default.nix imports hardware.nix and host-packages.nix.
- variables.nix is the primary control surface (display manager, terminal/browser defaults, waybarChoice, stylix image, 24h clock, Thunar/printing/NFS flags, intel/nvidia Bus IDs, etc.).
@ -56,7 +56,7 @@ High-level architecture (big picture)
- nh.nix enables nh and pins programs.nh.flake to ~/zaneyos.
- user.nix integrates Home Manager and creates users.${username}, passing { inputs, username, host, profile } to the home layer.
- modules/drivers
- AMD, Intel, NVIDIA, NVIDIA Prime, and VM guest services; nvidia-prime options (enable, intelBusID, nvidiaBusID) are consumed by the nvidia-laptop profile.
- AMD, Intel, NVIDIA, NVIDIA Prime, NVIDIA AMD-Hybrid, and VM guest services; nvidia-prime options (enable, intelBusID, nvidiaBusID) are consumed by the nvidia-laptop profile; nvidia-amd-hybrid options (enable, amdgpuBusID, nvidiaBusID) are consumed by the amd-hybrid profile.
- modules/home
- Composes the user environment: Hyprland, Waybar (via waybarChoice), Rofi, Yazi, terminals (Kitty/WezTerm/Ghostty/Alacritty toggles), Zsh/Bash config, Git, NVF/Neovim, OBS, swaync, scripts, Stylix, optional Doom Emacs/VSCodium/Helix.
- scripts/default.nix installs zcli; zcli wraps rebuild/update/boot, cleanup, diagnostics, host management, and Doom lifecycle.

View file

@ -11,7 +11,7 @@ Preferido (específico de ZaneyOS):
- Nota: el alias `fr` está obsoleto.
Método manual de respaldo (funciona en cualquier instalación):
- Desde la raíz del repo, reemplaza PROFILE por tu perfil (intel, nvidia, nvidia-laptop, vm):
- Desde la raíz del repo, reemplaza PROFILE por tu perfil (intel, nvidia, nvidia-laptop, amd-hybrid, vm):
- `sudo nixos-rebuild switch --flake .#PROFILE`
---

View file

@ -11,7 +11,7 @@ Preferred (ZaneyOS-specific):
- Note: The `fr` alias is deprecated.
Manual backup method (works anywhere):
- From the repo root, replace PROFILE with your profile (intel, nvidia, nvidia-laptop, vm):
- From the repo root, replace PROFILE with your profile (intel, nvidia, nvidia-laptop, amd-hybrid, vm):
- `sudo nixos-rebuild switch --flake .#PROFILE`
---

View file

@ -57,7 +57,7 @@ Preferido (específico de ZaneyOS):
- Nota: el alias `fr` está obsoleto.
Método manual de respaldo (funciona en cualquier instalación):
- Desde la raíz del repo, reemplaza PROFILE por tu perfil (intel, nvidia, nvidia-laptop, vm):
- Desde la raíz del repo, reemplaza PROFILE por tu perfil (intel, nvidia, nvidia-laptop, amd-hybrid, vm):
- `sudo nixos-rebuild switch --flake .#PROFILE`
Consejos

View file

@ -57,7 +57,7 @@ Preferred (ZaneyOS-specific):
- Note: The `fr` alias is deprecated.
Manual backup method (works anywhere):
- From the repo root, replace PROFILE with your profile (intel, nvidia, nvidia-laptop, vm):
- From the repo root, replace PROFILE with your profile (intel, nvidia, nvidia-laptop, amd-hybrid, vm):
- `sudo nixos-rebuild switch --flake .#PROFILE`
Tips

View file

@ -34,7 +34,7 @@ zcli advanced options (for rebuild/update)
- --no-nom disable nix-output-monitor
Profiles and when to use them
- amd, intel, nvidia, nvidia-laptop (hybrid), vm
- amd, intel, nvidia, nvidia-laptop (intel+NVIDIA hybrid), amd-hybrid (AMD+NVIDIA hybrid), vm
- Choose with the <profile> argument in nh/nixos-rebuild commands (e.g., .#vm)
High-level architecture
@ -49,7 +49,7 @@ High-level architecture
- ../../modules/drivers
- ../../modules/core
- Flips toggles: drivers.*.enable and vm.guest-services.enable
- Hybrid laptops: profiles/nvidia-laptop pulls intel/nvidia Bus IDs from the host’s variables.nix and wires nvidia-prime
- Hybrid laptops: profiles/nvidia-laptop pulls intel/nvidia Bus IDs from the host’s variables.nix and wires nvidia-prime; profiles/amd-hybrid pulls amdgpu/nvidia Bus IDs and wires the AMD+NVIDIA offload module
- hosts/<hostname>/
- default.nix imports hardware.nix and host-packages.nix
- variables.nix is the control panel for UX + feature toggles:
@ -64,7 +64,7 @@ High-level architecture
- nh.nix enables nh, configures GC, and pins programs.nh.flake = /home/${username}/zaneyos
- modules/drivers
- Aggregates AMD, Intel, NVIDIA, NVIDIA Prime, and VM guest services
- nvidia-prime-drivers.nix exposes options.drivers.nvidia-prime.{enable,intelBusID,nvidiaBusID} consumed by the nvidia-laptop profile
- nvidia-prime-drivers.nix exposes options.drivers.nvidia-prime.{enable,intelBusID,nvidiaBusID} consumed by the nvidia-laptop profile; nvidia-amd-hybrid.nix exposes options.drivers.nvidia-amd-hybrid.{enable,amdgpuBusID,nvidiaBusID} consumed by the amd-hybrid profile
- vm-guest-services.nix enables qemu-guest, spice agents when vm.guest-services.enable = true
- modules/home
- default.nix composes the user environment (Hyprland, Waybar via waybarChoice, Rofi, Yazi, Kitty/WezTerm/Ghostty/Alacritty toggles, Zsh/Bash config, Git, NVF/Neovim, OBS, swaync, scripts, Stylix, optional Doom Emacs/VSCodium/Helix)