From b4a4be4c0f3c1457b8598a9ddaf68a1dbec645aa Mon Sep 17 00:00:00 2001
From: Roman Lubij <roman.lubij@gmail.com>
Date: Sun, 9 Nov 2025 00:43:09 +0100
Subject: [PATCH] Move flatpak defs to programs

---
 modules/programs.nix | 44 ++++++++++++++++++++++++++++++++++++++++++--
 modules/services.nix | 40 ----------------------------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/modules/programs.nix b/modules/programs.nix
index d606b84..6a4c470 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -32,7 +32,7 @@
             cursor-theme = "Bibata-Modern-Classic";
             clock-format = "24h";
           };
-          
+
           "org/gnome/shell/portal" = {
             color-scheme = "prefer-dark";
           };
@@ -50,7 +50,7 @@
       enable = true;
       lfs.enable = true;
     };
-    
+
     nh = {
       clean = {
         enable = true;
@@ -83,4 +83,44 @@
     };
     virt-manager.enable = true;
   };
+
+  services.flatpak = {
+    enable = true;
+    remotes = [
+      {
+        name = "flathub";
+        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+      }
+    ];
+    packages = [
+      {
+        appId = "com.mattjakeman.ExtensionManager";
+        origin = "flathub";
+      }
+      {
+        appId = "com.prusa3d.PrusaSlicer";
+        origin = "flathub";
+      }
+      {
+        appId = "com.github.tchx84.Flatseal";
+        origin = "flathub";
+      }
+      {
+        appId = "org.gtk.Gtk3theme.Adwaita-dark";
+        origin = "flathub";
+      }
+      {
+        appId = "org.gtk.Gtk3theme.Flat-Remix-GTK-Red-Darkest";
+        origin = "flathub";
+      }
+      {
+        appId = "com.github.iwalton3.jellyfin-media-player";
+        origin = "flathub";
+      }
+      {
+        appId = "org.freecad.FreeCAD";
+        origin = "flathub";
+      }
+    ];
+  };
 }
diff --git a/modules/services.nix b/modules/services.nix
index 5b97a77..409d50b 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -13,46 +13,6 @@
   services = {
     lact.enable = true;
 
-    flatpak = {
-      enable = true;
-      remotes = [
-        {
-          name = "flathub";
-          location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-        }
-      ];
-      packages = [
-        {
-          appId = "com.mattjakeman.ExtensionManager";
-          origin = "flathub";
-        }
-        {
-          appId = "com.prusa3d.PrusaSlicer";
-          origin = "flathub";
-        }
-        {
-          appId = "com.github.tchx84.Flatseal";
-          origin = "flathub";
-        }
-        {
-          appId = "org.gtk.Gtk3theme.Adwaita-dark";
-          origin = "flathub";
-        }
-        {
-          appId = "org.gtk.Gtk3theme.Flat-Remix-GTK-Red-Darkest";
-          origin = "flathub";
-        }
-        {
-          appId = "com.github.iwalton3.jellyfin-media-player";
-          origin = "flathub";
-        }
-        {
-          appId = "org.freecad.FreeCAD";
-          origin = "flathub";
-        }
-      ];
-    };
-
     sshd.enable = true;
     displayManager.gdm.enable = true;
     desktopManager.gnome.enable = true;