From e20d791a78bb5d3e69dfc23b8f3056d0e9d1adc2 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Tue, 5 May 2026 15:05:54 -0500
Subject: [PATCH] Fix SSH/GPG agent conflicts and remove redundant catppuccin
 import

---
 home/common/default.nix   | 14 +++++++-------
 home/common/pi-server.nix |  5 -----
 home/gui/services.nix     |  2 +-
 home/pi-server.nix        |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/home/common/default.nix b/home/common/default.nix
index e196eee..1fa4f8c 100644
--- a/home/common/default.nix
+++ b/home/common/default.nix
@@ -116,20 +116,20 @@
       tray.enable = true;
     };
     ssh-agent = {
-      enable = true;
+      enable = false;
     };
     gpg-agent = {
       enable = true;
       defaultCacheTtl = 1800;
-      # enableSshSupport = true;
+      enableSshSupport = true;
     };
   };
   programs.go.enable = true;
-  programs.keychain = {
-    enable = true;
-    enableBashIntegration = true;
-    keys = "id_aur  id_dsa  id_ed25519  git C7E41C9F79C846984163693FCCD8E76F07EA701B";
-  };
+  # programs.keychain = {
+  #   enable = true;
+  #   enableBashIntegration = true;
+  #   keys = "id_aur  id_dsa  id_ed25519  git C7E41C9F79C846984163693FCCD8E76F07EA701B";
+  # };
   home.file.".links/links.cfg".source = files/links.cfg;
   xdg.configFile."nix/nix.conf".text = ''
     extra-experimental-features = flakes nix-command
diff --git a/home/common/pi-server.nix b/home/common/pi-server.nix
index f0fa0a4..e605f89 100644
--- a/home/common/pi-server.nix
+++ b/home/common/pi-server.nix
@@ -50,11 +50,6 @@
       enableSshSupport = true;
     };
   };
-  programs.keychain = {
-    enable = true;
-    enableBashIntegration = true;
-    keys = "id_aur  id_dsa  id_ed25519  git C7E41C9F79C846984163693FCCD8E76F07EA701B";
-  };
   home.file.".links/links.cfg".source = files/links.cfg;
   xdg.configFile."nix/nix.conf".text = ''
     extra-experimental-features = flakes nix-command
diff --git a/home/gui/services.nix b/home/gui/services.nix
index 784ca1d..755702e 100644
--- a/home/gui/services.nix
+++ b/home/gui/services.nix
@@ -7,7 +7,7 @@
 }: {
   services = {
     gnome-keyring = {enable = true;};
-    ssh-agent = {enable = true;};
+    ssh-agent = {enable = lib.mkForce false;};
     wlsunset = {
       enable = true;
       latitude = 29.7;
diff --git a/home/pi-server.nix b/home/pi-server.nix
index 7fc1e53..453b7e2 100644
--- a/home/pi-server.nix
+++ b/home/pi-server.nix
@@ -16,7 +16,7 @@
     users = {
       don = {
         imports = [
-          inputs.catppuccin.homeModules.catppuccin
+          # inputs.catppuccin.homeModules.catppuccin
           ./common/pi-server.nix
         ];
         home = {