Modularize and fix wireguard

cluster.nix

@@ -0,0 +1,58 @@
+{ config, pkgs, lib, ...} @ args:
+  with builtins;
+  with lib;
+{
+  options.filouterie = with types; {
+    hostName = mkOption {
+      type = str;
+      description = "Node name";
+    };
+
+    clusterPrefix = mkOption {
+      type = str;
+      description = "Cluster IP prefix";
+    };
+
+    clusterNodes = mkOption {
+      description = "Nodes that are part of this cluster";
+      type = attrsOf (submodule {
+        options = {
+	  address = mkOption {
+            type = str;
+	    description = "IP Address in the Wireguard network";
+	  };
+
+	  pubkey = mkOption {
+            type = str;
+	    description = "Wireguard public key";
+	  };
+
+	  endpoint = mkOption {
+            type = str;
+	    description = "Wireguard endpoint on the public internet";
+	  };
+	};
+      });
+    };
+  };
+
+  config.filouterie.clusterPrefix = "10.0.0.0/16";
+
+  config.filouterie.clusterNodes = {
+    "fifi" = {
+      pubkey = "/TJVF6aLEvqngjd8Gq3QkH5esEQSIL+ryz/uKdJaZEQ=";
+      address = "10.0.1.1";
+      endpoint = "92.179.73.254:19720";
+    };
+    "riri" = {
+      pubkey = "lUUTv85m7vtIKY7+s//AWL5r/epjXSBZNJCrgjRfQj0=";
+      address = "10.0.2.1";
+      endpoint = "176.159.248.209:19720";
+    };
+    "loulou" = {
+      pubkey = "J/liQaChv4ZBjwlLmobM0NA/Wwgl8nDcQEcGdsC5Exc=";
+      address = "10.0.3.1";
+      endpoint = "82.67.117.71:19720";
+    };
+  };
+}

cluster/nodes/fifi.nix

@@ -1,20 +1,9 @@
 { config, lib, pkgs, ...}:
 
 {  
-   # Defining hostname
-
-   networking.hostName = "fifi";
-   
-
-   # Setting up environment variables
-
-   environment.sessionVariables = rec {
-     NODE = "fifi";
-   };
-
+   config.filouterie.hostName = "fifi";
 
    # Setting up wifi networking and static ip (out of DHCP range 50-200)
-
    networking.wireless.enable = true;
    networking.wireless.networks = {
      "Atalante_5G" = {
@@ -33,8 +22,5 @@
    
 
    # Setting up bootloader in UEFI mode
-
-   boot.loader.grub.devices = [ "nodev"];
-
-
+   config.boot.loader.grub.devices = [ "nodev"];
 }

cluster/nodes/loulou.nix

@@ -1,13 +1,5 @@
 { config, lib, pkgs, ...}:
 
 {
-   networking.hostName = "loulou";
-
-
-   # Setting up environment variables
-
-   environment.sessionVariables = rec {
-     NODE = "loulou";
-   };
-
+  config.filouterie.hostName = "loulou";
 }

cluster/nodes/riri.nix

@@ -1,16 +1,9 @@
 { config, lib, pkgs, ...}:
 
 {
+  config.filouterie.hostName = "riri";
+
   # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-   networking.hostName = "riri";
-
-   # Setting up environment variables
-
-   environment.sessionVariables = rec {
-     NODE = "riri";
-   };
-
+  config.boot.loader.systemd-boot.enable = true;
+  config.boot.loader.efi.canTouchEfiVariables = true;
 }

configuration.nix

@@ -7,19 +7,34 @@
   ...
 }:
 
+let
+  cfg = config.filouterie;
+in
+with builtins;
+with pkgs.lib;
 {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
+    ./cluster.nix
     ./node.nix
     ./wgautomesh.nix
   ];
 
-  programs.nix-ld.enable = true; # for vscode server
+  config =
+    let
+      clusterNodeCfg = getAttr cfg.hostName cfg.clusterNodes;
+      clusterAddress = clusterNodeCfg.address;
+    in
+    {
+      networking.hostName = cfg.hostName;
+      environment.sessionVariables = rec {
+        NODE = cfg.hostName;
+      };
 
+      programs.nix-ld.enable = true; # for vscode server
       # Set your time zone.
       time.timeZone = "Europe/Paris";
-
       # Select internationalisation properties.
       i18n.defaultLocale = "en_US.UTF-8";
       console = {
@@ -28,9 +43,6 @@
         useXkbConfig = true; # use xkb.options in tty.
       };
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.libinput.enable = true;
-
       # Define a user account. Don't forget to set a password with ‘passwd’.
       users.users = {
         nixos = {
@@ -115,7 +127,6 @@
       services.openssh.enable = true;
       services.openssh.settings.PasswordAuthentication = false;
 
-
       services.unbound = {
         enable = true;
         settings = {
@@ -137,7 +148,7 @@
       services.resolved.enable = false;
 
       networking.wireguard.interfaces.wg0 = {
-    ips = [ "10.0.0.0/16" ];
+        ips = [ "${clusterAddress}/16" ];
         listenPort = 19720;
         privateKeyFile = "/var/lib/filouterie/wireguard-keys/private";
         mtu = 1420;
@@ -147,26 +158,20 @@
         enable = true;
         interface = "wg0";
         gossipPort = 1600;
-    peers = [
-      # Fifi
+        peers = attrValues (
+          mapAttrs (
+            hostname:
             {
-        address = "10.0.1.1";
-	endpoint = "92.179.73.254:19720";
-	pubkey = "/TJVF6aLEvqngjd8Gq3QkH5esEQSIL+ryz/uKdJaZEQ=";
-      }
-      # Riri
+              pubkey,
+              endpoint,
+              address,
+              ...
+            }:
             {
-        address = "10.0.2.1";
-	endpoint = "176.159.248.209:19720";
-	pubkey = "lUUTv85m7vtIKY7+s//AWL5r/epjXSBZNJCrgjRfQj0=";
+              inherit pubkey address endpoint;
             }
-      # Fifi
-      {
-        address = "10.0.3.1";
-	endpoint = "82.67.117.71:19720";
-	pubkey = "J/liQaChv4ZBjwlLmobM0NA/Wwgl8nDcQEcGdsC5Exc=";
-      }
-    ];
+          ) cfg.clusterNodes
+        );
       };
 
       system.activationScripts.generate_filouterie_wg_key = ''
@@ -190,11 +195,11 @@
 
         extraCommands = ''
           # Allow other nodes on VPN to access all ports
-      iptables -A INPUT -s 10.0.0.0/16 -j ACCEPT
+            iptables -A INPUT -s ${cfg.clusterPrefix} -j ACCEPT
         '';
 
         extraStopCommands = ''
-      iptables -D INPUT -s 10.0.0.0/16 -j ACCEPT
+          iptables -D INPUT -s ${cfg.clusterPrefix} -j ACCEPT
         '';
       };
       # Garbage collection to remove old NixOs iterations
@@ -210,4 +215,5 @@
       # system.copySystemConfiguration = true;
 
       system.stateVersion = "25.05"; # Never bloody change this value, got it lads ?
+    };
 }

deploy_nix.sh

@@ -9,4 +9,5 @@ fi
 cp configuration.nix /etc/nixos/configuration.nix
 cp cluster/nodes/$NODE.nix /etc/nixos/node.nix
 cp wgautomesh.nix /etc/nixos/wgautomesh.nix
+cp cluster.nix /etc/nixos/cluster.nix
 nixos-rebuild switch