colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sxmo-utils-latest: 2023-10-05 -> 2023-10-10

Browse Source
This commit is contained in:
Colin 2023-10-11 01:30:43 +00:00
parent ff89819940
commit c3d0b6b486
5 changed files with 18 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/additional/sxmo-utils/0005-system-audio.patch
View File

@ -1,21 +0,0 @@
diff --git a/configs/default_hooks/sxmo_hook_start.sh b/configs/default_hooks/sxmo_hook_start.sh
index 194814d..beb9232 100755
--- a/configs/default_hooks/sxmo_hook_start.sh
+++ b/configs/default_hooks/sxmo_hook_start.sh
@@ -16,16 +16,6 @@ while ! superctl status > /dev/null 2>&1; do
sleep 0.5
done
-# Load our sound daemons
-
-if [ "$(command -v pulseaudio)" ]; then
- superctl start pulseaudio
-elif [ "$(command -v pipewire)" ]; then
- # pipewire-pulse will start pipewire
- superctl start pipewire-pulse
- superctl start wireplumber
-fi
-
# Periodically update some status bar components
sxmo_hook_statusbar.sh all
sxmo_daemons.sh start statusbar_periodics sxmo_run_aligned.sh 60 \

13
pkgs/additional/sxmo-utils/0104-full-auto-rotate.patch
View File

@ -1,13 +0,0 @@
diff --git a/scripts/core/sxmo_autorotate.sh b/scripts/core/sxmo_autorotate.sh
index 58e3f4b..cbf0163 100755
--- a/scripts/core/sxmo_autorotate.sh
+++ b/scripts/core/sxmo_autorotate.sh
@@ -18,6 +18,8 @@ while true; do
x_raw="$(cat "$FILE_X")"
if [ "$x_raw" -ge "$RIGHT_SIDE_UP" ] && sxmo_rotate.sh isrotated ; then
sxmo_rotate.sh rotnormal
+ elif [ "$x_raw" -le "$UPSIDE_DOWN" ] && [ "$(sxmo_rotate.sh isrotated)" != "invert" ]; then
+ sxmo_rotate.sh rotinvert
elif [ "$y_raw" -le "$UPSIDE_DOWN" ] && [ "$(sxmo_rotate.sh isrotated)" != "right" ]; then
sxmo_rotate.sh rotright
elif [ "$y_raw" -ge "$RIGHT_SIDE_UP" ] && [ "$(sxmo_rotate.sh isrotated)" != "left" ]; then

48
pkgs/additional/sxmo-utils/0106-no-restart-lisgd.patch
View File

