Merge branch 'master' of ssh://git.nx2.site:20022/nx2/dotfiles

system-modules/boot.nix

@@ -30,7 +30,10 @@ in
     };
     security.polkit.enable = true;
   } else if host == "NxXPS" then {
-    boot.loader.grub = {
+    boot = {
+      loader = {
+        efi.canTouchEfiVariables = true;
+        grub = {
           enable = true;
           configurationLimit = 30;
           device = "nodev";
@@ -39,10 +42,6 @@ in
           theme = grub-theme-ascii-diana;
           font = "${grub-theme-ascii-diana}/unicode.pf2";
           fontSize = 50;
-      # splashImage = null;
-    
-
-      efi.canTouchEfiVariables = true;
           extraEntries = ''
             menuentry 'Windows 11' --class windows --class os $menuentry_id_option 'osprober-efi-0A97-7A2D' {
               insmod part_gpt
@@ -51,7 +50,8 @@ in
               chainloader /EFI/Microsoft/Boot/bootmgfw.efi
             }
           '';
-
+        };
+      };
       extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
       kernelModules = [ "v4l2loopback" ];
       extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1'';