AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: AtaraxiaDev:130b1e9eb35dab486f9e501f76bd521b99dfa265
Branches Tags
AtaraxiaDev:master
AtaraxiaDev:dev-v2
...
compare: AtaraxiaDev:115a2545cc522ee5894f83d35ffb79d0daad00ee
Branches Tags
AtaraxiaDev:dev-v2
AtaraxiaDev:master

2 Commits
130b1e9eb3 ... 115a2545cc

Author SHA1 Message Date
Dmitriy Kholkin
115a2545cc
style: rename systemdDevice into waitForDevice 2025-03-10 20:17:43 +03:00
Dmitriy Kholkin
ebf506016e
style: mount options to variable 2025-03-10 20:16:07 +03:00
3 changed files with 28 additions and 72 deletions
Show Stats Expand all files Collapse all files

2
hosts/redshift/default.nix
View File

@ -19,7 +19,7 @@
ataraxia.filesystems.btrfs.enable = true;
ataraxia.filesystems.btrfs.eraseOnBoot.enable = true;
ataraxia.filesystems.btrfs.eraseOnBoot.device = "/dev/sda4";
ataraxia.filesystems.btrfs.eraseOnBoot.systemdDevice =
ataraxia.filesystems.btrfs.eraseOnBoot.waitForDevice =
"sys-devices-pci0000:00-0000:00:05.0-0000:01:01.0-virtio3-host0-target0:0:0-0:0:0:0-block-sda.device";
ataraxia.filesystems.btrfs.eraseOnBoot.eraseVolumes = [
{

76
hosts/redshift/disk-config.nix
View File

@ -5,6 +5,12 @@
disko.devices.disk.disk1 =
let
device = "/dev/sda";
defaultMountOpts = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
in
{
inherit device;
@ -58,94 +64,44 @@
"/snapshots" = { };
"/rootfs" = {
mountpoint = "/";
mountOptions = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
mountOptions = defaultMountOpts;
};
"/homefs" = {
mountpoint = "/home";
mountOptions = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
mountOptions = defaultMountOpts;
};
"/persist" = { };
"/persist/nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
mountOptions = defaultMountOpts;
};
"/persist/srv" = {
mountpoint = "/srv";
mountOptions = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
mountOptions = defaultMountOpts;
};
"/persist/docker" = {
mountpoint = "/var/lib/docker";
mountOptions = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
mountOptions = defaultMountOpts;
};
"/persist/podman" = {
mountpoint = "/var/lib/podman";
mountOptions = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
mountOptions = defaultMountOpts;
};
"/persist/containers" = {
mountpoint = "/var/lib/containers";
mountOptions = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
mountOptions = defaultMountOpts;
};
"/persist/libvirt" = {
mountpoint = "/var/lib/libvirt";
mountOptions = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
mountOptions = defaultMountOpts;
};
"/persist/log" = {
mountpoint = "/var/log";
mountOptions = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
mountOptions = defaultMountOpts;
};
"/persist/impermanence" = {
mountpoint = "/persist";
mountOptions = [
"compress=zstd"
"noatime"
"autodefrag"
"ssd"
];
mountOptions = defaultMountOpts;
};
};
};

22
modules/nixos/filesystems/btrfs.nix
View File

@ -48,15 +48,6 @@ in
default = config.persist.enable;
description = "Clean btrfs subvolumes on boot";
};
device = mkOption {
type = str;
description = "Device on which is btrfs partititon";
};
systemdDevice = mkOption {
type = str;
description = "Escaped string with name of .device service";
example = "dev-disk-by\\x2did-ata\\x2dPhison_SATA_SSD_2165.device";
};
eraseVolumes = mkOption {
type = listOf (submodule eraseVolumesOpts);
default = [ ];
@ -70,6 +61,15 @@ in
A list of subvolumes to erase on boot.
'';
};
device = mkOption {
type = str;
description = "Device on which is btrfs partititon";
};
waitForDevice = mkOption {
type = str;
description = "Escaped string with name of .device service";
example = "dev-disk-by\\x2did-ata\\x2dPhison_SATA_SSD_2165.device";
};
};
};
@ -105,8 +105,8 @@ in
systemd.services.rollback = mkIf config.boot.initrd.systemd.enable {
description = "Rollback btrfs root subvolume to a pristine state on boot";
wantedBy = [ "initrd.target" ];
requires = [ cfg.eraseOnBoot.systemdDevice ];
after = [ cfg.eraseOnBoot.systemdDevice ];
requires = [ cfg.eraseOnBoot.waitForDevice ];
after = [ cfg.eraseOnBoot.waitForDevice ];
before = [ "sysroot.mount" ];
path = [
pkgs.btrfs-progs