Compare commits
3 Commits
archive/uc
...
feat/temp-
| Author | SHA1 | Date | |
|---|---|---|---|
| 7a3885a036 | |||
| 44b8121edb | |||
| 5aca97e057 |
Submodule assets/compose updated: d3f2e3b7b9...dab158da0a
@@ -65,6 +65,7 @@
|
|||||||
./hosts/lazyworkhorse/configuration.nix
|
./hosts/lazyworkhorse/configuration.nix
|
||||||
./hosts/lazyworkhorse/hardware-configuration.nix
|
./hosts/lazyworkhorse/hardware-configuration.nix
|
||||||
./modules/nixos/filesystem/hoardingcow-mount.nix
|
./modules/nixos/filesystem/hoardingcow-mount.nix
|
||||||
|
./modules/nixos/filesystem/poup-16t-disk.nix
|
||||||
./modules/nixos/services/docker_manager.nix
|
./modules/nixos/services/docker_manager.nix
|
||||||
./modules/nixos/services/open_code_server.nix
|
./modules/nixos/services/open_code_server.nix
|
||||||
./modules/nixos/services/ollama_init_custom_models.nix
|
./modules/nixos/services/ollama_init_custom_models.nix
|
||||||
|
|||||||
@@ -8,6 +8,14 @@
|
|||||||
# NAS Mounting
|
# NAS Mounting
|
||||||
hoardingcow-mount.enable = true;
|
hoardingcow-mount.enable = true;
|
||||||
|
|
||||||
|
# 16TB btrfs storage disk (WD Red Pro — Poup_16T — LUKS2 + btrfs + btrbk snapshots)
|
||||||
|
# ⚠ SETUP REQUIRED: Connect the disk, get the LUKS UUID with 'blkid /dev/sdb',
|
||||||
|
# then set gortium.poup16t.luksUuid here and deploy.
|
||||||
|
# gortium.poup16t = {
|
||||||
|
# enable = true;
|
||||||
|
# luksUuid = "REPLACE_ME_WITH_REAL_UUID";
|
||||||
|
# };
|
||||||
|
|
||||||
# Flakesss
|
# Flakesss
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
|
||||||
nix.settings.trusted-users = [ "root" "gortium" ];
|
nix.settings.trusted-users = [ "root" "gortium" ];
|
||||||
|
|||||||
121
modules/nixos/filesystem/poup-16t-disk.nix
Normal file
121
modules/nixos/filesystem/poup-16t-disk.nix
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.gortium.poup16t;
|
||||||
|
luksName = cfg.luksName;
|
||||||
|
in
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
{
|
||||||
|
options.gortium.poup16t = {
|
||||||
|
enable = mkEnableOption "Poup_16T storage disk (btrfs + LUKS + btrbk snapshots)";
|
||||||
|
|
||||||
|
luksUuid = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = ''
|
||||||
|
UUID of the LUKS partition on the 16TB disk (WD Red Pro).
|
||||||
|
|
||||||
|
Find this by running as root when the disk is connected:
|
||||||
|
blkid /dev/sdb # or wherever the disk appears
|
||||||
|
lsblk -o NAME,SIZE,FSTYPE,UUID
|
||||||
|
|
||||||
|
Since btrfs is inside LUKS, the FS UUID is hidden — use the
|
||||||
|
LUKS partition UUID from blkid (it'll show TYPE=\"crypto_LUKS\").
|
||||||
|
'';
|
||||||
|
example = "00000000-0000-0000-0000-000000000000";
|
||||||
|
};
|
||||||
|
|
||||||
|
luksName = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "poup_16t";
|
||||||
|
description = "Name for the LUKS /dev/mapper/ mapping";
|
||||||
|
};
|
||||||
|
|
||||||
|
mountPoint = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "/mnt/Poup_16T";
|
||||||
|
description = "Mount point for the 16TB data disk";
|
||||||
|
};
|
||||||
|
|
||||||
|
btrfsOptions = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
default = [ "defaults" "noatime" "compress=zstd:3" "nofail" ];
|
||||||
|
description = "Mount options for the btrfs filesystem. 'nofail' ensures boot succeeds when disk is disconnected.";
|
||||||
|
};
|
||||||
|
|
||||||
|
btrbk = {
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Enable btrbk snapshot management on this volume";
|
||||||
|
};
|
||||||
|
|
||||||
|
schedule = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "daily";
|
||||||
|
description = "systemd calendar event for btrbk (e.g. 'daily', 'hourly', '*-*-* 00:00:00')";
|
||||||
|
};
|
||||||
|
|
||||||
|
preserveMin = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "2d";
|
||||||
|
description = "btrbk snapshot_preserve_min — minimum age before pruning";
|
||||||
|
};
|
||||||
|
|
||||||
|
preserve = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "14d 4w 3m";
|
||||||
|
description = "btrbk snapshot_preserve — retention policy (daily, weekly, monthly)";
|
||||||
|
};
|
||||||
|
|
||||||
|
snapshotDir = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = ".snapshots";
|
||||||
|
description = "Directory name for snapshots relative to volume root";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
# Enable btrfs kernel support (no DKMS needed — it's in-tree)
|
||||||
|
boot.supportedFilesystems = [ "btrfs" ];
|
||||||
|
|
||||||
|
# Install btrfs administration tools
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
btrfs-progs # mkfs.btrfs, btrfs, fsck, balance, scrub
|
||||||
|
btrbk # Snapshot management + rotation
|
||||||
|
];
|
||||||
|
|
||||||
|
# LUKS2 unlock at boot (uses keyfile or prompts if unavailable)
|
||||||
|
# Since the disk may be disconnected, initrd times out gracefully (~30s)
|
||||||
|
boot.initrd.luks.devices.${luksName} = {
|
||||||
|
device = "/dev/disk/by-uuid/${cfg.luksUuid}";
|
||||||
|
preLVM = false;
|
||||||
|
allowDiscards = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Mount the unlocked mapper device as btrfs
|
||||||
|
fileSystems.${cfg.mountPoint} = {
|
||||||
|
device = "/dev/mapper/${luksName}";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = cfg.btrfsOptions;
|
||||||
|
};
|
||||||
|
|
||||||
|
# btrbk — automated snapshot creation and rotation
|
||||||
|
services.btrbk = mkIf cfg.btrbk.enable {
|
||||||
|
instances.poup16t = {
|
||||||
|
onCalendar = cfg.btrbk.schedule;
|
||||||
|
settings = {
|
||||||
|
snapshot_preserve_min = cfg.btrbk.preserveMin;
|
||||||
|
snapshot_preserve = cfg.btrbk.preserve;
|
||||||
|
|
||||||
|
volume.${cfg.mountPoint} = {
|
||||||
|
snapshot_create = "always";
|
||||||
|
snapshot_dir = cfg.btrbk.snapshotDir;
|
||||||
|
subvolume = ".";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user