From d76eff6f683f648171959ff1cef4e12ab18e8091 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 12 Dec 2025 13:39:40 -0600
Subject: [PATCH] cleanup

---
 .../x86_64-linux/admin@jallen-nas/default.nix | 59 +++++++++----------
 modules/home/sops/default.nix                 |  6 --
 2 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/homes/x86_64-linux/admin@jallen-nas/default.nix b/homes/x86_64-linux/admin@jallen-nas/default.nix
index 7bd92fa..237554e 100755
--- a/homes/x86_64-linux/admin@jallen-nas/default.nix
+++ b/homes/x86_64-linux/admin@jallen-nas/default.nix
@@ -20,39 +20,38 @@
   };
 
   sops = {
-    # enable = true; 
-    # age.keyFile = "/home/admin/.config/sops/age/keys.txt";
-    # defaultSopsFile = "/etc/nixos/secrets/secrets.yaml";
-    # validateSopsFiles = false;
-    # secrets = {
-    #   "ssh-keys-public/jallen-nas" = {
-    #     path = "/home/admin/.ssh/id_ed25519.pub";
-    #     mode = "0644";
-    #   };
-    #   "ssh-keys-private/jallen-nas" = {
-    #     path = "/home/admin/.ssh/id_ed25519";
-    #     mode = "0600";
-    #   };
-    #   "ssh-keys-public/desktop-nixos" = {
-    #     path = "/home/admin/.ssh/authorized_keys";
-    #     mode = "0600";
-    #   };
+    age.keyFile = "/home/admin/.config/sops/age/keys.txt";
+    defaultSopsFile = "/etc/nixos/secrets/secrets.yaml";
+    validateSopsFiles = false;
+    secrets = {
+      "ssh-keys-public/jallen-nas" = {
+        path = "/home/admin/.ssh/id_ed25519.pub";
+        mode = "0644";
+      };
+      "ssh-keys-private/jallen-nas" = {
+        path = "/home/admin/.ssh/id_ed25519";
+        mode = "0600";
+      };
+      "ssh-keys-public/desktop-nixos" = {
+        path = "/home/admin/.ssh/authorized_keys";
+        mode = "0600";
+      };
 
-    #   "ssh-keys-public/desktop-nixos-root" = {
-    #     path = "/home/admin/.ssh/authorized_keys2";
-    #     mode = "0600";
-    #   };
+      "ssh-keys-public/desktop-nixos-root" = {
+        path = "/home/admin/.ssh/authorized_keys2";
+        mode = "0600";
+      };
 
-    #   "ssh-keys-public/desktop-windows" = {
-    #     path = "/home/admin/.ssh/authorized_keys3";
-    #     mode = "0600";
-    #   };
+      "ssh-keys-public/desktop-windows" = {
+        path = "/home/admin/.ssh/authorized_keys3";
+        mode = "0600";
+      };
 
-    #   "ssh-keys-public/macbook-macos" = {
-    #     path = "/home/admin/.ssh/authorized_keys4";
-    #     mode = "0600";
-    #   };
-    # };
+      "ssh-keys-public/macbook-macos" = {
+        path = "/home/admin/.ssh/authorized_keys4";
+        mode = "0600";
+      };
+    };
   };
 
   programs = {
diff --git a/modules/home/sops/default.nix b/modules/home/sops/default.nix
index df5c0dc..71f1ee4 100644
--- a/modules/home/sops/default.nix
+++ b/modules/home/sops/default.nix
@@ -24,11 +24,5 @@ in
         '';
       };
     };
-
-    programs.zsh.initContent = ''
-      if [ -f ${config.sops.templates.".env".path} ]; then
-        export $(grep -v '^#' ${config.sops.templates.".env".path} | xargs)
-      fi
-    '';
   };
 }