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.

2 files changed, 21 insertions, 35 deletions

diff --git a/users/fcuny/configs/mpd/mpd.conf b/users/fcuny/configs/mpd/mpd.conf
deleted file mode 100644
index c7e9b3b..0000000
--- a/users/fcuny/configs/mpd/mpd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-playlist_directory  "~/.config/mpd/playlists"
-db_file	            "~/.config/mpd/database"
-sticker_file        "~/.config/mpd/sticker.sql"
-music_directory     "~/media/music"
-
-auto_update "yes"
-
-filesystem_charset "UTF-8"
-
-input {
-  plugin "curl"
-}
-
-audio_output {
-  type "pipewire"
-  name "PipeWire Sound Server"
-}
-
-audio_output {
-  type   "fifo"
-  name   "visualizer"
-  path   "/tmp/mpd.fifo"
-  format "44100:16:2"
-}
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";
+    };
   };
 }