diff --git a/home-manager/nathan/programs/git/default.nix b/home-manager/nathan/programs/git/default.nix
index a30b574..755b5f9 100644
--- a/home-manager/nathan/programs/git/default.nix
+++ b/home-manager/nathan/programs/git/default.nix
@@ -8,8 +8,15 @@
     config = lib.mkIf config.homeconfig.git.enable {
         
         programs.git = {
-            userName = "Nathan";
-            userEmail = "nathanblunkall5@gmail.com";
+            userName._secret = if (!config.homeconfig.home-manager.enable) then 
+                config.home-manager.nathan.sops.secrets."git/username"
+            else
+                config.sops.secrets."git/username";
+
+            userEmail._secret = if (!config.homeconfig.home-manager.enable) then 
+                config.home-manager.nathan.sops.secrets."git/email"
+            else
+                config.sops.secrets."git/email";
 
             extraConfig = {
                 init = {
diff --git a/home-manager/nathan/secrets.yaml b/home-manager/nathan/secrets.yaml
index e69de29..481a3ed 100644
--- a/home-manager/nathan/secrets.yaml
+++ b/home-manager/nathan/secrets.yaml
@@ -0,0 +1,27 @@
+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]
+sops:
+    age:
+        - recipient: age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3dER2bmZjYUhlNHpvVVNY
+            dlFYdU1KVzQ0WGhtUlRyRUtMdldqdC9nNm1JCjdJU3pqQ2x2NE52Qm15MUw4d2lv
+            MjM4V3lBQ1o5MWl2MDRrTlJLWFFHRjAKLS0tIHhpUld3NXh4RzdKajJWMzM2a3gy
+            VU4xSytSZHgzd3pocUdOZmFTTVg4OXMKPkk9mbu6POQNwy+6jAhgv3t/DAN1n+Jo
+            xK0s1Ni1FKPU4mvQUsIN2v6y3Nircfr15CfzThjpIBoLtBOyoRhXrw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByM3lvcDM4Z0VJMGVBK1lU
+            Y0g1bTE2U3ZiN0E3NUJ0QVlQSUdlSDh6NjNNCmRVZjQ4VWJSM3g4S2Q1TnRWbjZG
+            TVVKUkJTWS9nUGN0Uy9LQ1V0YlpLeWsKLS0tIHRCWkxFTUhNQ21wYVBUL0k4d25h
+            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]
+    unencrypted_suffix: _unencrypted
+    version: 3.10.2
diff --git a/system-config/configuration/laptop/default.nix b/system-config/configuration/laptop/default.nix
index d30833d..8425493 100644
--- a/system-config/configuration/laptop/default.nix
+++ b/system-config/configuration/laptop/default.nix
@@ -74,8 +74,6 @@
         ags.enable = true;
         kdePlasma6.enable = true;
         hyprland.enable = true;
-        git.enable = true;
-        nh.enable = true;
         netbird.enable = true;
 
         ollama.enable = true;
@@ -112,6 +110,8 @@
                         calcurse.enable = true;
                         rofi.enable = true;
                         firefox.enable = true;
+                        git.enable = true;
+                        nh.enable = true;
                     };
                 }
                 inputs.nathan-home-manager