From d365d73a5ca5438f57d48601cdcb334beebefec9 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 20 Sep 2021 22:30:37 -0300 Subject: aux/: Update --- aux/containers/guix/manifest.scm | 29 ++++++++++ aux/containers/guix/pinned-channels.scm | 11 ++++ aux/containers/guix/with-container.sh | 19 +++++++ aux/guix/manifest.scm | 29 ---------- aux/guix/pinned-channels.scm | 11 ---- aux/guix/with-container.sh | 17 ------ aux/with-container | 1 + aux/workflow/commonmark.sh | 3 +- aux/workflow/style.css | 99 ++++++++++++++++++++------------- 9 files changed, 122 insertions(+), 97 deletions(-) create mode 100644 aux/containers/guix/manifest.scm create mode 100644 aux/containers/guix/pinned-channels.scm create mode 100755 aux/containers/guix/with-container.sh delete mode 100644 aux/guix/manifest.scm delete mode 100644 aux/guix/pinned-channels.scm delete mode 100755 aux/guix/with-container.sh create mode 120000 aux/with-container (limited to 'aux') diff --git a/aux/containers/guix/manifest.scm b/aux/containers/guix/manifest.scm new file mode 100644 index 0000000..b10cc6d --- /dev/null +++ b/aux/containers/guix/manifest.scm @@ -0,0 +1,29 @@ +(specifications->manifest + (map symbol->string + '(bash + coreutils + findutils + diffutils + grep + sed + git + tar + gzip + gawk + make + perl + shellcheck + pandoc + + jekyll + flac + mediainfo + mdpo-patched + git-annex + hunspell + inkscape + imagemagick + ffmpeg + lilypond + mktorrent-latest ;; in xyz-euandreh channel + timidity++))) diff --git a/aux/containers/guix/pinned-channels.scm b/aux/containers/guix/pinned-channels.scm new file mode 100644 index 0000000..504406f --- /dev/null +++ b/aux/containers/guix/pinned-channels.scm @@ -0,0 +1,11 @@ +(cons* + (channel + (name 'xyz-euandreh) + (url "git://euandreh.xyz/package-repository") + (branch "main") + (introduction + (make-channel-introduction + "d749e053e6db365069cb9b2ef47a78b06f9e7361" + (openpgp-fingerprint + "5BDA E9B8 B2F6 C6BC BB0D 6CE5 81F9 0EC3 CD35 6060")))) + %default-channels) diff --git a/aux/containers/guix/with-container.sh b/aux/containers/guix/with-container.sh new file mode 100755 index 0000000..fcbb8b5 --- /dev/null +++ b/aux/containers/guix/with-container.sh @@ -0,0 +1,19 @@ +#!/bin/sh +set -eu + +CHANNEL_REMOTE='https://euandreh.xyz/package-repository.git' +CHANNEL_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/euandreh-guix-channel" + +if [ ! -d "$CHANNEL_DIR" ]; then + git clone "$CHANNEL_REMOTE" "$CHANNEL_DIR" +fi + +git -C "$CHANNEL_DIR" pull + +ENV_CMD="guix environment -L $CHANNEL_DIR/src/ -m aux/containers/guix/manifest.scm" + +if [ -z "${1:-}" ]; then + $ENV_CMD +else + $ENV_CMD --pure -C -- sh -c "$@" +fi diff --git a/aux/guix/manifest.scm b/aux/guix/manifest.scm deleted file mode 100644 index b10cc6d..0000000 --- a/aux/guix/manifest.scm +++ /dev/null @@ -1,29 +0,0 @@ -(specifications->manifest - (map symbol->string - '(bash - coreutils - findutils - diffutils - grep - sed - git - tar - gzip - gawk - make - perl - shellcheck - pandoc - - jekyll - flac - mediainfo - mdpo-patched - git-annex - hunspell - inkscape - imagemagick - ffmpeg - lilypond - mktorrent-latest ;; in xyz-euandreh channel - timidity++))) diff --git a/aux/guix/pinned-channels.scm b/aux/guix/pinned-channels.scm deleted file mode 100644 index 504406f..0000000 --- a/aux/guix/pinned-channels.scm +++ /dev/null @@ -1,11 +0,0 @@ -(cons* - (channel - (name 'xyz-euandreh) - (url "git://euandreh.xyz/package-repository") - (branch "main") - (introduction - (make-channel-introduction - "d749e053e6db365069cb9b2ef47a78b06f9e7361" - (openpgp-fingerprint - "5BDA E9B8 B2F6 C6BC BB0D 6CE5 81F9 0EC3 CD35 6060")))) - %default-channels) diff --git a/aux/guix/with-container.sh b/aux/guix/with-container.sh deleted file mode 100755 index 6e19691..0000000 --- a/aux/guix/with-container.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -eu - -if [ -z "${1:-}" ]; then - guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \ - environment --fallback -m aux/guix/manifest.scm -elif [ "$1" = '-p' ]; then - guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \ - environment --fallback -m aux/guix/manifest.scm --pure -C -elif [ "$1" = '-C' ]; then - guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \ - pack -f docker -S/bin=bin -m aux/guix/manifest.scm -v3 -else - guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \ - environment --fallback -m aux/guix/manifest.scm --pure -C \ - -- sh -c "$@" -fi diff --git a/aux/with-container b/aux/with-container new file mode 120000 index 0000000..b96cf67 --- /dev/null +++ b/aux/with-container @@ -0,0 +1 @@ +containers/guix/with-container.sh \ No newline at end of file diff --git a/aux/workflow/commonmark.sh b/aux/workflow/commonmark.sh index 6f5e59b..39aacb4 100755 --- a/aux/workflow/commonmark.sh +++ b/aux/workflow/commonmark.sh @@ -39,4 +39,5 @@ pandoc \ --metadata "lang=$THE_LANG" \ -r commonmark \ -w html \ - -H aux/workflow/favicon.html + -H aux/workflow/favicon.html \ + -H aux/workflow/style.css diff --git a/aux/workflow/style.css b/aux/workflow/style.css index d72991e..56e4712 100644 --- a/aux/workflow/style.css +++ b/aux/workflow/style.css @@ -1,41 +1,62 @@ -- cgit v1.2.3