stuff

classes/headful/hardware.nix

@@ -4,8 +4,7 @@
     steam-hardware.enable = true;
     xone.enable = true;
     xpadneo.enable = true;
-    # TODO
-    # opentabletdriver.enable = true;
+    opentabletdriver.enable = true;
     graphics = {
       enable = true;
       enable32Bit = true;

hosts/headful/work/docker.nix

@@ -5,9 +5,9 @@
 }: {
   virtualisation.docker.enable = true;
 
-  users.groups.docker.members = config.users.normalUsers;
-
   environment.systemPackages = [
     pkgs.docker-compose
   ];
+
+  users.groups.docker.members = config.users.normalUsers;
 }

hosts/headful/work/phps.nix

@@ -27,8 +27,8 @@
 
   phps = lib.genAttrs supportedPhps (
     phpName: let
-      base = inputs.phps.packages.${pkgs.system}.${phpName};
-      unwrapped = base.buildEnv {
+      phpBase = inputs.phps.packages.${pkgs.system}.${phpName};
+      phpWithEnv = phpBase.buildEnv {
         extensions = {
           enabled,
           all,
@@ -36,18 +36,22 @@
           enabled
           ++ [all.xdebug]
           ++ (
-            if (lib.versionAtLeast base.version "8")
+            if (lib.versionAtLeast phpBase.version "8")
             then [all.amqp]
             else []
           );
         inherit extraConfig;
       };
-      wrapped = pkgs.symlinkJoin {
-        inherit (unwrapped) name version meta passthru;
-        paths = [unwrapped unwrapped.packages.composer pkgs.symfony-cli];
+      phpWithTools = pkgs.symlinkJoin {
+        inherit (phpWithEnv) name version meta passthru;
+        paths = [
+          phpWithEnv
+          phpWithEnv.packages.composer
+          pkgs.symfony-cli
+        ];
       };
     in
-      wrapped
+      phpWithTools
   );
 
   prefix = "/var/lib/phps";