diff --git a/modules/nncp.nix b/modules/nncp.nix
index a78f9bea..fd6037eb 100644
--- a/modules/nncp.nix
+++ b/modules/nncp.nix
@@ -11,43 +11,6 @@ let
pkg = programCfg.package;
in {
options = {
- programs.nncp = {
-
- enable = mkEnableOption "NNCP (Node to Node copy) utilities";
-
- package = mkOption {
- type = types.package;
- default = pkgs.nncp;
- defaultText = literalExpression "pkgs.nncp";
- description = "The NNCP package to use system-wide.";
- };
-
- secrets = mkOption {
- type = with types; listOf str;
- example = [ "/run/keys/nncp.hjson" ];
- description = ''
- A list of paths to NNCP configuration files that should not be
- in the Nix store. These files are layered on top of the values at
- .
- '';
- };
-
- settings = mkOption {
- type = settingsFormat.type;
- description = ''
- NNCP configuration, see
- .
- At runtime these settings will be overlayed by the contents of
- into the file
- ${nncpCfgFile}. Node keypairs go in
- secrets, do not specify them in
- settings as they will be leaked into
- /nix/store!
- '';
- default = { };
- };
-
- };
services.nncp = {
@@ -110,35 +73,6 @@ in {
message = "NNCP caller enabled but call configuration is missing";
}];
- programs.nncp.settings = {
- spool = mkDefault "/var/spool/nncp";
- log = mkDefault "/var/spool/nncp/log";
- };
-
- environment = mkIf programCfg.enable {
- systemPackages = [ pkg ];
- etc."nncp.hjson".source = nncpCfgFile;
- };
-
- systemd.tmpfiles.rules = [
- "d ${programCfg.settings.spool} 0770 root uucp"
- "f ${programCfg.settings.log} 0770 root uucp"
- ];
-
- system.activationScripts.nncp = ''
- nncpCfgDir=$(mktemp --directory nncp.XXXXXXXXXX)
- for f in ${jsonCfgFile} ${toString config.programs.nncp.secrets}; do
- tmpdir=$(mktemp --directory nncp.XXXXXXXXXX)
- ${pkg}/bin/nncp-cfgdir -cfg $f -dump $tmpdir
- ${pkgs.findutils}/bin/find $tmpdir -size 1c -delete
- cp -a $tmpdir/* $nncpCfgDir/
- rm -rf $tmpdir
- done
- ${pkg}/bin/nncp-cfgdir -load $nncpCfgDir > ${nncpCfgFile}
- rm -rf $nncpCfgDir
- chgrp uucp ${nncpCfgFile}
- '';
-
systemd.services."nncp-caller" = {
inherit (callerCfg) enable;
description = "Croned NNCP TCP daemon caller.";