modules/community-builder: allow users to set a shell

modules/nixos/community-builder/default.nix

@@ -26,10 +26,6 @@
     withUtempter = false;
   };
 
-  programs.fish.enable = true;
-  # disable generated completion
-  environment.etc."fish/generated_completions".text = pkgs.lib.mkForce "";
-
   systemd.services.nixpkgs-clone = {
     serviceConfig.Type = "oneshot";
     startAt = "daily";

modules/nixos/community-builder/users.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 let
   inherit (pkgs) lib;
 
@@ -190,6 +190,7 @@ let
     extraGroups = userGroups opts;
     createHome = true;
     home = "/home/${name}";
+    shell = opts.shell or config.users.defaultUserShell;
     hashedPassword = opts.password or null;
     openssh.authorizedKeys.keyFiles = [ opts.keys ];
   };