@ -1,48 +0,0 @@
commit 0b3ce90e74f4d063432170239f6a3aea0c2ad665 (HEAD -> dev/sane)
Author: Colin <colin@uninsane.org>
Date: 2023-07-16 12:45:49 +0000
sxmo_rotate: don't restart lisgd on sway
AFAICT we restart lisgd because it learns the orientation via its
`-o <orientation>` CLI argument. but we only pass that flag on dwm/x11,
not sway. restarting it on sway is wasteful, and potentially racy (i'm
able to get multiple lisgd's running just by enabling autorotate and
flipping the phone rapidly), so don't do that.
diff --git a/scripts/core/sxmo_rotate.sh b/scripts/core/sxmo_rotate.sh
index 159236f..3a95657 100755
--- a/scripts/core/sxmo_rotate.sh
+++ b/scripts/core/sxmo_rotate.sh
@@ -52,7 +52,6 @@ xorgrotinvert() {
swayrotinvert() {
swaymsg -- output "-" transform 180
- superctl restart sxmo_hook_lisgd
sxmo_hook_rotate.sh invert
exit 0
}
@@ -68,7 +67,6 @@ xorgrotnormal() {
swayrotnormal() {
swaymsg -- output "-" transform 0
- superctl restart sxmo_hook_lisgd
sxmo_hook_rotate.sh normal
exit 0
}
@@ -84,7 +82,6 @@ xorgrotright() {
swayrotright() {
swaymsg -- output "-" transform 90
- superctl restart sxmo_hook_lisgd
sxmo_hook_rotate.sh right
exit 0
}
@@ -100,7 +97,6 @@ xorgrotleft() {
swayrotleft() {
swaymsg -- output "-" transform 270
- superctl restart sxmo_hook_lisgd
sxmo_hook_rotate.sh left
exit 0
}

5
pkgs/additional/sxmo-utils/common.nix
View File

@ -123,7 +123,9 @@ stdenv.mkDerivation rec {
# let superd find sxmo service binaries at runtime via PATH
# TODO: replace with fully-qualified paths
sed -i 's:ExecStart=/usr/bin/:ExecStart=/usr/bin/env :' configs/superd/services/*.service
sed -i 's:ExecStart=/usr/bin/:ExecStart=/usr/bin/env :' \
configs/services/*.service \
configs/superd/services/*.service
# install udev rules to where nix expects
substituteInPlace Makefile \
@ -150,6 +152,7 @@ stdenv.mkDerivation rec {
"SYSCONFDIR=${placeholder "out"}/etc"
"DESTDIR="
"OPENRC=0"
# TODO: use SERVICEDIR and EXTERNAL_SERVICES=0 to integrate superd/systemd better
];
preInstall = ''
# busybox is used by setup_config_version.sh, but placing it in nativeBuildInputs breaks the nix builder

31
pkgs/additional/sxmo-utils/default.nix
View File

@ -87,26 +87,23 @@ let
})
## these might or might not be upstream-worthy
./0104-full-auto-rotate.patch
# ./0106-no-restart-lisgd.patch
(fetchpatch {
name = "sxmo_autorotate: allow all four orientations";
url = "https://git.uninsane.org/colin/sxmo-utils/commit/e3aadb4b53fcf83c233b0ebfb31504f35c1bf68c.patch";
hash = "sha256-oZ2EZ50p61//rv2tSKfLIZIJpBoOgCYIjhvsKX/8kJw=";
})
## not upstreamable
# let NixOS manage the audio daemons (pulseaudio/pipewire)
./0005-system-audio.patch
(fetchpatch {
# let NixOS manage the audio daemons (pulseaudio/pipewire)
name = "sxmo_hook_start: don't start audio daemons";
url = "https://git.uninsane.org/colin/sxmo-utils/commit/124f8fed85c3ff89ab45f1c21569bcc034d07693.patch";
hash = "sha256-GteXFZCuRpIXuYrEdEraIhzCm1b4vNJgh3Lmg+Qjeqk=";
})
];
# these don't apply cleanly to the stable release; only to latest
unmerged-tip-only = [
# TODO: send these upstream
(fetchpatch {
name = "manpage: fix typo to sxmo_hook_network_pre_{up,down}.sh";
url = "https://git.uninsane.org/colin/sxmo-utils/commit/9954df10f4885c6dad7396829d97a39e20d285dd.patch";
hash = "sha256-+76kia1kEb7Rj8KgP1ty9VlboB4OlWpZS/U0ANLYE5E=";
})
(fetchpatch {
name = "add defaults for hooks referenced in sxmo_power.sh";
url = "https://git.uninsane.org/colin/sxmo-utils/commit/3f432023b766db4146aaaa830c68f31494ebe90b.patch";
hash = "sha256-jkdh6gJg0kQVPf5UnTqSv+4aImN0syuQx96NLctKUPE=";
})
(fetchpatch {
name = "sxmo_hook_apps: add a few";
url = "https://git.uninsane.org/colin/sxmo-utils/commit/dd17fd707871961906ed4577b8c89f6128c5f121.patch";
@ -141,9 +138,9 @@ in {
patches = patches.merged ++ patches.unmerged;
};
latest = callPackage ./common.nix {
version = "unstable-2023-10-05";
rev = "05fd5112d5f2b49051cbb2f0bbb25202363bf83e";
hash = "sha256-YmVe9P0w2KSqj6G/az499r7+z3Crfm3TbBIawjVKP1M=";
version = "unstable-2023-10-10";
rev = "2547af4cbc1b36087fd8067ce46f5ca62be31773";
hash = "sha256-14ciTSM3L7cBEPhQvY1k62ZKe0ToXNFwqgQ4w6Fd6ro=";
patches = patches.unmerged ++ patches.unmerged-tip-only;
};
}