From 4b1c7369f63c4efd8ce57ff9cd7655a6b996556b Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Sun, 3 Mar 2024 21:09:46 -0500
Subject: [PATCH] switched gnome apps from flatpaks to nixpkgs

---
 desktop/default.nix       |  2 +
 desktop/gnome/default.nix | 94 +++++++++++++++++++--------------------
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/desktop/default.nix b/desktop/default.nix
index a2bc9aa5..378f4779 100644
--- a/desktop/default.nix
+++ b/desktop/default.nix
@@ -19,7 +19,9 @@
   services.flatpak.enable = true;
   services.flatpak.packages = [
     "org.mozilla.firefox"
+    "com.github.tchx84.Flatseal"
   ];
+
   # services.flatpak.overrides = {
   #   sockets = [
   #     "gpg-agent" # Expose GPG agent
diff --git a/desktop/gnome/default.nix b/desktop/gnome/default.nix
index 68e36459..4d43d6d9 100644
--- a/desktop/gnome/default.nix
+++ b/desktop/gnome/default.nix
@@ -27,54 +27,54 @@
   ];
 
   # Prefer baset set of gnome apps from Flatpaks.
-  environment.gnome.excludePackages = (with pkgs; [
-    baobab
-    epiphany
-    evince
-    gnome-connections
-    gnome-photos
-    gnome-text-editor
-    gnome-tour
-    loupe
-    snapshot # webcam tool
-  ]) ++ (with pkgs.gnome; [
-    geary # email reader
-    gnome-calculator
-    gnome-calendar
-    gnome-characters
-    gnome-clocks
-    gnome-contacts
-    gnome-logs
-    gnome-music
-    gnome-weather
-    sushi
-    totem # video player
-  ]);
+  # environment.gnome.excludePackages = (with pkgs; [
+  #   baobab
+  #   epiphany
+  #   evince
+  #   gnome-connections
+  #   gnome-photos
+  #   gnome-text-editor
+  #   gnome-tour
+  #   loupe
+  #   snapshot # webcam tool
+  # ]) ++ (with pkgs.gnome; [
+  #   geary # email reader
+  #   gnome-calculator
+  #   gnome-calendar
+  #   gnome-characters
+  #   gnome-clocks
+  #   gnome-contacts
+  #   gnome-logs
+  #   gnome-music
+  #   gnome-weather
+  #   sushi
+  #   totem # video player
+  # ]);
 
-  services.flatpak.packages = [
-    "com.github.tchx84.Flatseal"
-    "org.gnome.baobab"
-    "org.gnome.Builder"
-    "org.gnome.Calculator"
-    "org.gnome.Characters"
-    "org.gnome.clocks"
-    "org.gnome.Connections"
-    "org.gnome.Contacts"
-    "org.gnome.Epiphany"
-    "org.gnome.Evince"
-    "org.gnome.Fractal"
-    "org.gnome.Geary"
-    "org.gnome.Logs"
-    "org.gnome.Loupe"
-    "org.gnome.Music"
-    "org.gnome.NautilusPreviewer"
-    "org.gnome.Photos"
-    "org.gnome.Snapshot"
-    "org.gnome.TextEditor"
-    "org.gnome.Totem"
-    "org.gnome.Weather"
-    "org.gnome.Calendar"
-  ];
+  # services.flatpak.packages = [
+  #   "com.github.tchx84.Flatseal"
+  #   "org.gnome.baobab"
+  #   "org.gnome.Builder"
+  #   "org.gnome.Calculator"
+  #   "org.gnome.Characters"
+  #   "org.gnome.clocks"
+  #   "org.gnome.Connections"
+  #   "org.gnome.Contacts"
+  #   "org.gnome.Epiphany"
+  #   "org.gnome.Evince"
+  #   "org.gnome.Fractal"
+  #   "org.gnome.Geary"
+  #   "org.gnome.Logs"
+  #   "org.gnome.Loupe"
+  #   "org.gnome.Music"
+  #   "org.gnome.NautilusPreviewer"
+  #   "org.gnome.Photos"
+  #   "org.gnome.Snapshot"
+  #   "org.gnome.TextEditor"
+  #   "org.gnome.Totem"
+  #   "org.gnome.Weather"
+  #   "org.gnome.Calendar"
+  # ];
 
   nixpkgs.overlays = [
     (final: prev: {