nix: split configuration.nix into alternative toplevels

[sourcephile-nix.git] / servers / mermet / Makefile

diff --git a/servers/mermet/Makefile b/servers/mermet/Makefile
index 49c03bea71e2424517208ceeaeaec7f0dcfa0c96..c2cc2d377b79a97ddfd32846fa7b3f286d44b54b 100644 (file)
--- a/servers/mermet/Makefile
+++ b/servers/mermet/Makefile
@@ -6,6 +6,7 @@ mermet_cipher      := aes-128-gcm
 mermet_autotrim    :=
 mermet_reservation := 1G
 #mermet_channel     := $$(nix-env -p /nix/var/nix/profiles/per-user/$$USER/channels -q nixpkgs --no-name --out-path)
+#mermet_unicode_normalization := formD
 
 echo:
        echo $(MAKEFILES)
@@ -89,7 +90,7 @@ format:
         $(if $(mermet_cipher),-O encryption=$(mermet_cipher) \
         -O keyformat=passphrase \
         -O keylocation=prompt) \
-        -O normalization=formD \
+        $(if $(mermet_unicode_normalization),-O normalization=$(mermet_unicode_normalization) \
         -R /mnt/mermet rpool $(mermet_disk)-part5
        sudo zfs set \
         acltype=posixacl \
@@ -220,7 +221,7 @@ bootstrap: mount
         LANG="$$LANG" \
         LC_CTYPE="$$LC_CTYPE" \
         MERMET_DEPLOYMENT="$$MERMET_DEPLOYMENT" \
-        NIXOS_CONFIG="$$(readlink -e ../configuration.nix)" \
+        NIXOS_CONFIG="$$(readlink -e ../install.nix)" \
         NIX_CONF_DIR="$$NIX_CONF_DIR" \
         NIX_PATH="$$NIX_PATH" \
         PASSWORD_STORE_DIR="$$PASSWORD_STORE_DIR" \