wpaperd instead of hyprpaper

.github/FUNDING.yml

@@ -1,7 +1,5 @@
-liberapay: marcpartensky
 patreon: marcpartensky
 github: marcpartensky
 custom:
   # - monero:43J2XmRtjDPRLD35UsYGH2AZamFBQz7dt4VdvZXVm3SuadTrvcoXUXBRUNHqukFte23Q5TWXqhbwaLJJgoVQzzbe2AJDANQ
   - https://paypal.me/marcpartensky
-  - https://buymeacoffee.com/marcpartensky

.github/workflows/docker-build-test.yml

@@ -1,4 +1,4 @@
-name: Docker build test
+name: Docker
 
 on:
   schedule:
@@ -20,12 +20,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: docker/setup-qemu-action@v2
-    - uses: docker/setup-buildx-action@v2
-
+    - uses: actions/checkout@v2
+    - name: Update apt
+      run: sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y
     - name: Install make
       run: sudo apt install make docker-compose -y
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
     - name: build base
       run: make buildbase
     - name: build xorg

.github/workflows/docker-push.yml

@@ -1,4 +1,4 @@
-name: Docker push
+name: Docker
 
 on:
   schedule:
@@ -14,15 +14,18 @@ on:
   pull_request:
 
 jobs:
-  buildandpush:
+  build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: docker/setup-qemu-action@v2
-    - uses: docker/setup-buildx-action@v2
-
+    - uses: actions/checkout@v2
+    - name: Update apt
+      run: sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y
     - name: Install make
       run: sudo apt install make docker-compose -y
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
     - name: build base
       run: make buildbase
     - name: build xorg

README.md

@@ -1,15 +1,6 @@
 # Custom environment images
 
-
-## Shell
-[marcpartensky/arch](https://hub.docker.com/r/marcpartensky/arch)
-
-## Xephyr
-[marcpartensky/arch:xorg](https://hub.docker.com/r/marcpartensky/arch:xorg)
-
-## VNC/NoVNC
-[marcpartensky/arch:vnc](https://hub.docker.com/r/marcpartensky/arch:vnc)
-
-## Parabola
-Parabola is an arch derivative that focuses on foss.
+- [marcpartensky/arch](https://hub.docker.com/r/marcpartensky/arch)
+- [marcpartensky/arch:xorg](https://hub.docker.com/r/marcpartensky/arch:xorg)
+- [marcpartensky/arch:vnc](https://hub.docker.com/r/marcpartensky/arch:vnc)
 - [marcpartensky/arch:parabola](https://hub.docker.com/r/marcpartensky/arch:parabola)

docker-compose.yml

@@ -42,6 +42,19 @@ services:
       - arch_pacman:/var/cache/pacman/pkg
       - arch_home:/home/marc
 
+  waylandvnc:
+    image: marcpartensky/arch:waylandvnc
+    build:
+      context: waylandvnc
+    # user: $USER
+    ports:
+      - "18080:8080"
+      - "15900:5900"
+    volumes:
+      # - /var/run/docker.sock:/var/run/docker.sock
+      - arch_pacman:/var/cache/pacman/pkg
+      - arch_home:/home/marc
+
   parabola:
     image: marcpartensky/arch:parabola
     build:

waylandvnc/Dockerfile

@@ -0,0 +1,21 @@
+FROM marcpartensky/arch:waylandvnc
+LABEL maintainer=<marc.partensky@gmail.com>
+
+RUN paru -Syyyu --noconfirm \
+    hyprland-bin \
+    # hyprpaper-git \
+    hyprpaper-git \
+    wpaperd \
+    waybar \
+    grim \
+    wf-recorder \
+    swappy
+
+USER root
+COPY crontab.txt /var/spool/cron/marc
+RUN chmod 600 /var/spool/cron/marc
+
+USER marc
+COPY entrypoint.sh /opt/arch/
+COPY supervisord.conf /etc/supervisord.conf
+ENTRYPOINT [ "/opt/arch/entrypoint.sh" ]

waylandvnc/crontab.txt

@@ -0,0 +1 @@
+* * * * * /home/marc/.local/bin/wpp -n

waylandvnc/entrypoint.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export WALLPAPERS_PATH=/home/marc/wallpapers
+supervisord -l /tmp/supervisord.log

waylandvnc/supervisord.conf

@@ -0,0 +1,58 @@
+[supervisord]
+nodaemon=true
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[unix_http_server]
+file=/tmp/supervisord.sock
+
+[supervisorctl]
+serverurl=unix:///tmp/supervisord.sock
+
+[program:xvnc]
+command=Xvnc :0 -SecurityTypes None -geometry 1820x980
+autorestart=true
+user=marc
+priority=1
+
+[program:hyprland]
+command=Hyprland
+autorestart=true
+user=marc
+priority=3
+
+[program:noVNC]
+command=/sbin/novnc --vnc localhost:5900 --listen 8080
+autorestart=true
+user=marc
+priority=3
+
+[program:wpaperd]
+command=wpaperd --no-daemon
+autorestart=true
+user=marc
+priority=4
+
+# [program:hyprpaper]
+# command=hyprpaper
+# autorestart=true
+# user=marc
+# priority=4
+
+[program:waybar]
+command=waybar
+autorestart=true
+user=marc
+priority=4
+
+[program:cron]
+command=crond -f
+user=root
+priority=5
+
+[program:alacritty]
+command=alacritty -e neofetch"
+autorestart=false
+user=marc
+priority=5