Debian: add non-free-firmware for bookworm, but not bullseye

https://www.debian.org/releases/bookworm/amd64/release-notes/ch-information.html#non-free-split

Author: kenyon

data/common.yaml

@@ -1,5 +1,7 @@
 ---
 lookup_options:
+  apt::sources:
+    merge: hash
   munin::node::plugins:
     merge: hash
   profile::kenyon::dotfiles:

data/os/codename/bullseye.yaml

@@ -1,4 +1,31 @@
 apt::sources:
+  debian:
+    location: https://deb.debian.org/debian
+    release: "%{facts.os.distro.codename}"
+    repos: main contrib non-free
+    include:
+      src: true
+    architecture: "%{facts.os.architecture}"
+    keyring: /usr/share/keyrings/debian-archive-keyring.gpg
+
+  security:
+    location: https://deb.debian.org/debian-security
+    release: "%{facts.os.distro.codename}-security"
+    repos: main contrib non-free
+    include:
+      src: true
+    architecture: "%{facts.os.architecture}"
+    keyring: /usr/share/keyrings/debian-archive-keyring.gpg
+
+  updates:
+    location: https://deb.debian.org/debian
+    release: "%{facts.os.distro.codename}-updates"
+    repos: main contrib non-free
+    include:
+      src: true
+    architecture: "%{facts.os.architecture}"
+    keyring: /usr/share/keyrings/debian-archive-keyring.gpg
+
   puppet-tools:
     location: https://apt.puppet.com
     release: "%{facts.os.distro.codename}"

data/os/family/Debian.yaml

@@ -65,7 +65,7 @@ apt::sources:
   debian:
     location: https://deb.debian.org/debian
     release: "%{facts.os.distro.codename}"
-    repos: main contrib non-free
+    repos: main contrib non-free non-free-firmware
     include:
       src: true
     architecture: "%{facts.os.architecture}"
@@ -74,7 +74,7 @@ apt::sources:
   security:
     location: https://deb.debian.org/debian-security
     release: "%{facts.os.distro.codename}-security"
-    repos: main contrib non-free
+    repos: main contrib non-free non-free-firmware
     include:
       src: true
     architecture: "%{facts.os.architecture}"
@@ -83,7 +83,7 @@ apt::sources:
   updates:
     location: https://deb.debian.org/debian
     release: "%{facts.os.distro.codename}-updates"
-    repos: main contrib non-free
+    repos: main contrib non-free non-free-firmware
     include:
       src: true
     architecture: "%{facts.os.architecture}"