Fix the X1 bootloader issue

modules/default.nix

@@ -35,16 +35,19 @@ rec {
   base = { config, lib, pkgs, inputs, ... }:
     let
       universePkg = pkgs.callPackage ../derivations/universe.nix { };
-    in {
+    in
+    {
       # point the system nixpkgs to this flake by indirecting through
       # /etc so it changes when the system switches without having to
       # restart all the terminals. thanks ElvishJerricco
       nix.registry = builtins.mapAttrs (n: flake: { inherit flake; }) inputs;
 
-      environment.etc = lib.mapAttrs' (name: flake: {
+      environment.etc = lib.mapAttrs'
+        (name: flake: {
           name = "nix/inputs/${name}";
           value.source = flake.outPath;
-      }) inputs;
+        })
+        inputs;
 
       nix.nixPath = [ "/etc/nix/inputs" ];
 
@@ -265,7 +268,7 @@ rec {
 
       boot.loader.grub.device = "nodev";
       boot.loader.grub.efiSupport = true;
-    boot.loader.grub.efiInstallAsRemovable = true;
+      boot.loader.grub.efiInstallAsRemovable = lib.mkDefault true;
     };
 
   styles = { lib, pkgs, inputs, ... }: {

users/lxsameer/fg42.el

@@ -25,12 +25,12 @@
 ;; Uncomment this line for debugging
 ;; (setq debug-on-error t)
 (eval-when-compile
-  (defvar fg42/font nil))
+  (defvar fg42/config/font-size nil))
 
-(setq fg42/font '("Fira Code" 10))
 (when-wm
- (setq fg42/font '("Fira Code" 10)))
+ (setq fg42/font/font-size 8))
 
+(fg42/setup-font)
 
 (provide '.fg42)
 ;;; .fg42.el ends here

worlds/majin.nix

@@ -77,6 +77,7 @@ in
 {
 
   installer = import ./installer.nix (params // {
+    inherit host;
     diskModule = (modules.disk-installer
       host
       (if inVM then ./majin/vm.disk.nix else ./majin/disks.nix));

worlds/x1.nix

@@ -45,6 +45,8 @@ let
     '';
 
     fileSystems."/".neededForBoot = true;
+    fileSystems."/boot/efi".neededForBoot = true;
+
     services.gvfs.enable = true;
 
     networking.firewall = {
@@ -63,7 +65,11 @@ let
         id = [ "24571728" "24571700" ];
       };
     };
-
+    boot.loader.efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
+    };
+    boot.loader.grub.efiInstallAsRemovable = lib.mkForce false;
   };
 
   lxsameer = pkgs.callPackage ../users/lxsameer/default.nix { };
@@ -76,6 +82,7 @@ in
 {
 
   installer = import ./installer.nix (params // {
+    inherit host;
     diskModule = (modules.disk-installer
       host
       (if inVM then ./x1/vm.disk.nix else ./x1/disks.nix));

worlds/x1/disks.nix

@@ -9,12 +9,12 @@
             type = "gpt";
             partitions = {
               ESP = {
-                size = "1G";
+                size = "10M";
                 type = "EF00";
                 content = {
                   type = "filesystem";
                   format = "vfat";
-                  mountpoint = "/boot";
+                  mountpoint = "/boot/efi";
                 };
               };
               swap = {