From 036f16226445d877de02653e825bc256f1c47195 Mon Sep 17 00:00:00 2001
From: Evan Reichard <evan@reichard.io>
Date: Sat, 19 Apr 2025 21:08:21 -0400
Subject: [PATCH] fix sops

---
 .../default.nix                               |  1 -
 .../evanreichard@lin-va-thinkpad/default.nix  | 36 ++++++-------------
 .../evanreichard@lin-va-utility/default.nix   |  1 -
 .../lin-va-mbp-personal/default.nix           |  3 +-
 .../x86_64-linux/lin-va-thinkpad/default.nix  | 13 ++++---
 5 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix b/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix
index f33e23b..8e28b73 100755
--- a/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix
+++ b/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix
@@ -69,7 +69,6 @@ in
 
 
   home.pointerCursor = {
-    # x11.enable = true;
     gtk.enable = true;
     name = "catppuccin-macchiato-mauve-cursors";
     package = pkgs.catppuccin-cursors.macchiatoMauve;
diff --git a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
index b180e05..c477355 100755
--- a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
+++ b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, namespace, ... }:
+{ pkgs, lib, config, namespace, osConfig, ... }:
 let
   inherit (lib.${namespace}) enabled;
 in
@@ -15,11 +15,11 @@ in
       ssh-agent = enabled;
       fusuma = enabled;
       swww = enabled;
-      # sops = {
-      #   enable = true;
-      #   defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
-      #   sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
-      # };
+      sops = {
+        enable = true;
+        defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
+        sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
+      };
     };
 
     programs = {
@@ -64,7 +64,6 @@ in
 
 
   home.pointerCursor = {
-    # x11.enable = true;
     gtk.enable = true;
     name = "catppuccin-macchiato-mauve-cursors";
     package = pkgs.catppuccin-cursors.macchiatoMauve;
@@ -72,24 +71,11 @@ in
   };
 
   # Kubernetes Secrets
-  # sops.secrets = lib.mkIf osConfig.${namespace}.security.sops.enable {
-  #   rke2_kubeconfig = {
-  #     path = "${config.home.homeDirectory}/.kube/rke2";
-  #   };
-  # };
-
-  # Global Packages
-  # programs.jq = enabled;
-  # programs.pandoc = enabled;
-  # home.packages = with pkgs; [
-  #   android-tools
-  #   imagemagick
-  #   mosh
-  #   python311
-  #   texliveSmall # Pandoc PDF Dep
-  #   google-cloud-sdk
-  #   tldr
-  # ];
+  sops.secrets = lib.mkIf osConfig.${namespace}.security.sops.enable {
+    rke2_kubeconfig = {
+      path = "${config.home.homeDirectory}/.kube/rke2";
+    };
+  };
 
   # SQLite Configuration
   home.file.".sqliterc".text = ''
diff --git a/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix b/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
index ad5d6d3..d2eaadb 100755
--- a/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
+++ b/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
@@ -64,7 +64,6 @@ in
 
 
   home.pointerCursor = {
-    # x11.enable = true;
     gtk.enable = true;
     name = "catppuccin-macchiato-mauve-cursors";
     package = pkgs.catppuccin-cursors.macchiatoMauve;
diff --git a/systems/aarch64-linux/lin-va-mbp-personal/default.nix b/systems/aarch64-linux/lin-va-mbp-personal/default.nix
index 9b54c56..242953e 100755
--- a/systems/aarch64-linux/lin-va-mbp-personal/default.nix
+++ b/systems/aarch64-linux/lin-va-mbp-personal/default.nix
@@ -43,8 +43,7 @@ in
     security = {
       sops = {
         enable = true;
-        # sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-        defaultSopsFile = lib.snowfall.fs.get-file "secrets/lin-mbp-personal/default.yaml";
+        defaultSopsFile = lib.snowfall.fs.get-file "secrets/lin-va-mbp-personal/default.yaml";
       };
     };
 
diff --git a/systems/x86_64-linux/lin-va-thinkpad/default.nix b/systems/x86_64-linux/lin-va-thinkpad/default.nix
index 6c32a80..f4d4bbb 100755
--- a/systems/x86_64-linux/lin-va-thinkpad/default.nix
+++ b/systems/x86_64-linux/lin-va-thinkpad/default.nix
@@ -45,12 +45,11 @@ in
       };
     };
 
-    # security = {
-    #   sops = {
-    #     enable = true;
-    #     # sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-    #     defaultSopsFile = lib.snowfall.fs.get-file "secrets/lin-mbp-personal/default.yaml";
-    #   };
-    # };
+    security = {
+      sops = {
+        enable = true;
+        defaultSopsFile = lib.snowfall.fs.get-file "secrets/lin-va-thinkpad/default.yaml";
+      };
+    };
   };
 }