--- a/package_lists.py	Wed Dec 21 13:09:32 2022 -0800
+++ b/package_lists.py	Wed Dec 21 13:44:38 2022 -0800
@@ -19,6 +19,7 @@
 ]
 
 general = [
+    'apt-listchanges',
     'aptitude',
     'atool',
     'emacs',
@@ -47,8 +48,8 @@
     'nfs-client',
     'nodejs',
     'npm',
-    'podman-docker', # updated with https://podman.io/getting-started/installation
-    'python3-dulwich',
+    'podman-docker',  # updated with https://podman.io/getting-started/installation
+#    'python3-dulwich', # desired, but it may depend on an old python3
     'python3-invoke',
     'python3-pip',
     'python3-venv',
@@ -89,6 +90,11 @@
     'python3-iptables',
 ]
 
+for_prime = [
+    'opendkim',
+    'opendkim-tools',
+]
+
 laptop = [
     'brightnessctl',
     'i3',
@@ -101,7 +107,7 @@
     'arandr',
     'ardour',
     'code',
-    'cuda-minimal-build-11-8',
+    #'cuda-minimal-build-11-8', some issue on slash
     'dolphin',
     'eog',
     'evtest',
@@ -133,7 +139,7 @@
     'i3lock',
     'k4dirstat',
     'kitty',
-    'libcudnn8',
+#    'libcudnn8', some issue on slash
     'libreoffice-draw',
     'libreoffice-impress',
     'libreoffice-writer',
@@ -165,16 +171,17 @@
     'kbd',
     'libnvidia-cfg1-520',
     'libnvidia-common-520',
-    'libnvidia-compute-520:i386',
+    # not  on slash ,maybe needed for dash/steam?
+    #    'libnvidia-compute-520:i386',
     'libnvidia-compute-520',
-    'libnvidia-decode-520:i386',
+    #'libnvidia-decode-520:i386',
     'libnvidia-decode-520',
-    'libnvidia-encode-520:i386',
+    #'libnvidia-encode-520:i386',
     'libnvidia-encode-520',
     'libnvidia-extra-520',
-    'libnvidia-fbc1-520:i386',
+    #'libnvidia-fbc1-520:i386',
     'libnvidia-fbc1-520',
-    'libnvidia-gl-520:i386',
+    #'libnvidia-gl-520:i386',
     'libnvidia-gl-520',
     'nvidia-compute-utils-520',
     'nvidia-dkms-520',

--- a/packages.py	Wed Dec 21 13:09:32 2022 -0800
+++ b/packages.py	Wed Dec 21 13:44:38 2022 -0800
@@ -7,7 +7,7 @@
 
 
 def kitty():
-    vers = '0.26.4'  # see https://github.com/kovidgoyal/kitty/releases
+    vers = '0.26.5'  # see https://github.com/kovidgoyal/kitty/releases
     home = '/home/drewp'
     local = f"{home}/.local/kitty"
     dl = f'/tmp/kitty-{vers}-x86_64.txz'
@@ -24,7 +24,7 @@
     server.shell([
         # https://github.com/pnpm/pnpm/releases
         # but also https://pnpm.io/installation#compatibility
-        "npm install -g pnpm@6.35.0",
+        "npm install -g pnpm@6.35.1",
     ])
 
 
@@ -34,72 +34,56 @@
         apt.packages(packages='plocate')
 
 
-def pi_sources():
-    apt.packages(packages=['mandb', 'apt-listchanges'], present=False)
-    files.template(src='templates/pi_sources.list.j2', dest='/etc/apt/sources.list', rel='bullseye')
-    # 'apt upgrade'?
-    apt.packages(
-        update=False,  # see system.py
-        packages=package_lists.pi_setup)
-
-    apt.key(src='https://ftp-master.debian.org/keys/archive-key-8.asc')
-    apt.key(src='https://ftp-master.debian.org/keys/archive-key-8-security.asc')
-    apt.key(src='https://ftp-master.debian.org/keys/archive-key-9-security.asc')
-    apt.key(keyserver='keyserver.ubuntu.com', keyid='04EE7237B7D453EC')
-    apt.key(keyserver='keyserver.ubuntu.com', keyid='648ACFD622F3D138')
-
-    files.file(path='/etc/apt/sources.list.d/raspi.list', present=False)
-
-    files.template(src='templates/boot_config.txt.j2', dest='/boot/config.txt')
+def proper_man():
+    if host.name in ['pipe', 'prime'] or is_pi:
+        apt.packages(packages=['mandb'], present=False)
 
 
-if not is_pi:
-    apt.key(keyserver='keyserver.ubuntu.com', keyid='8B48AD6246925553')
+def pkg_keys():
+    # apt.key(keyserver='keyserver.ubuntu.com', keyid='04EE7237B7D453EC')
+    # apt.key(keyserver='keyserver.ubuntu.com', keyid='648ACFD622F3D138')
+    # apt.key(keyserver='keyserver.ubuntu.com', keyid='8B48AD6246925553')
+    # apt.key(keyserver='keyserver.ubuntu.com', keyid='F24AEA9FB05498B7')
+    apt.key(src='https://dl.google.com/linux/linux_signing_key.pub')
+    apt.key(src='https://ftp-master.debian.org/keys/archive-key-8-security.asc')
+    apt.key(src='https://ftp-master.debian.org/keys/archive-key-8.asc')
+    apt.key(src='https://ftp-master.debian.org/keys/archive-key-9-security.asc')
+    apt.key(src='https://packages.microsoft.com/keys/microsoft.asc')
 
 
-if host.name in ['pipe','prime'] or is_pi:
-    apt.packages(packages=['mandb'], present=False)
-
-if host.name == 'pipe':
-    apt.packages(packages=['apt-listchanges'], present=False)
-elif is_pi:
-    pi_sources()
+pkg_keys()
 
 apt.packages(packages=package_lists.setup)
+
 if not is_pi:
-    if host.name != 'prime':
-        apt.key(src='https://dl.google.com/linux/linux_signing_key.pub')
-        apt.repo(src='deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main')
-
-        apt.key(src='https://packages.microsoft.com/keys/microsoft.asc')
-        apt.repo(src="deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code stable main")
-
-        apt.key(keyserver='keyserver.ubuntu.com', keyid='F24AEA9FB05498B7')
-        apt.repo(src="deb [arch=amd64,i386] https://repo.steampowered.com/steam/ stable steam")
-
-    apt.packages(packages=package_lists.non_pi)
     if host.name != 'pipe':
-        apt.packages(packages=[
-            'reptyr',
-        ])
-
+        apt.packages(packages=['reptyr'])
     kitty()
     pnpm()
+else:
+    apt.packages(packages=package_lists.pi_setup)
 
 proper_locate()
+proper_man()
+
 apt.packages(packages=package_lists.general)
 apt.packages(packages=package_lists.debug)
 
-
 if host.name == "bang":
     apt.packages(packages=package_lists.for_bang)
 
 if host.name == "pipe":
     apt.packages(packages=package_lists.for_pipe)
 
+if host.name == "prime":
+    apt.packages(packages=package_lists.for_prime)
+
 if host.name == 'plus':
     apt.packages(packages=package_lists.laptop)
 
 desktop_env = host.name in ['dash', 'slash', 'plus']
 if desktop_env:
     apt.packages(packages=package_lists.xorg + package_lists.desktop)
+
+if not is_pi:
+    apt.packages(packages=package_lists.non_pi)