use xdg.configFile

home-manager/machines.nix

@@ -8,7 +8,7 @@ let
     };
   makeAutostart = name:
     { config, ... }: {
-      config.home.file.".config/autostart/${name}.desktop".source =
+      config.xdg.configFile."autostart/${name}.desktop".source =
         "${config.home.path}/share/applications/${name}.desktop";
     };
   makeBlock = list:

home-manager/roles/accounting.nix

@@ -1,4 +1,4 @@
 { pkgs, ... }: {
-  home.file.".config/jali/config.py".source = pkgs.privateFile "jaliconfig.py";
+  xdg.configFile."jali/config.py".source = pkgs.privateFile "jaliconfig.py";
   home.packages = builtins.attrValues pkgs.accounting-pkgs;
 }

home-manager/roles/beets.nix

@@ -1,5 +1,5 @@
 { pkgs, config, ... }: {
-  home.file.".config/beets/config.yaml".text = builtins.toJSON {
+  xdg.configFile."beets/config.yaml".text = builtins.toJSON {
     directory = config.services.mpd.musicDirectory;
     import.move = true;
     paths = {

home-manager/roles/kassandra.nix

@@ -26,11 +26,8 @@ let
   '';
 in
 {
-  home.file =
+  xdg.configFile =
     if pkgs.withSecrets then {
-      "kassandra-config" = {
-        target = ".config/kassandra";
-        source = dhallResult.out;
-      };
+      kassandra.source = dhallResult.out;
     } else { };
 }

home-manager/roles/khal.nix

@@ -3,17 +3,17 @@ let
   calendars = pkgs.privateValue [ ] "calendars";
 in
 {
-  home = {
-    packages = [ pkgs.khal ];
-    file.".config/khal/config".text = ''
+  home.packages = [ pkgs.khal ];
+  xdg.configFile."khal/config".text = ''
       [default]
       default_calendar = Standard
       [calendars]
-      ${pkgs.lib.concatMapStringsSep "\n" ({name, readOnly ? false, ...}:''
+      ${pkgs.lib.concatMapStringsSep "\n" (
+      { name, readOnly ? false, ... }: ''
         [[${name}]]
         type = discover
         path = ~/.calendars/${name}/*
-        readonly = ${if readOnly then "True" else "False"}'') calendars}
-    '';
-  };
+        readonly = ${if readOnly then "True" else "False"}''
+    ) calendars}
+  '';
 }

home-manager/roles/khard.nix

@@ -1,14 +1,12 @@
 { pkgs, ... }: {
-  home = {
-    packages = [ pkgs.khard ];
-    file.".config/khard/khard.conf".text = ''
-      [addressbooks]
-      [[Kontakte]]
-      path = ~/.contacts/nextcloud/Kontakte
+  home.packages = [ pkgs.khard ];
+  xdg.configFile."khard/khard.conf".text = ''
+    [addressbooks]
+    [[Kontakte]]
+    path = ~/.contacts/nextcloud/Kontakte
 
-      [general]
-      debug = no
-      default_action = list
-    '';
-  };
+    [general]
+    debug = no
+    default_action = list
+  '';
 }

home-manager/roles/neovim/default.nix

@@ -85,8 +85,8 @@ in
         ;
     };
   };
+  xdg.configFile."nvim/coc-settings.json".text = builtins.toJSON cocSettings;
   home = {
-    file.".config/nvim/coc-settings.json".text = builtins.toJSON cocSettings;
     packages = [ pkgs.neuron-language-server ];
     sessionVariables.EDITOR = "nvim";
   };

home-manager/roles/vdirsyncer.nix

@@ -33,11 +33,13 @@ let
       "storage ${remoteName}" = {
         inherit type;
         inherit url;
-      } // (if (type == "caldav") then {
-        inherit username;
-        "password.fetch" = [ "command" "${pkgs.pass}/bin/pass" passwordPath ];
-        read_only = readOnly;
-      } else { });
+      } // (
+        if (type == "caldav") then {
+          inherit username;
+          "password.fetch" = [ "command" "${pkgs.pass}/bin/pass" passwordPath ];
+          read_only = readOnly;
+        } else { }
+      );
     };
   mkAddressbook = { name, url, username, passwordPath, collections ? [ "from a" "from b" ], readOnly ? false }:
     let
@@ -66,17 +68,15 @@ let
     };
 in
 {
-  home = {
-    packages = [ pkgs.vdirsyncer ];
-    file.".config/vdirsyncer/config".source = mkConfig
-      (
-        pkgs.lib.fold (a: b: a // b)
-          {
-            general.status_path = "~/.vdirsyncer/status";
-          }
-          (map mkCalendar calendars ++ map mkAddressbook addressbooks)
-      );
-  };
+  xdg.configFile."vdirsyncer/config".source = mkConfig
+    (
+      pkgs.lib.fold (a: b: a // b)
+        {
+          general.status_path = "~/.vdirsyncer/status";
+        }
+        (map mkCalendar calendars ++ map mkAddressbook addressbooks)
+    );
+  home.packages = [ pkgs.vdirsyncer ];
 
   systemd.user = {
     services.vdirsyncer = {