hosts/{apeturescience,cityseventeen}: init apeturescience, change font and size in cityseventeen

hosts/shared/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+_:
 let
   listFiles = dir: builtins.attrNames (builtins.readDir dir);
 in

hosts/shared/nushell.nix

@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib.options) mkOption mkPackageOption mkEnableOption;
-  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.modules) mkIf;
   inherit (lib.types) nullOr str;
   cfg = config.alqueva.shells.nushell;
 in
@@ -21,18 +21,13 @@ in
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
-    {
-      environment = {
-        systemPackages = [ cfg.package ];
-        shells = [
-          (lib.getExe' cfg.package "nu")
-          "/run/current-system/sw/bin/nu"
-        ];
-      };
-    }
-    (mkIf (cfg.config != null) {
-      environment.systemPackages = [ ];
-    })
-  ]);
+  config = mkIf cfg.enable {
+    environment = {
+      systemPackages = [ cfg.package ];
+      shells = [
+        (lib.getExe' cfg.package "nu")
+        "/run/current-system/sw/bin/nu"
+      ];
+    };
+  };
 }

hosts/shared/users.nix

@@ -12,7 +12,7 @@ let
     str
     package
     ;
-  users = config.alqueva.users;
+  inherit (config.alqueva) users;
 in
 {
   options.alqueva.users = mkOption {
@@ -49,7 +49,7 @@ in
 
   config =
     let
-      enabledUsers = lib.filterAttrs (_: user: user.enable == true) users;
+      enabledUsers = lib.filterAttrs (_: user: user.enable) users;
     in
     {
       users.users = builtins.mapAttrs (un: uc: {