From 5abc647d98421d3bb2338e22adbf6ee01e75cf0c Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Wed, 1 Jan 2025 18:19:32 -0600
Subject: [PATCH] fixed home manager with impermanence

---
 .../home-manager/leyla/impermanence.nix       | 32 ++++++++-----------
 modules/home-manager-modules/default.nix      |  1 -
 modules/home-manager-modules/impermanence.nix | 17 ----------
 modules/nixos-modules/users.nix               |  8 +++++
 4 files changed, 22 insertions(+), 36 deletions(-)
 delete mode 100644 modules/home-manager-modules/impermanence.nix

diff --git a/configurations/home-manager/leyla/impermanence.nix b/configurations/home-manager/leyla/impermanence.nix
index 4a24310..ddb2f42 100644
--- a/configurations/home-manager/leyla/impermanence.nix
+++ b/configurations/home-manager/leyla/impermanence.nix
@@ -3,23 +3,19 @@
   osConfig,
   ...
 }: {
-  home.persistence."/persist/home/leyla" = lib.mkIf osConfig.host.impermanence.enable {
-    directories = [
-      "desktop"
-      "downloads"
-      "documents"
-      ".ssh"
-      ".nixops"
-      ".local/share/keyrings"
-      ".local/share/direnv"
-      {
-        directory = ".local/share/Steam";
-        method = "symlink";
-      }
-    ];
-    # files = [
-    #   ".screenrc"
-    # ];
-    allowOther = true;
+  config = lib.mkIf osConfig.host.impermanence.enable {
+    home.persistence."/persist/home/leyla" = {
+      directories = [
+        "desktop"
+        "downloads"
+        "documents"
+        ".ssh"
+        ".config/gnome-initial-setup-done"
+        {
+          directory = ".local/share/Steam";
+          method = "symlink";
+        }
+      ];
+    };
   };
 }
diff --git a/modules/home-manager-modules/default.nix b/modules/home-manager-modules/default.nix
index 22736d2..ef9bf0a 100644
--- a/modules/home-manager-modules/default.nix
+++ b/modules/home-manager-modules/default.nix
@@ -4,6 +4,5 @@
     ./flipperzero.nix
     ./i18n.nix
     ./openssh.nix
-    ./impermanence.nix
   ];
 }
diff --git a/modules/home-manager-modules/impermanence.nix b/modules/home-manager-modules/impermanence.nix
deleted file mode 100644
index a48fe9d..0000000
--- a/modules/home-manager-modules/impermanence.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  config,
-  osConfig,
-  ...
-}: {
-  config = lib.mkIf osConfig.host.impermanence.enable {
-    home.persistence."/persistent/home/${config.home.username}" = {
-      directories = [
-        ".ssh"
-        "desktop"
-        "downloads"
-        "documents"
-      ];
-    };
-  };
-}
diff --git a/modules/nixos-modules/users.nix b/modules/nixos-modules/users.nix
index af7dcb2..efd39f3 100644
--- a/modules/nixos-modules/users.nix
+++ b/modules/nixos-modules/users.nix
@@ -277,6 +277,14 @@ in {
           normalUsers)
       );
 
+      systemd = {
+        tmpfiles.rules =
+          builtins.map (
+            user: "d /persist/home/${user.name} 700 ${user.name} ${user.name} -"
+          )
+          normalUsers;
+      };
+
       fileSystems = lib.mkMerge [
         {
           ${SOPS_AGE_KEY_DIRECTORY}.neededForBoot = true;