From 06b3c12a19ef4e90b9a2f9f6f983402ef474c5b1 Mon Sep 17 00:00:00 2001
From: Lukas Wurzinger <lukas@wrz.one>
Date: Wed, 22 Jan 2025 20:38:41 +0100
Subject: [PATCH] stuff
---
classes/headful/hardware.nix | 3 +--
hosts/headful/work/docker.nix | 4 ++--
hosts/headful/work/phps.nix | 18 +++++++++++-------
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/classes/headful/hardware.nix b/classes/headful/hardware.nix
index c980cb3..b5416cc 100644
--- a/classes/headful/hardware.nix
+++ b/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;
diff --git a/hosts/headful/work/docker.nix b/hosts/headful/work/docker.nix
index 80fb3cf..5f25fb5 100644
--- a/hosts/headful/work/docker.nix
+++ b/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;
}
diff --git a/hosts/headful/work/phps.nix b/hosts/headful/work/phps.nix
index b8464c7..be4b232 100644
--- a/hosts/headful/work/phps.nix
+++ b/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";