From de49dd14573485bb825e5438989ff39518b47d75 Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@cock.li>
Date: Wed, 14 Feb 2024 21:14:14 +0100
Subject: [PATCH] use hm for xdg dirs

---
 hosts/niks/configuration.nix |  5 ---
 modules/other/xdg.nix        | 86 +++++++++++++++++++-----------------
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix
index 3202cf8c..5a9c799f 100644
--- a/hosts/niks/configuration.nix
+++ b/hosts/niks/configuration.nix
@@ -153,11 +153,6 @@
             MOZ_ENABLE_WAYLAND = "1";
             MOZ_DRM_DEVICE = "/dev/dri/card0";
 
-            XDG_DATA_HOME = "\$HOME/.local/share";
-            XDG_CONFIG_HOME = "\$HOME/.config";
-            XDG_STATE_HOME = "\$HOME/.local/state";
-            XDG_CACHE_HOME = "\$HOME/.cache";
-
             HISTFILE = "\${XDG_STATE_HOME}/bash/history";
             CARGO_HOME = "\${XDG_DATA_HOME}/cargo";
             GTK2_RC_FILES = "\${XDG_CONFIG_HOME}/gtk-2.0/gtkrc";
diff --git a/modules/other/xdg.nix b/modules/other/xdg.nix
index a986d513..a023df74 100644
--- a/modules/other/xdg.nix
+++ b/modules/other/xdg.nix
@@ -11,46 +11,52 @@
     text_editor = "nvim.desktop";
 in {
     home-manager.users.${config'.username} = {
-        xdg.mimeApps = {
-            enable = true;
-            defaultApplications = {
-                "text/html" = [ primary_browser secondary_browser ];
-                "x-scheme-handler/http" = [ primary_browser secondary_browser ];
-                "x-scheme-handler/https" = [ primary_browser secondary_browser ];
-                "x-scheme-handler/about" = [ primary_browser secondary_browser ];
-                "x-scheme-handler/unknown" = [ primary_browser secondary_browser ];
-                "x-scheme-handler/mailto" = [ mail_client ];
-                "message/rfc822" = [ mail_client ];
-                "x-scheme-handler/mid" = [ mail_client ];
-                "inode/directory" = [ file_manager ];
-                "x-scheme-handler/heroic" = [ "heroic.desktop" ];
-                "audio/mp3" = [ media_player ];
-                "audio/ogg" = [ media_player ];
-                "audio/mpeg" = [ media_player ];
-                "audio/aac" = [ media_player ];
-                "audio/opus" = [ media_player ];
-                "audio/wav" = [ media_player ];
-                "audio/webm" = [ media_player ];
-                "audio/3gpp" = [ media_player ];
-                "audio/3gpp2" = [ media_player ];
-                "video/mp4" = [ media_player ];
-                "video/x-msvideo" = [ media_player ];
-                "video/mpeg" = [ media_player ];
-                "video/ogg" = [ media_player ];
-                "video/mp2t" = [ media_player ];
-                "video/webm" = [ media_player ];
-                "video/3gpp" = [ media_player ];
-                "video/3gpp2" = [ media_player ];
-                "image/png" = [ image_viewer ];
-                "image/jpeg" = [ image_viewer ];
-                "image/gif" = [ image_viewer ];
-                "image/avif" = [ image_viewer ];
-                "image/bmp" = [ image_viewer ];
-                "image/vnd.microsoft.icon" = [ image_viewer ];
-                "image/svg+xml" = [ image_viewer ];
-                "image/tiff" = [ image_viewer ];
-                "image/webp" = [ image_viewer ];
-                "text/plain" = [ text_editor ];
+        xdg = {
+            cacheHome = "~/.cache";
+            configHome = "~/.config";
+            dataHome = "~/.local/share";
+            stateHome = "~/.local/state";
+            mimeApps = {
+                enable = true;
+                defaultApplications = {
+                    "text/html" = [ primary_browser secondary_browser ];
+                    "x-scheme-handler/http" = [ primary_browser secondary_browser ];
+                    "x-scheme-handler/https" = [ primary_browser secondary_browser ];
+                    "x-scheme-handler/about" = [ primary_browser secondary_browser ];
+                    "x-scheme-handler/unknown" = [ primary_browser secondary_browser ];
+                    "x-scheme-handler/mailto" = [ mail_client ];
+                    "message/rfc822" = [ mail_client ];
+                    "x-scheme-handler/mid" = [ mail_client ];
+                    "inode/directory" = [ file_manager ];
+                    "x-scheme-handler/heroic" = [ "heroic.desktop" ];
+                    "audio/mp3" = [ media_player ];
+                    "audio/ogg" = [ media_player ];
+                    "audio/mpeg" = [ media_player ];
+                    "audio/aac" = [ media_player ];
+                    "audio/opus" = [ media_player ];
+                    "audio/wav" = [ media_player ];
+                    "audio/webm" = [ media_player ];
+                    "audio/3gpp" = [ media_player ];
+                    "audio/3gpp2" = [ media_player ];
+                    "video/mp4" = [ media_player ];
+                    "video/x-msvideo" = [ media_player ];
+                    "video/mpeg" = [ media_player ];
+                    "video/ogg" = [ media_player ];
+                    "video/mp2t" = [ media_player ];
+                    "video/webm" = [ media_player ];
+                    "video/3gpp" = [ media_player ];
+                    "video/3gpp2" = [ media_player ];
+                    "image/png" = [ image_viewer ];
+                    "image/jpeg" = [ image_viewer ];
+                    "image/gif" = [ image_viewer ];
+                    "image/avif" = [ image_viewer ];
+                    "image/bmp" = [ image_viewer ];
+                    "image/vnd.microsoft.icon" = [ image_viewer ];
+                    "image/svg+xml" = [ image_viewer ];
+                    "image/tiff" = [ image_viewer ];
+                    "image/webp" = [ image_viewer ];
+                    "text/plain" = [ text_editor ];
+                };
             };
         };
     };