From 11c8400ec37f88767f7f6d1454276e51493b1bf0 Mon Sep 17 00:00:00 2001
From: Tim Keller <tjkeller.xyz>
Date: Sun, 9 Feb 2025 23:30:22 -0600
Subject: cleanup a bit

---
 modules/home/firefox.nix            | 8 ++------
 modules/home/gtk-bookmarks.nix      | 8 ++++----
 modules/home/initial-home-setup.nix | 4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'modules/home')

diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix
index 34ae636..9d4bb4e 100644
--- a/modules/home/firefox.nix
+++ b/modules/home/firefox.nix
@@ -1,10 +1,7 @@
 { pkgs, userDetails, ... }: {
 	programs.firefox = {
-		# TODO see if there is way to login to moz account in profile
 		enable = true;
-		arkenfox = {
-			enable = true;
-		};
+		arkenfox.enable = true;
 		profiles = let
 			search = {
 				engines = {
@@ -53,7 +50,7 @@
 
 				"app.normandy.first_run" = false;
 				"browser.aboutConfig.showWarning" = false;  # arkenfox does
-				"browser.download.dir" = userDetails.home.downloads;  # FF will create this dir if it doesn't exist
+				"browser.download.dir" = userDetails.home.downloads;
 				"browser.newtabpage.activity-stream.feeds.section.topstories" = false;
 				"browser.newtabpage.activity-stream.feeds.topsites" = false;
 				"browser.urlbar.suggest.topsites" = false;
@@ -61,7 +58,6 @@
 				"dom.push.enabled" = false;  #
 				"extensions.pocket.enabled" = false;
 				"general.smoothScroll" = false;
-				#identity.fxaccounts.account.device.name = "timmy’s Firefox on nixos";  # HOSTNAME
 			};
 			workSettings = settings // {
 				"extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";  # Use builtin dark theme instead of system theme
diff --git a/modules/home/gtk-bookmarks.nix b/modules/home/gtk-bookmarks.nix
index 067543d..e6c1ec7 100644
--- a/modules/home/gtk-bookmarks.nix
+++ b/modules/home/gtk-bookmarks.nix
@@ -8,10 +8,10 @@
 	};
 
 	config = {
-		gtk.gtk3.bookmarks = with userDetails; [
-			"file://${home.downloads} Downloads"
-			"file://${home.documents} Documents"
-			"file://${home.pictures} Pictures"
+		gtk.gtk3.bookmarks = with userDetails.home; [
+			"file://${downloads} Downloads"
+			"file://${documents} Documents"
+			"file://${pictures} Pictures"
 		] ++ config.additional-gtk-bookmarks;
 	};
 }
diff --git a/modules/home/initial-home-setup.nix b/modules/home/initial-home-setup.nix
index 046f5a5..6aa6ac7 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 = lib.hm.dag.entryAfter ["writeBoundary"] ''
-			run mkdir -p $VERBOSE_ARG "${userDetails.home.downloads}"
+		createDirs = with userDetails.home; lib.hm.dag.entryAfter ["writeBoundary"] ''
+			run mkdir -p $VERBOSE_ARG "${downloads}" "${documents}" "${pictures}"
 		'';
 	};
 }
-- 
cgit v1.2.3