Merge pull request #40043 from kierdavis/ckb-update-and-cleanup

ckb/ckb-next: 0.2.9 -> 0.3.2, and cleanup

4 files changed, 20 insertions, 9 deletions

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index a0d0b40748c7..c1649edcf236 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -197,6 +197,13 @@
       these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Package <literal>ckb</literal> is renamed to <literal>ckb-next</literal>,
+     and options <literal>hardware.ckb.*</literal> are renamed to
+     <literal>hardware.ckb-next.*</literal>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/hardware/ckb.nix b/nixos/modules/hardware/ckb-next.nix
index 8429572a8822..a275fb8fd604 100644
--- a/nixos/modules/hardware/ckb.nix
+++ b/nixos/modules/hardware/ckb-next.nix
@@ -3,17 +3,17 @@
 with lib;
 
 let
-  cfg = config.hardware.ckb;
+  cfg = config.hardware.ckb-next;
 
 in
   {
-    options.hardware.ckb = {
+    options.hardware.ckb-next = {
       enable = mkEnableOption "the Corsair keyboard/mouse driver";
 
       package = mkOption {
         type = types.package;
-        default = pkgs.ckb;
-        defaultText = "pkgs.ckb";
+        default = pkgs.ckb-next;
+        defaultText = "pkgs.ckb-next";
         description = ''
           The package implementing the Corsair keyboard/mouse driver.
         '';
@@ -23,12 +23,12 @@ in
     config = mkIf cfg.enable {
       environment.systemPackages = [ cfg.package ];
 
-      systemd.services.ckb = {
-        description = "Corsair Keyboard Daemon";
+      systemd.services.ckb-next = {
+        description = "Corsair Keyboards and Mice Daemon";
         wantedBy = ["multi-user.target"];
-        script = "${cfg.package}/bin/ckb-daemon";
+        script = "exec ${cfg.package}/bin/ckb-next-daemon";
         serviceConfig = {
-          Restart = "always";
+          Restart = "on-failure";
           StandardOutput = "syslog";
         };
       };
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0bbf9be37ceb..3d5479c31f01 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -34,7 +34,7 @@
   ./config/zram.nix
   ./hardware/all-firmware.nix
   ./hardware/brightnessctl.nix
-  ./hardware/ckb.nix
+  ./hardware/ckb-next.nix
   ./hardware/cpu/amd-microcode.nix
   ./hardware/cpu/intel-microcode.nix
   ./hardware/digitalbitbox.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index aa2b5c0b2dfb..dc0a175d5bb8 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -282,6 +282,10 @@ with lib;
     (mkRenamedOptionModule [ "programs" "man"  "enable" ] [ "documentation" "man"  "enable" ])
     (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])
 
+    # ckb
+    (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
+    (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
+
   ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
                    "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
                    "snmpExporter" "unifiExporter" "varnishExporter" ]