From 3a2f7149438007a7f5909b052329bdc2c6caaf13 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 5 Jul 2023 22:34:20 +0200 Subject: [PATCH] cli: Put name and email into a record --- home/cli.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/home/cli.nix b/home/cli.nix index ffeb20c..0969589 100644 --- a/home/cli.nix +++ b/home/cli.nix @@ -2,9 +2,11 @@ # minimal config, suitable for servers let - myUser = "alex"; - myName = "Alexander Kobjolke"; - myMail = "me@failco.de"; + user = { + name = "alex"; + fullName = "Alexander Kobjolke"; + mail = "me@failco.de"; + }; in { imports = [ # shell config @@ -13,8 +15,8 @@ in { programs.home-manager.enable = true; home = { - username = myUser; - homeDirectory = "/home/${myUser}"; + username = user.name; + homeDirectory = "/home/${config.home.username}"; stateVersion = "21.05"; sessionPath = [ "$HOME/.local/bin" "$HOME/.emacs.d/bin" ]; shellAliases = { @@ -96,9 +98,9 @@ in { target = "pijul/config.toml"; text = '' [author] - name = "${myUser}" - full_name = "${myName}" - email = "${myMail}" + name = "${user.name}" + full_name = "${user.fullName}" + email = "${user.mail}" ''; }; @@ -140,8 +142,8 @@ in { git = { enable = true; ignores = [ "*~" "*.swp" "result" "dist-newstyle" ]; - userEmail = myMail; - userName = myName; + userEmail = user.mail; + userName = user.fullName; aliases = { st = "status"; }; extraConfig = { init.defaultBranch = "main"; }; };