neofetch

This reverts commit 4b3712029e.

Makefile

@@ -19,10 +19,11 @@ buildparabola: buildbase
 buildall: buildbase buildxorg buildvnc buildparabola
 
 updateall:
-	docker-compose build --no-cache
-	# docker-compose build --no-cache xorg
-	# docker-compose build --no-cache vnc
-	# docker-compose build --no-cache parabola
+	docker pull archlinux
+	docker-compose build --no-cache base
+	docker-compose build --no-cache xorg
+	docker-compose build --no-cache vnc
+	docker-compose build --no-cache parabola
 	docker-compose push
 
 push: buildall

docker-compose.yml

@@ -26,6 +26,8 @@ services:
       # - /tmp:/tmp
       # devices:
       # - /dev/dri
+      - arch_pacman:/var/cache/pacman/pkg
+      - /srv/arch/home/marc:/home/marc
 
   vnc:
     image: marcpartensky/arch:vnc
@@ -35,9 +37,14 @@ services:
       - "18080:8080"
       - "15900:5900"
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      # - /var/run/docker.sock:/var/run/docker.sock
+      - arch_pacman:/var/cache/pacman/pkg
+      - /srv/arch/home/marc:/home/marc
 
   parabola:
     image: marcpartensky/arch:parabola
     build:
       context: parabola
+
+volumes:
+  arch_pacman:

vnc/Dockerfile

@@ -1,21 +1,20 @@
 FROM marcpartensky/arch:xorg
 LABEL maintainer=<marc.partensky@gmail.com>
 
+USER marc
 EXPOSE 5900 8080
 ENV DISPLAY=:0.0
 
 # Install packages
-RUN paru -Syyy --noconfirm \
-	net-tools \
-	supervisor \
-	alacritty \
+RUN paru -Syyyu --noconfirm \
 	x11vnc \
     novnc \
     cron \
-	xorg-server \
+	# xorg-server \
 	# xorg-server-utils \
     ttf-meslo-nerd-font-powerlevel10k \
-	xorg-server-xvfb
+	# xorg-server-xvfb
+    xf86-video-dummy
 
 USER root
 COPY crontab.txt /var/spool/cron/marc
@@ -25,6 +24,8 @@ USER marc
 COPY supervisord.ini /etc/supervisor.d/supervisord.ini
 
 USER root
-COPY entrypoint.sh entrypoint.sh
-ENTRYPOINT [ ".//entrypoint.sh" ]
+RUN pwd
+RUN ls
+COPY entrypoint.sh /root/entrypoint.sh
+ENTRYPOINT [ "/root/entrypoint.sh" ]
 # ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisor.d/supervisord.ini"]

vnc/supervisord.ini

@@ -3,7 +3,7 @@ nodaemon=true
 ; nodaemon=false
 
 [program:X11]
-command=/usr/bin/Xvfb :0 -screen 0 1536x768x24
+command=/usr/bin/Xvfb :0 -screen 0 1820x980x8
 autorestart=true
 user=marc
 priority=1
@@ -20,7 +20,7 @@ autorestart=true
 priority=2
 
 [program:x11vnc]
-command=/usr/bin/x11vnc
+command=/usr/bin/x11vnc -shared -forever
 autorestart=true
 user=marc
 priority=2
@@ -54,6 +54,6 @@ user=root
 priority=5
 
 [program:alacritty]
-command=alacritty -e sh -c "picom -b"
+command=alacritty -e neofetch"
 user=marc
 priority=5

xorg/Dockerfile

@@ -1,25 +1,25 @@
 FROM marcpartensky/arch
 
-RUN paru -Syyy --noconfirm \
+RUN paru -Syyyu --noconfirm \
 	net-tools \
 	supervisor \
     firefox \
+	alacritty \
     picom \
     rofi \
     feh \
+    ttf-meslo-nerd-font-powerlevel10k \
+    # for nested x
+    xorg-server-xephyr \
+    # dwm build dependencies
+    libxft \
+    libxinerama
     # ttf-menlo-powerline-git \
     # ttf-meslo \
-    ttf-meslo-nerd-font-powerlevel10k \
-	alacritty \
-    xorg-xinit \
-	xorg-server \
+    # xorg-xinit \
+	# xorg-server \
 	# xorg-server-utils \
 	# xorg-server-xvfb \
-    xorg-server-xephyr
-
-
-# dwm build dependencies
-RUN paru -S --noconfirm libxft libxinerama
 
 # setup dwn
 RUN git clone https://github.com/marcpartensky/dwm git/dwm
@@ -45,7 +45,7 @@ RUN git clone https://github.com/marcpartensky/shell git/shell
 RUN make -C git/shell
 
 USER root
-COPY entrypoint.sh entrypoint.sh
 COPY supervisord.ini /etc/supervisor.d/supervisord.ini
+COPY entrypoint.sh entrypoint.sh
 ENTRYPOINT [ "./entrypoint.sh" ]
 # ENTRYPOINT [ "DISPLAY=:0", "Xephyr", ":1" ]