diff --git a/configurations/home-manager/leyla/default.nix b/configurations/home-manager/leyla/default.nix
index 49abfe1..d7cecc4 100644
--- a/configurations/home-manager/leyla/default.nix
+++ b/configurations/home-manager/leyla/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  osConfig,
-  ...
-}: {
+{osConfig, ...}: {
   imports = [
     ./packages
     ./i18n.nix
@@ -39,7 +35,7 @@
         #   org.gradle.console=verbose
         #   org.gradle.daemon.idletimeout=3600000
         # '';
-        "${config.xdg.configHome}/user-dirs.dirs" = {
+        ".config/user-dirs.dirs" = {
           force = true;
           text = ''
             # This file is written by xdg-user-dirs-update
diff --git a/configurations/home-manager/leyla/impermanence.nix b/configurations/home-manager/leyla/impermanence.nix
index ceab775..29936b5 100644
--- a/configurations/home-manager/leyla/impermanence.nix
+++ b/configurations/home-manager/leyla/impermanence.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   osConfig,
   ...
 }: {
@@ -11,13 +10,13 @@
         "downloads"
         "documents"
         {
-          directory = "${config.xdg.dataHome}/Steam";
+          directory = ".local/share/Steam";
           method = "symlink";
         }
       ];
       files = [
         ".bash_history" # keep shell history around
-        "${config.xdg.dataHome}/recently-used.xbel" # gnome recently viewed files
+        ".local/share/recently-used.xbel" # gnome recently viewed files
       ];
       allowOther = true;
     };
diff --git a/modules/home-manager-modules/programs/anki.nix b/modules/home-manager-modules/programs/anki.nix
index 083d205..13e28c9 100644
--- a/modules/home-manager-modules/programs/anki.nix
+++ b/modules/home-manager-modules/programs/anki.nix
@@ -19,7 +19,7 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.dataHome}/Anki2/"
+            "~/.local/share/Anki2"
           ];
           allowOther = true;
         };
diff --git a/modules/home-manager-modules/programs/bitwarden.nix b/modules/home-manager-modules/programs/bitwarden.nix
index b9b91c4..0265488 100644
--- a/modules/home-manager-modules/programs/bitwarden.nix
+++ b/modules/home-manager-modules/programs/bitwarden.nix
@@ -19,7 +19,7 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.configHome}/Bitwarden"
+            "~/.config/Bitwarden"
           ];
           allowOther = true;
         };
diff --git a/modules/home-manager-modules/programs/bruno.nix b/modules/home-manager-modules/programs/bruno.nix
index 00b248f..3323e5b 100644
--- a/modules/home-manager-modules/programs/bruno.nix
+++ b/modules/home-manager-modules/programs/bruno.nix
@@ -19,7 +19,7 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.configHome}/bruno/"
+            "~/.config/bruno/"
           ];
           allowOther = true;
         };
diff --git a/modules/home-manager-modules/programs/calibre.nix b/modules/home-manager-modules/programs/calibre.nix
index 9e5f34e..c26cd5e 100644
--- a/modules/home-manager-modules/programs/calibre.nix
+++ b/modules/home-manager-modules/programs/calibre.nix
@@ -19,7 +19,7 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.configHome}/calibre"
+            "~/.config/calibre"
           ];
           allowOther = true;
         };
diff --git a/modules/home-manager-modules/programs/dbeaver.nix b/modules/home-manager-modules/programs/dbeaver.nix
index a962459..26dcc52 100644
--- a/modules/home-manager-modules/programs/dbeaver.nix
+++ b/modules/home-manager-modules/programs/dbeaver.nix
@@ -19,7 +19,7 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.dataHome}/DBeaverData/"
+            "~/.local/share/DBeaverData/"
           ];
           allowOther = true;
         };
diff --git a/modules/home-manager-modules/programs/discord.nix b/modules/home-manager-modules/programs/discord.nix
index e8605a5..a7cbb5f 100644
--- a/modules/home-manager-modules/programs/discord.nix
+++ b/modules/home-manager-modules/programs/discord.nix
@@ -19,7 +19,7 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.configHome}/discord/"
+            "~/.config/discord/"
           ];
           allowOther = true;
         };
diff --git a/modules/home-manager-modules/programs/idea.nix b/modules/home-manager-modules/programs/idea.nix
index f0a928c..f4edf12 100644
--- a/modules/home-manager-modules/programs/idea.nix
+++ b/modules/home-manager-modules/programs/idea.nix
@@ -20,11 +20,11 @@
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
             # configuration
-            "${config.xdg.configHome}/JetBrains/"
+            "~/.config/JetBrains/"
             # plugins
-            "${config.xdg.dataHome}/JetBrains/"
+            "~/.local/share/JetBrains/"
             # System and Logs
-            "${config.xdg.cacheHome}/JetBrains/"
+            "~/.cache/JetBrains/"
           ];
         };
       }
diff --git a/modules/home-manager-modules/programs/obsidian.nix b/modules/home-manager-modules/programs/obsidian.nix
index 4d28b3e..d2d9c77 100644
--- a/modules/home-manager-modules/programs/obsidian.nix
+++ b/modules/home-manager-modules/programs/obsidian.nix
@@ -9,7 +9,7 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.configHome}/obsidian"
+            ".config/obsidian"
           ];
         };
       }
diff --git a/modules/home-manager-modules/programs/prostudiomasters.nix b/modules/home-manager-modules/programs/prostudiomasters.nix
index 9e6088f..372cfc6 100644
--- a/modules/home-manager-modules/programs/prostudiomasters.nix
+++ b/modules/home-manager-modules/programs/prostudiomasters.nix
@@ -19,7 +19,7 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.configHome}/ProStudioMasters"
+            ".config/ProStudioMasters"
           ];
         };
       }
diff --git a/modules/home-manager-modules/programs/protonvpn.nix b/modules/home-manager-modules/programs/protonvpn.nix
index dd11aae..9a0ee65 100644
--- a/modules/home-manager-modules/programs/protonvpn.nix
+++ b/modules/home-manager-modules/programs/protonvpn.nix
@@ -19,8 +19,8 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.configHome}/protonvpn"
-            "${config.xdg.configHome}/Proton"
+            ".config/protonvpn"
+            ".config/Proton"
           ];
         };
       }
diff --git a/modules/home-manager-modules/programs/qbittorrent.nix b/modules/home-manager-modules/programs/qbittorrent.nix
index 02e23df..5d22c89 100644
--- a/modules/home-manager-modules/programs/qbittorrent.nix
+++ b/modules/home-manager-modules/programs/qbittorrent.nix
@@ -19,7 +19,7 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.configHome}/qBittorrent"
+            ".config/qBittorrent"
           ];
         };
       }
diff --git a/modules/home-manager-modules/programs/signal.nix b/modules/home-manager-modules/programs/signal.nix
index fdf0af9..d75b8a6 100644
--- a/modules/home-manager-modules/programs/signal.nix
+++ b/modules/home-manager-modules/programs/signal.nix
@@ -19,7 +19,7 @@
       lib.mkIf osConfig.host.impermanence.enable {
         home.persistence."/persist${config.home.homeDirectory}" = {
           directories = [
-            "${config.xdg.configHome}/Signal"
+            ".config/Signal"
           ];
         };
       }