aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2024-11-08 15:29:25 -0800
committerMark Nipper <nipsy@bitgnome.net>2024-11-08 15:29:25 -0800
commitede6fac73494152e307355c8b045dd42c17aaf96 (patch)
tree23d3158e5e722d80204b64d977386283a724a408
parent78fc6ec2874f975db4fda1a7a39f71db3ab71e7e (diff)
downloadnix-ede6fac73494152e307355c8b045dd42c17aaf96.tar
nix-ede6fac73494152e307355c8b045dd42c17aaf96.tar.gz
nix-ede6fac73494152e307355c8b045dd42c17aaf96.tar.bz2
nix-ede6fac73494152e307355c8b045dd42c17aaf96.tar.lz
nix-ede6fac73494152e307355c8b045dd42c17aaf96.tar.xz
nix-ede6fac73494152e307355c8b045dd42c17aaf96.tar.zst
nix-ede6fac73494152e307355c8b045dd42c17aaf96.zip
Rework disko command
-rw-r--r--flake.nix2
-rwxr-xr-xscripts/install-with-disko7
2 files changed, 4 insertions, 5 deletions
diff --git a/flake.nix b/flake.nix
index e10ca1b..018d881 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 ef21f61..2640084 100755
--- a/scripts/install-with-disko
+++ b/scripts/install-with-disko
@@ -88,11 +88,10 @@ if [[ "${REPLY}" == "y" ]]; then
sudo true
if (( ! ${+opts[--skip-disko]} )); then
- sudo nix run github:nix-community/disko \
- --extra-experimental-features "nix-command flakes" \
- --no-write-lock-file \
+ sudo nix --experimental-features "nix-command flakes" \
+ run github:nix-community/disko/latest \
-- \
- --mode zap_create_mount \
+ --mode destroy,format,mount \
"${DIR}/../hosts/${TARGET_HOST}/disks.nix"
fi