funding

.github/FUNDING.yml

@@ -1,5 +1,7 @@
+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
+name: Docker build test
 
 on:
   schedule:
@@ -20,15 +20,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Update apt
-      run: sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y
+    - uses: actions/checkout@v3
+    - uses: docker/setup-qemu-action@v2
+    - uses: docker/setup-buildx-action@v2
+
     - 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
+name: Docker push
 
 on:
   schedule:
@@ -14,18 +14,15 @@ on:
   pull_request:
 
 jobs:
-  build:
+  buildandpush:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Update apt
-      run: sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y
+    - uses: actions/checkout@v3
+    - uses: docker/setup-qemu-action@v2
+    - uses: docker/setup-buildx-action@v2
+
     - 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,6 +1,15 @@
 # Custom environment images
 
-- [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)
+
+## 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:parabola](https://hub.docker.com/r/marcpartensky/arch:parabola)

docker-compose.yml

@@ -42,23 +42,6 @@ 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"
-    tmpfs:
-      - /tmp
-      - /run
-    volumes:
-      # - /var/run/docker.sock:/var/run/docker.sock
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-      - arch_pacman:/var/cache/pacman/pkg
-      - arch_home:/home/marc
-
   parabola:
     image: marcpartensky/arch:parabola
     build:

makefile

@@ -6,8 +6,6 @@ vnc: buildvnc
 	docker-compose up vnc
 parabola: buildparabola
 	docker-compose up parabola
-waylandvnc: buildwaylandvnc
-	docker-compose up waylandvnc
 
 buildbase:
 	docker-compose build base
@@ -17,8 +15,6 @@ buildvnc: buildxorg
 	docker-compose build vnc
 buildparabola: buildbase
 	docker-compose build parabola
-buildwaylandvnc: buildxorg
-	docker-compose build waylandvnc
 
 buildall: buildbase buildxorg buildvnc buildparabola
 
@@ -28,10 +24,9 @@ updateall:
 	docker-compose build --no-cache xorg
 	docker-compose build --no-cache vnc
 	docker-compose build --no-cache parabola
-	docker-compose build --no-cache waylandvnc
 	docker-compose push
 
 push: buildall
 	docker-compose push
 
-.PHONY: base xorg vnc parabola waylandvnc
+.PHONY: base xorg vnc parabola

waylandvnc/Dockerfile

@@ -1,27 +0,0 @@
-FROM marcpartensky/arch:xorg
-LABEL maintainer=<marc.partensky@gmail.com>
-
-USER marc
-RUN paru -Syyyu --noconfirm \
-    hyprland-bin \
-    hyprpaper-git \
-    wayvnc \
-    waybar \
-    wpaperd \
-    grim \
-    wf-recorder \
-    swappy
-
-RUN go env -w GO111MODULE=off
-RUN go get -u github.com/d4l3k/go-sct/cmd/waysct
-
-# waysct, wpaperd
-
-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

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

waylandvnc/entrypoint.sh

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

waylandvnc/supervisord.conf

@@ -1,52 +0,0 @@
-[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:wayvnc]
-command=wayvnc
-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: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