mirror of
https://github.com/wlcx/home.git
synced 2026-07-08 13:33:13 +01:00
Compare commits
No commits in common. "344f52c05be276d9da769fb64263a5ba17e7536e" and "edcb28871642357bb83b12fcf85466eac804e01f" have entirely different histories.
344f52c05b
...
edcb288716
@ -115,10 +115,6 @@ in
|
||||
serverAliveInterval = 30;
|
||||
serverAliveCountMax = 10;
|
||||
compression = true;
|
||||
controlMaster = "autoask";
|
||||
controlPath = "~/.ssh/master-%r@%n:%p";
|
||||
# Close socket once last connection closes
|
||||
controlPersist = "no";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -41,7 +41,6 @@
|
||||
st = "status";
|
||||
sw = "switch";
|
||||
swc = "switch --create";
|
||||
unp = "log --branches --not --remotes --no-walk --decorate --oneline";
|
||||
|
||||
gone = ''! git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' │ awk '$2 == "[gone]" {print $1}' | xargs -r git branch -D'';
|
||||
};
|
||||
|
||||
@ -19,17 +19,6 @@
|
||||
extraOptions."IdentityAgent" =
|
||||
"~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
|
||||
};
|
||||
programs.zsh.sessionVariables = {
|
||||
SSH_AUTH_SOCK = "$HOME/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
|
||||
# Make connection muxing permission work.
|
||||
# Openssh by default will only use SSH_ASKPASS if it sees DISPLAY/WAYLAND_DISPLAY, so we have to force it
|
||||
SSH_ASKPASS_REQUIRE = "force";
|
||||
# A nice applescript permission dialog
|
||||
SSH_ASKPASS = (pkgs.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/theseal/ssh-askpass/refs/heads/master/ssh-askpass";
|
||||
hash= "sha256-bQUuGS3Mb+i4Kt+1mDP203s2W1jlRcpl/7uXA7TUZ+o=";
|
||||
executable = true;
|
||||
});
|
||||
};
|
||||
programs.zsh.sessionVariables.SSH_AUTH_SOCK = "$HOME/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
|
||||
programs.zsh.initContent = "[ -e /opt/homebrew/bin/brew ] && eval $(/opt/homebrew/bin/brew shellenv)";
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user