Unverified Commit 84527c8c authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents 7029ffd9 34d927eb
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
@@ -6644,6 +6644,14 @@
    github = "ErinvanderVeen";
    githubId = 10973664;
  };
  erooke = {
    email = "ethan@roo.ke";
    name = "Ethan Rooke";
    keys = [ { fingerprint = "B66B EB9F 6111 E44B 7588  8240 B287 4A77 049A 5923"; } ];
    github = "erooke";
    githubId = 46689793;
    matrix = "@ethan:roo.ke";
  };
  erosennin = {
    email = "ag@sologoc.com";
    github = "erosennin";
@@ -11279,6 +11287,13 @@
    github = "keenanweaver";
    githubId = 37268985;
  };
  keksgesicht = {
    name = "Jan Braun";
    email = "git@keksgesicht.de";
    github = "Keksgesicht";
    githubId = 32649612;
    keys = [ { fingerprint = "65DF D21C 22A9 E4CD FD1A  0804 C3D7 16E7 29B3 C86A"; } ];
  };
  keldu = {
    email = "mail@keldu.de";
    github = "keldu";
@@ -23120,6 +23135,12 @@
    githubId = 7677567;
    name = "Victor SENE";
  };
  vtimofeenko = {
    email = "nixpkgs.maintain@vtimofeenko.com";
    github = "VTimofeenko";
    githubId = 9886026;
    name = "Vladimir Timofeenko";
  };
  vtuan10 = {
    email = "mail@tuan-vo.de";
    github = "vtuan10";
+5 −1
Original line number Diff line number Diff line
@@ -448,7 +448,9 @@
  before changing the package to `pkgs.stalwart-mail` in
  [`services.stalwart-mail.package`](#opt-services.stalwart-mail.package).

- The `nomad_1_5` package was dropped, as [it has reached end-of-life upstream](https://support.hashicorp.com/hc/en-us/articles/360021185113-Support-Period-and-End-of-Life-EOL-Policy). Evaluating it will throw an error.
- The `nomad_1_5` and `nomad_1_6` package were dropped, as [they have reached end-of-life upstream](https://support.hashicorp.com/hc/en-us/articles/360021185113-Support-Period-and-End-of-Life-EOL-Policy). Evaluating them will throw an error.

- The default `nomad` package has been updated to 1.8.x. For more information, see [breaking changes for Nomad 1.8](https://developer.hashicorp.com/nomad/docs/upgrade/upgrade-specific#nomad-1-8-0)

- `androidndkPkgs` has been updated to `androidndkPkgs_26`.

@@ -727,6 +729,8 @@

- `lib.misc.mapAttrsFlatten` is now formally deprecated and will be removed in future releases; use the identical [`lib.attrsets.mapAttrsToList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.mapAttrsToList) instead.

- `virtualisation.docker.liveRestore` has been renamed to `virtualisation.docker.daemon.settings."live-restore"` and turned off by default for state versions of at least 24.11.

- Tailscale's `authKeyFile` can now have its corresponding parameters set through `config.services.tailscale.authKeyParameters`, allowing for non-ephemeral unsupervised deployment and more.
  See [Registering new nodes using OAuth credentials](https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials) for the supported options.

+35 −0
Original line number Diff line number Diff line
{ config, lib, ... }:
let
  cfg = config.hardware.tuxedo-drivers;
  tuxedo-drivers = config.boot.kernelPackages.tuxedo-drivers;
in
{
  imports = [
    (lib.mkRenamedOptionModule
      [
        "hardware"
        "tuxedo-keyboard"
      ]
      [
        "hardware"
        "tuxedo-drivers"
      ]
    )
  ];

  options.hardware.tuxedo-drivers = {
    enable = lib.mkEnableOption ''
      The tuxedo-drivers driver enables access to the following on TUXEDO notebooks:
      - Driver for Fn-keys
      - SysFS control of brightness/color/mode for most TUXEDO keyboards
      - Hardware I/O driver for TUXEDO Control Center

      For more inforation it is best to check at the source code description: <https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers>
    '';
  };

  config = lib.mkIf cfg.enable {
    boot.kernelModules = [ "tuxedo_keyboard" ];
    boot.extraModulePackages = [ tuxedo-drivers ];
  };
}
+0 −32
Original line number Diff line number Diff line
{ config, lib, pkgs, ... }:
let
  cfg = config.hardware.tuxedo-keyboard;
  tuxedo-keyboard = config.boot.kernelPackages.tuxedo-keyboard;
in
  {
    options.hardware.tuxedo-keyboard = {
      enable = lib.mkEnableOption ''
          the tuxedo-keyboard driver.

          To configure the driver, pass the options to the {option}`boot.kernelParams` configuration.
          There are several parameters you can change. It's best to check at the source code description which options are supported.
          You can find all the supported parameters at: <https://github.com/tuxedocomputers/tuxedo-keyboard#kernelparam>

          In order to use the `custom` lighting with the maximumg brightness and a color of `0xff0a0a` one would put pass {option}`boot.kernelParams` like this:

          ```
          boot.kernelParams = [
           "tuxedo_keyboard.mode=0"
           "tuxedo_keyboard.brightness=255"
           "tuxedo_keyboard.color_left=0xff0a0a"
          ];
          ```
      '';
    };

    config = lib.mkIf cfg.enable
    {
      boot.kernelModules = ["tuxedo_keyboard"];
      boot.extraModulePackages = [ tuxedo-keyboard ];
    };
  }
+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@
  ./hardware/sensor/iio.nix
  ./hardware/steam-hardware.nix
  ./hardware/system-76.nix
  ./hardware/tuxedo-keyboard.nix
  ./hardware/tuxedo-drivers.nix
  ./hardware/ubertooth.nix
  ./hardware/uinput.nix
  ./hardware/uni-sync.nix
@@ -1479,6 +1479,7 @@
  ./services/web-apps/ocis.nix
  ./services/web-apps/onlyoffice.nix
  ./services/web-apps/openvscode-server.nix
  ./services/web-apps/mediagoblin.nix
  ./services/web-apps/mobilizon.nix
  ./services/web-apps/openwebrx.nix
  ./services/web-apps/outline.nix
Loading