ch-equinox-ws: re-install with ubuntu noble

2 files changed, 21 insertions, 21 deletions

diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml
index 43288d79..b2dd76db 100644
--- a/chaos-at-home/ch-equinox-ws.yml
+++ b/chaos-at-home/ch-equinox-ws.yml
@@ -24,15 +24,14 @@
   - role: apt-repo/backports
   - role: apt-repo/spreadspace
   - role: apt-repo/ansible
-  - role: apt-repo/tor-project
+  #- role: apt-repo/tor-project  ## https://gitlab.torproject.org/tpo/core/tor/-/issues/40946
   - role: apt-repo/kubernetes
   - role: apt-repo/element
-  - role: apt-repo/qmk
+  #- role: apt-repo/qmk  ## qmk-repo does not support noble yet..
   - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: ws/base
   - role: core/users
-  - role: ws/pipewire
   - role: ws/flatpak
   post_tasks:
   - name: disable caps-lock
@@ -49,11 +48,12 @@
       opts: nodev,x-systemd.automount,nofail
       state: mounted
 
-  - name: install deps for c3voc/cm repo
-    pip:
-      name:
-      - "bundlewrap>=4.13.6"
-      - "bundlewrap-keepass"
+  ## PEP 668
+  #- name: install deps for c3voc/cm repo
+  #  pip:
+  #    name:
+  #    - "bundlewrap>=4.13.6"
+  #    - "bundlewrap-keepass"
 
   # - name: install gotify-desktop
   #   become: yes
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index f2456b54..98fbd9fc 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -106,7 +106,6 @@ ws_base_extra_packages:
   - clinfo
   - cmake
   - cpu-x
-  - cura
   - ddrescueview
   - debhelper
   - debmake
@@ -168,7 +167,6 @@ ws_base_extra_packages:
   - kpartx
   - libdbd-mysql-perl
   - libgpgme11
-  - libncurses5
   - libusb-dev
   - libusb-1.0-0-dev
   - libvirt-clients
@@ -183,7 +181,6 @@ ws_base_extra_packages:
   - meld
   - meson
   - mingw-w64
-  - mono-devel
   - mosh
   - msmtp-mta
   - mumble
@@ -226,8 +223,7 @@ ws_base_extra_packages:
   - python3-sphinx-rtd-theme
   - python3-toml
   - python3-xopen
-  - qemu
-  - qemu-kvm
+  - qemu-system
   - qemu-system-gui
   - qemu-user-static
   - qemu-utils
@@ -252,7 +248,7 @@ ws_base_extra_packages:
   - spice-client-gtk
   - sqlite3
   - sshfs
-  - steam
+  - steam-installer
   - stlink-tools
   - stm32flash
   - stress
@@ -288,27 +284,28 @@ ws_base_extra_packages:
   - xdg-desktop-portal-gtk
   - xfce4-goodies
   - xorriso
-  - xul-ext-lightning
   - yamllint
   - yasm
   # needs apt-repo/spreadspace
   - go
   - info-beamer
-  #- helm         ## TODO: not yet in repo for jammy
   - k9s
   - kubeletctl
   - grype
   # needs apt-repo/ansible
   - ansible
-  # needs apt-repo/tor-project
-  - tor
-  - tor-geoipdb
+  ### needs apt-repo/tor-project -> https://gitlab.torproject.org/tpo/core/tor/-/issues/40946
+  ##- tor
+  ##- tor-geoipdb
   # needs apt-repo/kubernetes
   - kubectl
   # needs apt-repo/element
   - element-desktop
-  # needs apt-repo/qmk
-  - qmk
+  ## needs apt-repo/qmk
+  #- qmk
+
+ws_base_extra_snaps:
+  - thunderbird
 
 kubernetes_version: "1.30"
 
@@ -346,3 +343,6 @@ ws_flatpak_apps:
   - name: org.kicad.KiCad
     shortcuts:
     - name: kicad
+  - name: com.ultimaker.cura
+    shortcuts:
+    - name: cura