diff --git a/flake.nix b/flake.nix
index 011a2e0..7a50555 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,6 +42,7 @@
           ./hosts/generic/persistence.nix
           ./hosts/generic/configuration_generic.nix
           ./hosts/generic/users.nix
+          ./hosts/generic/home-persistence.nix
           ./hosts/Aphelion/hardware-Aphelion.nix
           ./hosts/Aphelion/nvidia.nix
           ./desktop/gnome.nix
@@ -49,35 +50,8 @@
           home-manager.nixosModules.home-manager
           {
             home-manager.useUserPackages = true;
-            home-manager.users.yaroslav = {
-              imports = [ 
-                impermanence.homeManagerModules.impermanence
-                "./home/yaroslav/Aphelion/Aphelion.nix"
-              ];
-              home.persistence."/nix/persist/home" = {
-                directories = [
-                  "Downloads"
-                  "Music"
-                  "Pictures"
-                  "Documents"
-                  "Videos"
-                  ".ssh"
-                  "nixos"
-                  ".local/share/keyrings"
-                  ".local/share/nicotine"
-                  ".local/share/mpd"
-                  ".config/nicotine"
-                  ".mozilla"
-                  ".local/share/AyuGramDesktop"
-                ];
-                files = [
-                  ".p10k.zsh"
-                  ".zsh_history"
-                  
-                ];
-            };
-          };
-        }
+            home-manager.users.yaroslav = import ./home/yaroslav/Aphelion/Aphelion.nix;
+          }
         ];
       };
     };
diff --git a/hosts/generic/home-persistence.nix b/hosts/generic/home-persistence.nix
new file mode 100644
index 0000000..3152d5f
--- /dev/null
+++ b/hosts/generic/home-persistence.nix
@@ -0,0 +1,27 @@
+{ ... }:
+
+{
+  environment.persistence."/nix/persist/home" = {
+    hideMounts = true;
+    users.yaroslav = {
+      directories = [
+        ".local/share/nicotine"
+        ".local/share/mpd"
+        ".local/share/AyuGramDesktop"
+        # XDG User directories
+        "Downloads"
+        "Music"
+        "Pictures"
+        "Documents"
+        "Videos"
+        ".cert"
+        ".ssh"
+        ".steam"
+      ];
+      files = [
+        ".p10k.zsh"
+        ".zhistory"
+      ];
+    };
+  };
+}