Unverified Commit 31c64720 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #231384 from mrcjkb/tuxedo-rs

parents f75e92b4 01cc0a60

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
@@ -80,6 +80,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/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 ];

}

pkgs/os-specific/linux/tailor-gui/default.nix

0 → 100644
+60 −0
Original line number Diff line number Diff line 
{ stdenv

, lib

, rustPlatform

, cargo

, rustc

, pkg-config

, desktop-file-utils

, appstream-glib

, wrapGAppsHook4

, meson

, ninja

, libadwaita

, gtk4

, tuxedo-rs

}:

let

  src = tuxedo-rs.src;

  sourceRoot = "source/tailor_gui";

  pname = "tailor_gui";

  version = tuxedo-rs.version;

in

stdenv.mkDerivation {



  inherit src sourceRoot pname version;



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src sourceRoot;

    name = "${pname}-${version}";

    hash = "sha256-DUaSLv1V6skWXQ7aqD62uspq+I9KiWmjlwwxykVve5A=";

  };



  nativeBuildInputs = [

    rustPlatform.cargoSetupHook

    pkg-config

    desktop-file-utils

    appstream-glib

    wrapGAppsHook4

  ];



  buildInputs = [

    cargo

    rustc

    meson

    ninja

    libadwaita

    gtk4

  ];



  meta = with lib; {

    description = "Rust GUI for interacting with hardware from TUXEDO Computers";

    longDescription = ''

      An alternative to the TUXEDO Control Center (https://www.tuxedocomputers.com/en/TUXEDO-Control-Center.tuxedo),

      written in Rust.

    '';

    homepage = "https://github.com/AaronErhardt/tuxedo-rs";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ mrcjkb ];

    platforms = platforms.linux;

  };

}