From 33556e22750c7778bd0539110582f20f52462644 Mon Sep 17 00:00:00 2001
From: Stonewall Jackson <stonewall@sacredheartsc.com>
Date: Thu, 30 Mar 2023 11:00:03 -0400
Subject: linux_desktop: remove some gnome hacks

---
 roles/linux_desktop/defaults/main.yml                          |  2 --
 roles/linux_desktop/tasks/main.yml                             |  5 +++--
 roles/linux_desktop/templates/etc/dconf/db/local.d/00-gnome.j2 |  8 --------
 roles/linux_desktop/vars/main.yml                              | 10 ++++++----
 4 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'roles/linux_desktop')

diff --git a/roles/linux_desktop/defaults/main.yml b/roles/linux_desktop/defaults/main.yml
index ab00eff..c184ecc 100644
--- a/roles/linux_desktop/defaults/main.yml
+++ b/roles/linux_desktop/defaults/main.yml
@@ -2,5 +2,3 @@ linux_desktop_access_group: role-linux-desktop-access
 linux_desktop_flatpak_update_on_calendar: daily
 linux_desktop_enable_wayland: yes
 linux_desktop_thumbnail_cache_size: 4096 # MB
-
-linux_desktop_enable_window_buttons: yes
diff --git a/roles/linux_desktop/tasks/main.yml b/roles/linux_desktop/tasks/main.yml
index dbddcd4..3421471 100644
--- a/roles/linux_desktop/tasks/main.yml
+++ b/roles/linux_desktop/tasks/main.yml
@@ -70,9 +70,10 @@
 
 - name: add flathub flatpak repository
   flatpak_remote:
-    name: flathub
-    flatpakrepo_url: '{{ linux_desktop_flathub_repo }}'
+    name: '{{ item.name }}'
+    flatpakrepo_url: '{{ item.url }}'
     state: present
+  loop: '{{ linux_desktop_flathub_repos }}'
 
 - name: install flatpak applications
   flatpak:
diff --git a/roles/linux_desktop/templates/etc/dconf/db/local.d/00-gnome.j2 b/roles/linux_desktop/templates/etc/dconf/db/local.d/00-gnome.j2
index 42e4570..69a7632 100644
--- a/roles/linux_desktop/templates/etc/dconf/db/local.d/00-gnome.j2
+++ b/roles/linux_desktop/templates/etc/dconf/db/local.d/00-gnome.j2
@@ -8,11 +8,3 @@ show-image-thumbnails='always'
 
 [org/gnome/nautilus/list-view]
 use-tree-view=true
-
-{% if linux_desktop_enable_window_buttons %}
-[org/gnome/desktop/wm/preferences]
-button-layout=':minimize,maximize,close'
-{% endif %}
-
-[org/gnome/shell]
-enabled-extensions=['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock@gnome-shell-extensions.gcampax.github.com']
diff --git a/roles/linux_desktop/vars/main.yml b/roles/linux_desktop/vars/main.yml
index 67cd80a..e63abf3 100644
--- a/roles/linux_desktop/vars/main.yml
+++ b/roles/linux_desktop/vars/main.yml
@@ -45,7 +45,11 @@ linux_desktop_excluded_packages:
 
 linux_desktop_hbac_hostgroup: linux_desktops
 
-linux_desktop_flathub_repo: https://dl.flathub.org/repo/flathub.flatpakrepo
+linux_desktop_flathub_repos:
+  - name: flathub
+    url: https://dl.flathub.org/repo/flathub.flatpakrepo
+  - name: flathub-beta
+    url: https://flathub.org/beta-repo/flathub-beta.flatpakrepo
 
 linux_desktop_flatpaks:
   - org.signal.Signal
@@ -56,10 +60,8 @@ linux_desktop_flatpaks:
   - com.makemkv.MakeMKV
   - org.gnucash.GnuCash
   - org.gnome.Rhythmbox3
-  - org.gajim.Gajim
-  - org.gajim.Gajim.Plugin.omemo
+  - im.dino.Dino
 
 linux_desktop_flatpak_overrides:
   org.gnome.EasyTAG:    --filesystem=host
   org.gnome.Rhythmbox3: --filesystem=host
-  org.signal.Signal:    --env=SIGNAL_USE_TRAY_ICON=1
-- 
cgit