From 5e09533ca18c15d154679d5f2c42dd98c90ab4ee Mon Sep 17 00:00:00 2001 From: foglar Date: Wed, 1 Jan 2025 16:42:41 +0100 Subject: [PATCH] Heroic moved to stable and nvtop commented out --- README.md | 1 + kogami/home.nix | 6 ++- nixos/home/apps/games.nix | 70 ++++++++++++++++-------------- nixos/home/apps/terminal_tools.nix | 2 +- 4 files changed, 44 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 08ef9cf..ca11aca 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ sudo nixos-rebuild switch --flake ~/.dotfiles#kogami - The system consists currently from 2 profiles: - [Kogami](./kogami/) - My daily driver notebook - [Ginoza](./ginoza/) - Old notebook, only essentials installed + - [Tsunemori](./tsunemori/) - Phone configuration, for those moments without notebook ### Custom setup diff --git a/kogami/home.nix b/kogami/home.nix index 46c90b7..f68b19d 100644 --- a/kogami/home.nix +++ b/kogami/home.nix @@ -1,4 +1,8 @@ -{userSettings, ...}: { +{ + userSettings, + pkgs, + ... +}: { # Home manager configuration home.username = "${userSettings.username}"; home.homeDirectory = "/home/${userSettings.username}"; diff --git a/nixos/home/apps/games.nix b/nixos/home/apps/games.nix index a6d99b4..2187254 100644 --- a/nixos/home/apps/games.nix +++ b/nixos/home/apps/games.nix @@ -1,5 +1,6 @@ { pkgs, + pkgs-stable, lib, config, ... @@ -9,43 +10,46 @@ lib.mkEnableOption "enable games"; }; config = lib.mkIf config.app_list.games.enable { - home.packages = with pkgs; [ - vitetris - steam - superTuxKart - heroic - wine + home.packages = + (with pkgs; [ + vitetris + steam + superTuxKart + wine - (writeShellScriptBin "gs" '' - set -xeuo pipefail + (writeShellScriptBin "gs" '' + set -xeuo pipefail - gamescopeArgs=( - --adaptive-sync # VRR support - --hdr-enabled - --mangoapp # performance overlay - --rt - --steam - ) - steamArgs=( - -pipewire-dmabuf - -tenfoot - ) - mangoConfig=( - cpu_temp - gpu_temp - ram - vram - ) - mangoVars=( - MANGOHUD=1 - MANGOHUD_CONFIG="$(IFS=,; echo "''${mangoConfig[*]}")" - ) + gamescopeArgs=( + --adaptive-sync # VRR support + --hdr-enabled + --mangoapp # performance overlay + --rt + --steam + ) + steamArgs=( + -pipewire-dmabuf + -tenfoot + ) + mangoConfig=( + cpu_temp + gpu_temp + ram + vram + ) + mangoVars=( + MANGOHUD=1 + MANGOHUD_CONFIG="$(IFS=,; echo "''${mangoConfig[*]}")" + ) - export "''${mangoVars[@]}" - exec gamescope "''${gamescopeArgs[@]}" -- steam "''${steamArgs[@]}" + export "''${mangoVars[@]}" + exec gamescope "''${gamescopeArgs[@]}" -- steam "''${steamArgs[@]}" - '') - ]; + '') + ]) + ++ (with pkgs-stable; [ + heroic + ]); nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ diff --git a/nixos/home/apps/terminal_tools.nix b/nixos/home/apps/terminal_tools.nix index 1aca801..f8d4405 100644 --- a/nixos/home/apps/terminal_tools.nix +++ b/nixos/home/apps/terminal_tools.nix @@ -28,7 +28,7 @@ ++ ( if pkgs.system == "x86_64-linux" then [ - nvtopPackages.full + #nvtopPackages.full ] else [] );