sokai/mynixos-config
1
1
Fork 0
forked from mirrors_public/oddlama_nix-config
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: zpool definition error

Browse source
This commit is contained in:
oddlama 2022-12-04 20:31:15 +01:00
parent befa4cb74f
commit d7e6ab7071
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
5 changed files with 46 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make-honey.nix
View file

@ -36,7 +36,7 @@ in
evalSelected = names: l.filterAttrs (name: _: l.elem name names) this.toplevel; evalSelected = names: l.filterAttrs (name: _: l.elem name names) this.toplevel;
evalSelectedDrvPaths = names: l.mapAttrs (_: v: v.drvPath) (this.evalSelected names); evalSelectedDrvPaths = names: l.mapAttrs (_: v: v.drvPath) (this.evalSelected names);
metaConfig = { metaConfig = {
name = "divnix/hive"; name = "oddlama/infranix";
inherit (import ./flake.nix) description; inherit (import ./flake.nix) description;
machinesFile = null; machinesFile = null;
allowApplyAll = false; allowApplyAll = false;

2
nix/home/colmenaConfigurations.nix
View file

@ -3,7 +3,7 @@
networking.hostName = "nom"; networking.hostName = "nom";
deployment = { deployment = {
allowLocalDeployment = true; allowLocalDeployment = true;
targetHost = null; targetHost = "192.168.1.183";
}; };
imports = [cell.nixosConfigurations.nom]; imports = [cell.nixosConfigurations.nom];
}; };

84
nix/home/diskoConfigurations.nix
View file

@ -11,7 +11,7 @@
{ {
type = "partition"; type = "partition";
name = "efi"; name = "efi";
start = "0"; start = "2048";
end = "8GiB"; end = "8GiB";
fs-type = "fat32"; fs-type = "fat32";
content = { content = {
@ -38,51 +38,53 @@
device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNX1T325329W"; device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNX1T325329W";
content = { content = {
type = "zfs"; type = "zfs";
pool = "zpool"; pool = "rpool";
}; };
}; };
}; };
rpool = { zpool = {
type = "zpool"; rpool = {
mode = "mirror"; type = "zpool";
rootFsOptions = { mode = "mirror";
compression = "zstd"; rootFsOptions = {
acltype = "posix"; compression = "zstd";
atime = "off"; acltype = "posix";
xattr = "sa"; atime = "off";
dnodesize = "auto"; xattr = "sa";
mountpoint = "none"; dnodesize = "auto";
canmount = "off"; mountpoint = "none";
devices = "off"; canmount = "off";
encryption = "aes-256-gcm"; devices = "off";
keyformat = "passphrase"; encryption = "aes-256-gcm";
keylocation = "prompt"; keyformat = "passphrase";
"autobackup:snap" = "true"; keylocation = "prompt";
"autobackup:home" = "true"; "autobackup:snap" = "true";
}; "autobackup:home" = "true";
options = {
ashift = "12";
bootfs = "rpool/root/nixos";
};
datasets = {
"root" = {
zfs_type = "filesystem";
}; };
"root/nixos" = { options = {
zfs_type = "filesystem"; ashift = "12";
options = { bootfs = "rpool/root/nixos";
canmount = "on"; };
mountpoint = "/"; datasets = {
"root" = {
zfs_type = "filesystem";
}; };
}; "root/nixos" = {
"home" = { zfs_type = "filesystem";
zfs_type = "filesystem"; options = {
}; canmount = "on";
"home/root" = { mountpoint = "/";
zfs_type = "filesystem"; };
options = { };
canmount = "on"; "home" = {
mountpoint = "/root"; zfs_type = "filesystem";
};
"home/root" = {
zfs_type = "filesystem";
options = {
canmount = "on";
mountpoint = "/root";
};
}; };
}; };
}; };

1
nix/home/nixosConfigurations.nix
View file

@ -33,7 +33,6 @@
accept-flake-config = true; accept-flake-config = true;
}; };
networking.hostName = "nom";
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
# Select internationalisation properties. # Select internationalisation properties.

2
pasteurize.nix
View file

@ -81,7 +81,7 @@
}; };
checkAndTransformConfigFor = site: target: out: config: let checkAndTransformConfigFor = site: target: out: config: let
_file = "github:divnix/hive: ./comb/${site}; target: ${target}"; _file = "github:oddlama/infranix: ./nix/${site}; target: ${target}";
locatedConfig = { locatedConfig = {
imports = [config]; imports = [config];
inherit _file; inherit _file;