From cb720d62b0915af217851a5a9396b930586f898a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 19 Aug 2025 11:01:53 +0200
Subject: nixos: tweak Mox's configurations

Ensure that dm-mod is available and autoscrub BTRFS and limit journald
size.
---
 flake.lock                        | 30 +++++++++++++++---------------
 nixos/configurations/dean.nix     | 14 ++++++++++++++
 nixos/configurations/spt-mox.nix  |  2 ++
 nixos/configurations/spt-mox2.nix | 16 ++++++++++------
 nixos/configurations/zd-mox.nix   |  2 ++
 nixos/modules/generic.nix         |  2 +-
 6 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9dd104d..9ff8bb2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -135,11 +135,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1754564048,
-        "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=",
+        "lastModified": 1755330281,
+        "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113",
+        "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1754725699,
-        "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=",
+        "lastModified": 1755186698,
+        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054",
+        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
         "type": "github"
       },
       "original": {
@@ -226,11 +226,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1752077645,
-        "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
+        "lastModified": 1755268003,
+        "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6",
+        "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388",
         "type": "github"
       },
       "original": {
@@ -313,11 +313,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1752493999,
-        "narHash": "sha256-FfVJ8pzzKDruj3VoLTVbjoDysdU6BJyGQftmGsPsWD0=",
+        "lastModified": 1755529547,
+        "narHash": "sha256-p8/c1Vf3jpz/un9vSMhYg5OZ9JKclAiUL5tqNoURBks=",
         "owner": "cynerd",
         "repo": "nixturris",
-        "rev": "0c48a67c245ab0baf2e8ec36dd6a1c99f1d8e78e",
+        "rev": "7323f9aa5c20824861e137b90d5ba10729224ae5",
         "type": "gitlab"
       },
       "original": {
@@ -561,11 +561,11 @@
     },
     "vpsadminos": {
       "locked": {
-        "lastModified": 1754767390,
-        "narHash": "sha256-CajW0Om1hqiO1PtXBzYho3fwlQowq5EHntGxdfaWfcQ=",
+        "lastModified": 1755530779,
+        "narHash": "sha256-RX/xF3dzT3/E48huI514yytHh4VVBe8cJ5jrtdfOOWg=",
         "owner": "vpsfreecz",
         "repo": "vpsadminos",
-        "rev": "01f64d0dd3c416b56eb5019a75b60db2c39f1da4",
+        "rev": "8a39154991162e0f1c9546f692b047dc53c912b1",
         "type": "github"
       },
       "original": {
diff --git a/nixos/configurations/dean.nix b/nixos/configurations/dean.nix
index dfb03e1..a95d9f1 100644
--- a/nixos/configurations/dean.nix
+++ b/nixos/configurations/dean.nix
@@ -11,6 +11,20 @@
     };
   };
 
+  boot.initrd.availableKernelModules = ["dm-mod"];
+
+  hardware.enableAllFirmware = false; # No wifi so we do not need firmwares
+  services = {
+    journald.extraConfig = ''
+      SystemMaxUse=512M
+    '';
+
+    btrfs.autoScrub = {
+      enable = true;
+      fileSystems = ["/"];
+    };
+  };
+
   networking = {
     useNetworkd = true;
     useDHCP = false;
diff --git a/nixos/configurations/spt-mox.nix b/nixos/configurations/spt-mox.nix
index a9f4965..4dfa2c8 100644
--- a/nixos/configurations/spt-mox.nix
+++ b/nixos/configurations/spt-mox.nix
@@ -28,6 +28,8 @@
     };
   };
 
+  boot.initrd.availableKernelModules = ["dm-mod"];
+
   services = {
     journald.extraConfig = ''
       SystemMaxUse=512M
diff --git a/nixos/configurations/spt-mox2.nix b/nixos/configurations/spt-mox2.nix
index fd2c074..2e76449 100644
--- a/nixos/configurations/spt-mox2.nix
+++ b/nixos/configurations/spt-mox2.nix
@@ -23,13 +23,17 @@
     };
   };
 
-  services.journald.extraConfig = ''
-    SystemMaxUse=512M
-  '';
+  boot.initrd.availableKernelModules = ["dm-mod"];
 
-  services.btrfs.autoScrub = {
-    enable = true;
-    fileSystems = ["/"];
+  services = {
+    journald.extraConfig = ''
+      SystemMaxUse=512M
+    '';
+
+    btrfs.autoScrub = {
+      enable = true;
+      fileSystems = ["/"];
+    };
   };
 
   networking = {
diff --git a/nixos/configurations/zd-mox.nix b/nixos/configurations/zd-mox.nix
index 07da891..a6f327c 100644
--- a/nixos/configurations/zd-mox.nix
+++ b/nixos/configurations/zd-mox.nix
@@ -29,6 +29,8 @@ in {
     monitoring.speedtest = true;
   };
 
+  boot.initrd.availableKernelModules = ["dm-mod"];
+
   services = {
     journald.extraConfig = ''
       SystemMaxUse=512M
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index e029058..e6e96a4 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -37,7 +37,7 @@ in {
       kernelPackages = mkOverride 1100 pkgs.linuxPackages_latest;
       kernelParams = ["boot.shell_on_fail"];
     };
-    hardware.enableAllFirmware = true;
+    hardware.enableAllFirmware = mkDefault true;
     services.fwupd.enable = mkDefault (pkgs.system == "x86_64-linux");
     systemd.oomd.enable = false;
 
-- 
cgit v1.2.3