From 129b4d157116b0b1153fdb7789cabb1d2ad23fad Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Sun, 4 Feb 2024 15:35:02 +0100
Subject: [PATCH] Install more packages

---
 playbooks/apt.yaml     | 12 +++++++++++-
 playbooks/firefox.yaml | 19 ++++++++++---------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/playbooks/apt.yaml b/playbooks/apt.yaml
index b50a0c1..bb92627 100644
--- a/playbooks/apt.yaml
+++ b/playbooks/apt.yaml
@@ -18,9 +18,11 @@
           - composer
           - cups
           - curl
+          - dbus-broker
           - dia
           - evince
           - fcitx5
+          - file-roller
           - flameshot
           - foot
           - git
@@ -29,9 +31,11 @@
           - inkscape
           - isort
           - libreoffice
+          - lightdm
           - lxpolkit
           - mesa-utils
           - mesa-utils-bin
+          - meson
           - network-manager-gnome
           - network-manager-config-connectivity-debian
           - nextcloud-desktop
@@ -40,9 +44,13 @@
           - npm
           - pass
           - pavucontrol
+          - pipewire
           - pipewire-audio
           - pipx
           - plocate
+          - plymouth
+          - plymouth-themes
+          - plymouth-label
           - pkexec
           - puppet-lint
           - python3-deepdiff
@@ -51,6 +59,7 @@
           - qt5ct
           - rsync
           - scdaemon
+          - shfmt
           - simple-scan
           - sway
           - sway-backgrounds
@@ -62,17 +71,18 @@
           - tsocks
           - unzip
           - waybar
+          - waypipe
           - wdisplays
           - wget
           - wl-clipboard
           - wlr-randr
           - wofi
           - xdg-desktop-portal
+          - xdg-desktop-portal-gtk
           - xdg-desktop-portal-wlr
           - xwayland
           - yapf3
           - yq
-          - zathura
           - zsh
         state: latest
         update_cache: true
diff --git a/playbooks/firefox.yaml b/playbooks/firefox.yaml
index 7adb868..5b5ecfb 100644
--- a/playbooks/firefox.yaml
+++ b/playbooks/firefox.yaml
@@ -14,18 +14,19 @@
         path: '{{key_path}}'
       register: key
     - name: Get key
+      become: true
       ansible.builtin.command:
         chdir: /tmp
-        cmd: wget -O ./keyring.gpg '{{ key_url }}'
-        creates: /tmp/keyring.gpg
-      when: not key.stat.exists
-    - name: Dearmor key
-      ansible.builtin.command:
-        chdir: /tmp
-        cmd: gpg --dearmor -o {{ key_path }} ./keyring.gpg 
+        cmd: wget -O '{{ key_path }}' '{{ key_url }}'
         creates: '{{key_path}}'
-      become: true
       when: not key.stat.exists
+    # - name: Dearmor key
+    #   ansible.builtin.command:
+    #     chdir: /tmp
+    #     cmd: gpg --dearmor -o {{ key_path }} ./keyring.gpg 
+    #     creates: '{{key_path}}'
+    #   become: true
+    #   when: not key.stat.exists
     - name: install repo
       become: true
       ansible.builtin.template:
@@ -38,7 +39,7 @@
         autoclean: true
         autoremove: true
         install_recommends: true
-        pkg: [firefox-mozilla-build]
+        pkg: [firefox]
         state: latest
         update_cache: true
     - name: Get host app