diff --git a/beta/configuration.nix b/beta/configuration.nix index 117eac1..76b0936 100644 --- a/beta/configuration.nix +++ b/beta/configuration.nix @@ -12,8 +12,6 @@ # x86-64 machine nixpkgs.hostPlatform = "x86_64-linux"; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.memtest86.enable = true; # our hostname networking.hostName = "beta"; diff --git a/miku/configuration.nix b/miku/configuration.nix index 8e2b41c..3ab5d8d 100644 --- a/miku/configuration.nix +++ b/miku/configuration.nix @@ -12,8 +12,6 @@ # x86-64 machine nixpkgs.hostPlatform = "x86_64-linux"; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.memtest86.enable = true; # our hostname networking.hostName = "miku"; diff --git a/neko/configuration.nix b/neko/configuration.nix index 4016935..c22d12c 100644 --- a/neko/configuration.nix +++ b/neko/configuration.nix @@ -12,8 +12,6 @@ # x86-64 machine nixpkgs.hostPlatform = "x86_64-linux"; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.memtest86.enable = true; # our hostname networking.hostName = "neko"; diff --git a/share/common.nix b/share/common.nix index 7e25edb..63c2078 100644 --- a/share/common.nix +++ b/share/common.nix @@ -116,6 +116,12 @@ in # use systemd early, we use boot.initrd.systemd.services.rollback to rollback / boot.initrd.systemd.enable = true; + # works only on x86 machines, not on the Macs + boot.loader.efi.canTouchEfiVariables = pkgs.stdenv.hostPlatform.isx86; + + # memcheck, works only on x86 machines + boot.loader.systemd-boot.memtest86.enable = pkgs.stdenv.hostPlatform.isx86; + # setup the console stuff early and use a nice font console.earlySetup = true; console.font = "${pkgs.spleen}/share/consolefonts/spleen-16x32.psfu"; diff --git a/zeta/configuration.nix b/zeta/configuration.nix index a987588..3a98fc8 100644 --- a/zeta/configuration.nix +++ b/zeta/configuration.nix @@ -13,7 +13,6 @@ # AArch64 machine nixpkgs.hostPlatform = "aarch64-linux"; - boot.loader.efi.canTouchEfiVariables = false; # our hostname networking.hostName = "zeta";