From cef3b9ad86452be2eb47c8a438b974c8884b0f3e Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Tue, 30 Dec 2025 15:16:35 -0600
Subject: pull from main

---
 hosts/jupiter/config.nix              | 1 +
 modules/desktop/nixos/gnome.nix       | 2 ++
 modules/terminal/nixos/github_ssh.nix | 4 ----
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index ff78c3d..17cf67b 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -38,6 +38,7 @@
           enable = true;
           userName = "Collin Williams";
           userEmail = "96917990+bluedragon1221@users.noreply.github.com";
+          installKey = true;
         };
       };
     };
diff --git a/modules/desktop/nixos/gnome.nix b/modules/desktop/nixos/gnome.nix
index 216f312..335815a 100644
--- a/modules/desktop/nixos/gnome.nix
+++ b/modules/desktop/nixos/gnome.nix
@@ -9,6 +9,8 @@ in
   lib.mkIf cfg.enable {
     services.desktopManager.gnome.enable = true;
 
+    services.gnome.gcr-ssh-agent.enable = false; # conflicts with normal ssh-agent
+
     environment.gnome.excludePackages = with pkgs; [
       orca
       evince
diff --git a/modules/terminal/nixos/github_ssh.nix b/modules/terminal/nixos/github_ssh.nix
index 4d8912c..a2a0324 100644
--- a/modules/terminal/nixos/github_ssh.nix
+++ b/modules/terminal/nixos/github_ssh.nix
@@ -13,10 +13,6 @@ in
       };
     };
 
-    hjem.users.${config.collinux.user.name}.files.".ssh/id_ed25519_github.pub".text = ''
-      ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3SjzIs3YI8PWJaNrAuaEeRcTcvIVHOKyCh2VwHTHEF 96917990+bluedragon1221@users.noreply.github.com
-    '';
-
     programs.ssh = {
       knownHosts."github.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
       startAgent = true;
-- 
cgit v1.3.1