summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLassulus <github@lassul.us>2022-11-21 12:17:57 +0100
committerGitHub <noreply@github.com>2022-11-21 12:17:57 +0100
commit1668efc14a56f126cd4aaa3fc2569120e962c2a9 (patch)
tree368b8f28fa960746d864177228d639338a439556
parentc60f20ceffd9cd662aad8482dd1bdeed472d75c2 (diff)
parent581870a4445b53945303239ef3305212c22d12a3 (diff)
Merge pull request #57 from a-kenji/fix-typos
fix: typos
-rwxr-xr-xdisko2
-rw-r--r--types.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/disko b/disko
index 89926d8..d641304 100755
--- a/disko
+++ b/disko
@@ -107,7 +107,7 @@ if [[ ! -z "${flake+x}" ]]; then
elif [[ ! -z "${disko_config+x}" ]] && [[ -e "$disko_config" ]]; then
nix_args+=("--arg" "diskoFile" "$disko_config")
else
- abort "disko config must be an exising file or flake must be set"
+ abort "disko config must be an existing file or flake must be set"
fi
script=$(nix-build "${libexec_dir}"/cli.nix \
diff --git a/types.nix b/types.nix
index fe04e9c..d4d6256 100644
--- a/types.nix
+++ b/types.nix
@@ -16,7 +16,7 @@ rec {
nestedTypes = typeAttr;
};
- # option for valid contents of partitons (basically like devices, but without tables)
+ # option for valid contents of partitions (basically like devices, but without tables)
partitionType = mkOption {
type = types.nullOr (diskoLib.subType { inherit btrfs filesystem zfs mdraid luks lvm_pv; });
default = null;
@@ -138,7 +138,7 @@ rec {
sortedDeviceList = diskoLib.sortDevicesByDependencies ((diskoLib.meta devices).deviceDependencies or {}) devices;
in ''
set -efux
- # first create the neccessary devices
+ # first create the necessary devices
${concatStrings (map (dev: attrByPath (dev ++ [ "_mount" "dev" ]) "" devices) sortedDeviceList)}
# and then mount the filesystems in alphabetical order