l antimicrox: fix with newer versions

3 files changed, 62 insertions, 47 deletions

diff --git a/lass/2configs/antimicrox/default.nix b/lass/2configs/antimicrox/default.nix
index 16f546ce6..2b683b8bc 100644
--- a/lass/2configs/antimicrox/default.nix
+++ b/lass/2configs/antimicrox/default.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, ... }:
 {
   systemd.services.antimicrox = {
+    after = [ "display-manager.service" ];
     wantedBy = [ "multi-user.target" ];
     environment = {
       DISPLAY = ":0";
@@ -8,18 +9,23 @@
     serviceConfig = {
       User = config.users.users.mainUser.name;
       ExecStartPre = lib.singleton (pkgs.writeDash "init_state" "echo 0 > /tmp/gamepad.state");
-      ExecStart = "${pkgs.antimicrox}/bin/antimicrox --no-tray --hidden --profile ${./mouse.amgp}";
+      ExecStart = "${pkgs.antimicrox}/bin/antimicrox --hidden --profile ${./mouse.gamecontroller.amgp}";
     };
   };
 
+  services.udev.extraRules = ''
+    KERNEL=="uinput", MODE="0660", GROUP="input", OPTIONS+="static_node=uinput"
+  '';
+
   environment.systemPackages = [
+    pkgs.antimicrox
     (pkgs.writers.writeDashBin "gamepad_mouse_disable" ''
       echo 1 > /tmp/gamepad.state
-      ${pkgs.antimicrox}/bin/antimicrox --profile ${./empty.amgp}
+      ${pkgs.antimicrox}/bin/antimicrox --profile ${./empty.gamecontroller.amgp}
     '')
     (pkgs.writers.writeDashBin "gamepad_mouse_enable" ''
       echo 0 > /tmp/gamepad.state
-      ${pkgs.antimicrox}/bin/antimicrox --profile ${./mouse.amgp}
+      ${pkgs.antimicrox}/bin/antimicrox --profile ${./mouse.gamecontroller.amgp}
     '')
     (pkgs.writers.writeDashBin "gamepad_mouse_toggle" ''
       state=$(${pkgs.coreutils}/bin/cat /tmp/gamepad.state)
diff --git a/lass/2configs/antimicrox/empty.amgp b/lass/2configs/antimicrox/empty.gamecontroller.amgp
index 0257bfe71..0257bfe71 100644
--- a/lass/2configs/antimicrox/empty.amgp
+++ b/lass/2configs/antimicrox/empty.gamecontroller.amgp
diff --git a/lass/2configs/antimicrox/mouse.amgp b/lass/2configs/antimicrox/mouse.gamecontroller.amgp
index 313e598de..743618f54 100644
--- a/lass/2configs/antimicrox/mouse.amgp
+++ b/lass/2configs/antimicrox/mouse.gamecontroller.amgp
@@ -23,7 +23,8 @@
                 <maxZone>29501</maxZone>
                 <modifierZone>1412</modifierZone>
                 <diagonalRange>90</diagonalRange>
-                <stickbutton index="7">
+                <squareStick>100</squareStick>
+                <stickbutton index="1">
                     <mousespeedx>74</mousespeedx>
                     <mousespeedy>74</mousespeedy>
                     <accelerationmultiplier>4</accelerationmultiplier>
@@ -32,16 +33,12 @@
                     <extraaccelerationcurve>easeoutquad</extraaccelerationcurve>
                     <slots>
                         <slot>
-                            <code>3</code>
+                            <code>1</code>
                             <mode>mousemovement</mode>
                         </slot>
                     </slots>
                 </stickbutton>
-                <stickbutton index="6">
-                    <mousespeedx>74</mousespeedx>
-                    <mousespeedy>74</mousespeedy>
-                </stickbutton>
-                <stickbutton index="5">
+                <stickbutton index="3">
                     <mousespeedx>74</mousespeedx>
                     <mousespeedy>74</mousespeedy>
                     <accelerationmultiplier>4</accelerationmultiplier>
@@ -50,16 +47,16 @@
                     <extraaccelerationcurve>easeoutquad</extraaccelerationcurve>
                     <slots>
                         <slot>
-                            <code>2</code>
+                            <code>4</code>
                             <mode>mousemovement</mode>
                         </slot>
                     </slots>
                 </stickbutton>
-                <stickbutton index="4">
+                <stickbutton index="2">
                     <mousespeedx>74</mousespeedx>
                     <mousespeedy>74</mousespeedy>
                 </stickbutton>
-                <stickbutton index="3">
+                <stickbutton index="5">
                     <mousespeedx>74</mousespeedx>
                     <mousespeedy>74</mousespeedy>
                     <accelerationmultiplier>4</accelerationmultiplier>
@@ -68,16 +65,16 @@
                     <extraaccelerationcurve>easeoutquad</extraaccelerationcurve>
                     <slots>
                         <slot>
-                            <code>4</code>
+                            <code>2</code>
                             <mode>mousemovement</mode>
                         </slot>
                     </slots>
                 </stickbutton>
-                <stickbutton index="2">
+                <stickbutton index="4">
                     <mousespeedx>74</mousespeedx>
                     <mousespeedy>74</mousespeedy>
                 </stickbutton>
-                <stickbutton index="1">
+                <stickbutton index="7">
                     <mousespeedx>74</mousespeedx>
                     <mousespeedy>74</mousespeedy>
                     <accelerationmultiplier>4</accelerationmultiplier>
@@ -86,11 +83,15 @@
                     <extraaccelerationcurve>easeoutquad</extraaccelerationcurve>
                     <slots>
                         <slot>
-                            <code>1</code>
+                            <code>3</code>
                             <mode>mousemovement</mode>
                         </slot>
                     </slots>
                 </stickbutton>
+                <stickbutton index="6">
+                    <mousespeedx>74</mousespeedx>
+                    <mousespeedy>74</mousespeedy>
+                </stickbutton>
                 <stickbutton index="8">
                     <mousespeedx>74</mousespeedx>
                     <mousespeedy>74</mousespeedy>
@@ -99,66 +100,66 @@
             <stick index="1">
                 <deadZone>2578</deadZone>
                 <maxZone>30799</maxZone>
-                <stickbutton index="7">
+                <stickbutton index="1">
                     <mouseacceleration>linear</mouseacceleration>
                     <slots>
                         <slot>
-                            <code>6</code>
+                            <code>4</code>
                             <mode>mousebutton</mode>
                         </slot>
                     </slots>
                 </stickbutton>
-                <stickbutton index="6">
-                    <mouseacceleration>linear</mouseacceleration>
-                </stickbutton>
-                <stickbutton index="5">
+                <stickbutton index="3">
                     <mouseacceleration>linear</mouseacceleration>
                     <slots>
                         <slot>
-                            <code>5</code>
+                            <code>7</code>
                             <mode>mousebutton</mode>
                         </slot>
                     </slots>
                 </stickbutton>
-                <stickbutton index="4">
+                <stickbutton index="2">
                     <mouseacceleration>linear</mouseacceleration>
                 </stickbutton>
-                <stickbutton index="3">
+                <stickbutton index="5">
                     <mouseacceleration>linear</mouseacceleration>
                     <slots>
                         <slot>
-                            <code>7</code>
+                            <code>5</code>
                             <mode>mousebutton</mode>
                         </slot>
                     </slots>
                 </stickbutton>
-                <stickbutton index="2">
+                <stickbutton index="4">
                     <mouseacceleration>linear</mouseacceleration>
                 </stickbutton>
-                <stickbutton index="1">
+                <stickbutton index="7">
                     <mouseacceleration>linear</mouseacceleration>
                     <slots>
                         <slot>
-                            <code>4</code>
+                            <code>6</code>
                             <mode>mousebutton</mode>
                         </slot>
                     </slots>
                 </stickbutton>
+                <stickbutton index="6">
+                    <mouseacceleration>linear</mouseacceleration>
+                </stickbutton>
                 <stickbutton index="8">
                     <mouseacceleration>linear</mouseacceleration>
                 </stickbutton>
             </stick>
             <dpad index="1">
-                <dpadbutton index="6">
+                <dpadbutton index="12">
                     <wheelspeedx>2</wheelspeedx>
                     <wheelspeedy>10</wheelspeedy>
                 </dpadbutton>
-                <dpadbutton index="4">
-                    <wheelspeedx>2</wheelspeedx>
+                <dpadbutton index="1">
+                    <wheelspeedx>10</wheelspeedx>
                     <wheelspeedy>10</wheelspeedy>
                     <slots>
                         <slot>
-                            <code>0x1000017</code>
+                            <code>0x1000013</code>
                             <mode>keyboard</mode>
                         </slot>
                     </slots>
@@ -172,22 +173,22 @@
                     <wheelspeedy>10</wheelspeedy>
                     <slots>
                         <slot>
-                            <code>0x1000011</code>
+                            <code>0x1000014</code>
                             <mode>keyboard</mode>
                         </slot>
                     </slots>
                 </dpadbutton>
-                <dpadbutton index="1">
-                    <wheelspeedx>10</wheelspeedx>
+                <dpadbutton index="4">
+                    <wheelspeedx>2</wheelspeedx>
                     <wheelspeedy>10</wheelspeedy>
                     <slots>
                         <slot>
-                            <code>0x1000016</code>
+                            <code>0x1000015</code>
                             <mode>keyboard</mode>
                         </slot>
                     </slots>
                 </dpadbutton>
-                <dpadbutton index="12">
+                <dpadbutton index="6">
                     <wheelspeedx>2</wheelspeedx>
                     <wheelspeedy>10</wheelspeedy>
                 </dpadbutton>
@@ -200,7 +201,7 @@
                     <wheelspeedy>10</wheelspeedy>
                     <slots>
                         <slot>
-                            <code>0x1000010</code>
+                            <code>0x1000012</code>
                             <mode>keyboard</mode>
                         </slot>
                     </slots>
@@ -235,31 +236,39 @@
                     </slot>
                 </slots>
             </button>
-            <button index="5">
+            <button index="2">
                 <slots>
                     <slot>
-                        <code>1</code>
+                        <code>3</code>
                         <mode>mousebutton</mode>
                     </slot>
                 </slots>
             </button>
-            <button index="3">
+            <button index="1">
                 <slots>
                     <slot>
-                        <code>2</code>
+                        <code>1</code>
                         <mode>mousebutton</mode>
                     </slot>
                 </slots>
             </button>
-            <button index="2">
+            <button index="4">
                 <slots>
                     <slot>
-                        <code>3</code>
+                        <code>0x1000004</code>
+                        <mode>keyboard</mode>
+                    </slot>
+                </slots>
+            </button>
+            <button index="3">
+                <slots>
+                    <slot>
+                        <code>2</code>
                         <mode>mousebutton</mode>
                     </slot>
                 </slots>
             </button>
-            <button index="1">
+            <button index="5">
                 <slots>
                     <slot>
                         <code>1</code>