diff options
| author | Martin Fischer <martin@push-f.com> | 2025-03-09 18:52:38 +0100 |
|---|---|---|
| committer | Martin Fischer <martin@push-f.com> | 2025-03-09 19:04:00 +0100 |
| commit | 509f45656171f9aa4fc3398c9a2a2022da11faf8 (patch) | |
| tree | 8e687067c50507ab67d2e1a01c2583e29fb22186 | |
| parent | f4101de3db3b6a8771108e587f300156743bd350 (diff) | |
refactor: rename lib.nix to helpers.nix
To avoid confusion with nixpkgs.lib.
| -rw-r--r-- | nixos/helpers.nix (renamed from nixos/lib.nix) | 0 | ||||
| -rw-r--r-- | nixos/hosts/ev/torrent.nix | 6 | ||||
| -rw-r--r-- | nixos/shared/vpn.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/lib.nix b/nixos/helpers.nix index 7880cc7..7880cc7 100644 --- a/nixos/lib.nix +++ b/nixos/helpers.nix diff --git a/nixos/hosts/ev/torrent.nix b/nixos/hosts/ev/torrent.nix index 93a7b43..7b7cbdb 100644 --- a/nixos/hosts/ev/torrent.nix +++ b/nixos/hosts/ev/torrent.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - mylib = import <top/lib.nix>; + helpers = import <top/helpers.nix>; cfg = config.torrent; in { @@ -27,7 +27,7 @@ in systemd = { packages = [pkgs.qbittorrent-nox]; - services."qbittorrent" = mylib.joinWgNamespace cfg.networkNamespace { + services."qbittorrent" = helpers.joinWgNamespace cfg.networkNamespace { enable = true; path = [pkgs.qbittorrent-nox]; serviceConfig = { @@ -37,7 +37,7 @@ in wantedBy = ["multi-user.target"]; }; - services.qbittorrent-webui-proxy = mylib.mkPortProxy "qbittorrent" cfg.networkNamespace cfg.qbittorrentWebUiPort; + services.qbittorrent-webui-proxy = helpers.mkPortProxy "qbittorrent" cfg.networkNamespace cfg.qbittorrentWebUiPort; }; }; } diff --git a/nixos/shared/vpn.nix b/nixos/shared/vpn.nix index 44a4f2c..59fb225 100644 --- a/nixos/shared/vpn.nix +++ b/nixos/shared/vpn.nix @@ -7,7 +7,7 @@ # We're creating the wireguard interfaces in network namespaces so that # we can use them on demand: # * for a command by prefixing it with `sudo ip netns exec <ns>` - # * for a systemd service by passing its config to joinWgNamespace from lib.nix + # * for a systemd service by passing its config to joinWgNamespace from helpers.nix networking.wireguard = { enable = true; |