mira/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added fixes from flake check

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
devices/ellaca/default.nix
View file

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

74
devices/ellaca/disko.nix
View file

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

21
flake.lock generated
View file

@ -98,6 +98,26 @@
"type": "github" "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": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -463,6 +483,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko",
"home-manager": "home-manager", "home-manager": "home-manager",
"niri": "niri", "niri": "niri",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",