rogueking/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

darwin fixes

Browse Source
This commit is contained in:
rogueking
2025-08-19 23:39:42 -07:00
parent 9535c156d8
commit fb6a6bd22d
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
home-manager/commands/commands.nix
View File

@@ -125,12 +125,12 @@
user = "git"; user = "git";
}; };
}; };
extraConfig = if hostname != "eva-02" extraConfig = if hostname == "eva-02"
then '' then ''
IdentityAgent ~/.1password/agent.sock IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
'' ''
else '' else ''
IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" IdentityAgent ~/.1password/agent.sock
''; '';
}; };

9
home-manager/commands/git.nix
View File

@@ -11,21 +11,20 @@
userName = "rogueking"; userName = "rogueking";
userEmail = "miguel@muniz.org"; userEmail = "miguel@muniz.org";
lfs.enable = true; lfs.enable = true;
} // lib.optionalAttrs (! (lib.elem hostname [ "buildbox" ])) { } // lib.optionalAttrs (! (lib.elem hostname [ "buildbox" "eva-02"])) {
signing = { signing = {
signByDefault = true; signByDefault = true;
signer = if hostname != "eva-02" signer = if hostname == "eva-02"
then then
"/opt/1Password/op-ssh-sign" "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
else else
"/Applications/1Password.app/Contents/MacOS/op-ssh-sign"; "/opt/1Password/op-ssh-sign";
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHI7zcxrwwg4VqpGduhPX31aslzXwkRXiM32+8K+aIMu"; key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHI7zcxrwwg4VqpGduhPX31aslzXwkRXiM32+8K+aIMu";
}; };
extraConfig = { extraConfig = {
gpg = { gpg = {
format = "ssh"; format = "ssh";
# program = lib.mkIf (hostname == "eva-02") "/Applications/1Password.app/Contents/MacOS/op-ssh-sign";
}; };
}; };
}; };