modules/keventd: init

Author: aanderse

modules/default.nix

@@ -21,6 +21,7 @@ let
       # required modules - included by default
       "dbus"
       "elogind"
+      "keventd"
       "mdevd"
       "seatd"
       "udev"
@@ -52,6 +53,7 @@ in
       ./security
       ./services/dbus
       ./services/elogind
+      ./services/keventd
       ./services/mdevd
       ./services/seatd
       ./services/udev

modules/finit/initrd.nix

@@ -127,7 +127,13 @@ in
 
           ${lib.concatMapStringsSep "\n" mkMount (
             lib.filter (lib.getAttr "neededForBoot") (
-              lib.filter (fs: !lib.elem fs.fsType [ "luks" "lvm" ]) (lib.attrValues config.fileSystems)
+              lib.filter (
+                fs:
+                !lib.elem fs.fsType [
+                  "luks"
+                  "lvm"
+                ]
+              ) (lib.attrValues config.fileSystems)
             )
           )}
         '';
@@ -190,6 +196,7 @@ in
           task [S] name:fs-import tty:@console \
             ${lib.optionalString config.services.mdevd.enable "<run/coldplug/success>"} \
             ${lib.optionalString config.services.udev.enable "<run/udevadm:5/success>"} \
+            ${lib.optionalString config.services.keventd.enable "<service/keventd/ready>"} \
             finix-fs-import
 
           task [S] name:mount-all <task/fs-import/success> finix-mount-all
@@ -202,6 +209,10 @@ in
             service [S] <!> notify:s6 /bin/udevd --ready-notify=%n
           ''}
 
+          ${lib.optionalString config.services.keventd.enable ''
+            service [S] name:keventd notify:pid <!> keventd -n -c
+          ''}
+
           run [1] finix-switch-root
         '';
       }
@@ -222,9 +233,13 @@ in
       }
       {
         target = "/etc/group";
-        source = pkgs.writeText "group" ''
-          root:x:0:
-        '';
+        source = pkgs.writeText "group" (
+          lib.concatStringsSep "\n" (
+            lib.concatMap (g: lib.optionals (g.gid != null) [ "${g.name}:x:${toString g.gid}" ]) (
+              lib.attrValues config.users.groups
+            )
+          )
+        );
       }
       {
         target = "/etc/shadow";
@@ -245,6 +260,12 @@ in
       { source = "${config.finit.package}/lib/finit/rescue.conf"; }
       { source = "${config.finit.package}/lib/finit/tmpfiles.d"; }
       { source = "${config.finit.package}/lib/tmpfiles.d"; }
+    ]
+    ++ lib.optionals config.services.keventd.enable [
+      {
+        target = "/etc/udev/rules.d"; # keventd reads /etc - avoids collision
+        source = "${config.finit.package}/lib/udev/rules.d";
+      }
     ];
   };
 }

modules/programs/brightnessctl/default.nix

@@ -23,7 +23,7 @@ in
       type = lib.types.package;
       default = package.override {
         logindSupport = config.services.elogind.enable;
-        udevSupport = config.services.udev.enable;
+        udevSupport = config.services.udev.enable || config.services.keventd.enable;
 
         systemdLibs = config.services.elogind.package;
       };

modules/programs/hyprland/default.nix

@@ -17,16 +17,16 @@ let
     Keywords=tiling;wayland;compositor;
   '';
 
