aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2025-10-18 10:39:01 -0700
committerFranck Cuny <franck@fcuny.net>2025-10-18 10:39:01 -0700
commit176141410a00dc8ef4376ea9d67b87a0b96ec68c (patch)
tree8bfb9a85e86f0773ea0fc6ec9ecad69e21a26a9d
parentintroduce a module for baremetal machines (diff)
downloadinfra-176141410a00dc8ef4376ea9d67b87a0b96ec68c.tar.gz
move the disk configuration for rivendell as a profile
-rw-r--r--flake/hosts.nix1
-rw-r--r--machines/nixos/x86_64-linux/rivendell/default.nix2
-rw-r--r--profiles/disk/btrfs-on-luks.nix (renamed from machines/nixos/x86_64-linux/rivendell/disks.nix)7
3 files changed, 9 insertions, 1 deletions
diff --git a/flake/hosts.nix b/flake/hosts.nix
index db1b686..ef2b28b 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -155,6 +155,7 @@ let
{
home-manager.users.${adminUser.name}.imports = [
"${self}/home/programs/bat.nix"
+ { home.stateVersion = "25.05"; }
];
}
]
diff --git a/machines/nixos/x86_64-linux/rivendell/default.nix b/machines/nixos/x86_64-linux/rivendell/default.nix
index 787f090..700a57f 100644
--- a/machines/nixos/x86_64-linux/rivendell/default.nix
+++ b/machines/nixos/x86_64-linux/rivendell/default.nix
@@ -9,7 +9,7 @@
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
inputs.nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series
- ./disks.nix
+ ../../../../profiles/disk/btrfs-on-luks.nix
];
boot.initrd.availableKernelModules = [
diff --git a/machines/nixos/x86_64-linux/rivendell/disks.nix b/profiles/disk/btrfs-on-luks.nix
index 8cb1f32..3fe57f7 100644
--- a/machines/nixos/x86_64-linux/rivendell/disks.nix
+++ b/profiles/disk/btrfs-on-luks.nix
@@ -1,3 +1,4 @@
+{ ... }:
let
btrfsopt = [
"compress=zstd"
@@ -5,6 +6,12 @@ let
];
in
{
+ services.btrfs.autoScrub.enable = true;
+ services.btrfs.autoScrub.fileSystems = [
+ "/nix"
+ "/data"
+ ];
+
disko.devices = {
disk = {
main = {