diff --git a/modules/hjem-ctp/fcitx5.nix b/modules/hjem-ctp/fcitx5.nix
index 1537b50..f2084a5 100644
--- a/modules/hjem-ctp/fcitx5.nix
+++ b/modules/hjem-ctp/fcitx5.nix
@@ -19,10 +19,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    files.".local/share/fcitx5/themes/catppuccin-${cfg.flavor}-${cfg.accent}".source =
+    xdg.data.files."fcitx5/themes/catppuccin-${cfg.flavor}-${cfg.accent}".source =
       "${finalPackage}/share/fcitx5/themes/catppuccin-${cfg.flavor}-${cfg.accent}";
 
-    files.".config/fcitx5/conf/classicui.conf".source = format.generate "fcitx5-classicui.conf" {
+    xdg.config.files."fcitx5/conf/classicui.conf".source = format.generate "fcitx5-classicui.conf" {
       globalSection = {
         Theme = "catppuccin-${cfg.flavor}-${cfg.accent}";
       };
diff --git a/modules/hjem-ctp/fish.nix b/modules/hjem-ctp/fish.nix
index 3441d02..c0244ef 100644
--- a/modules/hjem-ctp/fish.nix
+++ b/modules/hjem-ctp/fish.nix
@@ -21,7 +21,7 @@ in
   options.ctp.fish = ctp-lib.mkCatppuccinOptions "Fish" { };
 
   config = lib.mkIf cfg.enable {
-    files.".config/fish/themes/${themeName}.theme".source = "${src}/themes/${themeName}.theme";
+    xdg.config.files."fish/themes/${themeName}.theme".source = "${src}/themes/${themeName}.theme";
 
     rum.programs.fish.earlyConfigFiles.ctp-fish = ''
       fish_config theme choose "${themeName}"
diff --git a/modules/hjem-ctp/wleave.nix b/modules/hjem-ctp/wleave.nix
index 798a042..1dd7037 100644
--- a/modules/hjem-ctp/wleave.nix
+++ b/modules/hjem-ctp/wleave.nix
@@ -38,7 +38,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    files.".config/wleave/style.css".source = pkgs.concatText "wleave-style.css" [
+    xdg.config.files."wleave/style.css".source = pkgs.concatText "wleave-style.css" [
       "${src}/themes/${cfg.flavor}/${cfg.accent}.css"
       (pkgs.writeText "wleave-icons.css" iconsCss)
     ];
diff --git a/modules/hjem-ext/programs/direnv.nix b/modules/hjem-ext/programs/direnv.nix
index 25b7fa3..20200e0 100644
--- a/modules/hjem-ext/programs/direnv.nix
+++ b/modules/hjem-ext/programs/direnv.nix
@@ -25,7 +25,7 @@ in
       ${lib.getExe cfg.package} hook fish | source
     '';
 
-    files.".config/direnv/lib/hm-nix-direnv.sh".source =
+    xdg.config.files."direnv/lib/hm-nix-direnv.sh".source =
       lib.mkIf cfg.nix-direnv.enable "${cfg.nix-direnv.package}/share/nix-direnv/direnvrc";
   };
 }
diff --git a/modules/hjem-ext/programs/hyfetch.nix b/modules/hjem-ext/programs/hyfetch.nix
index 0353b7f..b7ab30a 100644
--- a/modules/hjem-ext/programs/hyfetch.nix
+++ b/modules/hjem-ext/programs/hyfetch.nix
@@ -39,6 +39,6 @@ in
       ++ lib.optional (cfg.settings.backend == "neofetch") pkgs.neofetch;
     # TODO: add qwqfetch when it's added to nixpkgs
 
-    files.".config/hyfetch.json".source = lib.mkIf (cfg.settings != { }) configFile;
+    xdg.config.files."hyfetch.json".source = lib.mkIf (cfg.settings != { }) configFile;
   };
 }
diff --git a/modules/hjem-ext/programs/jujutsu.nix b/modules/hjem-ext/programs/jujutsu.nix
index 3f1cec5..781940b 100644
--- a/modules/hjem-ext/programs/jujutsu.nix
+++ b/modules/hjem-ext/programs/jujutsu.nix
@@ -23,7 +23,7 @@ in
 
   config = lib.mkIf cfg.enable {
     packages = [ cfg.package ];
-    files.".config/jj/config.toml".source = lib.mkIf (cfg.settings != { }) (
+    xdg.config.files."jj/config.toml".source = lib.mkIf (cfg.settings != { }) (
       format.generate "jj-config.toml" cfg.settings
     );
   };
diff --git a/modules/hjem-ext/programs/swayosd.nix b/modules/hjem-ext/programs/swayosd.nix
index 0305e25..eeb24e3 100644
--- a/modules/hjem-ext/programs/swayosd.nix
+++ b/modules/hjem-ext/programs/swayosd.nix
@@ -30,9 +30,11 @@ in
   config = lib.mkIf cfg.enable {
     packages = [ cfg.package ];
 
-    files.".config/swayosd/config.toml".source = lib.mkIf (cfg.settings != { }) (
-      format.generate "swayosd-config.toml" cfg.settings
-    );
-    files.".config/swayosd/style.css".source = lib.mkIf (cfg.style != null) cfg.style;
+    xdg.config.files = {
+      "swayosd/config.toml".source = lib.mkIf (cfg.settings != { }) (
+        format.generate "swayosd-config.toml" cfg.settings
+      );
+      "swayosd/style.css".source = lib.mkIf (cfg.style != null) cfg.style;
+    };
   };
 }
