wpaperd instead of hyprpaper

Makefile

@@ -6,8 +6,6 @@ vnc: buildvnc
 	docker-compose up vnc
 parabola: buildparabola
 	docker-compose up parabola
-artix: buildartix
-	docker-compose up artix
 
 buildbase:
 	docker-compose build base
@@ -17,8 +15,6 @@ buildvnc: buildxorg
 	docker-compose build vnc
 buildparabola: buildbase
 	docker-compose build parabola
-buildartix:
-	docker-compose build artix
 
 buildall: buildbase buildxorg buildvnc buildparabola
 
@@ -28,7 +24,6 @@ updateall:
 	docker-compose build --no-cache xorg
 	docker-compose build --no-cache vnc
 	docker-compose build --no-cache parabola
-	docker-compose build --no-cache artix
 	docker-compose push
 
 push: buildall

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)

artix/Dockerfile

@@ -1,83 +0,0 @@
-FROM artixlinux/openrc:latest
-LABEL maintainer="Marc Partensky"
-
-
-RUN pacman -Syyyu --needed --noconfirm base-devel
-RUN pacman -S --noconfirm git
-
-RUN useradd --create-home --groups wheel --shell /usr/bin/zsh marc
-RUN passwd -d marc
-RUN echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers
-
-USER marc
-WORKDIR /tmp
-RUN git clone https://aur.archlinux.org/paru.git
-WORKDIR /tmp/paru
-RUN makepkg -si --noconfirm
-
-# RUN paru -Rc --noconfirm elogind-openrc
-
-RUN paru -Syyyu --noconfirm \
-    zsh \
-    neovim \
-    exa \
-    paruz \
-    make \
-    npm \
-    go \
-    pod2man \
-    openssh \
-    stow-git
-
-# RUN paru -aS --noconfirm \
-#     bat
-
-COPY entrypoint.sh /tmp/entrypoint.sh
-
-USER root
-RUN cat /etc/locale.gen
-# RUN sed -i -e 's/en_US.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/' /etc/locale.gen
-# RUN cat /etc/locale.gen
-# RUN locale-gen
-# RUN cat /etc/locale.gen
-ENV LC_ALL fr_FR.UTF-8
-ENV LANG fr_FR.UTF-8
-ENV LANGUAGE fr_FR:fr
-
-USER marc
-
-WORKDIR /home/marc
-RUN mkdir git
-
-RUN git clone https://github.com/marcpartensky/dotfiles git/dotfiles
-RUN zsh git/dotfiles/main.sh
-RUN make -C git/dotfiles stow
-RUN touch .profile
-
-RUN git clone https://github.com/marcpartensky/nvim ~/.config/nvim
-RUN make -C ~/.config/nvim setup
-
-# ENV WLR_DRM_DEVICES=/dev/dri/card0
-ENV WLR_BACKENDS=headless
-ENV WLR_RENDERER=pixman
-ENV WLR_RENDERER_ALLOW_SOFTWARE=1
-ENV WLR_LIBINPUT_NO_DEVICES=1
-ENV WAYLAND_DISPLAY=wayland-1
-ENV LIBSEAT_BACKEND=logind
-ENV XDG_RUNTIME_DIR=/tmp
-ENV XDG_SESSION_TYPE=wayland
-
-RUN paru -Syyyu --noconfirm \
-    alacritty \
-    firefox \
-    nautilus
-
-RUN paru -Syyyu --noconfirm \
-    hyprland \
-    wayvnc \
-    wpaperd \
-    # waysct
-
-
-USER root
-# ENTRYPOINT [ "/tmp/entrypoint.sh" ]

artix/entrypoint.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/zsh
-
-ssh-keygen -q -t rsa -N '' -f $HOME/.ssh/id_rsa
-exec zsh

docker-compose.yml

@@ -10,27 +10,6 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
 
-  artix:
-    image: marcpartensky/artix
-    build:
-      context: artix
-    tmpfs:
-      - /tmp
-      - /run
-    # volumes:
-      # - /var/run/docker.sock:/var/run/docker.sock
-      # - /sys/fs/cgroup:/sys/fs/cgroup:ro
-      # - /dev/dri:/dev/dri
-    devices:
-      - /dev/dri
-    # deploy:
-    #   resources:
-    #     reservations:
-    #       devices:
-    #         - driver: nvdia
-    #           count: 1
-    #           capabilities: [gpu]
-
   xorg:
     image: marcpartensky/arch:xorg
     build:
@@ -63,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