Commit f8d669f4 authored by K900's avatar K900
Browse files

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

parents 45e7932c 0832d1b3
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -3918,6 +3918,12 @@
    name = "Builditluc";
    keys = [ { fingerprint = "FF16E475723B8C1E57A6B2569374074AE2D6F20E"; } ];
  };
  burmudar = {
    email = "william.bezuidenhout@gmail.com";
    github = "burmudar";
    githubId = 1001709;
    name = "William Bezuidenhout";
  };
  buurro = {
    email = "marcoburro98@gmail.com";
    github = "buurro";
@@ -14284,6 +14290,11 @@
    githubId = 2034420;
    name = "Luke Sandell";
  };
  lasantosr = {
    github = "lasantosr";
    githubId = 5946707;
    name = "Luis Santos";
  };
  lassulus = {
    email = "lassulus@gmail.com";
    matrix = "@lassulus:lassul.us";
+4 −0
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@

- `strongSwan` has been updated to 6.0. See [strongSwan 6.0.0 release notes](https://github.com/strongswan/strongswan/releases/tag/6.0.0) for a complete list of changes.

- `slurm` no longer supports gtk2.

- `amdgpu` kernel driver overdrive mode can now be enabled by setting [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable) and customized through [hardware.amdgpu.overdrive.ppfeaturemask](#opt-hardware.amdgpu.overdrive.ppfeaturemask).
  This allows for fine-grained control over the GPU's performance and maybe required by overclocking softwares like Corectrl and Lact. These new options replace old options such as {option}`programs.corectrl.gpuOverclock.enable` and {option}`programs.tuxclocker.enableAMD`.

@@ -392,3 +394,5 @@
- `sparkleshare` has been removed as it no longer builds and has been abandoned upstream.

- The `open-webui` package's postgres support have been moved to optional dependencies to comply with upstream changes in 0.6.26.

- `prl-tools` has been moved out of `linuxPackages` because Parallels Guest Tools become driverless since 26.1.0.
+3 −2
Original line number Diff line number Diff line
@@ -12,17 +12,18 @@ let
    shell:
    if (shell == "fish") then
      ''
        ${lib.getExe pkgs.git-worktree-switcher} init ${shell} | source
        ${lib.getExe cfg.package} init ${shell} | source
      ''
    else
      ''
        eval "$(${lib.getExe pkgs.git-worktree-switcher} init ${shell})"
        eval "$(${lib.getExe cfg.package} init ${shell})"
      '';
in
{
  options = {
    programs.git-worktree-switcher = {
      enable = lib.mkEnableOption "git-worktree-switcher, switch between git worktrees with speed.";
      package = lib.mkPackageOption pkgs "git-worktree-switcher" { };
    };
  };

+22 −1
Original line number Diff line number Diff line
@@ -236,13 +236,14 @@ let
    +
      /*
        Now we update the other settings defined in cleanedConfig which are not
        "folders" or "devices".
        "folders", "devices", or "guiPasswordFile".
      */
      (lib.pipe cleanedConfig [
        builtins.attrNames
        (lib.subtractLists [
          "folders"
          "devices"
          "guiPasswordFile"
        ])
        (map (subOption: ''
          curl -X PUT -d ${
@@ -251,6 +252,12 @@ let
        ''))
        (lib.concatStringsSep "\n")
      ])
    +
      # Now we hash the contents of guiPasswordFile and use the result to update the gui password
      (lib.optionalString (cfg.guiPasswordFile != null) ''
        ${pkgs.mkpasswd}/bin/mkpasswd -m bcrypt --stdin <"${cfg.guiPasswordFile}" | tr -d "\n" > "$RUNTIME_DIRECTORY/password_bcrypt"
        curl -X PATCH --variable "pw_bcrypt@$RUNTIME_DIRECTORY/password_bcrypt" --expand-json '{ "password": "{{pw_bcrypt}}" }' ${curlAddressArgs "/rest/config/gui"}
      '')
    + ''
      # restart Syncthing if required
      if curl ${curlAddressArgs "/rest/config/restart-required"} |
@@ -285,6 +292,14 @@ in
        '';
      };

      guiPasswordFile = mkOption {
        type = types.nullOr types.str;
        default = null;
        description = ''
          Path to file containing the plaintext password for Syncthing's GUI.
        '';
      };

      overrideDevices = mkOption {
        type = types.bool;
        default = true;
@@ -837,6 +852,12 @@ in
          from the configuration, creating path conflicts.
        '';
      }
      {
        assertion = (lib.hasAttrByPath [ "gui" "password" ] cfg.settings) -> cfg.guiPasswordFile == null;
        message = ''
          Please use only one of services.syncthing.settings.gui.password or services.syncthing.guiPasswordFile.
        '';
      }
    ];

    networking.firewall = mkIf cfg.openDefaultPorts {
+3 −15
Original line number Diff line number Diff line
{
  config,
  lib,
  pkgs,
  ...
}:

@@ -27,20 +28,11 @@ in
        type = types.bool;
        default = false;
        description = ''
          This enables Parallels Tools for Linux guests, along with provided
          video, mouse and other hardware drivers.
          This enables Parallels Tools for Linux guests.
        '';
      };

      package = mkOption {
        type = types.nullOr types.package;
        default = config.boot.kernelPackages.prl-tools;
        defaultText = "config.boot.kernelPackages.prl-tools";
        example = literalExpression "config.boot.kernelPackages.prl-tools";
        description = ''
          Defines which package to use for prl-tools. Override to change the version.
        '';
      };
      package = lib.mkPackageOption pkgs "prl-tools" { };
    };

  };
@@ -53,10 +45,6 @@ in

    boot.extraModulePackages = [ prl-tools ];

    boot.kernelModules = [
      "prl_tg"
    ];

    services.timesyncd.enable = false;

    systemd.services.prltoolsd = {
Loading