programs -> apps to avoid collisions with nixpkgs

hosts/lavaridge/default.nix

@@ -31,9 +31,9 @@
     windowManagers.hyprland.enable = true;
   };
 
-  programs = {
-    flatpakSupport.enable = true;
-    steamGames.enable = true;
+  apps = {
+    flatpak.enable = true;
+    steam.enable = true;
   };
 
   homeLab.virtualization.enable = true;

hosts/mauville/default.nix

@@ -31,8 +31,12 @@
   home-manager.users.aly = import ../../home/aly-hyprland.nix;
 
   homeLab.enable = true;
-  programs.steamGames.enable = true;
   desktopConfig.enable = true;
 
+  apps = {
+    flatpak.enable = true;
+    steam.enable = true;
+  };
+
   system.stateVersion = "23.11";
 }

hosts/petalburg/default.nix

@@ -85,9 +85,9 @@ in {
     gnome.enable = true;
   };
 
-  programs = {
-    flatpakSupport.enable = true;
-    steamGames.enable = false;
+  apps = {
+    flatpak.enable = true;
+    steam.enable = false;
   };
 
   homeLab.virtualization.enable = true;

hosts/rustboro/default.nix

@@ -23,8 +23,9 @@
     windowManagers.hyprland.enable = true;
   };
 
-  programs = {
-    flatpakSupport.enable = true;
+  apps = {
+    flatpak.enable = true;
+    steam.enable = true;
   };
 
   systemConfig.plymouth.enable = true;

nixosModules/apps/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, lib, config, ... }: {
+
+
+  imports = [ ./flatpak ./steam ];
+
+}

nixosModules/apps/flatpak/default.nix

@@ -1,10 +1,10 @@
 { pkgs, lib, config, ... }: {
 
   options = {
-    programs.flatpakSupport.enable = lib.mkEnableOption "Enables flatpak support with GUI.";
+    apps.flatpak.enable = lib.mkEnableOption "Enables flatpak support with GUI.";
   };
 
-  config = lib.mkIf config.programs.flatpakSupport.enable {
+  config = lib.mkIf config.apps.flatpak.enable {
     # Needed for Flatpaks
     xdg.portal.enable = true;
     services.flatpak.enable = true;

nixosModules/apps/steam/default.nix

@@ -1,10 +1,10 @@
 { pkgs, lib, config, ... }: {
 
   options = {
-    programs.steamGames.enable = lib.mkEnableOption "Enables Steam for video games.";
+    apps.steam.enable = lib.mkEnableOption "Enables Steam for video games.";
   };
 
-  config = lib.mkIf config.programs.steamGames.enable {
+  config = lib.mkIf config.apps.steam.enable {
     hardware.steam-hardware.enable = true;
     programs.steam = {
       enable = true;

nixosModules/default.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./desktopConfig ./homeLab ./programs ./systemConfig ./userConfig ];
+  imports = [ ./desktopConfig ./homeLab ./apps ./systemConfig ./userConfig ];
 
 }

nixosModules/programs/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, lib, config, ... }: {
-
-
-  imports = [ ./flatpakSupport ./steamGames ];
-
-}