refactor: cleanup config

This reverts commit 420d4a287a.

.gitea/workflows/build.yaml

@@ -1,115 +0,0 @@
-name: Build containers
-on:
-  workflow_dispatch:
-  push:
-    branches: ["main"]
-    paths: ["containers/**", ".gitea/workflows/build.yaml"]
-  pull_request:
-    branches: ["main"]
-    paths: ["containers/**", ".gitea/workflows/build.yaml"]
-  schedule:
-    - cron: "0 16 * * FRI"
-
-jobs:
-  changes:
-    runs-on: job-v2
-    outputs:
-      base: ${{ steps.filter.outputs.base == 'true' }}
-      infra: ${{ steps.filter.outputs.infra == 'true' || steps.filter.outputs.base == 'true' }}
-      go: ${{ steps.filter.outputs.go == 'true' || steps.filter.outputs.base == 'true' }}
-      php: ${{ steps.filter.outputs.php == 'true' || steps.filter.outputs.base == 'true' }}
-      any_change: ${{ steps.filter.outputs.workflow == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: https://github.com/dorny/paths-filter@v3
-        id: filter
-        with:
-          filters: |
-            workflow: ['.gitea/workflows/build.yaml']
-            base: ['containers/base/**']
-            infra: ['containers/infra/**']
-            go: ['containers/go/**']
-            php: ['containers/php/**']
-
-  base-image:
-    needs: [changes]
-    if: ${{ needs.changes.outputs.base == 'true' || needs.changes.outputs.any_change == 'true' }}
-    runs-on: job-v2
-    steps:
-      - uses: actions/checkout@v4
-      - name: Log in
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: git.plabble.org
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-      - name: Build
-        id: build
-        uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
-        with:
-          image: job79/base
-          tags: ${{ github.ref_name }}
-          context: ./containers/base
-          containerfiles: ./containers/base/Containerfile
-          platforms: linux/amd64
-      - name: Push
-        uses: redhat-actions/push-to-registry@v2
-        with:
-          image: ${{ steps.build.outputs.image }}
-          tags: ${{ steps.build.outputs.tags }}
-          registry: git.plabble.org
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-          extra-args: |
-            --compression-format=zstd
-            --compression-level=12
-
-  dependent-images:
-    needs: [changes, base-image]
-    if: always() && needs.changes.result == 'success' && (needs.base-image.result == 'success' || needs.base-image.result == 'skipped')
-    runs-on: job-v2
-    strategy:
-      fail-fast: false
-      matrix:
-        container: [infra, go, php]
-    steps:
-      - name: Check if build needed
-        id: check
-        run: |
-          if [[ "${{ matrix.container }}" == "infra" && "${{ needs.changes.outputs.infra }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-          if [[ "${{ matrix.container }}" == "go" && "${{ needs.changes.outputs.go }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-          if [[ "${{ matrix.container }}" == "php" && "${{ needs.changes.outputs.php }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-          if [[ "${{ needs.changes.outputs.any_change }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-      - name: Clone repo
-        if: steps.check.outputs.run == 'true'
-        uses: actions/checkout@v4
-      - name: Log in
-        if: steps.check.outputs.run == 'true'
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: git.plabble.org
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-      - name: Build
-        id: build
-        if: steps.check.outputs.run == 'true'
-        uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
-        with:
-          image: job79/${{ matrix.container }}
-          tags: ${{ github.ref_name }}
-          context: ./containers/${{ matrix.container }}
-          containerfiles: ./containers/${{ matrix.container }}/Containerfile
-          build-args: TAG=${{ github.ref_name }}
-          platforms: linux/amd64
-      - name: Push
-        if: steps.check.outputs.run == 'true'
-        uses: redhat-actions/push-to-registry@v2
-        with:
-          image: ${{ steps.build.outputs.image }}
-          tags: ${{ steps.build.outputs.tags }}
-          registry: git.plabble.org
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-          extra-args: |
-            --compression-format=zstd
-            --compression-level=12

.gitea/workflows/ci.yaml

@@ -0,0 +1,32 @@
+name: Container build
+on:
+  push:
+  schedule:
+    - cron: '0 16 * * FRI'
+
+jobs:
+  container-build:
+    runs-on: plabble-sprinter
+    if: gitea.ref == 'refs/heads/main'
+    env:
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v4
+      - name: Set up BuildX
+        uses: docker/setup-buildx-action@v2
+        with:
+          endpoint: 'unix:///var/run/docker.sock'
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.plabble.org
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Containerfile
+          push: true
+          tags: git.plabble.org/job79/dev:latest

Containerfile

@@ -0,0 +1,29 @@
+# ========================================= #
+# Containerfile v1.0; job79                 #
+# Configure and setup a neovim devcontainer #
+# for go and nodejs development.            #
+# ========================================= #
+FROM quay.io/fedora/fedora:41
+
+# === setup system ===
+RUN dnf update -y && dnf -y install neovim unzip \
+  bash-completion zoxide fd-find procps \
+  git go npm
+
+# === setup container user ===
+RUN useradd -ms /bin/bash user && usermod -aG wheel user && sed -i '/NOPASSWD/s/^#//g' /etc/sudoers
+USER user
+WORKDIR /home/user
+COPY config/user/bashrc /home/user/.bashrc
+COPY config/user/profile /home/user/.bash_profile
+
+# === setup neovim ===
+RUN git clone --depth 1 https://github.com/LazyVim/starter ~/.config/nvim
+COPY --chown=user:user config/nvim/plugins /home/user/.config/nvim/lua/plugins
+COPY --chown=user:user config/nvim/config/keymaps.lua /home/user/.config/nvim/lua/config/keymaps.lua
+COPY --chown=user:user config/nvim/lazyvim.json /home/user/.config/nvim/lazyvim.json
+
+# === setup container ===
+ENV TZ="Europe/Amsterdam"
+VOLUME /home/user/.local /home/user/.cache
+CMD ["bash", "-l"]

config/nvim/config/keymaps.lua

@@ -0,0 +1,21 @@
+local keymap = vim.keymap.set
+local delkeymap = vim.keymap.del
+local opts = { noremap = true, silent = true }
+
+-- Improved line start/end
+keymap("n", "H", "^", opts)
+keymap("n", "L", "$", opts)
+keymap("v", "H", "^", opts)
+keymap("v", "L", "$", opts)
+
+-- Improved escape
+keymap("n", "<ESC>", "<ESC>:noh<CR>", opts)
+keymap("t", "<ESC><ESC>", "<C-\\><C-n>", opts)
+
+-- Improved <ctrl> + movement
+keymap("n", "<C-d>", "<C-d>zz", opts)
+keymap("n", "<C-u>", "<C-u>zz", opts)
+
+-- Disable alt j/k to move lines (conflict with default vim motions)
+delkeymap({ "i", "v" }, "<A-j>")
+delkeymap({ "i", "v" }, "<A-k>")

config/nvim/lazyvim.json

@@ -0,0 +1,12 @@
+{
+  "extras": [
+    "lazyvim.plugins.extras.coding.copilot",
+    "lazyvim.plugins.extras.dap.core",
+    "lazyvim.plugins.extras.lang.go",
+    "lazyvim.plugins.extras.lang.svelte",
+    "lazyvim.plugins.extras.lang.tailwind",
+    "lazyvim.plugins.extras.lang.typescript",
+    "lazyvim.plugins.extras.test.core"
+  ],
+  "version": 7
+}

config/nvim/plugins/colorscheme.lua

@@ -0,0 +1,12 @@
+-- Configure rose-pine and gruvbox-material colorschemes.
+return {
+	{ "rose-pine/neovim" },
+	{ "sainnhe/gruvbox-material" },
+	{
+		-- Set default colorscheme.
+		"LazyVim/LazyVim",
+		opts = {
+			colorscheme = "gruvbox-material",
+		},
+	},
+}

config/nvim/plugins/disabled.lua

@@ -0,0 +1,32 @@
+-- Disable unused plugins and functionality.
+return {
+	{
+		-- Disable the dashboard.
+		"folke/snacks.nvim",
+		opts = function(_, opts)
+			opts.dashboard = { enabled = false }
+		end,
+	},
+	{
+		-- Disable the bufferline.
+		"bufferline.nvim",
+		enabled = false,
+	},
+	{
+		-- Disable inline hints by default.
+		"neovim/nvim-lspconfig",
+		opts = {
+			inlay_hints = { enabled = false },
+		},
+	},
+	{
+		"hrsh7th/nvim-cmp",
+		opts = function(_, opts)
+			-- Disable autocomplete on enter.
+			local cmp = require("cmp")
+			opts.mapping = vim.tbl_deep_extend("force", opts.mapping, {
+				["<CR>"] = cmp.config.disable,
+			})
+		end,
+	},
+}

config/user/bashrc

@@ -0,0 +1,13 @@
+. /etc/bashrc
+
+# === environment ===
+export EDITOR=nvim \
+  WAYLAND_DISPLAY=wayland-0 \
+  XDG_RUNTIME_DIR=/run/user/1000 \
+  SSH_AUTH_SOCK=/run/user/1000/ssh-auth-sock \
+  PS1='\[\e[30;46m\] container | \w \[\e[0;36m\]\[\e[m\] '
+
+# === aliases and functions ===
+alias vi=nvim
+post() { curl -sF "content=<-" "https://paste.plabble.org/$2?lang=$1" && echo; }
+eval "$(zoxide init --cmd cd bash)"

config/user/profile

@@ -0,0 +1,7 @@
+. ~/.bashrc
+
+# === persist copilot auth files inside .local volume ===
+if [ ! -d ~/.config/github-copilot ]; then
+  mkdir -p ~/.local/share/github-copilot
+  ln -s ~/.local/share/github-copilot ~/.config
+fi

containers/base/Containerfile

@@ -1,32 +0,0 @@
-FROM quay.io/fedora/fedora:44
-
-# === install system packages ===
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
-  dnf update -y && \
-  dnf -y --setopt=keepcache=1 --setopt=install_weak_deps=False install \
-    bash-completion git-core fzf curl awk jq fd-find rg unzip which \
-    host-spawn wl-copy gcc
-
-RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | jq -r .tag_name | sed 's/^v//') && \
-  curl -sL "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_linux_x86_64.tar.gz" | tar xz -C /usr/local/bin lazygit && \
-  curl -sL "https://github.com/jorgerojas26/lazysql/releases/latest/download/lazysql_Linux_x86_64.tar.gz" | tar xz -C /usr/local/bin lazysql && \
-  curl -sL "https://github.com/neovim/neovim/releases/download/nightly/nvim-linux-x86_64.tar.gz" | tar xz -C /usr/local --strip-components=1
-
-COPY config/bin /usr/local/bin
-
-# === setup user ===
-RUN useradd -ms /bin/bash user && \
-  echo 'user ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/user && \
-  mkdir -p /run/user/1000 && \
-  chown user:user /run/user/1000
-
-USER user
-WORKDIR /home/user
-
-RUN mkdir -p .config .local .cache && \
-  git clone https://git.plabble.org/Job79/neovim-config.git .config/nvim
-
-COPY --chown=user:user config/bashrc .bashrc
-COPY --chown=user:user config/git .config/git/config
-
-VOLUME /home/user

containers/base/config/bashrc

@@ -1,21 +0,0 @@
-source /etc/bashrc
-
-# === bash settings ===
-set -o vi
-bind -m vi-insert '"\C-l": clear-screen'
-
-# === environment ===
-export PS1="\[\e[30;46m\] \h | \w \[\e[0;36m\]\[\e[m\] " \
-  EDITOR="nvim" \
-  WAYLAND_DISPLAY="wayland-0" \
-  XDG_RUNTIME_DIR="/run/user/1000" \
-  SSH_AUTH_SOCK="/run/user/1000/ssh-auth-sock" \
-  TZ="Europe/Amsterdam" \
-  FZF_CTRL_T_COMMAND="fd --type f --hidden --exclude .git --exclude Library --exclude .cache" \
-  FZF_ALT_C_COMMAND="fd --type d --hidden --exclude .git --exclude Library --exclude .cache"
-
-# === aliases and functions ===
-alias vi=nvim
-post() { curl -sF "content=<-" "https://paste.plabble.org/$2?lang=$1" && echo; }
-
-eval "$(fzf --bash)"

containers/base/config/bin/host

@@ -1,6 +0,0 @@
-#!/bin/bash
-export DBUS_SESSION_BUS_ADDRESS="unix:path=/tmp/bus"
-
-cmd="${0##*/}"
-[[ "$cmd" == "host" ]] && unset cmd
-exec host-spawn -cwd "${PWD/#$HOME/$HOST_HOME}" ${cmd:+"$cmd"} "$@"

containers/base/config/bin/podman

@@ -1 +0,0 @@
-host

containers/base/config/bin/xdg-open

@@ -1 +0,0 @@
-host

containers/base/config/git

@@ -1,12 +0,0 @@
-[user]
-	email = job@plabble.org
-	name = Job79
-  signingKey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPsqM6ABAaCTQZ+llFXD3CXrYYuIHDEnvz8IBbXddYEc job@plabble.org
-[gpg]
-	format = ssh
-[commit]
-	gpgSign = true
-[push]
-	autoSetupRemote = true
-[init]
-	defaultBranch = main

containers/go/Containerfile

@@ -1,10 +0,0 @@
-ARG TAG
-FROM job79/base:${TAG}
-USER root
-
-RUN GO_VERSION=$(curl -sL "https://go.dev/VERSION?m=text" | head -n 1 | tr -d '\r\n') && \
-  curl -sL "https://go.dev/dl/${GO_VERSION}.linux-amd64.tar.gz" | tar xz -C /usr/local && \
-  ln -sf /usr/local/go/bin/go /usr/local/bin/go && \
-  ln -sf /usr/local/go/bin/gofmt /usr/local/bin/gofmt
-
-USER user

containers/go/config.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-run_opts+=("-v" "$HOME/Documents/go:/home/user/Documents/go")

containers/infra/Containerfile

@@ -1,11 +0,0 @@
-ARG TAG
-FROM job79/base:${TAG}
-USER root
-
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
-  dnf -y --setopt=keepcache=1 --setopt=install_weak_deps=False install \
-    just kubectl k9s openssl age "$(curl -s https://api.github.com/repos/getsops/sops/releases/latest | jq -r ".assets[] | select(.name | test(\"sops-.*.$(arch).rpm\$\")) | .browser_download_url")" && \
-  curl -sL https://talos.dev/install | sh && \
-  curl -s https://fluxcd.io/install.sh | bash
-
-USER user

containers/infra/config.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-run_opts+=("-v" "$HOME/Documents/infra:/home/user/Documents/infra")

containers/php/Containerfile

@@ -1,9 +0,0 @@
-ARG TAG
-FROM job79/base:${TAG}
-USER root
-
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
-  dnf -y --setopt=keepcache=1 install php composer npm && \
-  composer global require laravel/installer
-
-USER user

containers/php/config.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-run_opts+=("-v" "$HOME/Documents/php:/home/user/Documents/php")

devc.sh

@@ -1,78 +0,0 @@
-#!/bin/bash
-# =============================================== #
-# devc.sh v2.1; job79, maurice                    #
-# Dev container entry script.                     #
-# =============================================== #
-set -euo pipefail
-log() { echo -e "\e[36m○\e[0m $1"; }
-die() { echo -e "\e[31mx\e[0m $1" && exit 1; }
-
-# default_args configures standard container options.
-default_args() {
-  run_opts+=(
-    "--name" "$name"
-    "--hostname" "$name"
-    "--pull=newer"                      # Update image.
-    "--userns=keep-id"                  # Map host user.
-    "-v" "$name:/home/user:copy"        # Persistent home volume.
-    "-v" "dnf-cache:/var/cache/libdnf5" # Cache dnf metadata.
-  )
-
-  # Unix sockets require SELinux label disable.
-  [[ -d /sys/fs/selinux ]] && run_opts+=("--security-opt" "label=disable")
-
-  # Desktop integration (Wayland, SSH).
-  [[ -e "/run/user/$UID/wayland-0" ]] && run_opts+=("-v" "/run/user/$UID/wayland-0:/run/user/1000/wayland-0")
-  [[ -e "${SSH_AUTH_SOCK:-}" ]] && run_opts+=("-v" "$SSH_AUTH_SOCK:/run/user/1000/ssh-auth-sock")
-
-  # Load custom container config.
-  local config_file="${BASH_SOURCE[0]%/*}/containers/$name/config.sh"
-  [[ -f "$config_file" ]] && source "$config_file" || true
-}
-
-# param_args parses CLI arguments into podman run options.
-param_args() {
-  while (($# > 0)); do
-    case "$1" in
-    -gpu) run_opts+=("--device" "/dev/dri") ;;
-    -host-spawn) run_opts+=("-v" "/run/user/$UID/bus:/tmp/bus" "-e" "HOST_HOME=$HOME") ;;
-    -container-sock) run_opts+=("-v" "$XDG_RUNTIME_DIR/podman/podman.sock:/var/run/docker.sock") ;;
-    -x11) run_opts+=("-v" "/tmp/.X11-unix:/tmp/.X11-unix" "-v" "$XAUTHORITY:/run/user/1000/.Xauthority:ro" "-e" "DISPLAY=$DISPLAY" "-e" "XAUTHORITY=/run/user/1000/.Xauthority") ;;
-    -mnt) shift && run_opts+=("-w" "/mnt/" "-v" "$1:/mnt/$([[ -d "$1" ]] || echo "file")") ;;
-    *) run_opts+=("$1") ;;
-    esac
-    shift
-  done
-}
-
-main() {
-  local state_file="$HOME/.local/share/devc-previous-container"
-  local image="${1:-}"
-
-  # Resolve container name (CLI arg > Last used > Error).
-  if [[ $image && $image != -* ]]; then
-    shift
-    [[ $image != *:* ]] && image+=":main"
-    echo "$image" >"$state_file"
-  elif [[ -f $state_file ]]; then
-    image=$(<$state_file)
-  else
-    die "no container name specified"
-  fi
-  local name="${image%:*}"
-
-  # Start/Restart if not running or if arguments change configuration.
-  if [[ -z "$(podman ps -q -f name="^$name$" -f status=running)" ]] || (($# > 0)); then
-    log "starting $image..."
-
-    default_args
-    param_args "$@"
-
-    [[ -n "${DEVC_REGISTRY:-}" ]] || die "registry unknown; set the DEVC_REGISTRY environment variable"
-    podman run --replace --stop-timeout 0 -td "${run_opts[@]}" "$DEVC_REGISTRY/$image"
-  fi
-
-  exec podman exec --detach-keys "ctrl-@,ctrl-@" -it "$name" ${DEVC_COMMAND:-bash -l}
-}
-
-main "$@"

enter.sh

@@ -0,0 +1,82 @@
+#!/bin/sh
+# =============================================== #
+# enter.sh v1.0; job79                            #
+# Enter into an existing or new dev container and #
+# automatically handle dev container updates.     #
+#                                                 #
+# TODO                                            #
+# ----------------------------------------------- #
+# remove --security-opt label=disable             #
+# configurable mount directories                  #
+# =============================================== #
+set -e
+
+# run_args returns the arguments required for the podman run
+# command.
+run_args() {
+  arg() { echo -n " $@"; }
+  arg "--name $name"
+
+  # Disable some security settings to make it possible to
+  # mount host directories without problems.
+  arg "--security-opt label=disable" # disable labeling so mounts don't need to be labeled.
+  arg "--userns=keep-id"             # required for ~/.ssh which is usually 700.
+
+  # Use host networking.
+  arg "--net=host"
+
+  # Mount the wayland socket. Required to get the system
+  # clipbard (wl-copy) working.
+  [ -e "/run/user/$UID/wayland-0" ] && arg "-v /run/user/$UID/wayland-0:/run/user/1000/wayland-0"
+
+  # Mount the ssh socket, directory and the git config
+  # directory. This gets the host ssh and git configuration
+  # working inside the container.
+  [ -e "$SSH_AUTH_SOCK" ] && arg "-v $SSH_AUTH_SOCK:/run/user/1000/ssh-auth-sock"
+  [ -d "$HOME/.ssh" ] && arg "-v $HOME/.ssh:/home/user/.ssh"
+  [ -d "$HOME/.config/git" ] && arg "-v $HOME/.config/git:/home/user/.config/git"
+
+  # Mount host directories with programming projects.
+  [ -d "$HOME/Documents" ] && arg "-v $HOME/Documents:/home/user/Documents"
+  [ -d "$HOME/.local/share/devcontainer" ] && arg "-v $HOME/.local/share/devcontainer:/home/user/.dev"
+
+  # Add volumes for .local and .cache so these survive
+  # container restarts.
+  arg "-v $name-local:/home/user/.local"
+  arg "-v $name-cache:/home/user/.cache"
+}
+
+### MAIN ###
+name="dev"
+image="git.plabble.org/job79/dev:latest"
+recreate=false
+
+while test $# -gt 0; do
+  case "$1" in
+  --image | -i)
+    shift
+    image="$1"
+    ;;
+  --name | -n)
+    shift
+    name="$1"
+    ;;
+  --recreate | -r)
+    recreate=true
+    ;;
+  *) echo "unknown argument '$1'" ;;
+  esac
+  shift
+done
+
+if
+  [ "$recreate" = true ] ||
+    { [ "$(podman container inspect "$name" -f {{.State.Running}})" = 'false' ] &&
+      [ "$(podman pull -q "$image")" != "$(podman container inspect "$name" -f {{.Image}})" ]; }
+then
+  podman container rm -f -t 1 "$name" 1>/dev/null
+  podman run -it $(run_args) "$image"
+else
+  podman start "$name" 1>/dev/null
+  podman exec -it "$name" bash -l
+fi