From ce1d40f6a275904a82dcebd781a6fef0926f7e60 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Fri, 21 Mar 2025 13:29:23 +0100
Subject: [PATCH] got manwe'a shell back up and running again

---
 hosts/manwe/users/chris/default.nix | 1 +
 hosts/orome/users/chris/default.nix | 1 +
 lib/user.nix                        | 2 +-
 modules/home/shell/default.nix      | 1 +
 modules/home/shell/toolset/git.nix  | 6 +++---
 modules/home/user.nix               | 7 +++++++
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/hosts/manwe/users/chris/default.nix b/hosts/manwe/users/chris/default.nix
index d7a2866..6c85330 100644
--- a/hosts/manwe/users/chris/default.nix
+++ b/hosts/manwe/users/chris/default.nix
@@ -2,6 +2,7 @@
 {
   user = {
     full_name = "Chris Kruining";
+    email = "chris@kruining.eu";
     is_trusted = true;
   };
 
diff --git a/hosts/orome/users/chris/default.nix b/hosts/orome/users/chris/default.nix
index 770e763..951ea48 100644
--- a/hosts/orome/users/chris/default.nix
+++ b/hosts/orome/users/chris/default.nix
@@ -2,6 +2,7 @@
 {
   user = {
     full_name = "Chris Kruining";
+    email = "chris@kruining.eu";
     is_trusted = true;
   };
 
diff --git a/lib/user.nix b/lib/user.nix
index 443a28e..b2dcc00 100644
--- a/lib/user.nix
+++ b/lib/user.nix
@@ -23,7 +23,7 @@ in rec
       # imports = (mapModulesRec' ../modules/home (file: import file (args // { user = name; })));
       home = {
         inherit stateVersion;
-        sessionPath = [ "$SNEEUWVLOK_BIN" "$XDG_BIN_HOME" "$PATH" ]; # Pretty sure I don't need this.
+        sessionPath = [ "$XDG_BIN_HOME" "$PATH" ]; # Pretty sure I don't need this.
       };
     };
 }
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index 4b252c8..a1ea44b 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -33,6 +33,7 @@ in
         tmux.enable = true;
         yazi.enable = true;
         eza.enable = true;
+        git.enable = true;
       };
 
       home-manager.users.${user} = {
diff --git a/modules/home/shell/toolset/git.nix b/modules/home/shell/toolset/git.nix
index 13ca66e..fa920f5 100644
--- a/modules/home/shell/toolset/git.nix
+++ b/modules/home/shell/toolset/git.nix
@@ -80,9 +80,9 @@ in
           credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret";
 
           user = {
-            name = "Chris Kruining";
-            email = "chris@kruining.eu";
-            signingKey = readFile "${config.user.home}/.ssh/id_rsa.pub";
+            name = config.modules.${user}.user.full_name;
+            email = config.modules.${user}.user.email;
+            signingKey = "~/.ssh/id_rsa.pub";
           };
 
           gpg.format = "ssh";
diff --git a/modules/home/user.nix b/modules/home/user.nix
index b1f7822..c746631 100644
--- a/modules/home/user.nix
+++ b/modules/home/user.nix
@@ -17,6 +17,13 @@ in
         description = "Full name of the user, this is used as the kde plasma display name for example";
     };
 
+    email = mkOption {
+        type = nullOr str;
+        default = null;
+        example = "name@domain.tld";
+        description = "user's email address";
+    };
+
     is_trusted = mkOption {
         type = bool;
         default = false;