-  # libudev-zero is a hard requirement when running mdevd
+  # libudev-zero is a hard requirement when running mdevd or keventd
   libinput = pkgs.libinput.override (
-    lib.optionalAttrs config.services.mdevd.enable {
+    lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
       udev = pkgs.libudev-zero;
       wacomSupport = false;
     }
   );
 
   aquamarine = pkgs.aquamarine.override (
-    lib.optionalAttrs config.services.mdevd.enable {
+    lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
       inherit libinput;
 
       udev = pkgs.libudev-zero;
@@ -49,7 +49,7 @@ in
         inherit aquamarine libinput;
 
         # since we're recompiling go ahead and disable systemd
-        withSystemd = !config.services.mdevd.enable;
+        withSystemd = !(config.services.mdevd.enable || config.services.keventd.enable);
       };
       defaultText = lib.literalExpression "pkgs.hyprland";
       description = ''

modules/programs/labwc/default.nix

@@ -17,9 +17,9 @@ let
     Type=Application
   '';
 
-  # libudev-zero is a hard requirement when running mdevd
+  # libudev-zero is a hard requirement when running mdevd or keventd
   libinput = pkgs.libinput.override (
-    lib.optionalAttrs config.services.mdevd.enable {
+    lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
       udev = pkgs.libudev-zero;
       wacomSupport = false;
     }

modules/programs/lxqt/default.nix

@@ -29,7 +29,7 @@ let
   '';
 
   libinput = pkgs.libinput.override (
-    lib.optionalAttrs config.services.mdevd.enable {
+    lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
       udev = pkgs.libudev-zero;
       wacomSupport = false;
     }

modules/programs/mangowc/default.nix

@@ -18,9 +18,9 @@ let
     Type=Application
   '';
 
-  # libudev-zero is a hard requirement when running mdevd
+  # libudev-zero is a hard requirement when running mdevd or keventd
   libinput = pkgs.libinput.override (
-    lib.optionalAttrs config.services.mdevd.enable {
+    lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
       udev = pkgs.libudev-zero;
       wacomSupport = false;
     }

modules/programs/niri/default.nix

@@ -16,18 +16,20 @@ let
     Type=Application
   '';
 
-  overrideAttrs = lib.optionalAttrs config.services.mdevd.enable {
-    eudev = pkgs.libudev-zero;
+  overrideAttrs =
+    # libudev-zero is a hard requirement when running mdevd or keventd
+    lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
+      eudev = pkgs.libudev-zero;
 
-    # since we're recompiling go ahead and disable systemd
-    withSystemd = false;
-
-    # libudev-zero is a hard requirement when running mdevd
-    libinput = pkgs.libinput.override {
-      udev = pkgs.libudev-zero;
-      wacomSupport = false;
+      libinput = pkgs.libinput.override {
+        udev = pkgs.libudev-zero;
+        wacomSupport = false;
+      };
+    }
+    // lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
+      # since we're recompiling go ahead and disable systemd
+      withSystemd = false;
     };
-  };
 in
 {
   options.programs.niri = {

modules/programs/regreet/default.nix

@@ -11,9 +11,9 @@ let
 
   configFile = format.generate "regreet.toml" cfg.settings;
 
-  # libudev-zero is a hard requirement when running mdevd
+  # libudev-zero is a hard requirement when running mdevd or keventd
   libinput = pkgs.libinput.override (
-    lib.optionalAttrs config.services.mdevd.enable {
+    lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
       udev = pkgs.libudev-zero;
       wacomSupport = false;
     }
@@ -27,9 +27,9 @@ let
   };
 
   xinit' = pkgs.xinit.override (
-    lib.optionalAttrs config.services.mdevd.enable {
+    lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
       xorg-server = pkgs.xorg-server.override (
-        lib.optionalAttrs config.services.mdevd.enable {
+        lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
           udev = pkgs.libudev-zero;
         }
       );

modules/programs/sway/default.nix

@@ -16,9 +16,9 @@ let
     DesktopNames=sway;wlroots
   '';
 
-  # libudev-zero is a hard requirement when running mdevd
+  # libudev-zero is a hard requirement when running mdevd or keventd
   libinput = pkgs.libinput.override (
-    lib.optionalAttrs config.services.mdevd.enable {
+    lib.optionalAttrs (config.services.mdevd.enable || config.services.keventd.enable) {
       udev = pkgs.libudev-zero;
       wacomSupport = false;
     }
@@ -35,7 +35,7 @@ let
     inherit libinput wlroots_0_20;
 
     # since we're recompiling go ahead and disable systemd
-    systemdSupport = !config.services.mdevd.enable;
+    systemdSupport = !(config.services.mdevd.enable || config.services.keventd.enable);
   };
 in
 {