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

feat: updated user configs to better match original config

Browse source
This commit is contained in:
Leyla Becker 2025-11-14 22:06:32 -06:00
parent 1eb66d1c31
commit f8edad75bf
3 changed files with 73 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/nixos-modules/storage/storage.nix
View file

@ -10,6 +10,16 @@
lib.mkIf config.storage.zfs.enable (lib.mkMerge [
{
storage.zfs.datasets = {
"persist" = {
type = "zfs_fs";
};
"persist/local" = {
type = "zfs_fs";
};
"persist/replicate" = {
type = "zfs_fs";
};
"persist/local/nix" = {
type = "zfs_fs";
mount = {
@ -22,6 +32,7 @@
atime = "off";
relatime = "off";
};
"persist/replicate/system/var/log" = {
type = "zfs_fs";
mount = {
@ -54,6 +65,9 @@
'';
storage.zfs.datasets = {
"ephemeral" = {
type = "zfs_fs";
};
"ephemeral/system/root" = {
type = "zfs_fs";
mount = {

6
modules/nixos-modules/storage/submodules/dataset.nix
View file

@ -73,11 +73,7 @@
snapshot = {
# This option should set this option flag
# "com.sun:auto-snapshot" = "false";
autoSnapshot = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Enable automatic snapshots for this dataset";
};
autoSnapshot = lib.mkEnableOption "Enable automatic snapshots for this dataset";
# Creates a blank snapshot in the post create hook for rollback purposes
blankSnapshot = lib.mkEnableOption "Should a blank snapshot be auto created in the post create hook";
};