fixes and formatting
This commit is contained in:
parent
a6c96c23ae
commit
80cf48f1e8
71 changed files with 746 additions and 1110 deletions
|
|
@ -1 +1 @@
|
|||
{nixpkgs.config.allowBroken = true;}
|
||||
{ nixpkgs.config.allowBroken = true; }
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{documentation.man.generateCaches = false;}
|
||||
{ documentation.man.generateCaches = false; }
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{crossPkgs, ...}: {
|
||||
{ crossPkgs, ... }:
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
gnome-shell = crossPkgs.gnome-shell;
|
||||
|
|
|
|||
|
|
@ -5,10 +5,12 @@
|
|||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
efiArch = pkgs.stdenv.hostPlatform.efiArch;
|
||||
in {
|
||||
imports = ["${modulesPath}/image/repart.nix"];
|
||||
in
|
||||
{
|
||||
imports = [ "${modulesPath}/image/repart.nix" ];
|
||||
boot.loader.grub.enable = false;
|
||||
|
||||
systemd.repart = {
|
||||
|
|
@ -41,9 +43,15 @@ in {
|
|||
partitions = {
|
||||
"20-esp" = {
|
||||
contents = {
|
||||
"/EFI/EDK2-UEFI-SHELL/SHELL.EFI".source = "${crossPkgs.edk2-uefi-shell.overrideAttrs {env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized";}}/shell.efi";
|
||||
"/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
|
||||
"/EFI/Linux/${config.system.boot.loader.ukiFile}".source = "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
|
||||
"/EFI/EDK2-UEFI-SHELL/SHELL.EFI".source = "${
|
||||
crossPkgs.edk2-uefi-shell.overrideAttrs {
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized";
|
||||
}
|
||||
}/shell.efi";
|
||||
"/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =
|
||||
"${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
|
||||
"/EFI/Linux/${config.system.boot.loader.ukiFile}".source =
|
||||
"${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
|
||||
"/loader/loader.conf".source = crossPkgs.writeText "loader.conf" ''
|
||||
timeout 5
|
||||
console-mode keep
|
||||
|
|
@ -63,8 +71,8 @@ in {
|
|||
};
|
||||
};
|
||||
"30-root" = {
|
||||
storePaths = [config.system.build.toplevel];
|
||||
contents."/boot".source = crossPkgs.runCommand "boot" {} "mkdir $out";
|
||||
storePaths = [ config.system.build.toplevel ];
|
||||
contents."/boot".source = crossPkgs.runCommand "boot" { } "mkdir $out";
|
||||
repartConfig = {
|
||||
Type = "root";
|
||||
Format = "ext4";
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{imports = [../server/ssh.nix];}
|
||||
{ imports = [ ../server/ssh.nix ]; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue