Fix various issues

modules/base.nix

@@ -44,7 +44,7 @@ with lib; {
 
     elss = {
       locale.enable = mkDefault true;
-      zsh.enable = mkdDefault true;
+      zsh.enable = mkDefault true;
     };
 
     boot = {

modules/users.nix

@@ -37,8 +37,7 @@ with lib; {
               description = "Email address of the user";
             };
             git = mkOption {
-              type = types.attrsOf
-                (types.submodule {
+              type = types.submodule {
                   options = {
                     key = mkOption {
                       type = types.str;
@@ -57,7 +56,7 @@ with lib; {
                       description = "Whether to force signing commits or not";
                     };
                   };
-                });
+                };
             };
           };
         });
@@ -163,11 +162,20 @@ with lib; {
               (mapUsers mkUser)
             ];
         };
-        home-manager.users = mapAllUsersAndRoot (login:
+        home-manager = {
+          useUserPackages = true;
+          useGlobalPkgs = true;
+          users =
+          mkMerge [
+            (mapAllUsers mkX11User)
+            (mapAllUsers mkGitUser)
+            (mapAllUsersAndRoot (login:
               mkMerge [
                 { config.home.stateVersion = mkDefault "21.11"; }
                 (if homeConfigurations ? "${login}" then homeConfigurations."${login}" else { })
-          ]
-        );
+              ]))
+          ];
+        };
+
       };
 }

modules/zsh.nix

@@ -1,7 +1,11 @@
 { config, pkgs, lib, ... }:
 with lib; {
   options.elss.zsh.enable = mkEnableOption "Setup systemwide zsh";
-  config = {
+  config =
+    let
+      inherit (elss.withConfig config) mapAllUsers;
+    in
+    mkIf config.elss.zsh.enable {
       environment = {
         shells = [ pkgs.zsh ];
         pathsToLink = [ "/share/zsh/" ];
@@ -30,5 +34,9 @@ with lib; {
           setOptions = [ "auto_pushd" "correct" "nocaseglob" "rcexpandparam" "numericglobsort" "nobeep" "appendhistory" ];
         };
       };
+
+      users.users = mapAllUsers (_: { shell = pkgs.zsh; }
+
+      );
     };
 }