From 60f9b486b8c98ea6ad955daada087df4ac836eec Mon Sep 17 00:00:00 2001 From: sora Date: Sat, 4 Nov 2023 02:33:48 +0100 Subject: [PATCH] Update README.md & steam --- README.md | 6 ++--- modules/home/cli/helix/default.nix | 2 +- modules/home/gui/games/default.nix | 3 +-- modules/nixos/gui/games/default.nix | 14 ++++++++++++ modules/nixos/hostcfg/default.nix | 29 ++++++++++++++++++++---- systems/x86_64-linux/iriy/default.nix | 1 + systems/x86_64-linux/valinor/default.nix | 1 + 7 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 modules/nixos/gui/games/default.nix diff --git a/README.md b/README.md index 641d2db..23092c0 100755 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ ...

- +
- - + +

diff --git a/modules/home/cli/helix/default.nix b/modules/home/cli/helix/default.nix index e71018e..db45d8d 100644 --- a/modules/home/cli/helix/default.nix +++ b/modules/home/cli/helix/default.nix @@ -1,6 +1,6 @@ { ... }: { programs.helix = { - enable = true; + #enable = true; languages = { }; settings = { }; themes = { }; diff --git a/modules/home/gui/games/default.nix b/modules/home/gui/games/default.nix index bdc1326..3054ac6 100644 --- a/modules/home/gui/games/default.nix +++ b/modules/home/gui/games/default.nix @@ -4,12 +4,11 @@ config = lib.mkIf (config.homecfg.make.game) { - # programs.steam.enable = true; - home.packages = with pkgs; [ custom.simc #games + steam gamemode gamescope mangohud diff --git a/modules/nixos/gui/games/default.nix b/modules/nixos/gui/games/default.nix new file mode 100644 index 0000000..9a3a6a6 --- /dev/null +++ b/modules/nixos/gui/games/default.nix @@ -0,0 +1,14 @@ +{ lib, config, pkgs, ... }: +let cfg = config.hostcfg.make.game; +in { + config = lib.mkIf cfg { + + programs.steam = { + enable = true; + remotePlay.openFirewall = + true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = + true; # Open ports in the firewall for Source Dedicated Server + }; + }; +} diff --git a/modules/nixos/hostcfg/default.nix b/modules/nixos/hostcfg/default.nix index 44df228..fd8d096 100755 --- a/modules/nixos/hostcfg/default.nix +++ b/modules/nixos/hostcfg/default.nix @@ -4,10 +4,26 @@ with lib; { hostname = mkOption { type = types.str; }; username = mkOption { type = types.str; }; make = { - cli = mkOption { type = types.bool; }; - gui = mkOption { type = types.bool; }; - virt = mkOption { type = types.bool; }; - power = mkOption { type = types.bool; }; + cli = mkOption { + type = types.bool; + default = true; + }; + gui = mkOption { + type = types.bool; + default = false; + }; + virt = mkOption { + type = types.bool; + default = true; + }; + power = mkOption { + type = types.bool; + default = false; + }; + game = mkOption { + type = types.bool; + default = false; + }; }; net = { wlp = { @@ -15,7 +31,10 @@ with lib; { nif = mkOption { type = types.str; }; }; wg = { - enable = mkOption { type = types.bool; }; + enable = mkOption { + type = types.bool; + default = true; + }; ip4 = mkOption { type = types.str; }; ip6 = mkOption { type = types.str; }; pk = mkOption { type = types.str; }; diff --git a/systems/x86_64-linux/iriy/default.nix b/systems/x86_64-linux/iriy/default.nix index e324b83..0b6f6d0 100644 --- a/systems/x86_64-linux/iriy/default.nix +++ b/systems/x86_64-linux/iriy/default.nix @@ -13,6 +13,7 @@ cli = true; virt = true; power = false; + game = true; }; net = { wlp = { diff --git a/systems/x86_64-linux/valinor/default.nix b/systems/x86_64-linux/valinor/default.nix index c4f349b..425c2d3 100644 --- a/systems/x86_64-linux/valinor/default.nix +++ b/systems/x86_64-linux/valinor/default.nix @@ -13,6 +13,7 @@ cli = true; virt = true; power = true; + game = true; }; net = { wlp = {