From 8fa746d74740d4c59540206243135047f4bb8239 Mon Sep 17 00:00:00 2001 From: Madeleine Date: Tue, 12 Jul 2022 14:17:33 +0100 Subject: [PATCH] add default.nix & simplify status --- config.h | 22 +++++++++++----------- default.nix | 4 ++++ slstatus.h | 3 +++ 3 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 default.nix diff --git a/config.h b/config.h index 9ac8ee9..d5de463 100644 --- a/config.h +++ b/config.h @@ -1,7 +1,7 @@ /* See LICENSE file for copyright and license details. */ /* interval between updates (in ms) */ -const unsigned int interval = 500; +const unsigned int interval = 1000; /* text to show if no value can be retrieved */ static const char unknown_str[] = "n/a"; @@ -65,14 +65,14 @@ static const char unknown_str[] = "n/a"; */ static const struct arg args[] = { /* function format argument */ - { run_command, " [ %s ]", "sb-volume" }, - { wifi_perc, " [  %s%% ]", "wlp3s0" }, - { disk_perc, " [  %s%% ]", "/" }, - { ram_perc, " [  %s%% ]", NULL }, - { cpu_perc, " [  %s%% ]", NULL }, - { temp, " [  %s°C ]", "/sys/class/thermal/thermal_zone2/temp" }, - { uptime, " [  %s ]", NULL }, - { kernel_release, " [  %s ]", NULL }, - { datetime, " [  %s ]", "%a %d %b" }, - { datetime, " [  %s ]", "%I:%M:%S %p" }, + { run_command, " %s |", "sb-volume" }, + /* { wifi_perc, "  %s%% |", "wlp3s0" }, */ + { disk_perc, "  %s%% |", "/" }, + { ram_perc, "  %s%% |", NULL }, + { cpu_perc, "  %s%% |", NULL }, + { temp, "  %s°C |", "/sys/class/thermal/thermal_zone2/temp" }, + { uptime, "  %s |", NULL }, + { kernel_release, "  %s |", NULL }, + { datetime, "  %s |", "%a %d %b" }, + { datetime, "  %s ", "%I:%M:%S %p" }, }; diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..23c5c11 --- /dev/null +++ b/default.nix @@ -0,0 +1,4 @@ +{ pkgs ? import {} }: + pkgs.mkShell { + nativeBuildInputs = [ pkgs.gnumake pkgs.pkg-config pkgs.xorg.libX11 ]; +} diff --git a/slstatus.h b/slstatus.h index b0f2564..5725844 100644 --- a/slstatus.h +++ b/slstatus.h @@ -79,6 +79,9 @@ const char *uid(void); /* volume */ const char *vol_perc(const char *card); +/* media */ +const char *media_mpd_stat(void); + /* wifi */ const char *wifi_perc(const char *interface); const char *wifi_essid(const char *interface);