From 43a1af6a1772d71f0bba93c08ba2180c47c6bce7 Mon Sep 17 00:00:00 2001 From: Maaz Khokhar Date: Tue, 7 Jul 2026 00:06:35 -0500 Subject: [PATCH] made podman the default oci runtime removed the bootloader from the core table in markdown --- cheatsheet.md | 28 ++++++++++------------------ modules/virtualization/podman.nix | 12 ++++++++---- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/cheatsheet.md b/cheatsheet.md index cb27db5..f1956e9 100644 --- a/cheatsheet.md +++ b/cheatsheet.md @@ -15,30 +15,22 @@ imports = [ Base system setup: kernel, bootloader, primary user, SSH, unfree packages. -| Option | Type | Default | Notes | -| ------------------------------- | ------------------------------------------------ | ---------------- | -------------------------------------------------------------------- | -| `kernel` | `"stable"` \| `"lts"` \| `"latest"` | `"lts"` | Maps to `linuxPackages`, `linuxPackages_lts`, `linuxPackages_latest` | -| `bootloader.type` | `"grub"` \| `"systemd"` | `"grub"` | Which bootloader path to use | -| `bootloader.grub.enable` | bool | `false` | Set `true` when `type = "grub"` | -| `bootloader.grub.device` | string | `"nodev"` | GRUB install target, e.g. `"/dev/sda"` | -| `bootloader.systemd.enable` | bool | `false` | Set `true` when `type = "systemd"` | -| `bootloader.systemd.efiSupport` | bool | `true` | | -| `user.name` | string | `"river"` | | -| `user.fullName` | string | `"Maaz Khokhar"` | | -| `user.shell` | string (typed as list in options — likely a bug) | `"fish"` | Used as `programs.${shell}.enable` | -| `allowUnfree` | bool | `true` | | -| `ssh.permitRootLogin` | bool | `false` | | +| Option | Type | Default | Notes | +| --------------------- | ------------------------------------------------ | ---------------- | -------------------------------------------------------------------- | +| `kernel` | `"stable"` \| `"lts"` \| `"latest"` | `"lts"` | Maps to `linuxPackages`, `linuxPackages_lts`, `linuxPackages_latest` | +| | +| `user.name` | string | `"river"` | | +| `user.fullName` | string | `"Maaz Khokhar"` | | +| `user.shell` | string (typed as list in options — likely a bug) | `"fish"` | Used as `programs.${shell}.enable` | +| `allowUnfree` | bool | `true` | | +| `ssh.permitRootLogin` | bool | `false` | | **Minimal core block:** ```nix homelab.core = { kernel = "lts"; - bootloader = { - type = "systemd"; - systemd.enable = true; - }; - # user / allowUnfree / ssh all have sensible defaults + # user / allowUnfree / ssh all have sensible defaults }; ``` diff --git a/modules/virtualization/podman.nix b/modules/virtualization/podman.nix index fe5f94b..a11d2cf 100644 --- a/modules/virtualization/podman.nix +++ b/modules/virtualization/podman.nix @@ -10,11 +10,15 @@ in { config = lib.mkMerge [ (lib.mkIf cfg.podman.enable { - virtualisation.podman = { - enable = true; + virtualisation = { + oci-containers.backend = "podman"; + podman = { - dockerCompat = true; - defaultNetwork.settings.dns_enabled = true; + enable = true; + + dockerCompat = true; + defaultNetwork.settings.dns_enabled = true; + }; }; # For rootless containers