diff options
-rw-r--r-- | hosts/ahmed/torrenting/default.nix | 1 | ||||
-rw-r--r-- | hosts/ahmed/torrenting/reverse-proxy.nix | 3 | ||||
-rw-r--r-- | hosts/ahmed/torrenting/wireguard.nix | 6 | ||||
-rw-r--r-- | modules/nixos/qbittorrent/default.nix | 16 |
4 files changed, 10 insertions, 16 deletions
diff --git a/hosts/ahmed/torrenting/default.nix b/hosts/ahmed/torrenting/default.nix index 9fc3fb1..efa4403 100644 --- a/hosts/ahmed/torrenting/default.nix +++ b/hosts/ahmed/torrenting/default.nix @@ -1,5 +1,4 @@ # This module configures the my torrenting setup. It uses qBittorrent over a VPN. - { pkgs, options, diff --git a/hosts/ahmed/torrenting/reverse-proxy.nix b/hosts/ahmed/torrenting/reverse-proxy.nix index fb141ed..a829e5a 100644 --- a/hosts/ahmed/torrenting/reverse-proxy.nix +++ b/hosts/ahmed/torrenting/reverse-proxy.nix @@ -1,6 +1,5 @@ # This module configures a reverse proxy for the various services that are # exposed to the internet. - { pkgs, config, @@ -44,7 +43,7 @@ in { locations."/" = { index = "index.html"; - root = pkgs.runCommand "${baseDomain}-portal" { inherit qbDomain jellyfinDomain; } '' + root = pkgs.runCommand "${baseDomain}-portal" {inherit qbDomain jellyfinDomain;} '' mkdir $out ${pkgs.xorg.lndir}/bin/lndir ${./portal} $out diff --git a/hosts/ahmed/torrenting/wireguard.nix b/hosts/ahmed/torrenting/wireguard.nix index 22d3f9c..af21848 100644 --- a/hosts/ahmed/torrenting/wireguard.nix +++ b/hosts/ahmed/torrenting/wireguard.nix @@ -1,9 +1,5 @@ # This module configures a WireGuard for qBittorrent to use. - -{ - config, - ... -}: let +{config, ...}: let wgInterface = "wg0"; wgPort = 51820; in { diff --git a/modules/nixos/qbittorrent/default.nix b/modules/nixos/qbittorrent/default.nix index 2d2c591..ad4b7e6 100644 --- a/modules/nixos/qbittorrent/default.nix +++ b/modules/nixos/qbittorrent/default.nix @@ -132,16 +132,16 @@ in { configPath = "${cfg.profile}/qBittorrent/config/qBittorrent.conf"; start-pre-script = pkgs.writeShellScript "qbittorrent-start-pre" '' - set -ue + set -ue - # Create data directory if it doesn't exist - if ! test -d ${cfg.profile}; then - echo "Creating initial qBittorrent data directory in: ${cfg.profile}" - install -d -m 0755 -o ${cfg.user} -g ${cfg.group} ${cfg.profile}/qBittorrent/config/ - fi + # Create data directory if it doesn't exist + if ! test -d ${cfg.profile}; then + echo "Creating initial qBittorrent data directory in: ${cfg.profile}" + install -d -m 0755 -o ${cfg.user} -g ${cfg.group} ${cfg.profile}/qBittorrent/config/ + fi - # Force-apply configuration. - ${pkgs.crudini}/bin/crudini --ini-options=nospace --merge ${configPath} <${settingsFile} + # Force-apply configuration. + ${pkgs.crudini}/bin/crudini --ini-options=nospace --merge ${configPath} <${settingsFile} ''; in # Requires full permissions to create data directory, hence the "!". |