diff --git a/home-manager/commands/commands.nix b/home-manager/commands/commands.nix
index 406dbea..e9a21c9 100644
--- a/home-manager/commands/commands.nix
+++ b/home-manager/commands/commands.nix
@@ -125,12 +125,12 @@
           user = "git";
         };
       };
-      extraConfig = if hostname != "eva-02"
+      extraConfig = if hostname == "eva-02"
       then ''
-        IdentityAgent ~/.1password/agent.sock
+        IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
       ''
       else ''
-        IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+        IdentityAgent ~/.1password/agent.sock
       '';
     };
 
diff --git a/home-manager/commands/git.nix b/home-manager/commands/git.nix
index 19854e8..48a1eff 100644
--- a/home-manager/commands/git.nix
+++ b/home-manager/commands/git.nix
@@ -11,21 +11,20 @@
       userName = "rogueking";
       userEmail = "miguel@muniz.org";
       lfs.enable = true;
-    } // lib.optionalAttrs (! (lib.elem hostname [ "buildbox" ])) {
+    } // lib.optionalAttrs (! (lib.elem hostname [ "buildbox" "eva-02"])) {
       signing = {
         signByDefault = true;
-        signer = if hostname != "eva-02"
+        signer = if hostname == "eva-02"
         then 
-          "/opt/1Password/op-ssh-sign" 
+          "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
         else 
-          "/Applications/1Password.app/Contents/MacOS/op-ssh-sign";
+          "/opt/1Password/op-ssh-sign"; 
         
         key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHI7zcxrwwg4VqpGduhPX31aslzXwkRXiM32+8K+aIMu";
       };
       extraConfig = {
         gpg = {
           format = "ssh";
-          # program = lib.mkIf (hostname == "eva-02") "/Applications/1Password.app/Contents/MacOS/op-ssh-sign";
         };
       };
     };