idk shits so fucked lol
This commit is contained in:
@@ -12,6 +12,7 @@ in
|
||||
imports = [
|
||||
./boot.nix
|
||||
./apps.nix
|
||||
# ./nas-pool.nix
|
||||
./users.nix
|
||||
./services.nix
|
||||
./sops.nix
|
||||
@@ -267,20 +268,119 @@ in
|
||||
# ###################################################
|
||||
# # Mounts # #
|
||||
# ###################################################
|
||||
fileSystems."/media/nas/main" = {
|
||||
label = "nas_pool";
|
||||
# device = "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/sdj:/dev/nmve0n1:/dev/nvme1n1";
|
||||
fsType = "bcachefs";
|
||||
mountPoint = "/media/nas/main";
|
||||
options = [
|
||||
# "noauto"
|
||||
"nofail"
|
||||
# "x-systemd.mount-timeout=0"
|
||||
# "x-systemd.device-timeout=0"
|
||||
];
|
||||
# fileSystems."/media/nas/main" = {
|
||||
# label = "nas_pool";
|
||||
# # device = "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/sdj:/dev/nmve0n1:/dev/nvme1n1";
|
||||
# fsType = "bcachefs";
|
||||
# mountPoint = "/media/nas/main";
|
||||
# options = [
|
||||
# # "noauto"
|
||||
# "nofail"
|
||||
# # "x-systemd.mount-timeout=0"
|
||||
# # "x-systemd.device-timeout=0"
|
||||
# ];
|
||||
# };
|
||||
fileSystems = {
|
||||
"/media/nas/main/appdata" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=appdata"
|
||||
"x-systemd.device-timeout=180s"
|
||||
];
|
||||
};
|
||||
"/media/nas/main/backup" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=backup"
|
||||
"x-systemd.device-timeout=180s"
|
||||
];
|
||||
};
|
||||
"/media/nas/main/databases" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=databases"
|
||||
"x-systemd.device-timeout=180s"
|
||||
];
|
||||
};
|
||||
"/media/nas/main/documents" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=documents"
|
||||
"x-systemd.device-timeout=180s"
|
||||
];
|
||||
};
|
||||
"/media/nas/games/heroic" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=heroic"
|
||||
"x-systemd.device-timeout=180s"
|
||||
];
|
||||
};
|
||||
"/media/nas/main/movies" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=movies"
|
||||
"x-systemd.device-timeout=180s"
|
||||
];
|
||||
};
|
||||
"/media/nas/main/photos" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=photos"
|
||||
"x-systemd.device-timeout=180s"
|
||||
];
|
||||
};
|
||||
"/media/nas/games/steam" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=steam"
|
||||
"x-systemd.device-timeout=180s"
|
||||
];
|
||||
};
|
||||
"/media/nas/main/tv" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=tv"
|
||||
"x-systemd.device-timeout=180s"
|
||||
];
|
||||
};
|
||||
"/persist" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=persist"
|
||||
"x-systemd.device-timeout=180s"
|
||||
];
|
||||
};
|
||||
"/subvolumes" = {
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
};
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-partlabel/disk-main-jallen-nas-cryptroot";
|
||||
environment.etc = {
|
||||
"crypttab".text = ''
|
||||
hdd1-cryptroot UUID="295d4c78-41f0-4792-bd97-ac88b2455cdc" none tpm2-device=auto
|
||||
hdd2-cryptroot UUID="7c9c2179-351c-40a5-9257-e9ee2a1e794a" none tpm2-device=auto
|
||||
ssd1-cryptroot UUID="d78fa862-212c-4d4f-ad86-bfeead5cc054" none tpm2-device=auto,allow-discards,perf-no_read_workqueue,perf-no_write_workqueue
|
||||
ssd2-cryptroot UUID="1661c173-3809-4517-9ab8-ad94c229048d" none tpm2-device=auto,allow-discards,perf-no_read_workqueue,perf-no_write_workqueue
|
||||
ssd3-cryptroot UUID="cfea125e-90b1-4248-834d-16dcaf310783" none tpm2-device=auto,allow-discards,perf-no_read_workqueue,perf-no_write_workqueue
|
||||
ssd4-cryptroot UUID="96055401-6d1a-4308-9e4e-2211e1e23635" none tpm2-device=auto,allow-discards,perf-no_read_workqueue,perf-no_write_workqueue
|
||||
ssd5-cryptroot UUID="055e27e0-c96a-4899-8ee7-cb1cd5f21476" none tpm2-device=auto,allow-discards,perf-no_read_workqueue,perf-no_write_workqueue
|
||||
ssd6-cryptroot UUID="6e830abd-2555-4558-81a3-4a990507b5a7" none tpm2-device=auto,allow-discards,perf-no_read_workqueue,perf-no_write_workqueue
|
||||
'';
|
||||
};
|
||||
|
||||
# boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-partlabel/disk-main-jallen-nas-cryptroot";
|
||||
|
||||
# Configure environment
|
||||
environment = {
|
||||
@@ -310,22 +410,18 @@ in
|
||||
persistence."/media/nas/main/persist" = {
|
||||
hideMounts = true;
|
||||
directories = [
|
||||
{
|
||||
directory = "/var/cache/ccache";
|
||||
user = "nobody";
|
||||
group = "nobody";
|
||||
mode = "u=rwx,g=rwx,o=rx";
|
||||
}
|
||||
{
|
||||
directory = "/var/lib/redis-ccache";
|
||||
user = "redis-ccache";
|
||||
group = "redis-ccache";
|
||||
mode = "u=rwx,g=,o=";
|
||||
}
|
||||
# {
|
||||
# directory = "/var/lib/redis-ccache";
|
||||
# user = "redis-ccache";
|
||||
# group = "redis-ccache";
|
||||
# mode = "u=rwx,g=,o=";
|
||||
# }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.checkReversePath = false;
|
||||
|
||||
# Configure programs
|
||||
programs = {
|
||||
kdeconnect.enable = lib.mkForce false;
|
||||
|
||||
Reference in New Issue
Block a user