From af401bc667731d518be48e60969f6f5a7dd44513 Mon Sep 17 00:00:00 2001
From: Mike Vink <mike.vink@stater.nl>
Date: Tue, 16 May 2023 23:07:10 +0000
Subject: fixup

---
 shell-scripts/nix-up | 81 ----------------------------------------------------
 shell-scripts/nixup  | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 81 deletions(-)
 delete mode 100644 shell-scripts/nix-up
 create mode 100644 shell-scripts/nixup

(limited to 'shell-scripts')

diff --git a/shell-scripts/nix-up b/shell-scripts/nix-up
deleted file mode 100644
index 03d911a..0000000
--- a/shell-scripts/nix-up
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-case "${@}" in
-    bootstrap-store)
-        [[ -d ${HOME}/nix ]] || {
-            docker create --name nix-data nixos/nix sh >/dev/null 2>&1
-            sudo docker cp nix-data:/nix /
-            docker rm nix-data
-        }
-        docker create -v ${HOME}/nix:/nix --name nix-data nixos/nix sh >/dev/null 2>&1
-        ;;
-    nuke)
-        docker rm nix-data
-        docker rm nixos-${USER}
-        ;;
-    "")
-        if ! docker image ls | grep nixos-${USER}; then
-            cat > /tmp/docker-build-${USER} <<EOF
-FROM alpine
-
-# Add your user the alpine way
-RUN apk add --no-cache --update shadow \
-    && groupadd -g $(id -g) ${USER} \
-    && useradd -g $(id -g) --groups wheel -u $(id -u) ${USER}
-
-# Enable HTTPS support in wget and set nsswitch.conf to make resolution work within containers
-RUN apk add --no-cache --update openssl \
-  && echo hosts: files dns > /etc/nsswitch.conf
-
-# Download Nix and install it into the system.
-ARG NIX_VERSION=2.3.14
-RUN wget https://nixos.org/releases/nix/nix-\${NIX_VERSION}/nix-\${NIX_VERSION}-\$(uname -m)-linux.tar.xz \
-  && tar xf nix-\${NIX_VERSION}-\$(uname -m)-linux.tar.xz \
-  && addgroup -g 30000 -S nixbld \
-  && for i in \$(seq 1 30); do adduser -S -D -h /var/empty -g "Nix build user \$i" -u \$((30000 + i)) -G nixbld nixbld\$i ; done \
-  && mkdir -m 0755 /etc/nix \
-  && echo 'sandbox = false' > /etc/nix/nix.conf \
-  && mkdir -m 0755 /nix && USER=root sh nix-\${NIX_VERSION}-\$(uname -m)-linux/install \
-  && ln -s /nix/var/nix/profiles/default/etc/profile.d/nix.sh /etc/profile.d/ \
-  && rm -r /nix-\${NIX_VERSION}-\$(uname -m)-linux* \
-  && /nix/var/nix/profiles/default/bin/nix-collect-garbage --delete-old \
-  && /nix/var/nix/profiles/default/bin/nix-store --optimise \
-  && /nix/var/nix/profiles/default/bin/nix-store --verify --check-contents
-
-ONBUILD ENV \
-    ENV=/etc/profile \
-    USER=root \
-    PATH=/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin \
-    GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt \
-    NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
-
-ENV \
-    ENV=/etc/profile \
-    USER=root \
-    PATH=/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin \
-    GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt \
-    NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
-    NIX_PATH=/nix/var/nix/profiles/per-user/root/channels
-EOF
-            docker build . -t nixos-${USER} -f /tmp/docker-build-${USER}
-        fi
-        docker run --volumes-from=nix-data --rm -it \
-        -v /etc/ssl/certs/ca-bundle.crt:/etc/ssl/certs/ca-certificates.crt \
-        -e GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt \
-        -e NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
-        -e SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
-        -e USER=${USER} \
-        -u $(id -u):$(id -g) \
-        --group-add wheel \
-            -v ${HOME}:${HOME} \
-            -w ${HOME} \
-            --name nixos-${USER} \
-            --network host \
-            nixos-${USER} bash
-        ;;
-    clear)
-        docker run --rm --volumes-from=nix-data nixos/nix nix-collect-garbage -d
-        ;;
-    list)
-        docker run --rm --volumes-from nix-data nixos/nix ls -la /nix
-        ;;
-esac
diff --git a/shell-scripts/nixup b/shell-scripts/nixup
new file mode 100644
index 0000000..2817f59
--- /dev/null
+++ b/shell-scripts/nixup
@@ -0,0 +1,81 @@
+#!@bash@/bin/bash
+case "${@}" in
+    bootstrap-store)
+        [[ -d ${HOME}/nix ]] || {
+            docker create --name nix-data-${USER} nixos/nix sh >/dev/null 2>&1
+            sudo docker cp nix-data-${USER}:/nix /
+            docker rm nix-data-${USER}
+        }
+        docker create -v ${HOME}/nix:/nix --name nix-data-${USER} nixos/nix sh >/dev/null 2>&1
+        ;;
+    nuke)
+        docker rm nix-data-${USER}
+        docker rm nixos-${USER}
+        ;;
+    "")
+        if ! docker image ls | grep nixos-${USER}; then
+            cat > /tmp/docker-build-${USER} <<EOF
+FROM alpine
+
+# Add your user the alpine way
+RUN apk add --no-cache --update shadow \
+    && groupadd -g $(id -g) ${USER} \
+    && useradd -g $(id -g) --groups wheel -u $(id -u) ${USER}
+
+# Enable HTTPS support in wget and set nsswitch.conf to make resolution work within containers
+RUN apk add --no-cache --update openssl \
+  && echo hosts: files dns > /etc/nsswitch.conf
+
+# Download Nix and install it into the system.
+ARG NIX_VERSION=2.3.14
+RUN wget https://nixos.org/releases/nix/nix-\${NIX_VERSION}/nix-\${NIX_VERSION}-\$(uname -m)-linux.tar.xz \
+  && tar xf nix-\${NIX_VERSION}-\$(uname -m)-linux.tar.xz \
+  && addgroup -g 30000 -S nixbld \
+  && for i in \$(seq 1 30); do adduser -S -D -h /var/empty -g "Nix build user \$i" -u \$((30000 + i)) -G nixbld nixbld\$i ; done \
+  && mkdir -m 0755 /etc/nix \
+  && echo 'sandbox = false' > /etc/nix/nix.conf \
+  && mkdir -m 0755 /nix && USER=root sh nix-\${NIX_VERSION}-\$(uname -m)-linux/install \
+  && ln -s /nix/var/nix/profiles/default/etc/profile.d/nix.sh /etc/profile.d/ \
+  && rm -r /nix-\${NIX_VERSION}-\$(uname -m)-linux* \
+  && /nix/var/nix/profiles/default/bin/nix-collect-garbage --delete-old \
+  && /nix/var/nix/profiles/default/bin/nix-store --optimise \
+  && /nix/var/nix/profiles/default/bin/nix-store --verify --check-contents
+
+ONBUILD ENV \
+    ENV=/etc/profile \
+    USER=root \
+    PATH=/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin \
+    GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt \
+    NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+
+ENV \
+    ENV=/etc/profile \
+    USER=root \
+    PATH=/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin \
+    GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt \
+    NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
+    NIX_PATH=/nix/var/nix/profiles/per-user/root/channels
+EOF
+            docker build . -t nixos-${USER} -f /tmp/docker-build-${USER}
+        fi
+        docker run --volumes-from=nix-data-${USER} --rm -it \
+        -v /etc/ssl/certs/ca-bundle.crt:/etc/ssl/certs/ca-certificates.crt \
+        -e GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt \
+        -e NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
+        -e SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
+        -e USER=${USER} \
+        -u $(id -u):$(id -g) \
+        --group-add wheel \
+        -v ${HOME}:${HOME} \
+        -w ${HOME} \
+        --name nixos-${USER} \
+        --network host \
+        nixos-${USER} bash --login
+        ;;
+    clear)
+        docker run --rm --volumes-from=nix-data-${USER} nixos/nix nix-collect-garbage -d
+        ;;
+    list)
+        docker run --rm --volumes-from nix-data-${USER} nixos/nix ls -la /nix
+        ;;
+esac
-- 
cgit v1.2.3