configs: packages: add nvim

builder/component/pacman.py

@@ -151,9 +151,6 @@ class Pacman:
 				if ret != 0: raise OSError(f"wget failed with {ret}")
 				self.pacman_key(["--add", keypath])
 				self.lsign_key(repo.keyid)
-			elif repo.keyid is not None:
-				self.recv_keys(repo.keyid)
-				self.lsign_key(repo.keyid)
 
 	def init_config(self):
 		"""
@@ -305,6 +302,9 @@ class Pacman:
 			if "publickey" in repo and "keyid" not in repo:
 				raise ArchBuilderConfigError("publickey is provided without keyid")
 
+			if "keyid" in repo and "publickey" not in repo:
+				raise ArchBuilderConfigError("keyid is provided without publickey")
+
 			if "publickey" in repo:
 				pacman_repo.publickey = repo["publickey"]
 

configs/common/pacman-init.yaml

@@ -1,17 +0,0 @@
-filesystem:
-  files:
-  - path: /etc/systemd/system/wait-addresses@.service
-    content: |
-      [Unit]
-      Description=Initializes Pacman keyring
-      Requires=etc-pacman.d-gnupg.mount
-      After=etc-pacman.d-gnupg.mount time-sync.target
-      BindsTo=etc-pacman.d-gnupg.mount
-      Before=archlinux-keyring-wkd-sync.service
-      [Service]
-      Type=oneshot
-      RemainAfterExit=yes
-      ExecStart=/usr/bin/pacman-key --init
-      ExecStart=/usr/bin/pacman-key --populate
-      [Install]
-      WantedBy=multi-user.target