From 51ae8d2b0004dabe2a559bd580069d27b54966f0 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Wed, 24 Sep 2025 21:27:41 -0600 Subject: [PATCH 1/4] test From 16ceef0c36c5cbdae3147271f6d6c768228e32e1 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Fri, 26 Sep 2025 14:20:59 -0600 Subject: [PATCH 2/4] sys: add android-tools to android module --- sys/modules/android.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/modules/android.nix b/sys/modules/android.nix index 57c1964..2fad4c1 100644 --- a/sys/modules/android.nix +++ b/sys/modules/android.nix @@ -14,5 +14,9 @@ in { services.udev.packages = with pkgs; [ android-udev-rules ]; + + environment.systemPackages = with pkgs; [ + android-tools + ]; }; } From ffe6069985d443c2125b61e91024427f7b9df5e5 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Fri, 26 Sep 2025 14:20:59 -0600 Subject: [PATCH 3/4] sys: add android-tools to android module --- sys/modules/android.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/modules/android.nix b/sys/modules/android.nix index 57c1964..2fad4c1 100644 --- a/sys/modules/android.nix +++ b/sys/modules/android.nix @@ -14,5 +14,9 @@ in { services.udev.packages = with pkgs; [ android-udev-rules ]; + + environment.systemPackages = with pkgs; [ + android-tools + ]; }; } From 3632d3f54a296f3db43a4e0b59f4369d1b2f31c0 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Fri, 26 Sep 2025 18:03:05 -0600 Subject: [PATCH 4/4] sys: move fwupd to defaultDesktopPack --- sys/modules/defaultDesktopPack.nix | 4 ++++ sys/platforms/t14/default.nix | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/modules/defaultDesktopPack.nix b/sys/modules/defaultDesktopPack.nix index 9cc8283..1c231b8 100644 --- a/sys/modules/defaultDesktopPack.nix +++ b/sys/modules/defaultDesktopPack.nix @@ -36,5 +36,9 @@ in { networkmanager.enable = true; useDHCP = false; # The global useDHCP flag is deprecated, therefore explicitly set to false here. }; + + services = { + fwupd.enable = true; + }; }; } diff --git a/sys/platforms/t14/default.nix b/sys/platforms/t14/default.nix index 884293b..eb7f7d3 100644 --- a/sys/platforms/t14/default.nix +++ b/sys/platforms/t14/default.nix @@ -23,11 +23,6 @@ thinkpad.enable = true; }; - services = { - fwupd.enable = true; #TODO - pcscd.enable = true; #TODO - }; - hardware.acpilight.enable = true; networking.hostName = "t14";