diff --git a/.github/workflows/bitbucket-mirror.yml b/.github/workflows/bitbucket-mirror.yml deleted file mode 100644 index 7cec3cd..0000000 --- a/.github/workflows/bitbucket-mirror.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Mirror the repo to bitbucket -on: [push] - -jobs: - bitbucket-mirror: - runs-on: ubuntu-latest - steps: - - name: mirror in bitbucket - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: yesolutions/mirror-action@v0.6.0 - with: - REMOTE: 'https://anas-elgarhy@bitbucket.org/archy-linux/archy-slstatus.git' - REMOTE_NAME: bitbucket - GIT_USERNAME: anas-elgarhy - GIT_PASSWORD: ${{ secrets.BITBUCKET_TOKEN }} diff --git a/.github/workflows/codeberg-mirror.yml b/.github/workflows/codeberg-mirror.yml deleted file mode 100644 index d53590c..0000000 --- a/.github/workflows/codeberg-mirror.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Mirror the repo to codeberg -on: [push] - -jobs: - codeberg-mirror: - runs-on: ubuntu-latest - steps: - - name: mirror in codeberg - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: yesolutions/mirror-action@v0.6.0 - with: - REMOTE: 'https://codeberg.org/archy-linux/archy-slstatus.git' - REMOTE_NAME: codeberg - GIT_USERNAME: anas-elgarhy - GIT_PASSWORD: ${{ secrets.CODEBERG_TOKEN }} diff --git a/.github/workflows/disroot-mirror.yml b/.github/workflows/disroot-mirror.yml deleted file mode 100644 index 6e302ec..0000000 --- a/.github/workflows/disroot-mirror.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Mirror the repo to disroot -on: [push] - -jobs: - disroot-mirror: - runs-on: ubuntu-latest - steps: - - name: mirror in git.disroot - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: yesolutions/mirror-action@v0.6.0 - with: - REMOTE: 'https://git.disroot.org/archy-linux/archy-slstatus.git' - REMOTE_NAME: disroot - GIT_USERNAME: anas-elgarhy - GIT_PASSWORD: ${{ secrets.DISROOT_TOKEN }} diff --git a/.github/workflows/gitdab-mirror.yml b/.github/workflows/gitdab-mirror.yml deleted file mode 100644 index fafe81a..0000000 --- a/.github/workflows/gitdab-mirror.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Mirror the repo to Gitdab -on: [ push ] - -jobs: - gitdab-mirror: - runs-on: ubuntu-latest - steps: - - name: mirror in Gitdab - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: yesolutions/mirror-action@v0.6.0 - with: - REMOTE: 'https://gitdab.com/archy-linux/archy-slstatus.git' - REMOTE_NAME: gitdab - GIT_USERNAME: anas-elgarhy - GIT_PASSWORD: ${{ secrets.GITDAB_TOKEN }} diff --git a/.github/workflows/gitea-mirror.yml b/.github/workflows/gitea-mirror.yml deleted file mode 100644 index 7ff1d01..0000000 --- a/.github/workflows/gitea-mirror.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Mirror the repo to Gitea -on: [ push ] - -jobs: - gitea-mirror: - runs-on: ubuntu-latest - steps: - - name: mirror in Gitea - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: yesolutions/mirror-action@v0.6.0 - with: - REMOTE: 'https://gitea.com/archy-linux/archy-slstatus.git' - REMOTE_NAME: gitea - GIT_USERNAME: anas-elgarhy - GIT_PASSWORD: ${{ secrets.GITEA_TOKEN }} diff --git a/.github/workflows/gitlab-mirror.yml b/.github/workflows/gitlab-mirror.yml deleted file mode 100644 index fd5d1d1..0000000 --- a/.github/workflows/gitlab-mirror.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Mirror the repo to gitlab -on: [push] - -jobs: - gitlab-mirror: - runs-on: ubuntu-latest - steps: - - name: mirror in gitlab - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: yesolutions/mirror-action@v0.6.0 - with: - REMOTE: 'https://gitlab.com/archy-linux/archy-slstatus.git' - GIT_USERNAME: Anas-Elgarhy - GIT_PASSWORD: ${{ secrets.GITLAP_TOKEN }} diff --git a/.github/workflows/pagure-mirror.yml b/.github/workflows/pagure-mirror.yml deleted file mode 100644 index 220ce43..0000000 --- a/.github/workflows/pagure-mirror.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Mirror the repo to pagure -on: [ push ] - -jobs: - pagure-mirror: - runs-on: ubuntu-latest - steps: - - name: mirror in pagure - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: yesolutions/mirror-action@v0.6.0 - with: - REMOTE: 'https://pagure.io/archy-linux/archy-slstatus.git' - REMOTE_NAME: pagure - GIT_USERNAME: anas-elgarhy - GIT_PASSWORD: ${{ secrets.PAGURE_TOKEN }} - diff --git a/.gitignore b/.gitignore index 38adf7e..e78f303 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ *.o slstatus -build/ -dist/ + diff --git a/Makefile b/Makefile index ef30754..dbadf33 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,9 @@ $(SLSTATUS_OBJ): $(SRC_DIR)/archy_slstatus.c $(SRC_DIR)/archy_slstatus.h $(SRC_D @mkdir -p $(@D) $(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $< +config.h: + cp config.def.h $@ + $(BUILD_DIR)/archy-slstatus: $(SLSTATUS_OBJ) $(COM_OBJ) $(REQ_OBJ) $(CC) -o $@ $(LDFLAGS) $(SLSTATUS_OBJ) $(COM_OBJ) $(REQ_OBJ) $(LDLIBS) diff --git a/config.mk b/config.mk index 8671f81..2516e6e 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ # slstatus version -VERSION = 1.0.0 +VERSION = 0 # customize below to fit your system diff --git a/src/config.def.h b/src/config.def.h new file mode 100644 index 0000000..93a875a --- /dev/null +++ b/src/config.def.h @@ -0,0 +1,69 @@ +/* See LICENSE file for copyright and license details. */ + +/* interval between updates (in ms) */ +const unsigned int interval = 1000; + +/* text to show if no value can be retrieved */ +static const char unknown_str[] = "n/a"; + +/* maximum output string length */ +#define MAXLEN 2048 + +/* + * function description argument (example) + * + * battery_perc battery percentage battery name (BAT0) + * NULL on OpenBSD/FreeBSD + * battery_state battery charging state battery name (BAT0) + * NULL on OpenBSD/FreeBSD + * battery_remaining battery remaining HH:MM battery name (BAT0) + * NULL on OpenBSD/FreeBSD + * cpu_perc cpu usage in percent NULL + * cpu_freq cpu frequency in MHz NULL + * datetime date and time format string (%F %T) + * disk_free free disk space in GB mountpoint path (/) + * disk_perc disk usage in percent mountpoint path (/) + * disk_total total disk space in GB mountpoint path (/") + * disk_used used disk space in GB mountpoint path (/) + * entropy available entropy NULL + * gid GID of current user NULL + * hostname hostname NULL + * ipv4 IPv4 address interface name (eth0) + * ipv6 IPv6 address interface name (eth0) + * kernel_release `uname -r` NULL + * keyboard_indicators caps/num lock indicators format string (c?n?) + * see keyboard_indicators.c + * keymap layout (variant) of current NULL + * keymap + * load_avg load average NULL + * netspeed_rx receive network speed interface name (wlan0) + * netspeed_tx transfer network speed interface name (wlan0) + * num_files number of files in a directory path + * (/home/foo/Inbox/cur) + * ram_free free memory in GB NULL + * ram_perc memory usage in percent NULL + * ram_total total memory size in GB NULL + * ram_used used memory in GB NULL + * run_command custom shell command command (echo foo) + * separator string to echo NULL + * swap_free free swap in GB NULL + * swap_perc swap usage in percent NULL + * swap_total total swap size in GB NULL + * swap_used used swap in GB NULL + * temp temperature in degree celsius sensor file + * (/sys/class/thermal/...) + * NULL on OpenBSD + * thermal zone on FreeBSD + * (tz0, tz1, etc.) + * uid UID of current user NULL + * uptime system uptime NULL + * username username of current user NULL + * vol_perc OSS/ALSA volume in percent mixer file (/dev/mixer) + * NULL on OpenBSD + * wifi_perc WiFi signal in percent interface name (wlan0) + * wifi_essid WiFi ESSID interface name (wlan0) + */ +static const struct arg args[] = { + /* function format argument */ + { datetime, "%s", "%F %T" }, +};