diff options
| author | azahi <azat@bahawi.net> | 2024-10-21 16:18:14 +0300 |
|---|---|---|
| committer | azahi <azat@bahawi.net> | 2024-10-21 16:18:14 +0300 |
| commit | 589c40482489e4d844ad7e540bf90fec07b9b631 (patch) | |
| tree | 082cf60cf7ecbe5d8205ff8f5c2c7d36da0aec01 | |
| parent | 2024-10-21 (diff) | |
2024-10-21
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | modules/wireguard.nix | 6 | ||||
| -rw-r--r-- | overlays.nix | 17 |
3 files changed, 16 insertions, 13 deletions
diff --git a/flake.lock b/flake.lock index af77467..ed48601 100644 --- a/flake.lock +++ b/flake.lock @@ -616,11 +616,11 @@ }, "nixpkgs-amneziawg": { "locked": { - "lastModified": 1728518462, - "narHash": "sha256-RTZ6X/fae4dRPGk0g/LMsD9yRfJ/N2kRQJ4TIaoGNIc=", + "lastModified": 1729516182, + "narHash": "sha256-u+HH+gyGSUERSnhYVFX/jMykfpDrQJvGUNsBmN31GsM=", "owner": "azahi", "repo": "nixpkgs", - "rev": "8030066aad97e91dbbb11a32788c7a1f89addf1c", + "rev": "cebf00faa0dab35517b368b5d14dc42018bf3ee0", "type": "github" }, "original": { diff --git a/modules/wireguard.nix b/modules/wireguard.nix index 8ea360b..fe01a86 100644 --- a/modules/wireguard.nix +++ b/modules/wireguard.nix @@ -21,12 +21,12 @@ let in { disabledModules = [ - "services/networking/wireguard.nix" "services/networking/wg-quick.nix" + "services/networking/wireguard.nix" ]; imports = [ - "${inputs.nixpkgs-amneziawg}/nixos/modules/services/networking/wireguard.nix" "${inputs.nixpkgs-amneziawg}/nixos/modules/services/networking/wg-quick.nix" + "${inputs.nixpkgs-amneziawg}/nixos/modules/services/networking/wireguard.nix" ]; options.nixfiles.modules.wireguard = { @@ -238,7 +238,7 @@ in }; services.prometheus.exporters.wireguard = { - enable = true; + enable = false; # TODO Doesn't work with amneziawg-tools. listenAddress = mkDefault this.wireguard.ipv4.address; withRemoteIp = true; port = 9586; diff --git a/overlays.nix b/overlays.nix index 5800a76..4a4401c 100644 --- a/overlays.nix +++ b/overlays.nix @@ -118,32 +118,35 @@ }; linuxPackages_latest = prev.linuxPackages_latest.extend ( - x: _: { + self: _: { amneziawg = inputs.nixpkgs-amneziawg.legacyPackages.${final.system}.linuxPackages_latest.amneziawg.override { - inherit (x) kernel; + inherit (self) kernel; }; } ); linuxPackages_hardened = prev.linuxPackages_hardened.extend ( - x: _: { + self: _: { amneziawg = inputs.nixpkgs-amneziawg.legacyPackages.${final.system}.linuxPackages_hardened.amneziawg.override { - inherit (x) kernel; + inherit (self) kernel; }; } ); linuxPackages_xanmod_latest = prev.linuxPackages_xanmod_latest.extend ( - x: _: { + self: _: { amneziawg = inputs.nixpkgs-amneziawg.legacyPackages.${final.system}.linuxPackages_xanmod_latest.amneziawg.override { - inherit (x) kernel; + inherit (self) kernel; }; } ); - inherit (inputs.nixpkgs-amneziawg.legacyPackages.${final.system}) amneziawg-go amneziawg-tools; + inherit (inputs.nixpkgs-amneziawg.legacyPackages.${final.system}) + amneziawg-go + amneziawg-tools + ; }; } |