technofab/disko
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/disko.git synced 2026-02-02 17:35:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib.types: turn _create, _mount and _config into values

Browse source
This commit is contained in:
lassulus 2023-07-01 19:02:01 +02:00 • committed by mergify[bot]
parent 8002e7cb89
commit ab9b880db2
17 changed files with 194 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/types/filesystem.nix
View file

@ -1,4 +1,4 @@
{ config, options, lib, diskoLib, rootMountPoint, parent, ... }:
{ config, options, lib, diskoLib, rootMountPoint, parent, device, ... }:
{
options = {
type = lib.mkOption {
@ -6,6 +6,11 @@
internal = true;
description = "Type";
};
device = lib.mkOption {
type = lib.types.str;
default = device;
description = "Device to use";
};
extraArgs = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
@ -38,18 +43,18 @@
};
_create = diskoLib.mkCreateOption {
inherit config options;
default = { dev }: ''
default = ''
mkfs.${config.format} \
${toString config.extraArgs} \
${dev}
${config.device}
'';
};
_mount = diskoLib.mkMountOption {
inherit config options;
default = { dev }: lib.optionalAttrs (config.mountpoint != null) {
default = lib.optionalAttrs (config.mountpoint != null) {
fs.${config.mountpoint} = ''
if ! findmnt ${dev} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then
mount ${dev} "${rootMountPoint}${config.mountpoint}" \
if ! findmnt ${config.device} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then
mount ${config.device} "${rootMountPoint}${config.mountpoint}" \
-t "${config.format}" \
${lib.concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \
-o X-mount.mkdir
@ -60,9 +65,9 @@
_config = lib.mkOption {
internal = true;
readOnly = true;
default = dev: lib.optional (config.mountpoint != null) {
default = lib.optional (config.mountpoint != null) {
fileSystems.${config.mountpoint} = {
device = dev;
device = config.device;
fsType = config.format;
options = config.mountOptions;
};