Home: Enable flatpak depending on system config

home/christoph/default.nix

@@ -661,7 +661,7 @@
       indicator = nixosConfig.programs.kdeconnect.enable;
     };
 
-    flatpak = {
+    flatpak = lib.mkIf nixosConfig.services.flatpak.enable {
       # FlatHub stable is only added by default if no custom remotes are specified
       remotes = lib.mkOptionDefault [
         {

system/default.nix

@@ -340,7 +340,7 @@ with mylib.networking; {
 
     acpid.enable = true;
     dbus.enable = true;
-    flatpak.enable = true; # Not quite the nix style but useful for bottles/proprietary stuff/steam/gaming
+    flatpak.enable = !headless; # Not quite the nix style but useful for bottles/proprietary stuff/steam/gaming
     fstrim.enable = true; # SSD
     fwupd.enable = true; # Device firmware (I don't think I have any supported devices)
     # locate.enable = true; # Periodically update index

system/services/gitea.nix

@@ -4,15 +4,19 @@
   pkgs,
   ...
 }: {
-  # Extra git user for Gitea
-  users.users.git = {
-    uid = 500;
-    group = "git";
-    isNormalUser = false;
-    isSystemUser = true;
-    description = "Gitea User";
-    extraGroups = ["docker" "podman"];
-    shell = pkgs.fish;
+  users = {
+    groups.git = {};
+
+    # Extra git user for Gitea
+    users.git = {
+      uid = 500;
+      group = "git";
+      isNormalUser = false;
+      isSystemUser = true;
+      description = "Gitea User";
+      extraGroups = ["docker" "podman"];
+      shell = pkgs.fish;
+    };
   };
 
   virtualisation.oci-containers.containers.gitea-db = {