From 8ddfb3a62f3f9ddd9bf5a6db4fcb518c8a2343b4 Mon Sep 17 00:00:00 2001
From: zelikos <pcsikos@zelikos.dev>
Date: Sun, 1 Oct 2023 13:50:04 -0400
Subject: [PATCH] refactor: Move flatpak installation to flatpaks module

---
 config/files/usr/etc/flatpak/install | 19 -------------------
 config/files/usr/etc/flatpak/remove  |  5 -----
 config/gnome-packages.yml            | 28 +++++++++++++++++++++++++++-
 3 files changed, 27 insertions(+), 25 deletions(-)
 delete mode 100644 config/files/usr/etc/flatpak/install
 delete mode 100644 config/files/usr/etc/flatpak/remove

diff --git a/config/files/usr/etc/flatpak/install b/config/files/usr/etc/flatpak/install
deleted file mode 100644
index 3b50fe5d..00000000
--- a/config/files/usr/etc/flatpak/install
+++ /dev/null
@@ -1,19 +0,0 @@
-org.gnome.Calculator
-org.gnome.Calendar
-io.github.celluloid_player.Celluloid
-org.gnome.Characters
-org.gnome.clocks
-org.gnome.Contacts
-org.gnome.baobab
-org.gnome.SimpleScan
-org.gnome.Evince
-org.gnome.font-viewer
-org.gnome.Logs
-org.gnome.Loupe
-org.gnome.Maps
-org.gnome.NautilusPreviewer
-org.gnome.TextEditor
-org.gnome.Weather
-org.gnome.Epiphany
-com.github.tchx84.Flatseal
-org.gnome.World.PikaBackup
\ No newline at end of file
diff --git a/config/files/usr/etc/flatpak/remove b/config/files/usr/etc/flatpak/remove
deleted file mode 100644
index 647b51db..00000000
--- a/config/files/usr/etc/flatpak/remove
+++ /dev/null
@@ -1,5 +0,0 @@
-org.fedoraproject.MediaWriter
-org.gnome.Cheese
-org.gnome.Connections
-org.gnome.eog
-org.gnome.Totem
\ No newline at end of file
diff --git a/config/gnome-packages.yml b/config/gnome-packages.yml
index 80280003..5d3f4aeb 100644
--- a/config/gnome-packages.yml
+++ b/config/gnome-packages.yml
@@ -8,4 +8,30 @@ modules:
   - gnome-terminal
   - gnome-terminal-nautilus
 
-- type: flatpaks
\ No newline at end of file
+- type: flatpaks
+  system:
+    install:
+    - org.gnome.Calculator
+    - org.gnome.Calendar
+    - io.github.celluloid_player.Celluloid
+    - org.gnome.Characters
+    - org.gnome.clocks
+    - org.gnome.Contacts
+    - org.gnome.baobab
+    - org.gnome.SimpleScan
+    - org.gnome.Evince
+    - org.gnome.font-viewer
+    - org.gnome.Logs
+    - org.gnome.Loupe
+    - org.gnome.Maps
+    - org.gnome.NautilusPreviewer
+    - org.gnome.TextEditor
+    - org.gnome.Weather
+    - org.gnome.Epiphany
+    - com.github.tchx84.Flatseal
+    - org.gnome.World.PikaBackup
+  user:
+    install:
+    - org.mozilla.firefox
+    - re.sonny.Junction
+    - org.libreoffice.LibreOffice