Clean files + add IP to hosts

cluster.nix

@@ -1,6 +1,11 @@
-{ config, pkgs, lib, ...} @ args:
+{
-  with builtins;
+  config,
-  with lib;
+  pkgs,
+  lib,
+  ...
+}@args:
+with builtins;
+with lib;
 {
   options.filouterie = with types; {
     hostName = mkOption {

cluster/nodes/fifi.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ...}:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   config.filouterie.hostName = "fifi";
@@ -21,5 +26,5 @@
   config.networking.defaultGateway = "192.168.1.1";
 
   # Setting up bootloader in UEFI mode
-   config.boot.loader.grub.devices = [ "nodev"];
+  config.boot.loader.grub.devices = [ "nodev" ];
 }

cluster/nodes/loulou.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ...}:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   config.filouterie.hostName = "loulou";

cluster/nodes/riri.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ...}:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   config.filouterie.hostName = "riri";

configuration.nix

@@ -43,18 +43,7 @@ with pkgs.lib;
         useXkbConfig = true; # use xkb.options in tty.
       };
 
-      # Define a user account. Don't forget to set a password with ‘passwd’.
       users.users = {
-        nixos = {
-          isNormalUser = true;
-          extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-          openssh.authorizedKeys.keys = [
-            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxRk3bAqq9sRuZD2rBecM9e2XXHnaUQVCkqNjkHrugv zuma@shenanigans.cc"
-            "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDgXUerUE+Q3nRP1NHfNYSFoKeNauYBxYXAQ9+CJy4ZBWbxnQ0lp9GEF/KM2Ww0jdpW0hRUh3UJsnTauseWgSG+wxa0+j+bRj64d44G+f7QEGJ6SxcXpJljxuEoIAkhs73bZ4oAdXDMrtcaNij/YAXy6llu1vQFTGu6OytktTsEOLzTDP0tWTdyVSToD4+lk7UR5yMbSDz8gXn8/J3C3kf3mefPDTCDzMXBCixEEctY8VXM32RjlCPdxrxLKr/v5CrY2YA4WjuRhillaLwYVabkm7s98kHUvYTN48fbB5DHfgkGK6WhbfEPfta4DorQf/2D4cXpMkBt+sG1f5r9xThsv649xQB5uTg9pGeOtYn5zH3mk5wJN/2/mdveEJeCWXsXrq0GNhq+f6SE4reUvL+7MBtdpzt06D5u59JKNfXH2dQCOiqnyl0+Ahv0LoYDetJCB1dxombrUqRZvNsyD5T6lIF0tyEoK/0CXSRjr4J3nldzjPpk1uTo7kuW/clNi3KuzpQo7V8dk6I3H+jlut2lL6h8Q/P1L3p9e7T8pVi5XxbRunJYcDsWdiAb/S0y0fb0vQfGsUbi7sqvZl4fBvxYoE2NkXkWsLCN7FiFRkaTxGDh6YIo3UNllvmOxpX7tiiCV3cNLVMhcsWpNcv/U/rlBbNihODQpy1de+U2f7H8Qw== maël@Laptop-Maël"
-            "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC870BBey886dVmSb8AoK3uMs1t1dsHW7Wy1MVbpsraAYY0U6QXzhCKvO1geRIuwf4Q8mj8i2iuDwI7p1KoN8NIAmvGBs5YdIM0b4OGlLgF/7qBT9Rj54TDi4uCt4RLzorfVIzO66uGghOJPfUGXBw2gPCEJDE091fShcV9RK6ByQUvSLDJMz0fTKC5Z+ejxgzT+ZPBRusC54SPMiXlpROh/ZQ+VyfH2DjDwrXtt2wYigEMTI3/KtCKypUwbZ2JMeG4qVLIjdHXCHppq7EZWKj8HYywLlmWC3FIhHccCPrwTU5tfs35s1uExz3/ffqBpmhQmsgVeVf9Yz8uIccUZlF9UbhtKj9IJ88X2Doy+YWjXZAKWba48bSblWDH9I7R1f/t1o5lPml5UnTNsaMAmXL1oX7je+pveTJ7VB349AW8tv5PoRxYKuHuSu/J9hq43u8RQVAveaYoFpLvwBYMBmc6K02Oj3cLIPPQhQQSZ26z8NazHpIgVyQxgWhrckCb/vAi5yxl5htTcJqONTLJBWdKOj2huG16kF7m6NsJ4m8mReoYDOAcaIR1UPVJKALHw82mKdgSlBP/YrN7rTU9woBXt/QoWnWMabNM4YYr1UssiR+NS6fs4yuNZ58MaYsJi1Zlv1Vjwm9bj+rNCmYoXTbpVesn+rXbWZxIAeMqNCsHRQ== achille.toupin@gadz.org"
-          ];
-        };
-
         zuma = {
           isNormalUser = true;
           extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
@@ -63,7 +52,6 @@ with pkgs.lib;
           ];
           hashedPassword = "$y$j9T$Qc23q8HQZMELvYyubvEoF/$jauiBKEGb65K03/va632gKIuGSR2Cro/CQ1yq5mOjxB";
         };
