instal kicad via flatpak and remove now stale apt-repos

11 files changed, 8 insertions, 68 deletions

diff --git a/chaos-at-home/ch-equinox-t450s.yml b/chaos-at-home/ch-equinox-t450s.yml
index 35f76d6d..8b57b6bc 100644
--- a/chaos-at-home/ch-equinox-t450s.yml
+++ b/chaos-at-home/ch-equinox-t450s.yml
@@ -26,7 +26,6 @@
   - role: apt-repo/tor-project
   - role: apt-repo/kubernetes
   - role: apt-repo/element
-  - role: apt-repo/kicad6
   - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: ws/base
diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml
index e89df4f3..24e071b5 100644
--- a/chaos-at-home/ch-equinox-ws.yml
+++ b/chaos-at-home/ch-equinox-ws.yml
@@ -27,7 +27,6 @@
   - role: apt-repo/tor-project
   - role: apt-repo/kubernetes
   - role: apt-repo/element
-  - role: apt-repo/kicad6
   - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: ws/base
diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml
index 89d2fb56..1d0864bd 100644
--- a/inventory/host_vars/ch-equinox-t450s.yml
+++ b/inventory/host_vars/ch-equinox-t450s.yml
@@ -11,7 +11,7 @@ ubuntu_autoinstall_manual_partitioning: yes
 # edit ESP -> size 128M
 # add new GPT Part, 1G, ext4, /boot
 # add new GPT Part, rest of disk, unformatted -> create new LVM: name t450s, enable crypto
-# add new LV, root, 50G, ext4, /
+# add new LV, root, 70G, ext4, /
 # add new LV, storage, 380G, unformatted
 
 
@@ -158,11 +158,6 @@ ws_base_extra_packages:
   - jq
   - kdenlive
   - keepassx
-  - kicad
-  - kicad-footprints
-  - kicad-libraries
-  - kicad-packages3d
-  - kicad-symbols
   - kpartx
   - libdbd-mysql-perl
   - libgpgme11
@@ -424,3 +419,6 @@ ws_flatpak_apps:
     - name: freecad
     - name: freecadcmd
       command: FreeCADCmd
+  - name: org.kicad.KiCad
+    shortcuts:
+    - name: kicad
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index 64a21321..4ead9282 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -165,11 +165,6 @@ ws_base_extra_packages:
   - jq
   - kdenlive
   - keepassx
-  - kicad
-  - kicad-footprints
-  - kicad-libraries
-  - kicad-packages3d
-  - kicad-symbols
   - kpartx
   - libdbd-mysql-perl
   - libgpgme11
@@ -346,3 +341,6 @@ ws_flatpak_apps:
     - name: freecad
     - name: freecadcmd
       command: FreeCADCmd
+  - name: org.kicad.KiCad
+    shortcuts:
+    - name: kicad
diff --git a/roles/apt-repo/freecad/files/repo.gpg b/roles/apt-repo/freecad/files/repo.gpg
deleted file mode 100644
index 79cc23e8..00000000
--- a/roles/apt-repo/freecad/files/repo.gpg
+++ /dev/null
diff --git a/roles/apt-repo/freecad/tasks/main.yml b/roles/apt-repo/freecad/tasks/main.yml
deleted file mode 100644
index 2f6f48e1..00000000
--- a/roles/apt-repo/freecad/tasks/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: add repository key
-  copy:
-    src: repo.gpg
-    dest: /etc/apt/keyrings/freecad.gpg
-  register: apt_repo_freecad_key
-
-- name: add repository entry
-  copy:
-    content: |
-      deb [signed-by=/etc/apt/keyrings/freecad.gpg] https://ppa.launchpadcontent.net/freecad-maintainers/freecad-stable/ubuntu {{ ansible_distribution_release }} main
-    dest: /etc/apt/sources.list.d/freecad.list
-  register: apt_repo_freecad_sources
-
-- name: update apt cache
-  when: apt_repo_freecad_key is changed or
-        apt_repo_freecad_sources is changed
-  command: apt-get update
diff --git a/roles/apt-repo/kicad6/files/repo.gpg b/roles/apt-repo/kicad6/files/repo.gpg
deleted file mode 100644
index 274698cd..00000000
--- a/roles/apt-repo/kicad6/files/repo.gpg
+++ /dev/null
diff --git a/roles/apt-repo/kicad6/tasks/main.yml b/roles/apt-repo/kicad6/tasks/main.yml
deleted file mode 100644
index 7eea235e..00000000
--- a/roles/apt-repo/kicad6/tasks/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: add repository key
-  copy:
-    src: repo.gpg
-    dest: /etc/apt/keyrings/kicad6.gpg
-  register: apt_repo_kicad6_key
-
-- name: add repository entry
-  copy:
-    content: |
-      deb [signed-by=/etc/apt/keyrings/kicad6.gpg] https://ppa.launchpadcontent.net/kicad/kicad-6.0-releases/ubuntu {{ ansible_distribution_release }} main
-    dest: /etc/apt/sources.list.d/kicad6.list
-  register: apt_repo_kicad6_sources
-
-- name: update apt cache
-  when: apt_repo_kicad6_key is changed or
-        apt_repo_kicad6_sources is changed
-  command: apt-get update
diff --git a/roles/apt-repo/kubic-project/files/repo.gpg b/roles/apt-repo/kubic-project/files/repo.gpg
deleted file mode 100644
index 9b827ee8..00000000
--- a/roles/apt-repo/kubic-project/files/repo.gpg
+++ /dev/null
diff --git a/roles/apt-repo/kubic-project/tasks/main.yml b/roles/apt-repo/kubic-project/tasks/main.yml
deleted file mode 100644
index 658565d0..00000000
--- a/roles/apt-repo/kubic-project/tasks/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: add repository key
-  copy:
-    src: repo.gpg
-    dest: /etc/apt/keyrings/kubic-project.gpg
-  register: apt_repo_kubic_project_key
-
-- name: add repository entry
-  copy:
-    content: |
-      deb [signed-by=/etc/apt/keyrings/kubic-project.gpg] http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/{{ (ansible_distribution == 'Ubuntu') | ternary('xUbuntu', ansible_distribution) }}_{{ ansible_distribution_version }}/ /
-    dest: /etc/apt/sources.list.d/kubic-project.list
-  register: apt_repo_kubic_project_sources
-
-- name: update apt cache
-  when: apt_repo_kubic_project_key is changed or
-        apt_repo_kubic_project_sources is changed
-  command: apt-get update
diff --git a/roles/ws/flatpak/tasks/main.yml b/roles/ws/flatpak/tasks/main.yml
index e88be377..904d4cca 100644
--- a/roles/ws/flatpak/tasks/main.yml
+++ b/roles/ws/flatpak/tasks/main.yml
@@ -29,6 +29,6 @@
   copy:
     content: |
       #!/bin/sh
-      exec flatpak run{% if 'command' in item %} "--command={{ item.command }}"{% endif %} "{{ item.app }}"
+      exec flatpak run{% if 'command' in item %} "--command={{ item.command }}"{% endif %} "{{ item.app }}" "$@"
     dest: "/usr/local/bin/{{ item.name }}"
     mode: 0755