From 65ed55a4f298d2cbc4655a73bf8449bb34719055 Mon Sep 17 00:00:00 2001
From: dachxy <Danny10132024@gmail.com>
Date: Wed, 25 Dec 2024 22:36:42 +0800
Subject: [PATCH] add new monitor

---
 system/dev/dn-lap/hardware-configuration.nix | 34 ++------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/system/dev/dn-lap/hardware-configuration.nix b/system/dev/dn-lap/hardware-configuration.nix
index c8bfe50..ac91539 100644
--- a/system/dev/dn-lap/hardware-configuration.nix
+++ b/system/dev/dn-lap/hardware-configuration.nix
@@ -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,37 +23,10 @@
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
-========
-  boot.initrd.availableKernelModules = [
-    "vmd"
-    "dm-raid"
-    "xhci_pci"
-    "thunderbolt"
-    "nvme"
-    "usbhid"
-    "uas"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/57d3a2d7-37e1-4e4b-be64-efcb2e6d6391"; }
   ];
-  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" ];
-  };
->>>>>>>> 34ba202 (test: dn-lap test build):system/dev/dn-pre7780/hardware-configuration.nix
-
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/57d3a2d7-37e1-4e4b-be64-efcb2e6d6391"; }];
 
   # 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