programs -> apps to avoid collisions with nixpkgs

This commit is contained in:
Aly Raffauf 2024-03-28 16:36:10 -04:00
parent 31d11dd424
commit 0e05713778
9 changed files with 25 additions and 20 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,10 +1,10 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { 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 # Needed for Flatpaks
xdg.portal.enable = true; xdg.portal.enable = true;
services.flatpak.enable = true; services.flatpak.enable = true;

View file

@ -1,10 +1,10 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { 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; hardware.steam-hardware.enable = true;
programs.steam = { programs.steam = {
enable = true; enable = true;

View file

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

View file

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