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

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:

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