From 579d0f3f8d694496eb67eda7af8d38ac8ea77fed Mon Sep 17 00:00:00 2001
From: Nathan Gill <n@ngill.net>
Date: Wed, 19 Aug 2026 09:03:13 +0100
Subject: [PATCH] add data partition fs option, remove htop patch

---
 modules/system/fs/default.nix                 | 20 +++++++++++++
 overlays/default.nix                          |  1 -
 overlays/htop.nix                             |  7 -----
 ...e-when-search-or-filter-is-cancelled.patch | 30 -------------------
 systems/natha-76k4epg/default.nix             |  1 +
 5 files changed, 21 insertions(+), 38 deletions(-)
 delete mode 100644 overlays/htop.nix
 delete mode 100644 patches/htop/0001-exit-follow-mode-when-search-or-filter-is-cancelled.patch

diff --git a/modules/system/fs/default.nix b/modules/system/fs/default.nix
index 4d8f453..0ee6bd5 100644
--- a/modules/system/fs/default.nix
+++ b/modules/system/fs/default.nix
@@ -22,6 +22,15 @@ in
       ];
       description = "Filesystem configuration type";
     };
+
+    dataType = mkOption {
+      type = types.enum [
+        "none"
+        "default"
+      ];
+      default = "none";
+      description = "Data partition condifuration type";
+    };
   };
 
   config =
@@ -100,6 +109,17 @@ in
             ];
           };
         })
+
+        (mkIf (cfg.dataType == "btrfs") {
+          fileSystems."/data" = {
+            device = "/dev/disk/by-label/DATA.EXT";
+            fsType = "btrfs";
+            options = [
+              "compress=zstd:1"
+              "noatime"
+            ];
+          };
+        })
       ];
     in
     fsConfig;
diff --git a/overlays/default.nix b/overlays/default.nix
index fb33213..9c38e69 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -7,5 +7,4 @@
   (import ./sidetree.nix)
   (import ./lic.nix { inherit system inputs; })
   (import ./way-edges.nix { inherit system inputs; })
-  (import ./htop.nix)
 ]
diff --git a/overlays/htop.nix b/overlays/htop.nix
deleted file mode 100644
index 123e203..0000000
--- a/overlays/htop.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-final: prev: {
-  htop = prev.htop.overrideAttrs (old: {
-    patches = (old.patches or [ ]) ++ [
-      ../patches/htop/0001-exit-follow-mode-when-search-or-filter-is-cancelled.patch
-    ];
-  });
-}
diff --git a/patches/htop/0001-exit-follow-mode-when-search-or-filter-is-cancelled.patch b/patches/htop/0001-exit-follow-mode-when-search-or-filter-is-cancelled.patch
deleted file mode 100644
index e98b99b..0000000
--- a/patches/htop/0001-exit-follow-mode-when-search-or-filter-is-cancelled.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 56eb25706ec2dde71feea4bed8f3d4f6e455b087 Mon Sep 17 00:00:00 2001
-From: Nathan Gill <n@ngill.net>
-Date: Sat, 25 Jul 2026 09:31:27 +0100
-Subject: [PATCH] exit follow mode when search or filter is cancelled
-
-condition change in bbec22d7592ea6cf26dfd615be649855a4e0f22b caused
-panel state during search to persist even if the search was cancelled
-(e.g. escape key). previous behaviour relied on the absence of the
-`HTOP_KEEP_FOLLOWING` reaction to stop following, which is no longer
-the case.
----
- MainPanel.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/MainPanel.c b/MainPanel.c
-index ede85422..638f60c6 100644
---- a/MainPanel.c
-+++ b/MainPanel.c
-@@ -121,6 +121,8 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
-          reaction |= HTOP_KEEP_FOLLOWING;
-          if (confirmedSearch)
-             reaction |= HTOP_REFRESH;
-+      } else {
-+         host->activeTable->following = -1;
-       }
-       result = HANDLED;
-    } else if (ch == 27) {
--- 
-2.55.0
-
diff --git a/systems/natha-76k4epg/default.nix b/systems/natha-76k4epg/default.nix
index ec1ba5d..82f037f 100644
--- a/systems/natha-76k4epg/default.nix
+++ b/systems/natha-76k4epg/default.nix
@@ -25,6 +25,7 @@
     programs.steam = true;
     fs = {
       type = "efi-default";
+      dataType = "default";
       swap = {
         enable = true;
         type = "partition";
-- 
2.51.2