jsw/NiksOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TASK: moved game option into desktokp

Browse source
This commit is contained in:
Jurn Wubben 2025-07-08 23:47:04 +02:00
parent a10f435059
commit 0924f9c267
6 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
home/programs/games.nix
View file

@ -5,7 +5,8 @@
lib, lib,
... ...
}: let }: let
inherit (osConfig.niksos) games bluetooth; inherit (osConfig.niksos) desktop bluetooth;
inherit (desktop) games;
in { in {
# Also look at system/programs/games.nix (some programs have to be overlayed or have systemwide modules that have to be installed.) # Also look at system/programs/games.nix (some programs have to be overlayed or have systemwide modules that have to be installed.)
home.packages = lib.mkIf games ([ home.packages = lib.mkIf games ([

6
home/wayland/hyprland/binds.nix
View file

@ -8,7 +8,8 @@
}: let }: let
inherit (lib) getExe; inherit (lib) getExe;
inherit (config.lib.stylix.colors) base0D; inherit (config.lib.stylix.colors) base0D;
inherit (osConfig.niksos) games portable; inherit (osConfig.niksos) desktop portable bluetooth;
inherit (desktop) games;
runOnce = program: "pgrep ${program} || uwsm app -- ${program}"; runOnce = program: "pgrep ${program} || uwsm app -- ${program}";
uwsm = getExe pkgs.uwsm; uwsm = getExe pkgs.uwsm;
@ -86,7 +87,7 @@ in {
"$m, Escape, exec, ${hyprlock}" "$m, Escape, exec, ${hyprlock}"
"$m, A, exec, ${pulsemixer}" "$m, A, exec, ${pulsemixer}"
"$m, B, exec, ${bluetui}"
"$m, N, exec, ${nmtui}" "$m, N, exec, ${nmtui}"
'' ''
$m, S, exec, bash -c 'hyprctl notify -1 5000 "rgb(${base0D})" "$(${getExe (import ./scripts.nix {inherit pkgs;}).statusnotify})"' $m, S, exec, bash -c 'hyprctl notify -1 5000 "rgb(${base0D})" "$(${getExe (import ./scripts.nix {inherit pkgs;}).statusnotify})"'
@ -106,6 +107,7 @@ in {
"$m SHIFT, j, movewindow, d" "$m SHIFT, j, movewindow, d"
] ]
++ workspaces ++ workspaces
++ lib.optional bluetooth "$m, B, exec, ${bluetui}"
++ lib.optionals games (let ++ lib.optionals games (let
torzu = "${ torzu = "${
appE inputs.nixpkgs-torzu.legacyPackages.${pkgs.system}.torzu appE inputs.nixpkgs-torzu.legacyPackages.${pkgs.system}.torzu

2
hosts/laptop/default.nix
View file

@ -39,8 +39,8 @@
}; };
neovim = true; neovim = true;
games = true;
desktop = { desktop = {
games = true;
enable = true; enable = true;
hyprland = true; hyprland = true;
kde = true; kde = true;

3
hosts/minimal/default.nix
View file

@ -14,9 +14,10 @@
enable = false; enable = false;
hyprland = false; hyprland = false;
kde = false; kde = false;
apps = false;
games = false;
}; };
fingerprint = false; fingerprint = false;
games = false;
graphics = { graphics = {
enable = false; enable = false;
intel = false; intel = false;

8
system/desktop/default.nix
View file

@ -18,7 +18,9 @@ in {
]; ];
options.niksos.desktop = { options.niksos.desktop = {
enable = mkEO "enable desktop related programs."; enable = mkEO "enable desktop related programs (+home manager).";
apps = mkEO "extra bloat.";
games = mkEO "gaming related programs";
hyprland = mkEO "enable hyprland related programs."; hyprland = mkEO "enable hyprland related programs.";
kde = mkEO "enable kde specialisation."; kde = mkEO "enable kde specialisation.";
}; };
@ -29,5 +31,9 @@ in {
assertion = cfg.enable; assertion = cfg.enable;
message = "You need to enable desktop for the hyprland/kde module to work"; message = "You need to enable desktop for the hyprland/kde module to work";
} }
{
assertion = config.niksos.desktop.enable;
message = "The games option needs desktop to be enabled for it to work properly (it enables home-manager).";
}
]; ];
} }

9
system/programs/games.nix
View file

@ -4,16 +4,9 @@
lib, lib,
... ...
}: let }: let
cfg = config.niksos.games; cfg = config.niksos.desktop.games;
in { in {
options.niksos.games = lib.mkEnableOption "gaming related stuff.";
config = lib.mkIf cfg { config = lib.mkIf cfg {
assertions = [
{
assertion = config.niksos.desktop.enable;
message = "The games option needs desktop to be enabled for it to work properly (it enables home-manager).";
}
];
# nixpkgs.overlays = [ # nixpkgs.overlays = [
# (final: prev: let # (final: prev: let
# version = "1.4.2"; # version = "1.4.2";