Drop tuxedo-keyboard package as it moved into nixpkgs

.github/workflows/build.yml

@@ -20,10 +20,9 @@ jobs:
       with:
         name: blitz
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-        pushFilter: '(-source$|nixpkgs\.tar\.gz$)'
+        pushFilter: '(-source$|nixpkgs\.tar\.gz$|nixexprs\.tar\.xz$)'
     - run: nix-shell --run "echo OK"
     - run: nix-build --arg nixpkgs "<nixpkgs>" ./nix/ci.nix -A tuxedo-control-center
-    - run: nix-build --arg nixpkgs "<nixpkgs>" ./nix/ci.nix -A tuxedo-keyboard
 
   test:
     needs: build

README.md

@@ -34,10 +34,6 @@ in {
    tuxedo.module
  ];
 
- nixpkgs.overlays = [
-   tuxedo.overlay
- ];
-
  hardware.tuxedo.enable = true;
 }
 ```

default.nix

@@ -1,4 +1,3 @@
 {
   module = import ./nix/module.nix;
-  overlay = import ./nix/overlay.nix;
 }

nix/ci.nix

@@ -1,15 +1,10 @@
 { nixpkgs ? (import ./sources.nix).nixpkgs }:
 let
   this = import ../.;
-
-  pkgs = import nixpkgs {
-    overlays = [
-      this.overlay
-    ];
-  };
+  pkgs = import nixpkgs {};
 
 in {
-  inherit (pkgs) tuxedo-control-center tuxedo-keyboard;
+  tuxedo-control-center = pkgs.callPackage ./tuxedo-control-center {};
 
   test = pkgs.nixosTest ({ lib, pkgs, ... }: {
     name = "tuxedo-control-center-test";

nix/module.nix

@@ -4,6 +4,8 @@ with lib;
 
 let
   cfg = config.hardware.tuxedo-control-center;
+
+  tuxedo-control-center = pkgs.callPackage ./tuxedo-control-center {};
 in
 {
   options.hardware.tuxedo-control-center = {
@@ -15,45 +17,40 @@ in
       will get the default configuration until you change it in the
       Tuxedo Control Center.
     '';
+
+    package = mkOption {
+      type = types.package;
+      default = tuxedo-control-center;
+      defaultText = "pkgs.tuxedo-control-center";
+      description = ''
+        Which package to use for tuxedo-control-center.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = !config.hardware.tuxedo-keyboard.enable;
-        message = "hardware.tuxedo-control-center is not compatible with tuxedo-keyboard as long as we use our own version of the tuxedo-keyboard module.";
-      }
-    ];
-
-    boot.extraModulePackages = [
-      (pkgs.tuxedo-keyboard.override {
-        kernel = config.boot.kernelPackages.kernel;
-      })
-    ];
+    hardware.tuxedo-keyboard.enable = true;
     boot.kernelModules = [ "tuxedo_io" ];
 
-    environment.systemPackages = [
-      pkgs.tuxedo-control-center
-    ];
-
-    services.dbus.packages = [ pkgs.tuxedo-control-center ];
+    environment.systemPackages = [ cfg.package ];
+    services.dbus.packages = [ cfg.package ];
 
     systemd.services.tccd = {
-      path = [ pkgs.tuxedo-control-center ];
+      path = [ cfg.package ];
 
       description = "Tuxedo Control Center Service";
 
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
         Type = "simple";
-        ExecStart = "${pkgs.tuxedo-control-center}/bin/tccd --start";
-        ExecStop = "${pkgs.tuxedo-control-center}/bin/tccd --stop";
+        ExecStart = "${cfg.package}/bin/tccd --start";
+        ExecStop = "${cfg.package}/bin/tccd --stop";
       };
     };
 
     systemd.services.tccd-sleep = {
-      path = [ pkgs.tuxedo-control-center ];
+      path = [ cfg.package ];
 
       description = "Tuxedo Control Center Service (sleep/resume)";
 

nix/overlay.nix

@@ -1,6 +1,3 @@
 final: prev: {
   tuxedo-control-center = final.callPackage ./tuxedo-control-center {};
-  tuxedo-keyboard = final.callPackage ./tuxedo-keyboard {
-    kernel = final.linux;
-  };
 }