diff --git a/doc/known-files/4e8f7cb9b699511f4ba5f9d5f8de1c9f5efb5c607de88faf5f58b8b9cb38edbf b/doc/known-files/4e8f7cb9b699511f4ba5f9d5f8de1c9f5efb5c607de88faf5f58b8b9cb38edbf new file mode 100644 index 0000000..d9e7156 --- /dev/null +++ b/doc/known-files/4e8f7cb9b699511f4ba5f9d5f8de1c9f5efb5c607de88faf5f58b8b9cb38edbf @@ -0,0 +1,7 @@ + +# Set up Nix only on SSH connections +# See: https://github.com/DeterminateSystems/nix-installer/pull/714 +if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ] && [ -n "${SSH_CONNECTION:-}" ] && [ "${SHLVL:-0}" -eq 1 ]; then + . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' +fi +# End Nix diff --git a/doc/known-files/71f7fdc9f6c9e55ca0f2e6f85137037d660b3224a34d59305e8530ca292bc734 b/doc/known-files/71f7fdc9f6c9e55ca0f2e6f85137037d660b3224a34d59305e8530ca292bc734 new file mode 100644 index 0000000..f0789e1 --- /dev/null +++ b/doc/known-files/71f7fdc9f6c9e55ca0f2e6f85137037d660b3224a34d59305e8530ca292bc734 @@ -0,0 +1,3 @@ +# Written by https://github.com/NixOS/nix-installer +# The contents below are based on options specified at installation time. + diff --git a/doc/known-files/74ee0ae5ad21a1b101617685fd3d001f74a9466d9d763d92eb75b99cc740db91 b/doc/known-files/74ee0ae5ad21a1b101617685fd3d001f74a9466d9d763d92eb75b99cc740db91 new file mode 100644 index 0000000..1df4ff6 --- /dev/null +++ b/doc/known-files/74ee0ae5ad21a1b101617685fd3d001f74a9466d9d763d92eb75b99cc740db91 @@ -0,0 +1,10 @@ +# Generated by https://github.com/NixOS/nix-installer +# See `/nix/nix-installer --version` for the version details. + +extra-experimental-features = nix-command flakes +always-allow-substitutes = true +bash-prompt-prefix = (nix:$name)\040 +max-jobs = auto +extra-nix-path = nixpkgs=flake:nixpkgs + +!include nix.custom.conf diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 00e62d5..724b98a 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -757,6 +757,7 @@ in "6bb8d6b0dd16b44ee793a9b8382dac76c926e4c16ffb8ddd2bb4884d1ca3f811" # DeterminateSystems Nix installer 0.34.0 "24797ac05542ff8b52910efc77870faa5f9e3275097227ea4e50c430a5f72916" # lix-installer 0.17.1 with flakes "b027b5cad320b5b8123d9d0db9f815c3f3921596c26dc3c471457098e4d3cc40" # lix-installer 0.17.1 without flakes + "74ee0ae5ad21a1b101617685fd3d001f74a9466d9d763d92eb75b99cc740db91" # experimental official Nix installer 2.33.3 ]; environment.etc."nix/registry.json".text = builtins.toJSON { @@ -881,10 +882,12 @@ in # to express that we want it deleted and know only one hash? system.activationScripts.checks.text = mkAfter '' nixCustomConfKnownSha256Hashes=( - # v0.33.0 + # DetSys v0.33.0 6787fade1cf934f82db554e78e1fc788705c2c5257fddf9b59bdd963ca6fec63 - # v0.34.0 + # DetSys v0.34.0 3bd68ef979a42070a44f8d82c205cfd8e8cca425d91253ec2c10a88179bb34aa + # Nix 2.33.3 + 71f7fdc9f6c9e55ca0f2e6f85137037d660b3224a34d59305e8530ca292bc734 ) if [[ -e /etc/nix/nix.custom.conf ]]; then nixCustomConfSha256Output=$(shasum -a 256 /etc/nix/nix.custom.conf) diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix index c5de334..94333f4 100644 --- a/modules/programs/zsh/default.nix +++ b/modules/programs/zsh/default.nix @@ -260,6 +260,7 @@ in environment.etc."zshenv".knownSha256Hashes = [ "d07015be6875f134976fce84c6c7a77b512079c1c5f9594dfa65c70b7968b65f" # DeterminateSystems installer + "4e8f7cb9b699511f4ba5f9d5f8de1c9f5efb5c607de88faf5f58b8b9cb38edbf" # experimental official Nix installer 2.33.3 ]; };