From a65a3a59282fc93ba7a4b994a7e4d03857e28f46 Mon Sep 17 00:00:00 2001
From: fred <2160318-free_zed@users.noreply.gitlab.com>
Date: Mon, 30 May 2022 22:58:41 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20neovim,=20detox,=20minitube?=
 =?UTF-8?q?=20&=20flatpak=20pkg=20mgr=20for=20Brave?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tasks/apt.yml         | 25 +++++++++++++++++++++----
 tasks/vars/Debian.yml |  1 -
 tasks/vars/Gnome.yml  |  1 +
 tasks/vars/Ubuntu.yml |  9 +++------
 tasks/vars/main.yml   |  8 ++++----
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/tasks/apt.yml b/tasks/apt.yml
index cf7feed..16cd3fd 100644
--- a/tasks/apt.yml
+++ b/tasks/apt.yml
@@ -18,7 +18,7 @@
       when: "'mate' in group_names"
       ansible.builtin.include_vars: "Mate.yml"
 
-    - name: Remove snap packages
+    - name: SNAP  | remove snap packages
       when: snap_uninstall_pkg is defined
       community.general.snap:
         name: "{{ snap_uninstall_pkg }}"
@@ -32,6 +32,19 @@
         state: present
         update_cache: true
 
+    - name: FLATPAK | add remote
+      community.general.flatpak_remote:
+        name: flathub
+        flatpakrepo_url: https://flathub.org/repo/flathub.flatpakrepo
+        state: present
+      register: flatpak_repo
+
+    - name: FLATPAK | add packages
+      community.general.flatpak:
+        name: com.brave.Browser
+        state: present
+        remote: flathub
+
     - name: SIGNAL | add key to keyring
       when: inventory_hostname in groups.station
       ansible.builtin.apt_key:
@@ -59,16 +72,20 @@
       ansible.builtin.apt:
         pkg: "{{ lookup('flattened', base_uninstall_pkg, os_uninstall_pkg) }}"
         state: absent
+      register: flatpak_repo
 
     - name: APT | upgrade all packages to the latest version
       ansible.builtin.apt:
         force_apt_get: yes
         upgrade: safe
 
-    - name: APT | install zoom client
+    - name: APT | install .deb packages
       when: inventory_hostname in groups.station
-      ansible.builtin.apt:
-        deb: https://zoom.us/client/latest/zoom_amd64.deb
+      ansible.builtin.apt: deb={{item}}
+      with_items:
+        - https://zoom.us/client/latest/zoom_amd64.deb
+        - https://flavio.tordini.org/files/minitube/minitube.deb
+        - https://github.com/neovim/neovim/releases/download/stable/nvim-linux64.deb
 
     - name: APT | remove useless packages from the cache
       ansible.builtin.apt:
diff --git a/tasks/vars/Debian.yml b/tasks/vars/Debian.yml
index 109b270..5426291 100644
--- a/tasks/vars/Debian.yml
+++ b/tasks/vars/Debian.yml
@@ -5,5 +5,4 @@ os_pkg: []
 os_uninstall_pkg: []
 
 station_os_pkg:
-  - chromium-l10n
   - firefox-esr-l10n-fr
diff --git a/tasks/vars/Gnome.yml b/tasks/vars/Gnome.yml
index 3717a48..e743f22 100644
--- a/tasks/vars/Gnome.yml
+++ b/tasks/vars/Gnome.yml
@@ -2,4 +2,5 @@
 
 station_wm_pkg:
   - gnome-tweaks
+  - nautilus-image-converter
   - nautilus-nextcloud
diff --git a/tasks/vars/Ubuntu.yml b/tasks/vars/Ubuntu.yml
index e2d262c..e3ddb0e 100644
--- a/tasks/vars/Ubuntu.yml
+++ b/tasks/vars/Ubuntu.yml
@@ -4,11 +4,8 @@ os_pkg: []
 
 os_uninstall_pkg:
   - thunderbird
+  - chromium-browser-l10n
 
-snap_uninstall_pkg:
-  - firefox
+snap_uninstall_pkg: []
 
-station_os_pkg:
-  - chromium-browser-l10n
-  - firefox-locale-fr
-  - firefox
+station_os_pkg: []
diff --git a/tasks/vars/main.yml b/tasks/vars/main.yml
index e19d8bd..b046a1c 100644
--- a/tasks/vars/main.yml
+++ b/tasks/vars/main.yml
@@ -18,10 +18,7 @@ base_pkg:
   - xkcdpass
   - zsh
 
-base_uninstall_pkg:
-  - geany-plugin-shiftcolumn
-  - jq
-  - httpie
+base_uninstall_pkg: []
 
 station_pkg:
   - ansible
@@ -30,6 +27,7 @@ station_pkg:
   - easytag
   - evolution
   - evolution-plugins
+  - flatpak
   - geany-plugin-addons
   - geany-plugin-extrasel
   - geany-plugin-git-changebar
@@ -41,6 +39,7 @@ station_pkg:
   - gimp
   - git
   - gnome-disk-utility
+  - gnome-software-plugin-flatpak
   - gpsprune
   - hplip
   - jhead
@@ -63,3 +62,4 @@ station_pkg:
   - torbrowser-launcher
   - unrar-free
   - vlc
+  - xz-utils
-- 
GitLab