diff --git a/README.md b/README.md index e6e7b3a..1e5f81a 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,34 @@ # pinephone-sway-poc Sway UI configured for PINE64 PinePhone (Proof Of Concept) -You can find ready-made config files, scripts and installation instructions on how to set up Sway on Arch Linux ARM or postmarketOS and use it with a PinePhone. +You can find ready-made config files, scripts and installation instructions on how to set up Sway on Arch Linux ARM and use it with a PinePhone. ![Screenshots](./screenshots.png) ## Install -### postmarketOS -Start with a [postmarketOS](https://wiki.postmarketos.org/wiki/PINE64_PinePhone_(pine64-pinephone)) for PinePhone image with `postmarketos-ui-sway` installed. Either use the pre-built demo image or build a custom one with `pmbootstrap`. +### Arch Linux ARM +Start with a [Pine64-Arch](https://github.com/dreemurrs-embedded/Pine64-Arch/) image flashed to the phone and get SSH access. + +Disable the default `phosh.service` so that it doesn't get started on boot (`sudo systemctl disable --now phosh.service`). -Flash the system onto the phone (either to an SD card or directly to the eMMC with Jumpdrive). +Run this installation: -Open a terminal on the phone (either through SSH, the serial connection or directly on the screen) and run this: ```bash # system components -$ sudo apk add waybar bemenu swaylock swayidle squeekboard bash dialog tzdata +$ sudo pacman -S sway waybar bemenu bemenu-wayland swaylock swayidle squeekboard bash dialog tzdata alacritty + +# build tools +$ sudo pacman -S git make meson ninja cargo linux-headers # user components -$ sudo apk add networkmanager htop pavucontrol +$ sudo pacman -S networkmanager htop pavucontrol -# build tools -$ sudo apk add git make meson ninja cargo linux-headers libinput-dev eudev-dev +# theme components +$ sudo pacman -S ttf-font-awesome ``` -### Arch Linux ARM -Start with a [Pine64-Arch](https://github.com/dreemurrs-embedded/Pine64-Arch/) image flashed to the phone. You'll need the `sway` package and most of what is mentioned in the `postmarketOS` section. Disable (or remove) the default `phosh` package so that it doesn't get loaded on boot. - ### Common + ```bash # installation $ git clone --recurse-submodules https://github.com/Dejvino/pinephone-sway-poc diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..96ab0aa --- /dev/null +++ b/TODO.md @@ -0,0 +1,11 @@ +# TODO + +- update PPTK +- drop or upgrade rot8 +- drop lisgd +- replace termite with alacritty + - extract out + - create command files and reference them from configs (e.g. waybar) +- cleanup waybar configs into one +- modular sway config? base config with extensions? + diff --git a/usr/local/bin/swayphone_power_wakeup b/usr/local/bin/swayphone_power_wakeup index e7dfa3e..562ccb8 100755 --- a/usr/local/bin/swayphone_power_wakeup +++ b/usr/local/bin/swayphone_power_wakeup @@ -8,6 +8,10 @@ pptk-led set green 0 pptk-led set blue 0 pptk-cpu-sleep disable +if [[ ! -e $BACKLIGHT_FILE ]]; then + echo $BACKLIGHT_MIN > $BACKLIGHT_FILE +fi + # restore last saved backlight level BACKLIGHT=$((`cat $BACKLIGHT_FILE` >= $BACKLIGHT_MIN ? `cat $BACKLIGHT_FILE` : $BACKLIGHT_MIN)) pptk-backlight set_percent $BACKLIGHT diff --git a/usr/share/wayland-sessions/sway.desktop b/usr/share/wayland-sessions/sway.desktop index 1cf1e8f..c4667c3 100644 --- a/usr/share/wayland-sessions/sway.desktop +++ b/usr/share/wayland-sessions/sway.desktop @@ -3,7 +3,7 @@ Name=Sway Name[en]=Sway Comment=This session logs you into Sway Comment[en]=This session logs in you into Sway -Exec=elogind-inhibit --what=shutdown:handle-power-key --mode=block dbus-run-session /usr/bin/sway +Exec=systemd-inhibit --what=shutdown:handle-power-key --mode=block dbus-run-session /usr/bin/sway #Exec=dbus-run-session /usr/bin/sway TryExec=/usr/bin/sway Icon=