albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Test

Browse source
This commit is contained in:
iFargle 2023-10-05 13:01:40 +09:00
parent 72d4cf648d
commit 0198b29594
2 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/hosts/osaka-vultr-01/default.nix
View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, modulesPath, desktop, username, ... }: { { config, lib, pkgs, modulesPath, desktop, username, ... }: {
imports = [ imports = [
# This machine won't be using secureboot # This machine won't be using secureboot
../../common/modules/boot.nixz # ../../common/modules/boot.nix
./disks.nix ./disks.nix
]; ];
nixpkgs.config.allowUnfree = false; nixpkgs.config.allowUnfree = false;

37
nixos/hosts/osaka-vultr-01/disks.nix
View file

@ -6,30 +6,19 @@
disko.devices.disk.vda = { disko.devices.disk.vda = {
device = "/dev/vda"; device = "/dev/vda";
type = "disk";
content = { content = {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ boot = {
{ size = "1M";
name = "BOOT"; type = "EF02";
start = "0%"; }; # partitions.boot
end = "550MiB"; luks = {
bootable = true; size = "100%";
flags = [ "esp" ];
fs-type = "fat32";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
} # partition 1 (ESP)
{
name = "LUKS";
start = "550MiB";
end = "100%";
content = { content = {
type = "luks"; type = "luks";
name = "ROOT"; name = "crypted";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = [ "--allow-discards" ];
content = { content = {
type = "btrfs"; type = "btrfs";
@ -48,10 +37,10 @@
mountOptions = [ "compress=zstd" "noatime" ]; mountOptions = [ "compress=zstd" "noatime" ];
}; # nix }; # nix
}; # subvolumes }; # subvolumes
}; # content.content
};# content };# content
} # partition 2 (/ BTRFS) }; # content
]; # partitions }; # luks.partitions
}; # partitions
}; # content }; # content
}; # disko.devices.disk.vda }; # disko.devices.disk.vda
} # root } # root