Unverified Commit bdd2e6b1 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #309324 from evenbrenden/move-jotta-cli 

nixos/jotta-cli: move to services.jotta-cli
parents 656409d2 9fa89d0e

nixos/doc/manual/release-notes/rl-2405.section.md

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- [mautrix-meta](https://github.com/mautrix/meta), a Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge. Available as services.mautrix-meta



- [Jottacloud Command-line Tool](https://docs.jottacloud.com/en/articles/1436834-jottacloud-command-line-tool), a CLI for the [Jottacloud](https://jottacloud.com/) cloud storage provider. Available as [user.services.jotta-cli](#opt-user.services.jotta-cli.enable).

- [Jottacloud Command-line Tool](https://docs.jottacloud.com/en/articles/1436834-jottacloud-command-line-tool), a CLI for the [Jottacloud](https://jottacloud.com/) cloud storage provider. Available as [services.jotta-cli](#opt-services.jotta-cli.enable).



- [transfer-sh](https://github.com/dutchcoders/transfer.sh), a tool that supports easy and fast file sharing from the command-line. Available as [services.transfer-sh](#opt-services.transfer-sh.enable).

nixos/modules/services/networking/jotta-cli.md

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ The [Jottacloud Command-line Tool](https://docs.jottacloud.com/en/articles/14368 


```nix

{

  user.services.jotta-cli.enable = true;

  services.jotta-cli.enable = true;

}

```
@@ -15,7 +15,7 @@ This adds `jotta-cli` to `environment.systemPackages` and starts a user service 
## Example Configuration {#module-services-jotta-cli-example-configuration}



```nix

user.services.jotta-cli = {

services.jotta-cli = {

  enable = true;

  options = [ "slow" ];

  package = pkgs.jotta-cli;

nixos/modules/services/networking/jotta-cli.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 


with lib;



let cfg = config.user.services.jotta-cli;

let cfg = config.services.jotta-cli;

in {

  options = {

    user.services.jotta-cli = {

    services.jotta-cli = {



      enable = mkEnableOption "Jottacloud Command-line Tool";

nixos/tests/jotta-cli.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { 
  meta.maintainers = with pkgs.lib.maintainers; [ evenbrenden ];



  nodes.machine = { pkgs, ... }: {

    user.services.jotta-cli.enable = true;

    services.jotta-cli.enable = true;

    imports = [ ./common/user-account.nix ];

  };