From 9e9a7027e98f436a652ca3de51cb2f31f245e2a2 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Sat, 10 Aug 2024 17:59:02 +0200
Subject: [PATCH] chore: adapt ssh-client to meta module
---
home-manager-modules/ssh-client/default.nix | 70 +++++++++++----------
1 file changed, 37 insertions(+), 33 deletions(-)
diff --git a/home-manager-modules/ssh-client/default.nix b/home-manager-modules/ssh-client/default.nix
index db5b507..07e6795 100644
--- a/home-manager-modules/ssh-client/default.nix
+++ b/home-manager-modules/ssh-client/default.nix
@@ -11,44 +11,48 @@ with lib;
config = mkIf cfg.enable {
programs.ssh = {
enable = true;
- matchBlocks = lib.mapAttrs
- (n: v: { hostname = "${n}.${lib.luj.tld}"; user = v.sshUser; port = v.sshPort; })
- lib.luj.machines // {
- sas = {
- hostname = "sas.eleves.ens.fr";
- user = "jmalka";
- };
- router = {
- hostname = "vpn.saumon.network";
- };
- mails = {
- hostname = "192.168.0.76";
- proxyJump = "router";
- };
+ matchBlocks =
+ lib.mapAttrs (n: v: {
+ hostname = "${n}.${lib.snowfield.${n}.tld}";
+ user = v.sshUser;
+ port = v.sshPort;
+ }) lib.snowfield
+ // {
+ sas = {
+ hostname = "sas.eleves.ens.fr";
+ user = "jmalka";
+ };
+ router = {
+ hostname = "vpn.saumon.network";
+ };
+ mails = {
+ hostname = "192.168.0.76";
+ proxyJump = "router";
+ };
- proxy-telecom = {
- hostname = "ssh.enst.fr";
- user = "jmalka";
- };
+ proxy-telecom = {
+ hostname = "ssh.enst.fr";
+ user = "jmalka";
+ };
- lame24 = {
- hostname = "lame24.enst.fr";
- user = "jmalka";
- proxyJump = "proxy-telecom";
- };
+ lame24 = {
+ hostname = "lame24.enst.fr";
+ user = "jmalka";
+ proxyJump = "proxy-telecom";
+ };
- epyc = {
- hostname = "epyc.infra.newtype.fr";
- user = "luj";
- proxyJump = "tower";
- };
+ epyc = {
+ hostname = "epyc.infra.newtype.fr";
+ user = "luj";
+ proxyJump = "tower";
+ };
- exps = {
- hostname = "192.168.0.240";
- proxyJump = "router";
- };
+ exps = {
+ hostname = "192.168.0.240";
+ proxyJump = "router";
+ };
- };
+ };
};
};
}