diff --git a/machines/nunotaba/configuration.nix b/machines/nunotaba/configuration.nix index f658fac..e254bf1 100644 --- a/machines/nunotaba/configuration.nix +++ b/machines/nunotaba/configuration.nix @@ -9,6 +9,7 @@ sbruder = { cpu.intel.enable = true; + games.enable = true; gpu.intel.enable = true; gui.enable = true; libvirt.enable = true; diff --git a/machines/sayuri/configuration.nix b/machines/sayuri/configuration.nix index 237c146..f876c01 100644 --- a/machines/sayuri/configuration.nix +++ b/machines/sayuri/configuration.nix @@ -9,6 +9,7 @@ sbruder = { cpu.intel.enable = true; + games.enable = true; gpu.amd.enable = true; gui.enable = true; libvirt.enable = true; diff --git a/modules/default.nix b/modules/default.nix index f7977d3..d818f29 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -20,6 +20,7 @@ in # Options that affect multiple modules options.sbruder = { gui.enable = lib.mkEnableOption "gui"; + games.enable = lib.mkEnableOption "games"; }; # All modules are imported but non-essential modules are activated by diff --git a/modules/unfree.nix b/modules/unfree.nix index 3a80290..a1c9526 100644 --- a/modules/unfree.nix +++ b/modules/unfree.nix @@ -26,6 +26,7 @@ in "vista-fonts" "wallpaper-unfree" # defined in users/simon/modules/sway.nix ] ++ lib.optionals cfg.allowSoftware [ + "osu-lazer" # exception: is mostly free (just has one unfree dependency) and runs in container "p7zip" # exception: rar source code is not free, but available; p7zip with `enableUnfree` includes it ] )); diff --git a/users/simon/default.nix b/users/simon/default.nix index 1cec97c..7be2e66 100644 --- a/users/simon/default.nix +++ b/users/simon/default.nix @@ -37,6 +37,7 @@ in home-manager.users.simon = { lib, pkgs, ... }: { options.sbruder = { gui.enable = inheritOption "sbruder.gui.enable"; + games.enable = inheritOption "sbruder.games.enable"; unfree = { allowAssets = inheritOption "sbruder.unfree.allowAssets"; allowSoftware = inheritOption "sbruder.unfree.allowSoftware"; diff --git a/users/simon/modules/default.nix b/users/simon/modules/default.nix index e637f61..9f15777 100644 --- a/users/simon/modules/default.nix +++ b/users/simon/modules/default.nix @@ -2,6 +2,7 @@ imports = [ ./alacritty.nix ./anki.nix + ./games.nix ./git.nix ./gpg.nix ./gtk.nix diff --git a/users/simon/modules/games.nix b/users/simon/modules/games.nix new file mode 100644 index 0000000..a77252d --- /dev/null +++ b/users/simon/modules/games.nix @@ -0,0 +1,5 @@ +{ config, lib, pkgs, ... }: +lib.mkIf config.sbruder.games.enable { + home.packages = [ ] + ++ lib.optional config.sbruder.unfree.allowSoftware pkgs.unstable.osu-lazer-container; +}