diff --git a/pkgs/navi/default.nix b/pkgs/navi/default.nix index 54894d2..3cb69d0 100644 --- a/pkgs/navi/default.nix +++ b/pkgs/navi/default.nix @@ -4,13 +4,14 @@ rustPlatform.buildRustPackage rec { name = "navi-${version}"; - version = "2.0.8"; + version = "e99e1511e50a2706f0eea3286df94b6373acf8b0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; - rev = "v${version}"; - sha256 = "1kh4s7s595l95xirdb0fvgkdbig3zcfkdiqk8zdz9cfglzcm5192"; + # rev = "v${version}"; + rev = "${version}"; + sha256 = "07pfyvbzy62i5ncxgwcdim1pl5nfis3b8a2vkvjdvz167kx99xhg"; }; cargoSha256 = "18d3b9g2jxkgscx9186v5301y4y01wd00kcs14617fgjnv0lyz1g"; diff --git a/system/all/packages.nix b/system/all/packages.nix index 1dd948d..535ed43 100644 --- a/system/all/packages.nix +++ b/system/all/packages.nix @@ -85,12 +85,10 @@ in { duc - (pkgs.writers.writeBashBin "cheat" '' - set -eu -o pipefail - output=$( navi --print --path "$HOME/.cheats:${pkgs.navi}/share/navi/cheats" ) - echo "$output" - ${pkgs.bash}/bin/bash -c "$output" - '') + #(pkgs.writers.writeBashBin "navi" '' + # set -eu -o pipefail + # navi --path "$HOME/.cheats:${pkgs.navi}/share/navi/cheats" "$@" + #'') navi memoryUsage @@ -109,5 +107,8 @@ in { ]; + # configure navi + environment.variables.NAVI_PATH = "$HOME/.cheats"; + } diff --git a/system/desktop/wtf.nix b/system/desktop/wtf.nix index 7313558..8d0303e 100644 --- a/system/desktop/wtf.nix +++ b/system/desktop/wtf.nix @@ -58,7 +58,8 @@ let ''; userHighlight = map ({ user, ... }: user) - (builtins.attrValues config.programs.custom.browser.configList); + (builtins.attrValues config.programs.custom.browser.configList) + ++ [ "steam" ]; activeUsers = pkgs.writers.writeBash "active-users" '' ${pkgs.procps}/bin/ps -eo user \