added fixes from flake check

This commit is contained in:
twoneis 2024-05-06 19:16:33 +02:00
parent 0636e412c0
commit 299f7ac111
3 changed files with 59 additions and 37 deletions

View file

@ -7,6 +7,7 @@
];
networking.hostName = "ellaca";
networking.hostId = "656c6c61";
# Select kernel version
boot.kernelPackages = pkgs.linuxPackages_zen;

View file

@ -58,47 +58,47 @@
};
};
};
zpool = {
zroot = {
type = "zpool";
mode = "";
rootFsOptions = {
compression = "zstd";
canmount = "off";
"com.sun:auto-snapshot" = "false";
};
postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
};
zpool = {
zroot = {
type = "zpool";
mode = "";
rootFsOptions = {
compression = "zstd";
canmount = "off";
"com.sun:auto-snapshot" = "false";
};
postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
datasets = {
root = {
type = "zfs_fs";
mountpoint = "/";
};
nix = {
type = "zfs_fs";
mountpoint = "/nix";
};
persist = {
type = "zfs_fs";
mountpoint = "/persist";
};
datasets = {
root = {
type = "zfs_fs";
mountpoint = "/";
};
nix = {
type = "zfs_fs";
mountpoint = "/nix";
};
persist = {
type = "zfs_fs";
mountpoint = "/persist";
};
};
zstore = {
type = "zpool";
mode = "";
rootFsOptions = {
compression = "zstd";
canmount = "off";
"com.sun:auto-snapshot" = "false";
};
postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
};
zstore = {
type = "zpool";
mode = "";
rootFsOptions = {
compression = "zstd";
canmount = "off";
"com.sun:auto-snapshot" = "false";
};
postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
datasets = {
persist = {
type = "zfs_fs";
mountpoint = "/persist/ext";
};
datasets = {
persist = {
type = "zfs_fs";
mountpoint = "/persist/ext";
};
};
};

21
flake.lock generated
View file

@ -98,6 +98,26 @@
"type": "github"
}
},
"disko": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1714959124,
"narHash": "sha256-oYmauPDpSgWjY9hvzwd815igGfP8Ds5Bk6bTo5JrBRk=",
"owner": "nix-community",
"repo": "disko",
"rev": "e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"flake-compat": {
"locked": {
"lastModified": 1696426674,
@ -463,6 +483,7 @@
},
"root": {
"inputs": {
"disko": "disko",
"home-manager": "home-manager",
"niri": "niri",
"nixos-hardware": "nixos-hardware",