ssh: add keys to agent (new config syntax), remove heimdall
Set TERM env var to xterm-256color in foot config instead of as ssh override, might fix emacs remote shell issues where it should be TERM=dumb
This commit is contained in:
parent
18a245e375
commit
c2dc12417c
|
@ -8,6 +8,7 @@
|
||||||
server.enable = true;
|
server.enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
main = {
|
main = {
|
||||||
|
term = "xterm-256color";
|
||||||
locked-title = false;
|
locked-title = false;
|
||||||
font = "${fonts.monospace.name}:size=${toString fonts.sizes.applications}";
|
font = "${fonts.monospace.name}:size=${toString fonts.sizes.applications}";
|
||||||
dpi-aware = false;
|
dpi-aware = false;
|
||||||
|
|
|
@ -5,16 +5,13 @@
|
||||||
];
|
];
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
addKeysToAgent = "yes";
|
||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
compression = true;
|
compression = true;
|
||||||
serverAliveInterval = 15;
|
serverAliveInterval = 15;
|
||||||
serverAliveCountMax = 3;
|
serverAliveCountMax = 3;
|
||||||
controlMaster = "auto";
|
controlMaster = "auto";
|
||||||
controlPersist = "10s";
|
controlPersist = "10s";
|
||||||
extraConfig = ''
|
|
||||||
AddKeysToAgent=yes
|
|
||||||
SetEnv TERM=xterm-256color
|
|
||||||
'';
|
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
"git*".user = "git";
|
"git*".user = "git";
|
||||||
"legion" = {
|
"legion" = {
|
||||||
|
@ -32,12 +29,6 @@
|
||||||
"freia" = {
|
"freia" = {
|
||||||
user = "elitherl";
|
user = "elitherl";
|
||||||
hostname = "freia027.hpc.l";
|
hostname = "freia027.hpc.l";
|
||||||
forwardX11Trusted = true;
|
|
||||||
};
|
|
||||||
"heimdall" = {
|
|
||||||
user = "elitherl";
|
|
||||||
hostname = "heimdall003.jet.uk";
|
|
||||||
forwardX11Trusted = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Reference in a new issue