From 1969493257f4644c3b105b3fc2c82a445a2ae664 Mon Sep 17 00:00:00 2001
From: Tim Keller <tjkeller.xyz>
Date: Mon, 5 May 2025 13:25:38 -0500
Subject: use xdg-userdirs functionality

---
 modules/home/default.nix            |  3 ++-
 modules/home/firefox.nix            |  2 +-
 modules/home/gtk-bookmarks.nix      | 10 +++++-----
 modules/home/initial-home-setup.nix |  4 ++--
 modules/home/userdirs.nix           |  5 +++++
 5 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 modules/home/userdirs.nix

(limited to 'modules/home')

diff --git a/modules/home/default.nix b/modules/home/default.nix
index 8748fb9..c6278f2 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,7 +1,7 @@
 { lib, userDetails, homeStateVersion, ... }: {
 	home = {
 		username = userDetails.username;
-		homeDirectory = userDetails.home.root;
+		homeDirectory = userDetails.home;
 		stateVersion = homeStateVersion;
 	};
 
@@ -14,6 +14,7 @@
 		./initial-home-setup.nix
 		./pcmanfm.nix  # TODO mk name changeable & doesn't seem to work right now
 		./theme.nix
+		./userdirs.nix
 		./wallpapers.nix
 	];
 
diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix
index 000277f..30fd08a 100644
--- a/modules/home/firefox.nix
+++ b/modules/home/firefox.nix
@@ -50,7 +50,7 @@
 
 				"app.normandy.first_run" = false;
 				"browser.aboutConfig.showWarning" = false;  # arkenfox does
-				"browser.download.dir" = userDetails.home.downloads;
+				#"browser.download.dir" = userDetails.userDirs.downloads;
 				"browser.newtabpage.activity-stream.feeds.section.topstories" = false;
 				"browser.newtabpage.activity-stream.feeds.topsites" = false;
 				"browser.urlbar.suggest.topsites" = false;
diff --git a/modules/home/gtk-bookmarks.nix b/modules/home/gtk-bookmarks.nix
index e6c1ec7..24c6563 100644
--- a/modules/home/gtk-bookmarks.nix
+++ b/modules/home/gtk-bookmarks.nix
@@ -8,10 +8,10 @@
 	};
 
 	config = {
-		gtk.gtk3.bookmarks = with userDetails.home; [
-			"file://${downloads} Downloads"
-			"file://${documents} Documents"
-			"file://${pictures} Pictures"
-		] ++ config.additional-gtk-bookmarks;
+		gtk.gtk3.bookmarks = (
+			lib.mapAttrsToList (name: path:
+				"file://${path} ${lib.toUpper (lib.substring 0 1 name)}${lib.substring 1 (-1) name}"
+			) userDetails.userDirs
+		) ++ config.additional-gtk-bookmarks;
 	};
 }
diff --git a/modules/home/initial-home-setup.nix b/modules/home/initial-home-setup.nix
index 6aa6ac7..4132386 100644
--- a/modules/home/initial-home-setup.nix
+++ b/modules/home/initial-home-setup.nix
@@ -15,8 +15,8 @@
 			export PATH="$HOME/.local/bin/misc:$PATH"
 			run mimewiz -i # already verbose
 		'';
-		createDirs = with userDetails.home; lib.hm.dag.entryAfter ["writeBoundary"] ''
-			run mkdir -p $VERBOSE_ARG "${downloads}" "${documents}" "${pictures}"
+		createDirs = lib.hm.dag.entryAfter ["writeBoundary"] ''
+			run mkdir -p $VERBOSE_ARG ${ lib.concatStringsSep " " (lib.attrValues userDetails.userDirs) }
 		'';
 	};
 }
diff --git a/modules/home/userdirs.nix b/modules/home/userdirs.nix
new file mode 100644
index 0000000..58c1d59
--- /dev/null
+++ b/modules/home/userdirs.nix
@@ -0,0 +1,5 @@
+{ userDetails, ... }: {
+	xdg.userDirs = {
+		enable = true;
+	} // userDetails.userDirs;
+}
-- 
cgit v1.2.3