From ebf3152ced66037a98fa33c7975b57306e0a18b0 Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Sat, 22 Oct 2022 05:56:04 -0700
Subject: [PATCH] refactor: purge `impermanence.home-files` option

persisting individual files doesn't work super well. we can do without
it and things are simpler.
---
 modules/impermanence.nix                   | 14 +-------------
 modules/universal/home-manager/default.nix |  3 ---
 modules/universal/home-packages.nix        |  2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/modules/impermanence.nix b/modules/impermanence.nix
index 8c2026e3..2804f902 100644
--- a/modules/impermanence.nix
+++ b/modules/impermanence.nix
@@ -14,10 +14,6 @@ in
       default = false;
       type = types.bool;
     };
-    sane.impermanence.home-files = mkOption {
-      default = [];
-      type = types.listOf types.str;
-    };
     sane.impermanence.home-dirs = mkOption {
       default = [];
       type = types.listOf (types.either types.str (types.attrsOf types.str));
@@ -40,14 +36,6 @@ in
     map-sys-dirs = map-dirs { user = "root"; group = "root"; mode = "0755"; directory = ""; };
     map-service-dirs = map-dirs { user = "root"; group = "root"; mode = "0755"; directory = ""; };
 
-    map-home-files = files: builtins.map (f: {
-      parentDirectory = {
-        user = "colin";
-        group = "users";
-        mode = "0755";
-      };
-      file = "/home/colin/${f}";
-    }) files;
   in mkIf cfg.enable {
     sane.image.extraDirectories = [ "/nix/persist/var/log" ];
     environment.persistence."/nix/persist" = {
@@ -107,7 +95,7 @@ in
         # "/etc/group"
         # "/etc/passwd"
         # "/etc/shadow"
-      ] ++ map-home-files cfg.home-files;
+      ];
     };
 
     systemd.services.sane-sops = {
diff --git a/modules/universal/home-manager/default.nix b/modules/universal/home-manager/default.nix
index 4056a41f..2f11c438 100644
--- a/modules/universal/home-manager/default.nix
+++ b/modules/universal/home-manager/default.nix
@@ -13,8 +13,6 @@ let
   pkglist = pkgspec: builtins.map (e: e.pkg or e) pkgspec;
   # extract `dir` from `extraPackages`
   dirlist = pkgspec: builtins.concatLists (builtins.map (e: if e ? "dir" then [ e.dir ] else []) pkgspec);
-  # extract `persist-files` from `extraPackages`
-  persistfileslist = pkgspec: builtins.concatLists (builtins.map (e: if e ? "persist-files" then e.persist-files else []) pkgspec);
   # TODO: dirlist and persistfileslist should be folded
   feeds = import ./feeds.nix { inherit lib; };
 in
@@ -67,7 +65,6 @@ in
       "Pictures"
       "Videos"
     ] ++ (dirlist cfg.extraPackages);
-    sane.impermanence.home-files = persistfileslist cfg.extraPackages;
 
     home-manager.useGlobalPkgs = true;
     home-manager.useUserPackages = true;
diff --git a/modules/universal/home-packages.nix b/modules/universal/home-packages.nix
index 69c6f0ea..e9502997 100644
--- a/modules/universal/home-packages.nix
+++ b/modules/universal/home-packages.nix
@@ -114,7 +114,7 @@ let
     tdesktop  # broken on phosh
 
     # vlc remembers play position in ~/.config/vlc/vlc-qt-interface.conf
-    { pkg = vlc; persist-files = [ ".config/vlc/vlc-qt-interface.conf" ]; }
+    { pkg = vlc; dir = ".config/vlc"; }
 
     whalebird # pleroma client. input is broken on phosh
     xdg-utils  # for xdg-open