From 7289db6b76256d769859a5d4f5d62c1996091903 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 1 Mar 2025 19:10:56 +0000
Subject: [PATCH] Move docker group addition to opdavies user module

---
 nix/hosts/t490/modules/docker.nix |  2 --
 nix/users/opdavies/default.nix    | 11 ++++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/nix/hosts/t490/modules/docker.nix b/nix/hosts/t490/modules/docker.nix
index 3314fcd..a878015 100644
--- a/nix/hosts/t490/modules/docker.nix
+++ b/nix/hosts/t490/modules/docker.nix
@@ -1,5 +1,3 @@
 {
   virtualisation.docker.enable = true;
-
-  users.users.opdavies.extraGroups = [ "docker" ];
 }
diff --git a/nix/users/opdavies/default.nix b/nix/users/opdavies/default.nix
index b21300a..affe382 100644
--- a/nix/users/opdavies/default.nix
+++ b/nix/users/opdavies/default.nix
@@ -1,8 +1,6 @@
-{
-  pkgs,
-  headless,
-  ...
-}:
+{ config, lib, ... }:
+
+with lib;
 
 {
   users.users.opdavies = {
@@ -11,10 +9,9 @@
     isNormalUser = true;
 
     extraGroups = [
-      "docker"
       "networkmanager"
       "wheel"
-    ];
+    ] ++ optionals config.virtualisation.docker.enable [ "docker" ];
 
     openssh.authorizedKeys.keys = [
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDkkbYaCD9NUIQT0NnsmlyfepwjxBYeiJSBCotOpdPTyc5inFAd29DiVw98j4skfaHdzjcqWmMFmDQWM6tGkK7eg8n0WuaABmsjdEbzTtfjHwM0tRDCIh5AtoT4IvoLhwLjEI2jKM05BGCQ2m5lS//AYJK1DjiV4UH+IjXHz6oy/3eFzQwANjxWS+mbR565p21yuAu1DKEyaGeVzT1xDhgzlnZG7Cys/rFgUYpIvYDHMOFxG6hsDB8vqyHiTXniniti5tdvGGYHgRGQcynRTU12aerrqHTIOefrElXJdf3/PA8FIY/Pd3MmZocY/vvQe0EVHXWrNtnHOF3MFQ1tFyfubKO51Dcp9KmzHnyBvO4CtvGVr/upSVWfo0I/EqkIqvCvBbdSIPeH9V5hAcyWENGF4Wf0/Yqtc0dBhfXJmPVBsC2ghZp9oERK+h5Xs7DpzkT0vtkN+wjgA5weIuG8e2UVNO29LWASzlychVqb7BVa6kNn5CyGwauyIGsYvAFnUjkyJpK8qleNM3VO5x9aw26IhSKlnSE9PAdX8p7PpdoWfxWRekKTc4h6iAe7pFOENvuokAvCNsE5LolR4VrYKXjA0m3nupDNWYexAWfR3lSeSlKd9nD3OENS0biJKayZHs11iDUTxm5u5gm/U60b4z0zDXjh1H/DI/pSCG6jjaXDpw=="