-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
tuxedo-drivers: init at 4.6.1 #293017
tuxedo-drivers: init at 4.6.1 #293017
Conversation
I do not have a tuxedo laptop. Maybe someone with a tuxedo laptop should test the builds? |
I am not sure how we should go on with the hardware/tuxedo-keyboard module. Either we deprecate it and introduce a new hardware/tuxedo-hardware, or we rename it. |
@blitz ? |
did some thinking and I think its best if we just rename the old module and do some adjustments to properly also integrate the tuxedo control center or something? |
Maybe. 🤷 But I suppose a more avid nix on tuxedo user should provide their points. As I mentioned at #291669 (comment) I rarely use mine anymore, so I'm also a bit out of the loop regarding their releases and changes. |
This is probably still difficult to do, due to:
I'm currently rebuilding my config using tuxedo-drivers instead of tuxedo-keyboard and come back here when I got results. |
So, together with the 6.6.17-xanmod1 kernel on a Pulse 15 Gen 1, using the tuxedo-drivers package from this PR instead of tuxedo-keyboard works flawlessly, afaict (i.e. hardware works, tuxedo control center works, no errors in dmesg). |
👍 nice. As no-one else took a stance, I think its best if we keep the old nix module and just introduce a new one? If no-one opposes that, I will do that for now. Edit: rethought, as no one did have a concrete opinion on this, I will just rename the old module, as that prevents evaluation clutter, and its a very common thing in nixpkgs. |
@RaitoBezarius I moved on to a Framework laptop, so I'm not particularly useful to test this anymore. :( |
So do I understand this correctly and TCC is not required anymore, if you use these drivers? |
Not sure, but I think it makes TCC optional. |
But most importantly: tuxedo-keyboard got merged into tuxedo-drivers. |
9036c86
to
3a68be0
Compare
bdcad16
to
f1b8530
Compare
Okay I think thats all needed. If nobody opposes anything, feel free to merge from my side :) |
f1b8530
to
7b25aa5
Compare
Had to remove the deprecation notice, as I forgot thats not how to deprecate things in nixpkgs 😅 should be good to go now.. |
I guess its ready to merge? |
ah, I think this is upstream commit bdcebd30983c3f7b2d15e8e26441d33bc5777dfe, which started passing through the |
You can fix that with the following: - makeFlags = kernel.makeFlags ++ [
- "KERNELRELEASE=${kernel.modDirVersion}"
- "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
- "INSTALL_MOD_PATH=$(out)"
- ];
+ makeFlags = lib.filter
+ (flag: lib.head (lib.strings.splitString "=" flag) != "O")
+ (kernel.makeFlags ++ [
+ "KERNELRELEASE=${kernel.modDirVersion}"
+ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+ "INSTALL_MOD_PATH=${placeholder "out"}"
+ ]); |
@CutestNekoAqua : How is this PR best tested with a flake.nix? Can I load this PR as input with: # Test tuxedo-drivers on this PR: https://github.com/NixOS/nixpkgs/pull/293017
tuxedo.url = "github:CutestNekoAqua/nixpkgs?ref=76427d3992c7a2a3293485d8322b98730afd20db"; and then I am abit stuck... |
@CutestNekoAqua : I found out:
in disabledModules = [
"hardware/tuxedo-keyboard.nix"
];
import = [
"${inputs.tuxedo}/nixos/modules/hardware/tuxedo-drivers.nix"
...
]; |
@@ -490,6 +490,8 @@ in { | |||
|
|||
rust-out-of-tree-module = if lib.versionAtLeast kernel.version "6.7" then callPackage ../os-specific/linux/rust-out-of-tree-module { } else null; | |||
|
|||
tuxedo-drivers = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-drivers { } else null; | |||
|
|||
tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the tuxedo-keyboard
kernel module was not removed from this file, is this planned for the next step?
I also tried to package this today, only now I am seeing this thread... I ended up with a working package using:
Maybe we should merge our efforts and have this merged in the nixpkgs. |
disabledModules = [
"hardware/tuxedo-keyboard.nix"
"services/hardware/tuxedo-rs.nix"
];
imports = [
# Testing PR 293017
"${inputs.tuxedo}/nixos/modules/hardware/tuxedo-drivers.nix"
"${inputs.tuxedo}/nixos/modules/services/hardware/tuxedo-rs.nix"
... and then somewhere I do: hardware.tuxedo-drivers.enable = true;
hardware.tuxedo-rs = {
enable = true;
tailor-gui.enable = true;
}; @CutestNekoAqua : I still have problems using this, how do you enable this modification over NixOS?
How do I make this |
boot.kernelPackages = pkgs.linuxKernel.packages.linux_X_X.extend (final: prev: {
tuxedo-drivers = inputs.tuxedo.legacyPackages.x86_64-linux.linuxKernel.packages.linux_X_X.tuxedo-drivers;
# OR `callPackage` it to download less packages
tuxedo-drivers = prev.callPackage (inputs.tuxedo + "/pkgs/os-specific/linux/tuxedo-keyboard/default.nix") { };
}); |
Imo this way is way to complicated. My way works fine :) |
Will fix |
@CutestNekoAqua I cloned your fork, switched to the Regarding the keyboard backlight: Gnome does support brightness level and on/off, but not change of color. Tailor does not support setting the backlight at all. The Fn hotkeys for on/off also work, together with the brightness adjustment, I don't know if there is a hotkey for changing the color. Maybe the only way to do it with this setup is using kernel params: https://nixos.wiki/wiki/TUXEDO_Devices |
Seams to work. But have not tested custom settings. |
Im also running into this issue. |
anything new? I'd like to switch to this to use the latest kernel as 6.9 is EOL. |
same goes here @SebRut, waiting |
updated version is here |
Co-Authored-By: April John <[email protected]> Co-Authored-By: Dominik Xaver Hörl <[email protected]> thanks to the work of: - NixOS#293017 - NixOS#343483
Co-authored-by: April John <[email protected]> Co-authored-by: Dominik Xaver Hörl <[email protected]> thanks to the work of: - NixOS#293017 - NixOS#343483
Co-Authored-By: April John <[email protected]> Co-Authored-By: Dominik Xaver Hörl <[email protected]> thanks to the work of: - NixOS#293017 - NixOS#343483
Co-Authored-By: April John <[email protected]> Co-Authored-By: Dominik Xaver Hörl <[email protected]> thanks to the work of: - NixOS#293017 - NixOS#343483
thank you for your work on this @CutestNekoAqua |
Description of changes
The currently-offered tuxedo-keyboard driver has been deprecated for a long time - see here.
The new driver is called tuxedo-drivers and is located here; also has a GitHub read-only mirror here.
Closes #291669
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.