From 0e05713778f73669cf41bdfeec38295696942d53 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Thu, 28 Mar 2024 16:36:10 -0400
Subject: [PATCH] programs -> apps to avoid collisions with nixpkgs

---
 hosts/lavaridge/default.nix                                 | 6 +++---
 hosts/mauville/default.nix                                  | 6 +++++-
 hosts/petalburg/default.nix                                 | 6 +++---
 hosts/rustboro/default.nix                                  | 5 +++--
 nixosModules/apps/default.nix                               | 6 ++++++
 .../{programs/flatpakSupport => apps/flatpak}/default.nix   | 4 ++--
 .../{programs/steamGames => apps/steam}/default.nix         | 4 ++--
 nixosModules/default.nix                                    | 2 +-
 nixosModules/programs/default.nix                           | 6 ------
 9 files changed, 25 insertions(+), 20 deletions(-)
 create mode 100644 nixosModules/apps/default.nix
 rename nixosModules/{programs/flatpakSupport => apps/flatpak}/default.nix (85%)
 rename nixosModules/{programs/steamGames => apps/steam}/default.nix (71%)
 delete mode 100644 nixosModules/programs/default.nix

diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix
index 56f902d7..3df3fc7e 100644
--- a/hosts/lavaridge/default.nix
+++ b/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;
diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix
index af4759cb..468c2fb5 100644
--- a/hosts/mauville/default.nix
+++ b/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";
 }
diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix
index 235dc110..8cf819b3 100644
--- a/hosts/petalburg/default.nix
+++ b/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;
diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix
index d4d8e330..cdc83e26 100644
--- a/hosts/rustboro/default.nix
+++ b/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;
diff --git a/nixosModules/apps/default.nix b/nixosModules/apps/default.nix
new file mode 100644
index 00000000..29ae006b
--- /dev/null
+++ b/nixosModules/apps/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, lib, config, ... }: {
+
+
+  imports = [ ./flatpak ./steam ];
+
+}
\ No newline at end of file
diff --git a/nixosModules/programs/flatpakSupport/default.nix b/nixosModules/apps/flatpak/default.nix
similarity index 85%
rename from nixosModules/programs/flatpakSupport/default.nix
rename to nixosModules/apps/flatpak/default.nix
index d7a93ab7..de0533d4 100644
--- a/nixosModules/programs/flatpakSupport/default.nix
+++ b/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;
diff --git a/nixosModules/programs/steamGames/default.nix b/nixosModules/apps/steam/default.nix
similarity index 71%
rename from nixosModules/programs/steamGames/default.nix
rename to nixosModules/apps/steam/default.nix
index cf825b16..a77ea042 100644
--- a/nixosModules/programs/steamGames/default.nix
+++ b/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;
diff --git a/nixosModules/default.nix b/nixosModules/default.nix
index 1950af57..a3cb97c5 100644
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./desktopConfig ./homeLab ./programs ./systemConfig ./userConfig ];
+  imports = [ ./desktopConfig ./homeLab ./apps ./systemConfig ./userConfig ];
 
 }
\ No newline at end of file
diff --git a/nixosModules/programs/default.nix b/nixosModules/programs/default.nix
deleted file mode 100644
index 65753e8a..00000000
--- a/nixosModules/programs/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, lib, config, ... }: {
-
-
-  imports = [ ./flatpakSupport ./steamGames ];
-
-}
\ No newline at end of file