talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixos/clash-verge: enable serviceModule by default

Browse Source
This commit is contained in:
wxt 2024-11-25 18:01:42 +08:00
parent 68107bed79
commit 6817299f38
No known key found for this signature in database
GPG Key ID: F62181757D8BF693
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2505.section.md
View File

@ -135,6 +135,8 @@
- `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0). - `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0).
`zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable. `zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable.
- `programs.clash-verge.tunMode` was deprecated and removed because now service mode is neccessary to start program. Without `programs.clash-verge.enable`, clash-verge-rev will refuse to start.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Other Notable Changes {#sec-release-25.05-notable-changes} ## Other Notable Changes {#sec-release-25.05-notable-changes}

27
nixos/modules/programs/clash-verge.nix
View File

@ -6,6 +6,11 @@
}: }:
{ {
imports = [
(lib.mkRemovedOptionModule [ "programs" "clash-verge" "tunMode" ] ''
The tunMode will work with service mode which is enabled by default.
'')
];
options.programs.clash-verge = { options.programs.clash-verge = {
enable = lib.mkEnableOption "Clash Verge"; enable = lib.mkEnableOption "Clash Verge";
package = lib.mkOption { package = lib.mkOption {
@ -15,10 +20,10 @@
clash-verge-rev and clash-nyanpasu, both are forks of clash-verge-rev and clash-nyanpasu, both are forks of
the original clash-verge project. the original clash-verge project.
''; '';
example = "pkgs.clash-verge-rev"; default = pkgs.clash-verge-rev;
defaultText = lib.literalExpression "pkgs.clash-verge-rev";
}; };
autoStart = lib.mkEnableOption "Clash Verge auto launch"; autoStart = lib.mkEnableOption "Clash Verge auto launch";
tunMode = lib.mkEnableOption "Clash Verge TUN mode";
}; };
config = config =
@ -37,13 +42,19 @@
)) ))
]; ];
security.wrappers.clash-verge = lib.mkIf cfg.tunMode { systemd.services.clash-verge = {
owner = "root"; enable = true;
group = "root"; description = "Clash Verge Service Mode";
capabilities = "cap_net_bind_service,cap_net_admin=+ep"; serviceConfig = {
source = "${lib.getExe cfg.package}"; ExecStart = "${cfg.package}/bin/clash-verge-service";
Restart = "on-failure";
};
wantedBy = [ "multi-user.target" ];
}; };
}; };
meta.maintainers = with lib.maintainers; [ zendo ]; meta.maintainers = with lib.maintainers; [
bot-wxt1221
Guanran928
];
} }