diff --git a/nixos/modules/private-storage.nix b/nixos/modules/private-storage.nix index cada491e04a49ce1e4931b58ffae6527f8cf77c5..3b979bfb92fbe9ec3f3a5057682ef91070611dee 100644 --- a/nixos/modules/private-storage.nix +++ b/nixos/modules/private-storage.nix @@ -21,14 +21,6 @@ let max-incident-age = "29d"; in { - # Upstream tahoe-lafs module conflicts with ours (since ours is a - # copy/paste/edit of upstream's...). Disable it. - # - # https://nixos.org/nixos/manual/#sec-replace-modules - disabledModules = - [ "services/network-filesystems/tahoe.nix" - ]; - imports = [ # Give it a good SSH configuration. ./ssh.nix diff --git a/nixos/modules/tahoe.nix b/nixos/modules/tahoe.nix index 8ea358863c8939d84857f6259b5f4370a401d908..4988109316aef8822181f198514838b26f3960a9 100644 --- a/nixos/modules/tahoe.nix +++ b/nixos/modules/tahoe.nix @@ -9,6 +9,14 @@ let ini = pkgs.callPackage ../lib/ini.nix { }; in { + # Upstream tahoe-lafs module conflicts with ours (since ours is a + # copy/paste/edit of upstream's...). Disable it. + # + # https://nixos.org/nixos/manual/#sec-replace-modules + disabledModules = + [ "services/network-filesystems/tahoe.nix" + ]; + options.services.tahoe = { introducers = mkOption { default = {};