From 2720ea4a2988b449de8aeedb4e173eb1f0900719 Mon Sep 17 00:00:00 2001 From: Tim Keller Date: Wed, 2 Oct 2024 22:54:57 -0500 Subject: userDetails added etc --- modules/home/default.nix | 6 +++--- modules/home/firefox.nix | 11 ++--------- modules/home/git.nix | 6 +++--- 3 files changed, 8 insertions(+), 15 deletions(-) (limited to 'modules/home') diff --git a/modules/home/default.nix b/modules/home/default.nix index bce93ba..e60bbff 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,7 +1,7 @@ -{ lib, ... }: { +{ lib, userDetails, ... }: { home = { - username = "timmy"; - homeDirectory = "/home/timmy"; + username = userDetails.username; + homeDirectory = userDetails.home.root; stateVersion = "24.05"; }; diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix index 3ae1278..0977bbe 100644 --- a/modules/home/firefox.nix +++ b/modules/home/firefox.nix @@ -1,4 +1,4 @@ -{ +{ userDetails, ... }: { programs.firefox = { # TODO see if there is way to login to moz account in profile enable = true; @@ -28,7 +28,7 @@ "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "browser.compactmode.show" = true; "browser.uidensity" = 1; # Compact - "browser.download.dir" = /home/timmy/dls; # FF will create this dir if it doesn't exist + "browser.download.dir" = userDetails.home.downloads; # FF will create this dir if it doesn't exist "browser.aboutConfig.showWarning" = false; # arkenfox does "app.normandy.first_run" = false; "browser.uiCustomization.state" = builtins.readFile ./resources/firefox/uiCustomization.json; # Toolbar etc. @@ -51,13 +51,6 @@ id = 1; inherit search; }; - Test = { - id = 2; - inherit search; - inherit arkenfox; - inherit userChrome; - inherit settings; - }; }; }; } diff --git a/modules/home/git.nix b/modules/home/git.nix index e1a36c3..9d15a90 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -1,7 +1,7 @@ -{ +{ userDetails, ... }: { programs.git = { enable = true; - userName = "Tim Keller"; # TODO set to user description - userEmail = "tjk@tjkeller.xyz"; # TODO set to user email + userName = userDetails.fullname; + userEmail = userDetails.email; }; } -- cgit v1.2.3