navi: 2.0.8 -> master

This commit is contained in:
Ingolf Wagner 2020-03-14 04:22:30 +08:00
parent 4c396c1fbe
commit f5bbaf4097
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
3 changed files with 13 additions and 10 deletions

View file

@ -4,13 +4,14 @@ rustPlatform.buildRustPackage rec {
name = "navi-${version}"; name = "navi-${version}";
version = "2.0.8"; version = "e99e1511e50a2706f0eea3286df94b6373acf8b0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denisidoro"; owner = "denisidoro";
repo = "navi"; repo = "navi";
rev = "v${version}"; # rev = "v${version}";
sha256 = "1kh4s7s595l95xirdb0fvgkdbig3zcfkdiqk8zdz9cfglzcm5192"; rev = "${version}";
sha256 = "07pfyvbzy62i5ncxgwcdim1pl5nfis3b8a2vkvjdvz167kx99xhg";
}; };
cargoSha256 = "18d3b9g2jxkgscx9186v5301y4y01wd00kcs14617fgjnv0lyz1g"; cargoSha256 = "18d3b9g2jxkgscx9186v5301y4y01wd00kcs14617fgjnv0lyz1g";

View file

@ -85,12 +85,10 @@ in {
duc duc
(pkgs.writers.writeBashBin "cheat" '' #(pkgs.writers.writeBashBin "navi" ''
set -eu -o pipefail # set -eu -o pipefail
output=$( navi --print --path "$HOME/.cheats:${pkgs.navi}/share/navi/cheats" ) # navi --path "$HOME/.cheats:${pkgs.navi}/share/navi/cheats" "$@"
echo "$output" #'')
${pkgs.bash}/bin/bash -c "$output"
'')
navi navi
memoryUsage memoryUsage
@ -109,5 +107,8 @@ in {
]; ];
# configure navi
environment.variables.NAVI_PATH = "$HOME/.cheats";
} }

View file

@ -58,7 +58,8 @@ let
''; '';
userHighlight = map ({ user, ... }: user) 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" '' activeUsers = pkgs.writers.writeBash "active-users" ''
${pkgs.procps}/bin/ps -eo user \ ${pkgs.procps}/bin/ps -eo user \