From d9ee773c65eabb76334aa5deaa71579e46fd5065 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Wed, 16 Feb 2022 17:44:12 -0800
Subject: xdg: use actual home directory path

Don't use `$HOME`, otherwise when calling `config.xdg-dir.music` in
other modules, they can complain that the value is not an absolute path.
---
 users/fcuny/desktop/xdg.nix | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'users/fcuny/desktop')

diff --git a/users/fcuny/desktop/xdg.nix b/users/fcuny/desktop/xdg.nix
index 7390811..44a5ce1 100644
--- a/users/fcuny/desktop/xdg.nix
+++ b/users/fcuny/desktop/xdg.nix
@@ -1,18 +1,28 @@
 { config, lib, pkgs, ... }:
 
 {
-  xdg.enable = true;
+  home.packages = [
+    pkgs.xdg-user-dirs
+  ];
 
-  xdg.userDirs = {
+  xdg = {
     enable = true;
-    createDirectories = true;
-    desktop = "\$HOME/documents";
-    documents = "\$HOME/documents";
-    download = "\$HOME/downloads";
-    music = "\$HOME/media/music";
-    pictures = "\$HOME/media/pictures";
-    publicShare = "\$HOME/documents/public";
-    templates = "\$HOME/documents/templates";
-    videos = "\$HOME/media/videos";
+
+    mimeApps = {
+      enable = true;
+    };
+
+    userDirs = {
+      enable = true;
+      createDirectories = true;
+      desktop = "${config.home.homeDirectory}/documents";
+      documents = "${config.home.homeDirectory}/documents";
+      download = "${config.home.homeDirectory}/downloads";
+      music = "${config.home.homeDirectory}/media/music";
+      pictures = "${config.home.homeDirectory}/media/pictures";
+      publicShare = "${config.home.homeDirectory}/documents/public";
+      templates = "${config.home.homeDirectory}/documents/templates";
+      videos = "${config.home.homeDirectory}/media/videos";
+    };
   };
 }
-- 
cgit v1.2.3