From e4bff9b5efa313694dc4fe98b23e6ef2e98687a8 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 30 Jan 2023 10:51:41 +0000
Subject: [PATCH] refactor: persist: remove dead code

---
 modules/persist/computed.nix |  8 --------
 modules/persist/default.nix  | 11 +----------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 modules/persist/computed.nix

diff --git a/modules/persist/computed.nix b/modules/persist/computed.nix
deleted file mode 100644
index 908761b7..00000000
--- a/modules/persist/computed.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, ... }:
-
-let
-  cfg = config.sane.persist;
-in
-{
-  sane.persist.byPath = cfg.sys.byPath;
-}
diff --git a/modules/persist/default.nix b/modules/persist/default.nix
index 804fbf9b..10a65b28 100644
--- a/modules/persist/default.nix
+++ b/modules/persist/default.nix
@@ -184,14 +184,6 @@ in
       default = {};
       type = dirsSubModule;
     };
-    sane.persist.byPath = mkOption {
-      type = types.attrsOf (convertInlineAcl entryAtPath);
-      # XXX: see computed.nix for definition
-      description = ''
-        map of <path> => <path config> for all paths to be persisted.
-        this is computed from the other options, but users can also set it explicitly (useful for overriding)
-      '';
-    };
     sane.persist.stores = mkOption {
       type = types.attrsOf storeType;
       default = {};
@@ -202,7 +194,6 @@ in
   };
 
   imports = [
-    ./computed.nix
     ./root-on-tmpfs.nix
     ./stores
   ];
@@ -243,7 +234,7 @@ in
           );
         }
       ];
-    configs = lib.mapAttrsToList cfgFor cfg.byPath;
+    configs = lib.mapAttrsToList cfgFor cfg.sys.byPath;
     take = f: { sane.fs = f.sane.fs; };
   in mkIf cfg.enable (
     take (sane-lib.mkTypedMerge take configs)