diff --git a/modules/hjem-ext/programs/vesktop.nix b/modules/hjem-ext/programs/vesktop.nix
index cfb4c41..6321ab1 100644
--- a/modules/hjem-ext/programs/vesktop.nix
+++ b/modules/hjem-ext/programs/vesktop.nix
@@ -56,15 +56,15 @@ in
       })
     ];
 
-    files =
+    xdg.config.files =
       {
-        ".config/vesktop/settings.json".source = format.generate "vesktop-settings.json" cfg.settings;
+        "vesktop/settings.json".source = format.generate "vesktop-settings.json" cfg.settings;
       }
       // lib.optionalAttrs cfg.vencord.enable {
-        ".config/vesktop/settings/settings.json".source =
+        "vesktop/settings/settings.json".source =
           format.generate "vencord-settings.json" cfg.vencord.settings;
 
-        ".config/vesktop/settings/quickCss.css".text = cfg.vencord.css;
+        "vesktop/settings/quickCss.css".text = cfg.vencord.css;
       };
   };
 }
diff --git a/users/leah/presets/niri/default.nix b/users/leah/presets/niri/default.nix
index ec53f8d..277e899 100644
--- a/users/leah/presets/niri/default.nix
+++ b/users/leah/presets/niri/default.nix
@@ -34,10 +34,11 @@
       resources
     ];
 
-    files.".config/niri/config.kdl".source = ./config.kdl;
-
-    files.".config/swaync/style.css".source = ./swaync/style.css;
-    files.".config/swaync/config.json".source = ./swaync/config.json;
+    xdg.config.files = {
+      "niri/config.kdl".source = ./config.kdl;
+      "swaync/style.css".source = ./swaync/style.css;
+      "swaync/config.json".source = ./swaync/config.json;
+    };
   };
 
   hjem.users.leah.rum.programs.fuzzel = {
diff --git a/users/leah/presets/niri/waybar/default.nix b/users/leah/presets/niri/waybar/default.nix
index ccae753..8b90eaa 100644
--- a/users/leah/presets/niri/waybar/default.nix
+++ b/users/leah/presets/niri/waybar/default.nix
@@ -10,7 +10,9 @@ in
   hjem.users.leah = {
     packages = [ pkgs.waybar ];
 
-    files.".config/waybar/style.css".source = ./style.css;
-    files.".config/waybar/config.jsonc".source = jsonFormat.generate "waybar-config.jsonc" config;
+    xdg.config.files = {
+      "waybar/style.css".source = ./style.css;
+      "waybar/config.jsonc".source = jsonFormat.generate "waybar-config.jsonc" config;
+    };
   };
 }
diff --git a/users/leah/programs/fcitx5.nix b/users/leah/programs/fcitx5.nix
index 92761f5..32ebd01 100644
--- a/users/leah/programs/fcitx5.nix
+++ b/users/leah/programs/fcitx5.nix
@@ -27,15 +27,15 @@ in
     ];
   };
 
-  hjem.users.leah.files = {
-    ".local/share/fcitx5/rime/default.custom.yaml".source = yaml.generate "default.yaml" {
+  hjem.users.leah.xdg.data.files = {
+    "fcitx5/rime/default.custom.yaml".source = yaml.generate "default.yaml" {
       patch.schema_list = [
         { schema = "luna_pinyin_simp"; }
         { schema = "luna_pinyin"; }
       ];
     };
-    ".local/share/fcitx5/rime/luna_pinyin.custom.yaml".source = luna_pinyin;
-    ".local/share/fcitx5/rime/luna_pinyin_simp.custom.yaml".source = luna_pinyin;
+    "fcitx5/rime/luna_pinyin.custom.yaml".source = luna_pinyin;
+    "fcitx5/rime/luna_pinyin_simp.custom.yaml".source = luna_pinyin;
   };
 
 }
diff --git a/users/leah/programs/fish.nix b/users/leah/programs/fish.nix
index 7e388c8..05ee1a3 100644
--- a/users/leah/programs/fish.nix
+++ b/users/leah/programs/fish.nix
@@ -28,5 +28,5 @@
     '';
   };
 
-  hjem.users.leah.files.".config/starship.toml".source = ./starship.toml;
+  hjem.users.leah.xdg.config.files."starship.toml".source = ./starship.toml;
 }
diff --git a/users/leah/programs/ghostty.nix b/users/leah/programs/ghostty.nix
index 1a584e9..8f4d6cd 100644
--- a/users/leah/programs/ghostty.nix
+++ b/users/leah/programs/ghostty.nix
@@ -9,7 +9,7 @@
 
   hjem.users.leah.rum.programs.ghostty = {
     enable = true;
-    package = inputs.ghostty.packages.${pkgs.system}.default;
+    package = inputs.ghostty.packages.${pkgs.system}.ghostty;
 
     settings = {
       font-family = "Iosevka";
diff --git a/users/leah/programs/helix.nix b/users/leah/programs/helix.nix
index 4e0bdd2..a9834ba 100644
--- a/users/leah/programs/helix.nix
+++ b/users/leah/programs/helix.nix
@@ -3,8 +3,11 @@
     environment.sessionVariables.EDITOR = "hx";
 
     # TODO: upstream this
-    files.".config/helix/ignore".text = ''
+    xdg.config.files."helix/ignore".text = ''
       flake.lock
+      result/
+      zig-out/
+      .zig-cache/
     '';
 
     rum.programs.helix = {