-
         mayel = {
           isNormalUser = true;
           extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
@@ -183,6 +171,11 @@ with pkgs.lib;
         fi
       '';
 
+      # Sets /etc/hosts to link all hostnames to wireguard IP
+      networking.extraHosts = concatStringsSep "\n" (
+        attrValues (mapAttrs (hostname: { address, ... }: "${address} ${hostname}") cfg.clusterNodes)
+      );
+
       # Open ports in the firewall.
       networking.firewall = {
         enable = true;

wgautomesh.nix

@@ -1,14 +1,25 @@
-{ config, lib, pkgs, ...}:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
 let
   cfg = config.filouterie.services.wgautomesh;
 in
-  with builtins;
+with builtins;
-  {
+{
   options.filouterie.services.wgautomesh = {
     enable = mkEnableOption "wgautomesh";
     logLevel = mkOption {
-        type = types.enum [ "trace" "debug" "info" "warn" "error" ];
+      type = types.enum [
+        "trace"
+        "debug"
+        "info"
+        "warn"
+        "error"
+      ];
       default = "info";
       description = "wgautomesh log level (trace/debug/info/warn/error)";
     };
@@ -21,7 +32,8 @@ in
       description = "wgautomesh gossip port";
     };
     peers = mkOption {
-        type = types.listOf (types.submodule {
+      type = types.listOf (
+        types.submodule {
           options = {
             pubkey = mkOption {
               type = types.str;
@@ -36,30 +48,34 @@ in
               description = "bootstrap endpoint";
             };
           };
-	});
+        }
+      );
       description = "wgautomesh peer list";
     };
   };
 
   config = mkIf cfg.enable (
     let
-      peerDefs = map (peer:
+      peerDefs = map (
-        let endpointDef = if peer.endpoint == null then ""
+        peer:
-	else ''endpoint = "${peer.endpoint}"'';
+        let
+          endpointDef = if peer.endpoint == null then "" else ''endpoint = "${peer.endpoint}"'';
         in
         ''
           	  [[peers]]
           	  pubkey = "${peer.pubkey}"
           	  address = "${peer.address}"
           	  ${endpointDef}
-	'') cfg.peers;
+          	''
+      ) cfg.peers;
       configFile = pkgs.writeText "wgautomesh.toml" ''
                 interface = "${cfg.interface}"
                 gossip_port = ${toString cfg.gossipPort}
 
         	${concatStringsSep "\n" peerDefs}
         	'';
-    in {
+    in
+    {
       systemd.services.wgautomesh = {
         enable = true;
         path = [ pkgs.wireguard-tools ];
@@ -83,5 +99,6 @@ in
         };
         wantedBy = [ "multi-user.target" ];
       };
-    });
     }
+  );
+}