Skip to content
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.

Sign up for GitHub

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

merge queue: embarking master (90642a0) and #1233 together #1234

Closed
wants to merge 3 commits into from
Closed

merge queue: embarking master (90642a0) and #1233 together #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
080942c
tests: update flake lock
soopyc Nov 6, 2024
ca3e271
tuxedo/aura/15-gen1: migrate renamed option
soopyc Nov 6, 2024
a2e5329
Merge of #1233
mergify[bot] Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions tests/flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions tuxedo/aura/15/gen1/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{lib, ...}: {
{ lib, ... }:
{
imports = [
../../../../common/cpu/amd
../../../../common/pc/laptop
Expand All @@ -9,5 +10,13 @@
services.thermald.enable = lib.mkDefault true;

# keyboard backlight lives in /sys/class/leds/rgb:kbd_backlight
hardware.tuxedo-keyboard.enable = lib.mkDefault true;
hardware =
if lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11" then
{
tuxedo-drivers.enable = lib.mkDefault true;
}
else
{
tuxedo-keyboard.enable = lib.mkDefault true;
};
}