From ca3547b27ada4bafecbd51a59a467ec98814d32a Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Sat, 9 Dec 2023 15:22:15 +0000
Subject: [PATCH] nixos/user: Use impermanence's users options

---
 nixos/modules/user.nix | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/user.nix b/nixos/modules/user.nix
index 9198d05..dc8f53d 100644
--- a/nixos/modules/user.nix
+++ b/nixos/modules/user.nix
@@ -58,33 +58,17 @@ in
 
             "/home/${user'.name}/.config/fish/fish_variables"
           ];
-          persistence.config =
-          let
-            perms = {
-              mode = "0700";
-              user = user.name;
-              group = user.group;
-            };
-          in
-          {
-            files = (map (file: {
-              inherit file;
-              parentDirectory = perms;
-            }) [
-              "/home/${user'.name}/.bash_history"
-              "/home/${user'.name}/.lesshst"
-            ]) ++ [
-              # Just to make sure we get correct default perms
-              "/home/.tmproot.dummy"
+          persistence.config.users."${user'.name}" = {
+            files = [
+              ".bash_history"
+              ".lesshst"
             ];
-            directories = map (directory: {
-              inherit directory;
-            } // perms) [
+            directories = [
               # Persist all of fish; it's not easy to persist just the history fish won't let you move it to a different
               # directory. Also it does some funny stuff and can't really be a symlink it seems.
-              "/home/${user'.name}/.local/share/fish"
+              ".local/share/fish"
 
-              "/home/${user'.name}/.cache/nix"
+              ".cache/nix"
             ];
           };
         };