From adde1760b022dd436d832d46b58378a278fd1a5d Mon Sep 17 00:00:00 2001
From: Aly Raffauf <achacega@gmail.com>
Date: Thu, 29 Feb 2024 18:56:46 -0500
Subject: [PATCH] moved steam flatpak and hardware to programs directory

---
 desktop/gnome/default.nix                | 3 ++-
 flake.nix                                | 1 +
 flatpak/default.nix                      | 2 --
 hardware/default.nix                     | 2 --
 {hardware => programs}/steam/default.nix | 3 +++
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename {hardware => programs}/steam/default.nix (50%)

diff --git a/desktop/gnome/default.nix b/desktop/gnome/default.nix
index c0cc4b13..1db2d5ef 100644
--- a/desktop/gnome/default.nix
+++ b/desktop/gnome/default.nix
@@ -52,10 +52,10 @@
   ]);
 
   services.flatpak.packages = [
+    "com.github.tchx84.Flatseal"
     "org.gnome.baobab"
     "org.gnome.Builder"
     "org.gnome.Calculator"
-    # "org.gnome.Calendar"
     "org.gnome.Characters"
     "org.gnome.clocks"
     "org.gnome.Connections"
@@ -73,6 +73,7 @@
     "org.gnome.TextEditor"
     "org.gnome.Totem"
     "org.gnome.Weather"
+    # "org.gnome.Calendar"
   ];
 
   nixpkgs.overlays = [
diff --git a/flake.nix b/flake.nix
index d1f9396c..6b4c4ad4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,7 @@
           ./network
           ./desktop/gnome
           ./programs/podman
+          ./programs/steam
 
           nix-flatpak.nixosModules.nix-flatpak
           # make home-manager as a module of nixos
diff --git a/flatpak/default.nix b/flatpak/default.nix
index 0891750a..c841ee06 100644
--- a/flatpak/default.nix
+++ b/flatpak/default.nix
@@ -5,9 +5,7 @@
 
   services.flatpak.enable = true;
   services.flatpak.packages = [
-    "com.valvesoftware.Steam"
     "org.mozilla.firefox"
-    "com.github.tchx84.Flatseal"
   ];
   services.flatpak.overrides = {
     global = {
diff --git a/hardware/default.nix b/hardware/default.nix
index bb7e4b54..aaf4c521 100644
--- a/hardware/default.nix
+++ b/hardware/default.nix
@@ -4,8 +4,6 @@
   imports =
     [ # Include the results of the hardware scan.
       ./qmk
-      ./steam
       ./sound
     ];
-
 }
\ No newline at end of file
diff --git a/hardware/steam/default.nix b/programs/steam/default.nix
similarity index 50%
rename from hardware/steam/default.nix
rename to programs/steam/default.nix
index 3eaff602..97fb11d2 100644
--- a/hardware/steam/default.nix
+++ b/programs/steam/default.nix
@@ -1,5 +1,8 @@
 { config, pkgs, ... }:
 
 {
+  services.flatpak.packages = [
+    "com.valvesoftware.Steam"
+  ];
   hardware.steam-hardware.enable = true;
 }