From 6fd2fee66a2094834b96dda1d36e5e98191d1274 Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <matthew@stobbs.ca>
Date: Fri, 7 Feb 2025 13:46:12 -0700
Subject: [PATCH] complete dbeaver

- dbeaver defaults to flatpak install
- bitwarden now defaults to flatpak install
---
 tasks/main.yml           |  4 ++--
 tasks/pkgs/bitwarden.yml | 16 +++++++++++++++-
 tasks/pkgs/dbeaver.yml   |  3 +--
 vars/bitwarden.yml       |  3 ++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 211e8ea..799a4b5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -72,7 +72,7 @@
         method: system
         name: "{{ repo.name }}"
         state: present
-      loop: "{{ flatpkg_repo }}"
+      loop: "{{ flatpkg_repo | unique }}"
       loop_control:
         loop_var: repo
       become: true
@@ -83,7 +83,7 @@
     - name: install flatpaks
       community.general.flatpak:
         method: "system"
-        name: "{{ flatpkgs }}"
+        name: "{{ flatpkgs | unique }}"
         state: latest
       become: true
       when:
diff --git a/tasks/pkgs/bitwarden.yml b/tasks/pkgs/bitwarden.yml
index cf0c5c2..515d321 100644
--- a/tasks/pkgs/bitwarden.yml
+++ b/tasks/pkgs/bitwarden.yml
@@ -5,10 +5,24 @@
 - ansible.builtin.set_fact:
     pkgconfig_bitwarden: "{{ _bitwarden | ansible.builtin.combine(pkgconfig.bitwarden) }}"
 
+- name: append to flatpkgs
+  block:
+    - ansible.builtin.include_tasks:
+        file: pkgs/flatpak.yml
+      when: pkgconfig_flatpak is undefined
+
+    - ansible.builtin.set_fact:
+        flatpkgs: "{{ flatpkgs + [ 'com.bitwarden.desktop' ] }}"
+  when:
+    - ansible_os_family != 'Darwin'
+    - pkgconfig_bitwarden.use_flatpak
+
 - name: append to srcpkgs
   ansible.builtin.set_fact:
     syspkgs: "{{ srcpkgs + [ 'bitwarden' ] }}"
-  when: ansible_os_family != 'Darwin'
+  when:
+    - ansible_os_family != 'Darwin'
+    - not pkgconfig_bitwarden.use_flatpak
 
 - name: append to caskpkgs
   ansible.builtin.set_fact:
diff --git a/tasks/pkgs/dbeaver.yml b/tasks/pkgs/dbeaver.yml
index 14650c4..d2f1937 100644
--- a/tasks/pkgs/dbeaver.yml
+++ b/tasks/pkgs/dbeaver.yml
@@ -1,4 +1,3 @@
-# TODO: implement
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/flatpak.yml
@@ -6,7 +5,7 @@
 
 - name: append to flatpkgs
   ansible.builtin.set_fact:
-    flatpkgs: "{{ flatpkgs + [ 'dbeaver' ] }}"
+    flatpkgs: "{{ flatpkgs + [ 'io.dbeaver.DBeaverCommunity' ] }}"
   when: ansible_os_family != 'Darwin'
 
 - name: append to caskpkgs
diff --git a/vars/bitwarden.yml b/vars/bitwarden.yml
index 8d21132..adb207f 100644
--- a/vars/bitwarden.yml
+++ b/vars/bitwarden.yml
@@ -1,7 +1,8 @@
 ---
 install_prefix: "{{ default_config.install_prefix }}"
 install_dir: /opt/bitwarden
-use_appimage: true
+use_flatpak: true
+use_appimage: false
 dobecome: true
 owner: root
 group: root