networking/fw-proxy: provide all_proxy env for cmdline

linyinfeng · Mar 7, 2024 · f333a49 · f333a49
1 parent 61f6b4e
commit f333a49
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/nixos/modules/networking/fw-proxy/default.nix b/nixos/modules/networking/fw-proxy/default.nix
@@ -12,13 +12,13 @@
  enableProxy = pkgs.writeShellApplication {
  name = "enable-proxy";
  text = ''
- ${lib.concatMapStringsSep "\n" (env: ''export ${env.name}="${env.value}"'') (lib.attrsToList cfg.environment)}
+ ${lib.concatMapStringsSep "\n" (env: ''export ${env.name}="${env.value}"'') (lib.attrsToList cfg.environmentCommandLine)}
  '';
  };
  disableProxy = pkgs.writeShellApplication {
  name = "disable-proxy";
  text = ''
- ${lib.concatMapStringsSep "\n" (name: ''export ${name}=""'') (lib.attrNames cfg.environment)}
+ ${lib.concatMapStringsSep "\n" (name: ''export ${name}=""'') (lib.attrNames cfg.environmentCommandLine)}
  '';
  };
  updateSingBoxUrl = pkgs.writeShellApplication {
@@ -398,6 +398,25 @@ in
  no_proxy = cfg.noProxy;
  };
  };
+ environmentCommandLine = mkOption {
+ type = with types; attrsOf str;
+ description = ''
+ Proxy environment for command line.
+ '';
+ default = let
+ proxyUrl = "http://localhost:${toString mixedPort}";
+ socksProxyUrl = "socks5h://localhost:${toString mixedPort}";
+ in {
+ HTTP_PROXY = proxyUrl;
+ HTTPS_PROXY = proxyUrl;
+ ALL_PROXY = socksProxyUrl;
+ http_proxy = proxyUrl;
+ https_proxy = proxyUrl;
+ all_proxy = socksProxyUrl;
+ NO_PROXY = cfg.noProxy;
+ no_proxy = cfg.noProxy;
+ };
+ };
  environmentContainter = mkOption {
  type = with types; attrsOf str;
  description = ''