From e827fc986aa29bf4c3ab08317877ecf6c830ddc9 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 18 Apr 2021 13:27:31 +0200
Subject: machines/profpatsch: make bitlbee and philip normal users

https://github.com/NixOS/nixpkgs/pull/115332 introduced a new check that
requires either isSystemUser or isNormalUser to be true to help UID
collision checks (I don't remember how this exactly aids that). To fix
evaluation of @Profpatsch's machines, I've set isNormalUser for bitlbee
and philip.

Note that bitlbee probably should be a system user, but seems like there
may be issues with that: https://github.com/NixOS/nixpkgs/pull/115332#issuecomment-792287827
Just to be safe, leave it as a normal user for now, the proper fix seems
to be to move the data dir creation into the service setup, rather than
doing it via the home setup.
---
 machines/profpatsch/lib.nix                  | 1 +
 modules/user/profpatsch/services/bitlbee.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/machines/profpatsch/lib.nix b/machines/profpatsch/lib.nix
index ae730824..80d800c7 100644
--- a/machines/profpatsch/lib.nix
+++ b/machines/profpatsch/lib.nix
@@ -13,5 +13,6 @@ rec {
     passwordFile = "${home}/.config/passwd";
     shell = "${lib.getBin fish}/bin/fish";
     openssh.authorizedKeys.keys = authKeys;
+    isNormalUser = true;
   };
 }
diff --git a/modules/user/profpatsch/services/bitlbee.nix b/modules/user/profpatsch/services/bitlbee.nix
index 84733270..196d83f7 100644
--- a/modules/user/profpatsch/services/bitlbee.nix
+++ b/modules/user/profpatsch/services/bitlbee.nix
@@ -51,6 +51,7 @@ in
       description = "BitlBee user";
       home = "/var/lib/bitlbee";
       createHome = true;
+      isNormalUser = true;
     };
 
     users.groups.bitlbee.name = "bitlbee";
-- 
cgit 1.4.1