Lillian-Violet/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use disko for configuration of the disk, built the ISO with lvm, put the default to the current setup for EDI. Make sure to update after flashing.

Browse source
This commit is contained in:
Lillian Violet 2024-02-13 15:41:05 +01:00
parent a0966aad40
commit e39fe5214b
3 changed files with 37 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
disko/EDI/default.nix
View file

@ -1,9 +1,9 @@
{ {
disko.devices = { disko.devices = {
disk = { disk = {
vdb = { nvme0n1 = {
device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1";
type = "disk"; type = "disk";
device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1";
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
@ -19,29 +19,28 @@
]; ];
}; };
}; };
}; encryptedSwap = {
luks = { size = "4G";
size = "100%";
content = {
type = "luks";
name = "crypted";
# disable settings.keyFile if you want to use interactive password entry
#passwordFile = "/tmp/secret.key"; # Interactive
settings = {
allowDiscards = true;
#keyFile = "/tmp/secret.key";
};
#additionalKeyFiles = ["/tmp/additionalSecret.key"];
content = { content = {
swap = { type = "swap";
type = "swap"; randomEncryption = true;
size = "4G"; };
resumeDevice = true; # resume from hiberation from this device };
luks = {
size = "100%";
content = {
type = "luks";
name = "crypted";
# disable settings.keyFile if you want to use interactive password entry
#passwordFile = "/tmp/secret.key"; # Interactive
settings = {
allowDiscards = true;
#keyFile = "/tmp/secret.key";
}; };
root = { #additionalKeyFiles = ["/tmp/additionalSecret.key"];
content = {
type = "filesystem"; type = "filesystem";
format = "bcachefs"; format = "bcachefs";
size = "100%";
mountpoint = "/"; mountpoint = "/";
}; };
}; };

2
nixos/hosts/EDI/configuration.nix
View file

@ -24,7 +24,7 @@
../../desktop ../../desktop
#../../../disko/EDI ../../../disko/EDI
# Import your generated (nixos-generate-config) hardware configuration # Import your generated (nixos-generate-config) hardware configuration
./hardware-configuration.nix ./hardware-configuration.nix

32
nixos/hosts/EDI/hardware-configuration.nix
View file

@ -17,25 +17,25 @@
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = { # fileSystems."/" = {
device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628"; # device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628";
fsType = "bcachefs"; # fsType = "bcachefs";
}; # };
boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/91da75e7-52bc-4a50-9293-7e5e431040e0"; #boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/91da75e7-52bc-4a50-9293-7e5e431040e0";
fileSystems."/boot" = { # fileSystems."/boot" = {
device = "/dev/disk/by-uuid/01B2-909E"; # device = "/dev/disk/by-uuid/01B2-909E";
fsType = "vfat"; # fsType = "vfat";
options = ["fmask=0077" "dmask=0077" "defaults"]; # options = ["fmask=0077" "dmask=0077" "defaults"];
}; # };
swapDevices = [ # swapDevices = [
{ # {
device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1-part2"; # device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1-part2";
randomEncryption.enable = true; # randomEncryption.enable = true;
} # }
]; # ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's