refactor: finish decoupling the library functions from config

This commit is contained in:
oddlama 2023-07-01 01:11:58 +02:00
parent 68bb9731d3
commit 80e7c1bdbf
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
59 changed files with 984 additions and 786 deletions

View file

@ -11,9 +11,7 @@
../../modules/optional/hardware/intel.nix
../../modules/optional/hardware/physical.nix
#../../modules
../../modules/config/lib.nix
../../modules
../../modules/optional/boot-efi.nix
../../modules/optional/initrd-ssh.nix
../../modules/optional/dev

View file

@ -1,15 +1,16 @@
{
inputs,
config,
lib,
pkgs,
...
}: {
}: let
disko = import ../../lib/disko.nix inputs;
in {
disko.devices = {
disk = {
m2-ssd = {
type = "disk";
device = "/dev/disk/by-id/${config.repo.secrets.local.disk.m2-ssd}";
content = with config.lib.disko.gpt; {
content = with disko.gpt; {
type = "table";
format = "gpt";
partitions = [
@ -20,7 +21,7 @@
boot-ssd = {
type = "disk";
device = "/dev/disk/by-id/${config.repo.secrets.local.disk.boot-ssd}";
content = with config.lib.disko.gpt; {
content = with disko.gpt; {
type = "table";
format = "gpt";
partitions = [
@ -30,7 +31,7 @@
};
};
};
zpool = with config.lib.disko.zfs; {
zpool = with disko.zfs; {
rpool = defaultZpoolOptions // {datasets = defaultZfsDatasets;};
};
};