make home configs work

programs/kanata/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ machine, pkgs, ... }:
 let
   kanata-config = ''
     (defcfg
@@ -86,32 +86,34 @@ let
   '';
 in
 {
-  custom.program.kanata.requirements = [ "graphical" ];
-  custom.program.kanata.home-config =
-    { pkgs, config, ... }:
-    {
-      systemd.user.services.kanata = {
-        Unit = {
-          Description = "kanata";
+  custom.program.kanata = machine.program {
+    requirements = [ "graphical" ];
+    home-config =
+      { pkgs, ... }:
+      {
+        systemd.user.services.kanata = {
+          Unit = {
+            Description = "kanata";
+          };
+
+          Service = {
+            Restart = "always";
+            RestartSec = "3";
+            ExecStart = "${pkgs.kanata-with-cmd}/bin/kanata --cfg ${pkgs.writeText "kanata.kbd" kanata-config}";
+            Nice = "-20";
+          };
+
+          Install = {
+            WantedBy = [ "default.target" ];
+          };
         };
 
-        Service = {
-          Restart = "always";
-          RestartSec = "3";
-          ExecStart = "${pkgs.kanata-with-cmd}/bin/kanata --cfg ${pkgs.writeText "kanata.kbd" kanata-config}";
-          Nice = "-20";
-        };
-
-        Install = {
-          WantedBy = [ "default.target" ];
+        home.file.kanata = {
+          target = ".config/kanata/kanata.kbd";
+          text = kanata-config;
         };
       };
-
-      home.file.kanata = {
-        target = ".config/kanata/kanata.kbd";
-        text = kanata-config;
-      };
-    };
+  };
 
   # custom.program.kanata.system-config =
   #   { pkgs, ... }:
@@ -123,15 +125,6 @@ in
   # reboot or sudo udevadm control --reload-rules && sudo udevadm trigger
   # sudo modprobe uinput
 
-  users.groups.uinput = { };
-  users.extraUsers.jana.extraGroups = [
-    "uinput"
-    "input"
-  ];
-  environment.systemPackages = [ pkgs.kanata-with-cmd ];
-  services.udev.extraRules = ''
-    KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput"
-  '';
   # };
 
 }