diff --git a/hosts.nix b/hosts.nix
index d85a6d3..7cae6bd 100644
--- a/hosts.nix
+++ b/hosts.nix
@@ -1,14 +1,77 @@
 let
   adm = 10;
-  srv = n: 4;
+  srv = ip: 4;
   srv-nat = 2;
   san = 3;
-  adh = 42;
+  adh = ip: 42;
 in
 {
   physiques ={ 
+    thot = {
+      id = 14;
+      vlans = [
+        adm
+      ];
+      serveur_type = ["backup"];
+      description = ''
+        Serveur de backup du Crans, actuellement en SQ39
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+    };    
+    ft = {
+      is_debian = true;
+      id = 15;
+      vlans = [
+        adm
+      ];
+      serveur_type = ["backup"];
+      description = ''
+        Serveur de backup du Crans, actuellement en SQ39
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+      switch = {
+        carapuce = 13;
+        arceus = 13;
+        ilo = {
+          carapuce = 25; # TODO
+        }
+      };
+    };    
+
+    tealc = {
+      is_debian = true;
+      id = 1;
+      vlans = [
+        adm
+        san
+      ];
+      serveur_type = ["san"];
+      description = ''
+        Stockage adm
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+      switch = {
+        carapuce = 10;
+        arceus = 10;
+        ilo = {
+          carapuce = 10; # TODO
+        }
+      };
+    };    
+    cameron = {
+      is_debian = true;
+      id = 2;
+      vlans = [
+        adm
+        san
+      ];
+      serveur_type = ["san"];
+      description = ''
+        Stockage adh
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+    };    
     # cephirot = {
-    #   name = "cephirot";
     #   id = 3;
     #   vlans = [
     #     adm
@@ -20,16 +83,149 @@ in
     #   '';
     #   public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
     # };    
-    thot = {
-      name = "thot";
-      id = 14;
+    
+    arceus = {
+      is_debian = true;
+      id = 7;
       vlans = [
         adm
         san
       ];
-      serveur_type = ["backup"];
+      serveur_type = ["switch"];
       description = ''
-        Serveur de backup du Crans, actuellement en SQ39
+        Switch principal
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+    };    
+    carapuce = {
+      is_debian = true;
+      id = 8;
+      vlans = [
+        adm
+        san
+      ];
+      serveur_type = ["switch"];
+      description = ''
+        Switch principal
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+    };    
+    
+    sam = {
+      is_debian = true;
+      id = 11;
+      vlans = [
+        adm
+        san
+        srv-nat
+      ];
+      serveur_type = ["pve"];
+      description = ''
+        PVE adm
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+      switch = {
+        carapuce = 1;
+        arceus = 1;
+        ilo = {
+          carapuce = 25; # TODO
+        }
+      };
+    };    
+    daniel = {
+      is_debian = true;
+      id = 12;
+      vlans = [
+        adm
+        san
+        srv-nat
+      ];
+      serveur_type = ["pve"];
+      description = ''
+        PVE adm
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+      switch = {
+        carapuce = 3;
+        arceus = 3;
+        ilo = {
+          carapuce = 25; # TODO
+        }
+      };
+    };    
+    jack = {
+      is_debian = true;
+      id = 13;
+      vlans = [
+        adm
+        san
+        srv-nat
+      ];
+      serveur_type = ["pve"];
+      description = ''
+        PVE adm
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+      switch = {
+        carapuce = 5;
+        arceus = 5;
+        ilo = {
+          carapuce = 25; # TODO
+        }
+      };
+    };    
+
+    odlyd = {
+      is_debian = true;
+      id = 16;
+      vlans = [
+        adh
+        adm
+      ];
+      serveur_type = ["pve"];
+      description = ''
+        PVE adh, fait actuellement le mort
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+    };    
+    stitch = {
+      is_debian = true;
+      id = 17;
+      vlans = [
+        adh
+        adm
+      ];
+      serveur_type = ["pve"];
+      description = ''
+        PVE adh
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+    };    
+    gulp = {
+      is_debian = true;
+      id = 18;
+      vlans = [
+        adh
+        adm
+      ];
+      serveur_type = ["pve"];
+      description = ''
+        PVE adh
+      '';
+      public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
+    };    
+    
+    zamok = {
+      is_debian = true;
+      id = 31;
+      vlans = [
+        adh
+        adm
+        san
+      ];
+      serveur_type = ["pve"];
+      description = ''
+        Serveur de calcul adhérent
       '';
       public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO";
     };    
@@ -43,7 +239,7 @@ in
       vlans = [
         adm
         (adh "185.230.78.252")
-        (srv "185.230.79.5")
+        (srv "185.230.79.59")
       ];
       description = ''
         DNS récursif