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

test

Browse source
This commit is contained in:
iFargle 2023-09-22 14:24:13 +09:00
parent 8fed6d80e4
commit 0cdc6cfb60
4 changed files with 57 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/common/modules/installer.nix
View file

@ -65,7 +65,8 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
sudo nixos-install --no-root-password --flake ".#$TARGET_HOST"
# Rsync nix-config to the target install.
rsync -a --delete "/tmp/nixos/git/" "/mnt/etc/nixos/git/"
sudo mkdir -p "/mnt/etc/nixos"
sudo rsync -a --delete "/tmp/nixos/git/" "/mnt/etc/nixos/git/"
pushd "/mnt/etc/nixos/git/"
popd

2
nixos/hosts/nixos-laptop/default.nix
View file

@ -24,7 +24,7 @@
};
boot.initrd.luks.devices."DISK".device = "/dev/nvme0n1p1";
fileSystems."/boot" = {
device = "/dev/disk/by-label/BOOT";
fsType = "vfat";

2
nixos/hosts/nixos-vm-02/default.nix
View file

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

108
nixos/hosts/nixos-vm-02/disks.nix
View file

@ -2,59 +2,57 @@
boot.loader.grub.device = "/dev/sda";
boot.initrd.luks.devices."sda2".device = "/dev/sda2";
disko.devices = {
disk = {
sda = {
device = "/dev/sda";
content = {
type = "table";
format = "gpt";
partitions = [
{
name = "BOOT";
start = "0%";
end = "550MiB";
bootable = true;
flags = [ "esp" ];
fs-type = "fat32";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
} # partition 1
{
name = "ROOT";
start = "550MiB";
end = "100%";
content = {
type = "luks";
name = "LUKS-ROOT";
extraOpenArgs = [ "--allow-discards" ];
settings.keyFile = "/tmp/secret.key";
content = {
type = "btrfs";
extraArgs = [ "-f" ];
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" ];
}; # root
"/home" = {
mountpoint = "/home";
mountOptions = [ "compress=zstd" "noatime" ];
}; # home
"/nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" ];
}; # nix
}; # subvolumes
}; # content.content
}; # content
} # partition 2
]; # partitions
}; # content
}; # sda
}; # disk
}; # disko.devices
disko.devices.disk.sda = {
device = "/dev/sda";
content = {
type = "table";
format = "gpt";
partitions = [
{
type = "partition";
name = "BOOT";
start = "0%";
end = "550MiB";
bootable = true;
flags = [ "esp" ];
fs-type = "fat32";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
} # partition 1
{
type = "partition";
name = "LUKS";
start = "550MiB";
end = "100%";
content = {
type = "luks";
name = "LUKS-ROOT";
extraOpenArgs = [ "--allow-discards" ];
# settings.keyFile = "/tmp/secret.key";
content = {
type = "btrfs";
# extraArgs = [ "-f" ];
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" ];
}; # root
"/home" = {
mountpoint = "/home";
mountOptions = [ "compress=zstd" "noatime" ];
}; # home
"/nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" ];
}; # nix
}; # subvolumes
}; # content.content
}; # content
} # partition 2
]; # partitions
}; # content
}; # disko.devices.disk.sda
} # root