wpaperd instead of hyprpaper

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,19 +42,24 @@ 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:
       context: parabola
 
-  openrc:
-    image: marcpartensky/arch:openrc
-    build:
-      context: openrc
-    ports:
-      - "18080:8080"
-      - "15900:5900"
-
 volumes:
   arch_pacman:
   arch_home:

openrc/Dockerfile

@@ -1,27 +0,0 @@
-FROM marcpartensky/arch:xorg
-LABEL maintainer=<marc.partensky@gmail.com>
-
-USER marc
-EXPOSE 5900 8080
-ENV DISPLAY=:0.0
-
-# Install packages
-RUN paru -Syyyu --noconfirm \
-    # xorg-server required for xdummy
-    openrc \
-	xorg-server \
-    # xorg-server-utils \
-	xorg-server-xvfb \
-    # xf86-video-dummy \
-	tigervnc \
-    novnc \
-    cron \
-    ttf-meslo-nerd-font-powerlevel10k
-
-USER root
-COPY crontab.txt /var/spool/cron/marc
-RUN chmod 600 /var/spool/cron/marc
-
-USER marc
-COPY entrypoint.sh /opt/arch/
-ENTRYPOINT [ "/opt/arch/entrypoint.sh" ]

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/entrypoint.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 export WALLPAPERS_PATH=/home/marc/wallpapers
-/sbin/init --user
+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