# HG changeset patch
# User drewp@bigasterisk.com
# Date 1678565965 28800
# Node ID 51a48aeca8ba4edf6cd966b0112acb062da53845
# Parent  2065998876e4f2129687400612f0e67fa1aaca4c
node/npm fixes

diff -r 2065998876e4 -r 51a48aeca8ba package_lists.py
--- a/package_lists.py	Sat Mar 11 12:17:56 2023 -0800
+++ b/package_lists.py	Sat Mar 11 12:19:25 2023 -0800
@@ -17,7 +17,10 @@
     'dirmngr',
     'gnupg2',
 ]
-
+non_pi_setup = [
+    'nodejs',  # alt source, contains npm
+    # 'npm',
+]
 general = [
     'apt-listchanges',
     'aptitude',
@@ -47,7 +50,6 @@
 non_pi = [
     'lpr',
     'nfs-client',
-    'nodejs', # alt source, includes npm
     'podman-docker',  # updated with https://podman.io/getting-started/installation
 #    'python3-dulwich', # desired, but it may depend on an old python3
     'python3-invoke',
diff -r 2065998876e4 -r 51a48aeca8ba packages.py
--- a/packages.py	Sat Mar 11 12:17:56 2023 -0800
+++ b/packages.py	Sat Mar 11 12:19:25 2023 -0800
@@ -21,8 +21,6 @@
 
 
 def pnpm():
-    if host not in ['plus', 'prime', 'slash', 'bang', 'dot']:
-        return
     server.shell([
         # https://github.com/pnpm/pnpm/releases
         # but also https://pnpm.io/installation#compatibility
@@ -47,6 +45,7 @@
 apt.packages(packages=package_lists.setup, **kw)
 
 if not is_pi:
+    apt.packages(packages=package_lists.non_pi_setup)
     if host.name != 'pipe':
         apt.packages(packages=['reptyr'])
     kitty()
diff -r 2065998876e4 -r 51a48aeca8ba templates/sources.list.j2
--- a/templates/sources.list.j2	Sat Mar 11 12:17:56 2023 -0800
+++ b/templates/sources.list.j2	Sat Mar 11 12:19:25 2023 -0800
@@ -12,7 +12,7 @@
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates main restricted
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates multiverse
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates universe
-deb [signed-by=/etc/apt/trusted.gpg] https://deb.nodesource.com/node_16.x jammy main
+deb [signed-by=/etc/apt/trusted.gpg] https://deb.nodesource.com/node_18.x jammy main
 deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/repos/code stable main
 deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main
 deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ unstable main
@@ -32,7 +32,7 @@
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates main restricted
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates multiverse
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates universe
-deb [signed-by=/etc/apt/trusted.gpg] https://deb.nodesource.com/node_16.x jammy main
+deb [signed-by=/etc/apt/trusted.gpg] https://deb.nodesource.com/node_18.x jammy main
 {% endif %}
 
 {% if host.name in ['ditto'] %}
@@ -64,9 +64,8 @@
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates main restricted
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates multiverse
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates universe
-deb [signed-by=/etc/apt/trusted.gpg] https://deb.nodesource.com/node_16.x jammy main
+deb [signed-by=/etc/apt/trusted.gpg] https://deb.nodesource.com/node_18.x jammy main
 deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main
-deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ unstable main
 {% endif %}
 
 {% if host.name in ['dot'] %}
@@ -82,9 +81,8 @@
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates main restricted
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates multiverse
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates universe
-deb [signed-by=/etc/apt/trusted.gpg] https://deb.nodesource.com/node_16.x jammy main
+deb [signed-by=/etc/apt/trusted.gpg] https://deb.nodesource.com/node_18.x jammy main
 deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main
-deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ unstable main
 {% endif %}
 
 {% if host.name in ['pipe'] %}
@@ -136,5 +134,5 @@
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates main restricted
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates multiverse
 deb http://us.archive.ubuntu.com/ubuntu jammy-updates universe
-deb [signed-by=/etc/apt/trusted.gpg] https://deb.nodesource.com/node_16.x jammy main
+deb [signed-by=/etc/apt/trusted.gpg] https://deb.nodesource.com/node_18.x jammy main
 {% endif %}