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

Merge master into staging-next

parents f80bca67 bbf12a91

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -11835,6 +11835,13 @@ 
    githubId = 2072185;

    name = "Marc Scholten";

  };

  mrcjkb = {

    email = "marc@jakobi.dev";

    matrix = "@mrcjk:matrix.org";

    name = "Marc Jakobi";

    github = "mrcjkb";

    githubId = 12857160;

  };

  mredaelli = {

    email = "massimo@typish.io";

    github = "mredaelli";

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

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ 


- [NNCP](http://www.nncpgo.org/). Added nncp-daemon and nncp-caller services. Configuration is set with [programs.nncp.settings](#opt-programs.nncp.settings) and the daemons are enabled at [services.nncp](#opt-services.nncp.caller.enable).



- [tuxedo-rs](https://github.com/AaronErhardt/tuxedo-rs), Rust utilities for interacting with hardware from TUXEDO Computers.



## Backward Incompatibilities {#sec-release-23.11-incompatibilities}



- The `boot.loader.raspberryPi` options have been marked deprecated, with intent for removal for NixOS 24.11. They had a limited use-case, and do not work like people expect. They required either very old installs ([before mid-2019](https://github.com/NixOS/nixpkgs/pull/62462)) or customized builds out of scope of the standard and generic AArch64 support. That option set never supported the Raspberry Pi 4 family of devices.

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -541,6 +541,7 @@ 
  ./services/hardware/tlp.nix

  ./services/hardware/trezord.nix

  ./services/hardware/triggerhappy.nix

  ./services/hardware/tuxedo-rs.nix

  ./services/hardware/udev.nix

  ./services/hardware/udisks2.nix

  ./services/hardware/undervolt.nix

nixos/modules/services/hardware/tlp.nix

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ in 
      "tlp.conf".text = (mkTlpConfig cfg.settings) + cfg.extraConfig;

    } // optionalAttrs enableRDW {

      "NetworkManager/dispatcher.d/99tlp-rdw-nm".source =

        "${tlp}/etc/NetworkManager/dispatcher.d/99tlp-rdw-nm";

        "${tlp}/usr/lib/NetworkManager/dispatcher.d/99tlp-rdw-nm";

    };



    environment.systemPackages = [ tlp ];

nixos/modules/services/hardware/tuxedo-rs.nix

0 → 100644
+49 −0
Original line number Diff line number Diff line 
{ config, lib, pkgs, ... }:



with lib;



let

  cfg = config.hardware.tuxedo-rs;



in

{

  options = {

    hardware.tuxedo-rs = {

      enable = mkEnableOption (lib.mdDoc "Rust utilities for interacting with hardware from TUXEDO Computers.");



      tailor-gui.enable = mkEnableOption (lib.mdDoc "Alternative to TUXEDO Control Center, written in Rust.");

    };

  };



  config = mkIf cfg.enable (mkMerge [

    {

      hardware.tuxedo-keyboard.enable = true;



      systemd = {

        services.tailord = {

          enable = true;

          description = "Tuxedo Tailor hardware control service";

          after = [ "systemd-logind.service" ];

          wantedBy = [ "multi-user.target" ];



          serviceConfig = {

            Type = "dbus";

            BusName = "com.tux.Tailor";

            ExecStart = "${pkgs.tuxedo-rs}/bin/tailord";

            Environment = "RUST_BACKTRACE=1";

            Restart = "on-failure";

          };

        };

      };



      services.dbus.packages = [ pkgs.tuxedo-rs ];



      environment.systemPackages = [ pkgs.tuxedo-rs ];

    }

    (mkIf cfg.tailor-gui.enable {

      environment.systemPackages = [ pkgs.tailor-gui ];

    })

  ]);



  meta.maintainers = with maintainers; [ mrcjkb ];

}