dachxy/nix-conf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove diff

Browse source
This commit is contained in:
dachxy 2024-12-26 10:16:14 +08:00
parent a86620a94f
commit b999f6cf80
1 changed files with 0 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

29
system/dev/dn-lap/hardware-configuration.nix
View file

@ -6,7 +6,6 @@
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
<<<<<<<< HEAD:system/dev/dn-lap/hardware-configuration.nix
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
@ -24,34 +23,6 @@
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
========
boot.initrd.availableKernelModules = [
"vmd"
"dm-raid"
"xhci_pci"
"thunderbolt"
"nvme"
"usbhid"
"uas"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelParams = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
>>>>>>>> fd9b942 (test: dn-lap test build):system/dev/dn-pre7780/hardware-configuration.nix
swapDevices =
[{ device = "/dev/disk/by-uuid/57d3a2d7-37e1-4e4b-be64-efcb2e6d6391"; }];