test iso

modules/users/nathan/home-manager/features/git.nix

@@ -4,26 +4,9 @@
 
         config = {
 
-            sops = {
-                secrets = {
-                    "git/username" = {};
-                    "git/email" = {};
-                };
-
-                templates.gitconfig.content = ''
-                    [user]
-                    name = "${config.sops.placeholder."git/username"}"
-                    email = "${config.sops.placeholder."git/email"}"
-                '';
-            };
-
             programs.git = {
                 enable = true;
 
-                includes = [
-                { path = "${config.sops.templates.gitconfig.path}"; }
-                ];
-
                 settings = {
                     init = {
                         defaultBranch = "master";
@@ -38,6 +21,11 @@
                             ];
                         };
                     };
+
+                    user = {
+                        name = "Nathan";
+                        email = "nathanblunkall5@gmail.com";
+                    };
                 };
             };
         };

modules/users/nathan/home-manager/features/sops.nix

@@ -0,0 +1,23 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan-sops = { config, lib, pkgs, ... }: {
+
+        imports = [
+            inputs.sops-nix.homeManagerModules.sops
+        ];
+
+        config = {
+
+            sops = {
+                age = {
+                    keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
+                    generateKey = true;
+                };
+                
+                defaultSopsFormat = "yaml";
+
+#secrets."remoteBuildKey" = {};
+            };
+        };
+    };
+}

modules/users/nathan/home-manager/features/ssh.nix

@@ -1,27 +1,41 @@
 { ... }: {
 
-    flake.homeModules.nathan-terminal = { ... }: {
+    flake.homeModules.nathan-terminal = { config, ... }: {
 
         programs.ssh = {
-
             enable = true;
 
-# defaults as of 25.11
-            matchBlocks."*" = {
-                forwardAgent = false;
-                addKeysToAgent = "no";
-                compression = false;
-                serverAliveInterval = 0;
-                serverAliveCountMax = 3;
-                hashKnownHosts = false;
-                userKnownHostsFile = "~/.ssh/known_hosts";
-                controlMaster = "no";
-                controlPath = "~/.ssh/master-%r@%n:%p";
-                controlPersist = "no";
-            };
             enableDefaultConfig = false;
 
+            matchBlocks = {
 
+                "*" = {
+                    forwardAgent = false;
+                    addKeysToAgent = "no";
+                    compression = false;
+                    serverAliveInterval = 0;
+                    serverAliveCountMax = 3;
+                    hashKnownHosts = false;
+                    userKnownHostsFile = "~/.ssh/known_hosts";
+                    controlMaster = "no";
+                    controlPath = "~/.ssh/master-%r@%n:%p";
+                    controlPersist = "no";
+                };
+
+                "builder" = {
+                    hostname = "esotericbytes.com";
+                    user = "remote-builder";
+                    identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
+                    port = 22;
+                };
+
+                "remote" = {
+                    hostname = "esotericbytes.com";
+                    user = "nathan";
+                    identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
+                    port = 22;
+                };
+            };
         };
     };
 }