Add disko

This commit is contained in:
Leonardo Eugênio 2023-02-24 11:59:17 -03:00
parent 3c09386643
commit b1c96cb075
8 changed files with 77 additions and 13 deletions

View file

@ -38,8 +38,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
inputs.disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; disko.inputs.nixpkgs.follows = "nixpkgs";
# my stuff # my stuff
dhist = { dhist = {
@ -116,15 +116,18 @@
++ lib.optional (desktop == "kde") ./system/kde.nix; ++ lib.optional (desktop == "kde") ./system/kde.nix;
in in
{ {
checks."${system}" = {
disko-format-i15 = pkgs.callPackage ./hosts/i15/partitions-test.nix { };
};
nixosConfigurations = { nixosConfigurations = {
i15 = lib.nixosSystem { i15 = lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;
modules = [ ./hosts/i15.nix ] ++ common_modules; modules = [ ./hosts/i15 ] ++ common_modules;
}; };
monolith = lib.nixosSystem { monolith = lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;
modules = [ modules = [
./hosts/monolith.nix ./hosts/monolith
./system/monolith-gitlab-runner.nix ./system/monolith-gitlab-runner.nix
./system/monolith-forgejo-runner.nix ./system/monolith-forgejo-runner.nix
./system/nix-serve.nix ./system/nix-serve.nix
@ -134,7 +137,7 @@
rainbow = lib.nixosSystem { rainbow = lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;
modules = [ modules = [
./hosts/rainbow.nix ./hosts/rainbow
./system/rainbow-gitlab-runner.nix ./system/rainbow-gitlab-runner.nix
] ++ common_modules; ] ++ common_modules;
}; };

25
hosts/i15/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ config, lib, pkgs, modulesPath, ... }: {
networking.hostName = "i15"; # Define your hostname.
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
disko.devices = (import ./partitions.nix { disks = [ "/dev/sda" ]; });
boot.loader.efi.efiSysMountPoint = "/boot/efi";
swapDevices = [{
device = "/swap/swapfile";
size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
}];
networking.useDHCP = lib.mkDefault true;
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -0,0 +1,14 @@
{ config, lib, pkgs, ... }:
pkgs.makeDiskoTest {
name = "test-disko-i15";
disko-config = ./partitions.nix;
enableOCR = true;
bootCommands = ''
machine.wait_for_text("[Pp]assphrase for")
machine.send_chars("secretsecret\n")
'';
extraTestScript = ''
machine.succeed("cryptsetup isLuks /dev/vda2");
machine.succeed("mountpoint /home");
'';
}

View file

@ -1,4 +1,8 @@
{ disks ? [ "/dev/sda" ], ... }: { { disks ? [ "/dev/sda" ], ... }:
let
btrfs_options = [ "compress=zstd:3" "noatime" ];
in
{
disk.sda = { disk.sda = {
type = "disk"; type = "disk";
device = builtins.elemAt disks 0; device = builtins.elemAt disks 0;
@ -10,28 +14,36 @@
type = "partition"; type = "partition";
name = "NIX_BOOT"; name = "NIX_BOOT";
start = "1MiB"; start = "1MiB";
end = "1GiB"; end = "300MiB";
bootable = true; bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
extraArgs = [ "-n" "BOOT_I15" ];
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
options = [ "defaults" ]; # options = [ "defaults" ];
}; };
} }
{ {
type = "partition"; type = "partition";
name = "NIX_CRYPT_ROOT"; name = "CRYPT_I15";
start = "1GiB"; start = "300MiB";
end = "100%"; end = "100%";
content = { content = {
type = "luks"; type = "luks";
name = "main"; name = "main";
keyFile = "/tmp/secret.key";
content = { content = {
type = "btrfs"; type = "btrfs";
name = "BTRFS_ROOT"; extraArgs = [ "--label" "ROOT_I15" ];
subvolumes = let mountOptions = btrfs_options; in {
"/home" = { inherit mountOptions; };
"/nixos" = {
inherit mountOptions;
mountpoint = "/"; mountpoint = "/";
subvolumes = [ "/home" "/nixos" "/swap" ]; };
"/swap" = { inherit mountOptions; };
};
}; };
}; };
} }

View file

@ -6,6 +6,7 @@ rec {
new-packages new-packages
patches patches
lib_extended lib_extended
disko
]; ];
scripts = (import ../scripts); scripts = (import ../scripts);
@ -69,4 +70,13 @@ rec {
}; };
} }
); );
disko = final: prev: {
makeDiskoTest =
let
makeTest = import (prev.path + "/nixos/tests/make-test-python.nix");
eval-config = import (prev.path + "/nixos/lib/eval-config.nix");
in
(prev.callPackage "${inputs.disko}/tests/lib.nix" { inherit makeTest eval-config; }).makeDiskoTest;
};
} }