home: ssh: use 'mkMerge'
This will make it easier to add new options (e.g: for `mosh`).
This commit is contained in:
parent
8398c4350a
commit
0b9c2309da
|
@ -7,7 +7,9 @@ in
|
||||||
enable = my.mkDisableOption "ssh configuration";
|
enable = my.mkDisableOption "ssh configuration";
|
||||||
};
|
};
|
||||||
|
|
||||||
config.programs.ssh = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable (lib.mkMerge [
|
||||||
|
{
|
||||||
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
includes = [
|
includes = [
|
||||||
|
@ -51,4 +53,6 @@ in
|
||||||
AddKeysToAgent yes
|
AddKeysToAgent yes
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue