secrets

home-manager/nathan/programs/git/default.nix

@@ -7,17 +7,21 @@
 
     config = lib.mkIf config.homeconfig.git.enable {
 
-        #sops.secrets."git/username" = {};
-        #sops.secrets."git/email" = {};
+        sops.secrets."git/username" = {};
+        sops.secrets."git/email" = {};
+
+        sops.templates.gitconfig.content = ''
+            [user]
+                name = "${config.sops.placeholder."git/username"}"
+                email = "${config.sops.placeholder."git/email"}"
+        '';
         
         programs.git = {
             enable = true;
-/* 
-            userName._secret = "${config.sops.secrets."git/username".path}";
-            userEmail._secret = "${config.sops.secrets."git/email".path}";
-*/
-            userName = "Nathan";
-            userEmail = "nathanblunkall5@gmail.com";
+
+            includes = [
+                { path = "${config.sops.templates.gitconfig.path}"; }
+            ];
             
             extraConfig = {
                 init = {

home-manager/nathan/secrets.yaml

@@ -1,6 +1,6 @@
 git:
-    - username: ENC[AES256_GCM,data:418z4cCK,iv:tgPmynsW8fEJs6n+OGfm6IypOjNNhVdVaqFImeKXpC4=,tag:V5zI47vb9FnSO/OWurbJ+A==,type:str]
-    - email: ENC[AES256_GCM,data:xp6HlIO1pTgvrXpGAOQwl0UvcnY4zrLrmw==,iv:LzGkluWeSe8MQqPXQMnNOv062UY+BkQE1fGjGqd/nCg=,tag:Y9nwo+Hjcg4ea2GxGKWApA==,type:str]
+    username: ENC[AES256_GCM,data:418z4cCK,iv:tgPmynsW8fEJs6n+OGfm6IypOjNNhVdVaqFImeKXpC4=,tag:V5zI47vb9FnSO/OWurbJ+A==,type:str]
+    email: ENC[AES256_GCM,data:xp6HlIO1pTgvrXpGAOQwl0UvcnY4zrLrmw==,iv:LzGkluWeSe8MQqPXQMnNOv062UY+BkQE1fGjGqd/nCg=,tag:Y9nwo+Hjcg4ea2GxGKWApA==,type:str]
 sops:
     age:
         - recipient: age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
@@ -21,7 +21,7 @@ sops:
             RWNTdys0VnV1V0ZHL3R1N0NvdGFOTjAKQtM4wMzD9Lr9G9o1sp0Ud7LsxnTXzyV9
             yQ5fxn5lmef7SAPAYVvkU7IH1uhtVyfH9SwsM+EnHdcQWO/lNQp+hg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-08-16T05:16:24Z"
-    mac: ENC[AES256_GCM,data:hvrllkaev+3vlSesbMcggEcQJIIB6BaLMPZePOM5MUhPS3kP5Pi0tficOnLXwMFrYNX8pzg0v3OwPvt8BdMS/TH8IDksrRP5l6Zj7fI8XuCgMINim0AmpcRrRPmnFkcbc2UfHrDXM4qDXFuJklOnE6MYoa5JToixf2naa9sBxtE=,iv:slOrGjecTnuEP0o3FdvMw1fIvII+G9L7vurW6ugfSwU=,tag:KjOnB6KGyP4OskxTx7eb/A==,type:str]
+    lastmodified: "2025-08-16T16:08:48Z"
+    mac: ENC[AES256_GCM,data:3/ztJNXhOIPqgQ47QxjM5KTeAJwXPpUuVtvI5/xJsMOOZhXYRt+uhL584F98rJiMHhnbsuGIZi+jGlYRiE6c+GJ9X7TKLj9yRqKvCMSCdWHGzY721GH5kMPcjD2YDYZ4tt+olIMePNJBPjC1XJgfhfOvs43o2HyDTCS95cEQzB4=,iv:qofZBAwxbTrc/hPyuSi8nxibJ0bGhoytZpUTZwwzbuI=,tag:z1SJXutJmlJ+j6RnV4u29Q==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.10.2

system-config/configuration/laptop/default.nix

@@ -99,7 +99,7 @@
         users = {
             "nathan" = lib.mkMerge [
                 {
-                    config.homeconfig = {
+                    homeconfig = {
                         host = "laptop";
                         minimal = false;
                         hyprland.enable = true;
@@ -115,7 +115,11 @@
                         nh.enable = true;
                     };
                 }
-                inputs.nathan-home-manager
+                (inputs.nathan-home-manager { 
+                    config = config.home-manager.users."nathan";
+                    sysconfig = config;
+                    inherit lib pkgs;
+                })
             ];
         };
     };