From ec23984c4db7a925cbd1f2d605639bef285e1717 Mon Sep 17 00:00:00 2001 From: Michael Aquilina Date: Mon, 2 Sep 2019 17:33:31 +0100 Subject: [PATCH 1/4] Fix minor typo in waybar-states --- man/waybar-states.5.scd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/waybar-states.5.scd b/man/waybar-states.5.scd index 588f21d..fe6a730 100644 --- a/man/waybar-states.5.scd +++ b/man/waybar-states.5.scd @@ -7,7 +7,7 @@ apply a class when the value matches the declared state value. # STATES -- Every entry (*state*) consits of a ** (typeof: *string*) and a ** (typeof: *integer*). +- Every entry (*state*) consists of a ** (typeof: *string*) and a ** (typeof: *integer*). - The state can be addressed as a CSS class in the *style.css*. The name of the CSS class is the ** of the state. Each class gets activated when the current capacity is equal or below the configured **. From f9b65baa2e163513b1ce86ea35c04bb95bef99be Mon Sep 17 00:00:00 2001 From: Michael Aquilina Date: Mon, 2 Sep 2019 17:37:46 +0100 Subject: [PATCH 2/4] Build scdocs in travis to pervent breakages --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db6e17b..b88bc23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ script: - echo FROM alexays/waybar:${distro} > Dockerfile - echo ADD . /root >> Dockerfile - docker build -t waybar . - - docker run waybar /bin/sh -c "cd /root && meson build && ninja -C build" \ No newline at end of file + - docker run waybar /bin/sh -c "cd /root && meson build -Dman-pages=enabled && ninja -C build" From 1f8493663979757f62d10658b63de241d723c509 Mon Sep 17 00:00:00 2001 From: Michael Aquilina Date: Mon, 2 Sep 2019 18:07:49 +0100 Subject: [PATCH 3/4] Add vim ft=Dockerfile for syntax highlight detection in editors --- Dockerfiles/alpine | 2 ++ Dockerfiles/archlinux | 2 ++ Dockerfiles/debian | 2 ++ Dockerfiles/fedora | 2 ++ Dockerfiles/opensuse | 2 ++ 5 files changed, 10 insertions(+) diff --git a/Dockerfiles/alpine b/Dockerfiles/alpine index 367a3cf..78a78b6 100644 --- a/Dockerfiles/alpine +++ b/Dockerfiles/alpine @@ -1,3 +1,5 @@ +# vim: ft=Dockerfile + FROM alpine:latest RUN apk add --no-cache git meson alpine-sdk libinput-dev wayland-dev wayland-protocols mesa-dev libxkbcommon-dev eudev-dev pixman-dev gtkmm3-dev jsoncpp-dev libnl3-dev pulseaudio-dev libmpdclient-dev scdoc diff --git a/Dockerfiles/archlinux b/Dockerfiles/archlinux index de0f86c..9197fb8 100644 --- a/Dockerfiles/archlinux +++ b/Dockerfiles/archlinux @@ -1,3 +1,5 @@ +# vim: ft=Dockerfile + FROM archlinux/base:latest RUN pacman -Syu --noconfirm && \ diff --git a/Dockerfiles/debian b/Dockerfiles/debian index b6cda88..8d7a065 100644 --- a/Dockerfiles/debian +++ b/Dockerfiles/debian @@ -1,3 +1,5 @@ +# vim: ft=Dockerfile + FROM debian:sid RUN apt-get update && \ diff --git a/Dockerfiles/fedora b/Dockerfiles/fedora index 4e61055..af88607 100644 --- a/Dockerfiles/fedora +++ b/Dockerfiles/fedora @@ -1,3 +1,5 @@ +# vim: ft=Dockerfile + FROM fedora:30 RUN dnf install sway meson git libinput-devel wayland-devel wayland-protocols-devel egl-wayland-devel mesa-libEGL-devel mesa-libGLES-devel mesa-libgbm-devel libxkbcommon-devel libudev-devel pixman-devel gtkmm30-devel jsoncpp-devel scdoc -y && \ diff --git a/Dockerfiles/opensuse b/Dockerfiles/opensuse index 8101b0e..c54777e 100644 --- a/Dockerfiles/opensuse +++ b/Dockerfiles/opensuse @@ -1,3 +1,5 @@ +# vim: ft=Dockerfile + FROM opensuse/tumbleweed:latest RUN zypper -n up && \ From dfb5ec0c658512408b20f1d890e90d245e4146fa Mon Sep 17 00:00:00 2001 From: Michael Aquilina Date: Tue, 3 Sep 2019 10:34:12 +0100 Subject: [PATCH 4/4] Fix formatting in waybar-puluseaudio --- man/waybar-pulseaudio.5.scd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/man/waybar-pulseaudio.5.scd b/man/waybar-pulseaudio.5.scd index 9b8e503..b076b6d 100644 --- a/man/waybar-pulseaudio.5.scd +++ b/man/waybar-pulseaudio.5.scd @@ -36,7 +36,7 @@ Additionally you can control the volume by scrolling *up* or *down* while the cu *format-icons*: ++ typeof: array ++ - Based on the current port-name and volume, the corresponding icon gets selected. The order is *low* to *high*. See [`Icons`](#module-pulseaudio-config-icons) + Based on the current port-name and volume, the corresponding icon gets selected. The order is *low* to *high*. See *Icons*. *rotate*: ++ typeof: integer ++ @@ -84,13 +84,13 @@ Additionally you can control the volume by scrolling *up* or *down* while the cu *{volume}*: Volume in percentage. -*{icon}*: Icon, as defined in `format-icons`. +*{icon}*: Icon, as defined in *format-icons*. -*{format_source}*: Source format, `format-source`, `format-source-muted`. +*{format_source}*: Source format, *format-source*, *format-source-muted*. # ICONS: -The following strings for `format-icons` are supported. +The following strings for *format-icons* are supported. If they are found in the current PulseAudio port name, the corresponding icons will be selected. - *default* (Shown, when no other port is found)