Commit b2390954 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 81ed1c72 bf099a49

maintainers/maintainer-list.nix

+7 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ 
  adamperkowski = {

    name = "Adam Perkowski";

    email = "me@adamperkowski.dev";

    matrix = "@xx0a_q:matrix.org";

    matrix = "@adam:matrix.system72.dev";

    github = "adamperkowski";

    githubId = 75480869;

    keys = [
@@ -1192,6 +1192,12 @@ 
    githubId = 2335822;

    name = "Alexandre Esteves";

  };

  alexland7219 = {

    email = "alexland7219@gmail.com";

    github = "alexland7219";

    githubId = 58669111;

    name = "Alexandre Ros";

  };

  alexnabokikh = {

    email = "nabokikh@duck.com";

    github = "alexnabokikh";

nixos/modules/services/backup/pgbackrest.nix

+2 −8
Original line number Diff line number Diff line
@@ -83,10 +83,7 @@ let 
  secretPathOption =

    with lib.types;

    lib.mkOption {

      type = nullOr (pathWith {

        inStore = false;

        absolute = true;

      });

      type = nullOr externalPath;

      default = null;

      internal = true;

    };
@@ -142,10 +139,7 @@ in 
              };



              options.sftp-private-key-file = lib.mkOption {

                type = nullOr (pathWith {

                  inStore = false;

                  absolute = true;

                });

                type = nullOr externalPath;

                default = null;

                description = ''

                  SFTP private key file.

nixos/modules/services/databases/postgres-websockets.nix

+2 −12
Original line number Diff line number Diff line
@@ -31,12 +31,7 @@ in 
    enable = lib.mkEnableOption "postgres-websockets";



    pgpassFile = lib.mkOption {

      type =

        with lib.types;

        nullOr (pathWith {

          inStore = false;

          absolute = true;

        });

      type = with lib.types; nullOr externalPath;

      default = null;

      example = "/run/keys/db_password";

      description = ''
@@ -54,12 +49,7 @@ in 
    };



    jwtSecretFile = lib.mkOption {

      type =

        with lib.types;

        nullOr (pathWith {

          inStore = false;

          absolute = true;

        });

      type = with lib.types; nullOr externalPath;

      example = "/run/keys/jwt_secret";

      description = ''

        Secret used to sign JWT tokens used to open communications channels.

nixos/modules/services/databases/postgrest.nix

+2 −12
Original line number Diff line number Diff line
@@ -54,12 +54,7 @@ in 
    enable = lib.mkEnableOption "PostgREST";



    pgpassFile = lib.mkOption {

      type =

        with lib.types;

        nullOr (pathWith {

          inStore = false;

          absolute = true;

        });

      type = with lib.types; nullOr externalPath;

      default = null;

      example = "/run/keys/db_password";

      description = ''
@@ -77,12 +72,7 @@ in 
    };



    jwtSecretFile = lib.mkOption {

      type =

        with lib.types;

        nullOr (pathWith {

          inStore = false;

          absolute = true;

        });

      type = with lib.types; nullOr externalPath;

      default = null;

      example = "/run/keys/jwt_secret";

      description = ''

nixos/modules/services/desktop-managers/plasma6.nix

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ in 
    services.upower.enable = config.powerManagement.enable;

    services.libinput.enable = mkDefault true;

    services.geoclue2.enable = mkDefault true;

    services.fwupd.enable = mkDefault true;



    # Extra UDEV rules used by Solid

    services.udev.packages = [