refactor: rename sane-sysinfo -> sane-sysload

This commit is contained in:
Colin 2024-06-19 01:04:06 +00:00
parent e4e32f46fe
commit 27efb10a27
7 changed files with 10 additions and 10 deletions

View File

@ -5,20 +5,20 @@
sandbox.net = "clearnet"; #< for the scripts it calls (weather) sandbox.net = "clearnet"; #< for the scripts it calls (weather)
sandbox.extraPaths = [ sandbox.extraPaths = [
"/sys/class/power_supply" "/sys/class/power_supply"
"/sys/devices" # needed by sane-sysinfo "/sys/devices" # needed by sane-sysload
# "/sys/devices/cpu" # "/sys/devices/cpu"
# "/sys/devices/system" # "/sys/devices/system"
]; ];
sandbox.whitelistWayland = true; sandbox.whitelistWayland = true;
suggestedPrograms = [ suggestedPrograms = [
"sane-sysinfo" "sane-sysload"
"sane-weather" "sane-weather"
]; ];
fs.".config/conky/conky.conf".symlink.target = pkgs.substituteAll { fs.".config/conky/conky.conf".symlink.target = pkgs.substituteAll {
src = ./conky.conf; src = ./conky.conf;
bat = "sane-sysinfo"; bat = "sane-sysload";
weather = "timeout 20 sane-weather"; weather = "timeout 20 sane-weather";
}; };

View File

@ -116,7 +116,7 @@
./sane-open.nix ./sane-open.nix
./sane-screenshot.nix ./sane-screenshot.nix
./sane-scripts.nix ./sane-scripts.nix
./sane-sysinfo.nix ./sane-sysload.nix
./sane-theme.nix ./sane-theme.nix
./sanebox.nix ./sanebox.nix
./schlock.nix ./schlock.nix

View File

@ -4,7 +4,7 @@
# - add network/bluetooth indicator # - add network/bluetooth indicator
# - <https://github.com/nwg-piotr/nwg-panel/issues/269> # - <https://github.com/nwg-piotr/nwg-panel/issues/269>
# - add CPU/meminfo executor # - add CPU/meminfo executor
# - use sane-sysinfo # - use sane-sysload
{ {
controlsSettingsComponents, controlsSettingsComponents,
height, height,
@ -143,7 +143,7 @@
}; };
executor-sysload = { executor-sysload = {
script = "sane-sysinfo"; script = "sane-sysload";
interval = 10; interval = 10;
css-name = ""; css-name = "";
on-right-click = ""; on-right-click = "";

View File

@ -1,6 +1,6 @@
{ ... }: { ... }:
{ {
sane.programs.sane-sysinfo = { sane.programs.sane-sysload = {
sandbox.method = "bwrap"; sandbox.method = "bwrap";
sandbox.extraPaths = [ sandbox.extraPaths = [
"/sys/class/power_supply" "/sys/class/power_supply"

View File

@ -1,5 +1,5 @@
{ static-nix-shell }: { static-nix-shell }:
static-nix-shell.mkPython3Bin { static-nix-shell.mkPython3Bin {
pname = "sane-sysinfo"; pname = "sane-sysload";
srcRoot = ./.; srcRoot = ./.;
} }

View File

@ -1,7 +1,7 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i python3 -p "python3.withPackages (ps: [ ])" #!nix-shell -i python3 -p "python3.withPackages (ps: [ ])"
""" """
usage: sane-sysinfo [options...] usage: sane-sysload [options...]
pretty-prints a battery estimate (icon to indicate state, and a duration estimate) pretty-prints a battery estimate (icon to indicate state, and a duration estimate)

View File

@ -84,7 +84,7 @@ let
sane-open = callPackage ./additional/sane-open { }; sane-open = callPackage ./additional/sane-open { };
sane-screenshot = callPackage ./additional/sane-screenshot { }; sane-screenshot = callPackage ./additional/sane-screenshot { };
sane-scripts = lib.recurseIntoAttrs (callPackage ./additional/sane-scripts { }); sane-scripts = lib.recurseIntoAttrs (callPackage ./additional/sane-scripts { });
sane-sysinfo = callPackage ./additional/sane-sysinfo { }; sane-sysload = callPackage ./additional/sane-sysload { };
sane-weather = callPackage ./additional/sane-weather { }; sane-weather = callPackage ./additional/sane-weather { };
sanebox = callPackage ./additional/sanebox { }; sanebox = callPackage ./additional/sanebox { };
schlock = callPackage ./additional/schlock { }; schlock = callPackage ./additional/schlock { };