From ce8718b042d7f31a1c56f9e66c3add2ef7c3aaf8 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 28 Dec 2024 21:05:45 -0500 Subject: [PATCH] Add wgh wireguard network. --- nix/configuration/hosts/odo/default.nix | 3 +++ nix/configuration/hosts/odo/optimized_build.nix | 17 +++++++++++++++++ nix/configuration/roles/wireguard/default.nix | 15 ++++++++++++--- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/nix/configuration/hosts/odo/default.nix b/nix/configuration/hosts/odo/default.nix index 147e253..ff78f4a 100644 --- a/nix/configuration/hosts/odo/default.nix +++ b/nix/configuration/hosts/odo/default.nix @@ -17,4 +17,7 @@ # Early KMS boot.initrd.kernelModules = [ "amdgpu" ]; + + # Mount tmpfs at /tmp + boot.tmp.useTmpfs = true; } diff --git a/nix/configuration/hosts/odo/optimized_build.nix b/nix/configuration/hosts/odo/optimized_build.nix index 22c0ba3..56edc2a 100644 --- a/nix/configuration/hosts/odo/optimized_build.nix +++ b/nix/configuration/hosts/odo/optimized_build.nix @@ -7,6 +7,23 @@ { imports = [ ]; + nix.settings.system-features = lib.mkForce [ + "gccarch-znver4" + "gccarch-skylake" + # "gccarch-alderlake" missing pkgwait + "gccarch-x86-64-v3" + "benchmark" + "big-parallel" + "kvm" + "nixos-test" + ]; + + # nixpkgs.hostPlatform = { + # gcc.arch = "znver4"; + # gcc.tune = "znver4"; + # system = "x86_64-linux"; + # }; + nixpkgs.overlays = [ ( self: super: diff --git a/nix/configuration/roles/wireguard/default.nix b/nix/configuration/roles/wireguard/default.nix index 350486d..007e3ea 100644 --- a/nix/configuration/roles/wireguard/default.nix +++ b/nix/configuration/roles/wireguard/default.nix @@ -10,14 +10,23 @@ networking.firewall.allowedUDPPorts = [ 51821 ]; networking.wireguard.enable = true; - networking.wg-quick.interfaces.wg0.configFile = "/persist/manual/wireguard/drmario.conf"; - systemd.services."wg-quick-wg0".after = [ + networking.wg-quick.interfaces.drmario.configFile = "/persist/manual/wireguard/drmario.conf"; + systemd.services."wg-quick-drmario".after = [ "nss-lookup.target" "systemd-resolved.service" "multi-user.target" ]; - systemd.services."wg-quick-wg0".preStart = "${pkgs.toybox}/bin/sleep 10"; + systemd.services."wg-quick-drmario".preStart = "${pkgs.toybox}/bin/sleep 10"; + + networking.wg-quick.interfaces.wgh.configFile = "/persist/manual/wireguard/wgh.conf"; + systemd.services."wg-quick-wgh".after = [ + "nss-lookup.target" + "systemd-resolved.service" + "multi-user.target" + ]; + + systemd.services."wg-quick-wgh".preStart = "${pkgs.toybox}/bin/sleep 10"; # environment.systemPackages = with pkgs; [ # wireguard-tools