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

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

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

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

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