From 490f1379448795fd331f212473fa77beabdf18a0 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Fri, 26 Jul 2024 19:06:48 +0200 Subject: [PATCH] Update hugo-coder, add devcontainer and update Matrix sessions --- .devcontainer/Dockerfile | 56 +++++++++++++++++++++++++++++++++ .devcontainer/devcontainer.json | 51 ++++++++++++++++++++++++++++++ content/contact.md | 7 ++--- themes/hugo-coder | 2 +- 4 files changed, 110 insertions(+), 6 deletions(-) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..9704b97 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,56 @@ +# syntax=docker/dockerfile:1 +FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04 + +ARG USER=vscode +ARG DEBIAN_FRONTEND=noninteractive +RUN usermod -s /usr/bin/zsh ${USER} + +# VARIANT can be either 'hugo' for the standard version or 'hugo_extended' for the extended version. +ARG VARIANT=hugo_extended +# VERSION can be either 'latest' or a specific version number +ARG VERSION=latest + +# Download Hugo +RUN case ${VERSION} in \ + latest) \ + export VERSION=$(curl -s https://api.github.com/repos/gohugoio/hugo/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}') ;;\ + esac && \ + echo ${VERSION} && \ + case $(uname -m) in \ + aarch64) \ + export ARCH=ARM64 ;; \ + *) \ + export ARCH=64bit ;; \ + esac && \ + echo ${ARCH} && \ + wget -O ${VERSION}.tar.gz https://github.com/gohugoio/hugo/releases/download/v${VERSION}/${VARIANT}_${VERSION}_Linux-${ARCH}.tar.gz && \ + tar xf ${VERSION}.tar.gz && \ + mv hugo /usr/bin/hugo + +# Hugo dev server port +EXPOSE 1313 + + +USER ${USER} +ARG HOME=/home/${USER} +WORKDIR ${HOME} + +ARG PNPM_HOME=${HOME}/.local/share/pnpm +ENV PATH="${PNPM_HOME}:$PATH" +RUN <> .zshrc +# EOT + +RUN < ${OHMYZSH_HOME}/plugins/git/_hugo +EOT diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..fba096d --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,51 @@ +{ + "name": "Hugo & pnpm", + + "build": { + "dockerfile": "Dockerfile" + }, + + // 👇 Features to add to the Dev Container. More info: https://containers.dev/implementors/features. + // "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {} }, + + // 👇 Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Configure tool-specific properties. + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + // Set *default* container specific settings.json values on container create. + "settings": { + "html.format.templating": true + }, + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + // https://marketplace.visualstudio.com/items?itemName=eliostruyf.vscode-front-matter + "eliostruyf.vscode-front-matter", + // https://marketplace.visualstudio.com/items?itemName=rusnasonov.vscode-hugo + "rusnasonov.vscode-hugo", + // https://marketplace.visualstudio.com/items?itemName=budparr.language-hugo-vscode + "budparr.language-hugo-vscode", + // https://marketplace.visualstudio.com/items?itemName=eliostruyf.vscode-hugo-themer + "eliostruyf.vscode-hugo-themer", + // https://marketplace.visualstudio.com/items?itemName=kaellarkin.hugo-shortcode-syntax + "kaellarkin.hugo-shortcode-syntax", + + // "csstools.postcss", + + // "esbenp.prettier-vscode", + // "tamasfe.even-better-toml", + // "naumovs.color-highlight", + // "GitHub.vscode-pull-request-github", + // "eamodio.gitlens", + "davidanson.vscode-markdownlint", + "streetsidesoftware.code-spell-checker" + ] + } + }, + + "remoteUser": "vscode", + + "postCreateCommand": "pnpm install-completion zsh" +} diff --git a/content/contact.md b/content/contact.md index 5c107f8..d7ec099 100644 --- a/content/contact.md +++ b/content/contact.md @@ -25,11 +25,8 @@ want to message me securely, please verify my session(s) below. ```yaml matrix_sessions: - name: Cinny Desktop - id: PUPSZQGFNJ - key: QAuN Uiuk Kjmw FhZb QJ8N XGjo dMbb itlT ghI9 8Yza Prs - - name: Cinny Laptop - id: KSZELXDCPM - key: FZOE Ri5e v7i2 zG+U p4zK db0+ jVuT h2gv 96r6 GzXv iqM + id: NFDMPZSFAX + key: oCbu 7AMU tUj4 d+q+ 4/v5 gPQP MqUj w/CJ 9VwA 5EBL 50c - name: FluffyChat Android id: JSDBHCPOOH key: Hl+e M1bZ 2YS1 tRK2 NqAg Qnyi UXa5 n2ej oA6s iwF9 GfY diff --git a/themes/hugo-coder b/themes/hugo-coder index 745f785..759cc94 160000 --- a/themes/hugo-coder +++ b/themes/hugo-coder @@ -1 +1 @@ -Subproject commit 745f785dd9a76b5102e6e58c9e5e550c458a6273 +Subproject commit 759cc945636473d251a28597e2007cbb7d11631d