technofab/disko
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/disko.git synced 2025-12-11 23:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #196 from nix-community/types-compact

Browse source
This commit is contained in:
Lassulus 2023-04-15 15:44:33 +02:00 • committed by GitHub
commit 6cbfde5b50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 237 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

2
example/bcachefs.nix
View file

@ -9,7 +9,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "ESP";
start = "1MiB";
end = "100MiB";
@ -22,7 +21,6 @@
}
{
name = "root";
type = "partition";
start = "100MiB";
end = "100%";
part-type = "primary";

7
example/boot-raid1.nix
View file

@ -10,14 +10,12 @@
partitions = [
{
name = "boot";
type = "partition";
start = "0";
end = "1M";
part-type = "primary";
flags = [ "bios_grub" ];
}
{
type = "partition";
name = "ESP";
start = "1MiB";
end = "128MiB";
@ -29,7 +27,6 @@
};
}
{
type = "partition";
name = "mdadm";
start = "128MiB";
end = "100%";
@ -50,14 +47,12 @@
partitions = [
{
name = "boot";
type = "partition";
start = "0";
end = "1M";
part-type = "primary";
flags = [ "bios_grub" ];
}
{
type = "partition";
name = "ESP";
start = "1MiB";
end = "128MiB";
@ -69,7 +64,6 @@
};
}
{
type = "partition";
name = "mdadm";
start = "128MiB";
end = "100%";
@ -101,7 +95,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "primary";
start = "1MiB";
end = "100%";

2
example/btrfs-subvolumes.nix
View file

@ -9,7 +9,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "ESP";
start = "1MiB";
end = "128MiB";
@ -23,7 +22,6 @@
}
{
name = "root";
type = "partition";
start = "128MiB";
end = "100%";
content = {

17
example/complex.nix
View file

@ -9,7 +9,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "ESP";
start = "1MiB";
end = "128MiB";
@ -32,7 +31,6 @@
format = "gpt";
partitions = [
{
type = "partition";
start = "1M";
end = "100%";
name = "luks";
@ -60,7 +58,6 @@
format = "gpt";
partitions = [
{
type = "partition";
start = "1M";
end = "100%";
name = "luks";
@ -90,7 +87,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "bla";
start = "1MiB";
end = "100%";
@ -109,7 +105,6 @@
type = "lvm_vg";
lvs = {
root = {
type = "lvm_lv";
size = "10M";
lvm_type = "mirror";
content = {
@ -122,7 +117,6 @@
};
};
raid1 = {
type = "lvm_lv";
size = "30M";
lvm_type = "raid0";
content = {
@ -131,7 +125,6 @@
};
};
raid2 = {
type = "lvm_lv";
size = "30M";
lvm_type = "raid0";
content = {
@ -140,7 +133,6 @@
};
};
zfs1 = {
type = "lvm_lv";
size = "128M";
lvm_type = "raid0";
content = {
@ -149,7 +141,6 @@
};
};
zfs2 = {
type = "lvm_lv";
size = "128M";
lvm_type = "raid0";
content = {
@ -172,21 +163,21 @@
datasets = {
zfs_fs = {
zfs_type = "filesystem";
type = "zfs_fs";
mountpoint = "/zfs_fs";
options."com.sun:auto-snapshot" = "true";
};
zfs_unmounted_fs = {
zfs_type = "filesystem";
type = "zfs_fs";
options.mountpoint = "none";
};
zfs_legacy_fs = {
zfs_type = "filesystem";
type = "zfs_fs";
options.mountpoint = "legacy";
mountpoint = "/zfs_legacy_fs";
};
zfs_testvolume = {
zfs_type = "volume";
type = "zfs_volume";
size = "10M";
content = {
type = "filesystem";

2
example/gpt-bios-compat.nix
View file

@ -11,7 +11,6 @@
partitions = [
{
name = "boot";
type = "partition";
start = "0";
end = "1M";
part-type = "primary";
@ -19,7 +18,6 @@
}
{
name = "root";
type = "partition";
# leave space for the grub aka BIOS boot
start = "1M";
end = "100%";

3
example/hybrid-tmpfs-on-root.nix
View file

@ -9,13 +9,11 @@
partitions = [
{
name = "boot";
type = "partition";
start = "0";
end = "1M";
flags = [ "bios_grub" ];
}
{
type = "partition";
name = "ESP";
start = "1M";
end = "512M";
@ -28,7 +26,6 @@
}
{
name = "nix";
type = "partition";
start = "512M";
end = "100%";
part-type = "primary";

3
example/hybrid.nix
View file

@ -10,13 +10,11 @@
partitions = [
{
name = "boot";
type = "partition";
start = "0";
end = "1M";
flags = [ "bios_grub" ];
}
{
type = "partition";
name = "ESP";
start = "1M";
end = "512M";
@ -28,7 +26,6 @@
};
}
{
type = "partition";
name = "root";
start = "512M";
end = "100%";

5
example/luks-lvm.nix
View file

@ -9,7 +9,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "ESP";
start = "1MiB";
end = "100MiB";
@ -24,7 +23,6 @@
};
}
{
type = "partition";
name = "luks";
start = "100MiB";
end = "100%";
@ -48,7 +46,6 @@
type = "lvm_vg";
lvs = {
root = {
type = "lvm_lv";
size = "100M";
content = {
type = "filesystem";
@ -60,7 +57,6 @@
};
};
home = {
type = "lvm_lv";
size = "10M";
content = {
type = "filesystem";
@ -69,7 +65,6 @@
};
};
raw = {
type = "lvm_lv";
size = "10M";
};
};

6
example/lvm-raid.nix
View file

@ -10,7 +10,6 @@
partitions = [
{
name = "boot";
type = "partition";
start = "0";
end = "100M";
fs-type = "fat32";
@ -21,7 +20,6 @@
};
}
{
type = "partition";
name = "primary";
start = "100M";
end = "100%";
@ -42,7 +40,6 @@
partitions = [
{
name = "boot";
type = "partition";
start = "0";
end = "100M";
fs-type = "fat32";
@ -53,7 +50,6 @@
};
}
{
type = "partition";
name = "primary";
start = "100M";
end = "100%";
@ -83,7 +79,6 @@
type = "lvm_vg";
lvs = {
root = {
type = "lvm_lv";
size = "100M";
lvm_type = "mirror";
content = {
@ -96,7 +91,6 @@
};
};
home = {
type = "lvm_lv";
size = "10M";
lvm_type = "raid0";
content = {

5
example/mdadm.nix
View file

@ -10,14 +10,12 @@
partitions = [
{
name = "boot";
type = "partition";
start = "0";
end = "1M";
part-type = "primary";
flags = [ "bios_grub" ];
}
{
type = "partition";
name = "mdadm";
start = "1MiB";
end = "100%";
@ -38,14 +36,12 @@
partitions = [
{
name = "boot";
type = "partition";
start = "0";
end = "1M";
part-type = "primary";
flags = [ "bios_grub" ];
}
{
type = "partition";
name = "mdadm";
start = "1MiB";
end = "100%";
@ -67,7 +63,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "primary";
start = "1MiB";
end = "100%";

2
example/multi-device-no-deps.nix
View file

@ -10,7 +10,6 @@
partitions = [
{
name = "nix";
type = "partition";
part-type = "primary";
start = "0%";
end = "100%";
@ -33,7 +32,6 @@
partitions = [
{
name = "root";
type = "partition";
part-type = "primary";
start = "0%";
end = "100%";

1
example/negative-size.nix
View file

@ -10,7 +10,6 @@
partitions = [
{
name = "nix";
type = "partition";
part-type = "primary";
start = "0%";
end = "-10MiB";

2
example/simple-efi.nix
View file

@ -9,7 +9,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "ESP";
start = "1MiB";
end = "100MiB";
@ -22,7 +21,6 @@
}
{
name = "root";
type = "partition";
start = "100MiB";
end = "100%";
part-type = "primary";

1
example/stand-alone/configuration.nix
View file

@ -25,7 +25,6 @@ let
partitions = [
{
name = "root";
type = "partition";
part-type = "primary";
start = "1M";
end = "100%";

3
example/swap.nix
View file

@ -9,7 +9,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "ESP";
start = "1MiB";
end = "100MiB";
@ -22,7 +21,6 @@
}
{
name = "root";
type = "partition";
start = "100MiB";
end = "-1G";
part-type = "primary";
@ -34,7 +32,6 @@
}
{
name = "swap";
type = "partition";
start = "-1G";
end = "100%";
part-type = "primary";

2
example/tmpfs.nix
View file

@ -9,7 +9,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "ESP";
start = "1MiB";
end = "100MiB";
@ -22,7 +21,6 @@
}
{
name = "root";
type = "partition";
start = "100MiB";
end = "100%";
part-type = "primary";

2
example/with-lib.nix
View file

@ -10,7 +10,6 @@
partitions = [
{
name = "boot";
type = "partition";
start = "0";
end = "1M";
part-type = "primary";
@ -18,7 +17,6 @@
}
{
name = "root";
type = "partition";
# leave space for the grub aka BIOS boot
start = "1M";
end = "100%";

6
example/zfs-over-legacy.nix
View file

@ -9,7 +9,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "ESP";
start = "1MiB";
end = "100MiB";
@ -24,7 +23,6 @@
};
}
{
type = "partition";
start = "100MiB";
end = "100%";
name = "primary";
@ -52,11 +50,11 @@
type = "zpool";
datasets = {
"root" = {
zfs_type = "filesystem";
type = "zfs_fs";
options.mountpoint = "none";
};
"root/zfs_fs" = {
zfs_type = "filesystem";
type = "zfs_fs";
mountpoint = "/zfs_fs";
options."com.sun:auto-snapshot" = "true";
};

17
example/zfs.nix
View file

@ -9,7 +9,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "ESP";
start = "0";
end = "64MiB";
@ -22,7 +21,6 @@
};
}
{
type = "partition";
name = "zfs";
start = "128MiB";
end = "100%";
@ -42,7 +40,6 @@
format = "gpt";
partitions = [
{
type = "partition";
name = "zfs";
start = "128MiB";
end = "100%";
@ -68,21 +65,21 @@
datasets = {
zfs_fs = {
zfs_type = "filesystem";
type = "zfs_fs";
mountpoint = "/zfs_fs";
options."com.sun:auto-snapshot" = "true";
};
zfs_unmounted_fs = {
zfs_type = "filesystem";
type = "zfs_fs";
options.mountpoint = "none";
};
zfs_legacy_fs = {
zfs_type = "filesystem";
type = "zfs_fs";
options.mountpoint = "legacy";
mountpoint = "/zfs_legacy_fs";
};
zfs_testvolume = {
zfs_type = "volume";
type = "zfs_volume";
size = "10M";
content = {
type = "filesystem";
@ -91,8 +88,7 @@
};
};
encrypted = {
zfs_type = "filesystem";
size = "20M";
type = "zfs_fs";
options = {
mountpoint = "none";
encryption = "aes-256-gcm";
@ -104,8 +100,7 @@
'';
};
"encrypted/test" = {
zfs_type = "filesystem";
size = "2M";
type = "zfs_fs";
mountpoint = "/zfs_crypted";
};
};