diff options
| author | Mike Vink <mike.vink@stater.nl> | 2023-05-16 23:07:10 +0000 |
|---|---|---|
| committer | Mike Vink <mike.vink@stater.nl> | 2023-05-16 23:07:10 +0000 |
| commit | af401bc667731d518be48e60969f6f5a7dd44513 (patch) | |
| tree | 283a8fab29f13f4c42a5b15e3d3e09b62b714796 /shell-scripts | |
| parent | 8dc76fc18e6bcae83f938ca3452f62aa5c28f2a7 (diff) | |
fixup
Diffstat (limited to 'shell-scripts')
| -rw-r--r-- | shell-scripts/nixup (renamed from shell-scripts/nix-up) | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/shell-scripts/nix-up b/shell-scripts/nixup index 03d911a..2817f59 100644 --- a/shell-scripts/nix-up +++ b/shell-scripts/nixup @@ -1,15 +1,15 @@ -#!/bin/bash +#!@bash@/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 --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 nixos/nix sh >/dev/null 2>&1 + docker create -v ${HOME}/nix:/nix --name nix-data-${USER} nixos/nix sh >/dev/null 2>&1 ;; nuke) - docker rm nix-data + docker rm nix-data-${USER} docker rm nixos-${USER} ;; "") @@ -58,7 +58,7 @@ ENV \ EOF docker build . -t nixos-${USER} -f /tmp/docker-build-${USER} fi - docker run --volumes-from=nix-data --rm -it \ + 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 \ @@ -66,16 +66,16 @@ EOF -e USER=${USER} \ -u $(id -u):$(id -g) \ --group-add wheel \ - -v ${HOME}:${HOME} \ - -w ${HOME} \ - --name nixos-${USER} \ - --network host \ - nixos-${USER} bash + -v ${HOME}:${HOME} \ + -w ${HOME} \ + --name nixos-${USER} \ + --network host \ + nixos-${USER} bash --login ;; clear) - docker run --rm --volumes-from=nix-data nixos/nix nix-collect-garbage -d + docker run --rm --volumes-from=nix-data-${USER} nixos/nix nix-collect-garbage -d ;; list) - docker run --rm --volumes-from nix-data nixos/nix ls -la /nix + docker run --rm --volumes-from nix-data-${USER} nixos/nix ls -la /nix ;; esac |