aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2024-11-08 15:58:19 -0800
committerMark Nipper <nipsy@bitgnome.net>2024-11-08 15:58:19 -0800
commitac1759e3e1b31e56d092cd4cf79fca31df9d06e1 (patch)
treed562a77f6fa89e34f92e9a3a120884b04eeb072b
parentf7066b606e431eab1fab038b85b2f685684c7684 (diff)
downloadnix-ac1759e3e1b31e56d092cd4cf79fca31df9d06e1.tar
nix-ac1759e3e1b31e56d092cd4cf79fca31df9d06e1.tar.gz
nix-ac1759e3e1b31e56d092cd4cf79fca31df9d06e1.tar.bz2
nix-ac1759e3e1b31e56d092cd4cf79fca31df9d06e1.tar.lz
nix-ac1759e3e1b31e56d092cd4cf79fca31df9d06e1.tar.xz
nix-ac1759e3e1b31e56d092cd4cf79fca31df9d06e1.tar.zst
nix-ac1759e3e1b31e56d092cd4cf79fca31df9d06e1.zip
Add experimental command settings back to @iso and fix nix shell shebang
Diffstat (limited to '')
-rw-r--r--flake.nix2
-rwxr-xr-xscripts/install-with-disko4
2 files changed, 3 insertions, 3 deletions
diff --git a/flake.nix b/flake.nix
index 018d881..e10ca1b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,7 +96,7 @@
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
({
#isoImage.squashfsCompression = "gzip -Xcompression-level 1";
- #nix.settings.experimental-features = [ "nix-command" "flakes" ];
+ nix.settings.experimental-features = [ "nix-command" "flakes" ];
users.users = {
nixos.openssh.authorizedKeys.keys = [ (builtins.readFile ./hosts/common/users/nipsy/keys/id_arrakis.pub) ];
root.openssh.authorizedKeys.keys = [ (builtins.readFile ./hosts/common/users/nipsy/keys/id_arrakis.pub) ];
diff --git a/scripts/install-with-disko b/scripts/install-with-disko
index f95dc4c..dce7c88 100755
--- a/scripts/install-with-disko
+++ b/scripts/install-with-disko
@@ -1,5 +1,5 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i zsh --packages rsync zsh
+#!/usr/bin/env nix
+#!nix shell nixpkgs#rsync nixpkgs#zsh --command zsh
setopt ERR_EXIT NO_UNSET PIPE_FAIL