yanlin/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conflict fix

Browse source
This commit is contained in:
Yan Lin 2025-10-24 13:01:17 +02:00
parent 071cd45f61
commit b632b0fbd6
2 changed files with 9 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hosts/nixos/thinkpad/disk-config.nix
View file

@ -1,13 +1,12 @@
# Disko configuration for ThinkPad P14s Gen 2
# Simple single-disk setup with EFI boot and ext4 root partition
# Reflects the actual installed system configuration
# NOTE: This uses UUIDs from the existing installation
{
disko.devices = {
disk = {
main = {
type = "disk";
# Update this to match your actual disk
# Use 'lsblk' or 'fdisk -l' to find your disk identifier
device = "/dev/nvme0n1"; # Common for NVMe SSDs in laptops
device = "/dev/nvme0n1";
content = {
type = "gpt";
partitions = {
@ -19,27 +18,18 @@
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "defaults" "umask=0077" ];
};
};
# Swap partition (optional, adjust size as needed)
swap = {
size = "16G"; # Match your RAM size for hibernation support
content = {
type = "swap";
randomEncryption = true;
mountOptions = [ "fmask=0077" "dmask=0077" ];
};
};
# Root partition - takes remaining space
# Swap is not configured on this system
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
mountOptions = [ "defaults" "noatime" ];
};
};
};

14
hosts/nixos/thinkpad/hardware-configuration.nix
View file

@ -13,18 +13,10 @@
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/97aa0a15-1b4a-43b6-b424-65d1926cec73";
fsType = "ext4";
};
# Filesystems are managed by disko configuration
# No filesystem declarations needed here
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/7C9B-24EC";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [ ];
# No swap devices configured here - handled by disko
# 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