From eb6cc5056f6884cd585837c7af88d6cec2e5732a 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

---
 home/config/hypr/monitor.conf                |  3 +-
 home/config/waybar/config                    | 37 +++++++++++++++++-
 system/dev/dn-lap/default.nix                |  7 ++--
 system/dev/dn-lap/hardware-configuration.nix | 40 ++++++++++++++++++++
 system/dev/dn-pre7780/default.nix            |  2 +-
 5 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 system/dev/dn-lap/hardware-configuration.nix

diff --git a/home/config/hypr/monitor.conf b/home/config/hypr/monitor.conf
index aa6c110..ffda077 100755
--- a/home/config/hypr/monitor.conf
+++ b/home/config/hypr/monitor.conf
@@ -1,3 +1,4 @@
-monitor=desc:ASUSTek COMPUTER INC ASUS VG32VQ1B 0x00002271,2560x1440@165, 0x0, 1
+monitor=desc:ASUSTek COMPUTER INC ASUS VG32VQ1B 0x00002271, 2560x1440@165, 0x0, 1
 monitor=desc:Acer Technologies XV272U V3 7422007E54222, 2560x1440@144, -1440x-540, auto, transform, 1
+monitor=desc:LG Display 0x0665, auto, 0x0, 1
 
diff --git a/home/config/waybar/config b/home/config/waybar/config
index 774834b..a123c18 100644
--- a/home/config/waybar/config
+++ b/home/config/waybar/config
@@ -1,6 +1,6 @@
 [
   {
-    "output": "!DP-3",
+    "output": "HDMI-A-2",
     "include": "~/.config/waybar/modules.json",
     "layer": "top",
     "exclusive": true,
@@ -28,6 +28,41 @@
       "custom/swaync",
       "pulseaudio"
     ]
+  },
+    {
+    "output": "eDP-1",
+    "include": "~/.config/waybar/modules.json",
+    "layer": "top",
+    "exclusive": true,
+    "passthrough": false,
+    "position": "top",
+    "spacing": 3,
+    "fixed-center": true,
+    "ipc": true,
+    "margin-top": 0,
+    "margin-left": 0,
+    "margin-right": 0,
+    "margin-bottom": 0,
+
+    "modules-left": [
+      "hyprland/workspaces",
+      "clock",
+      "custom/cava",
+      "mpris"
+    ],
+
+    "modules-center": [
+      "hyprland/window"
+    ],
+
+    "modules-right": [
+      "wlr/taskbar",
+      "cpu", 
+      "temperature", 
+      "memory",
+      "custom/swaync",
+      "pulseaudio"
+    ]
   },
   {
     "output": "DP-3",
diff --git a/system/dev/dn-lap/default.nix b/system/dev/dn-lap/default.nix
index f1e9c45..46f720b 100644
--- a/system/dev/dn-lap/default.nix
+++ b/system/dev/dn-lap/default.nix
@@ -19,7 +19,6 @@
     ../../modules/plymouth.nix
     ../../modules/polkit.nix
     ../../modules/programs.nix
-    ../../modules/sddm-theme.nix
     ../../modules/security.nix
     ../../modules/services.nix
     ../../modules/sound.nix
@@ -31,14 +30,14 @@
   ];
 
   # Overrides
-  networking.hostName = "dn-lap";
-  programs.steam.enable = false;
+  networking.hostName = lib.mkForce "dn-lap";
+  programs.steam.enable = lib.mkForce false;
 
   system.stateVersion = "24.11";
   home-manager = {
     backupFileExtension = "backup";
     extraSpecialArgs = { inherit inputs; };
-    users = { "danny" = import ../home; };
+    users = { "danny" = import ../../../home; };
   };
 }
 
diff --git a/system/dev/dn-lap/hardware-configuration.nix b/system/dev/dn-lap/hardware-configuration.nix
new file mode 100644
index 0000000..a8cdd01
--- /dev/null
+++ b/system/dev/dn-lap/hardware-configuration.nix
@@ -0,0 +1,40 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/e9be9e66-c3cb-4613-be7f-c23e7f89b508";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/B2AB-C9E4";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  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
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/system/dev/dn-pre7780/default.nix b/system/dev/dn-pre7780/default.nix
index 0660d35..4f2e3e4 100644
--- a/system/dev/dn-pre7780/default.nix
+++ b/system/dev/dn-pre7780/default.nix
@@ -16,7 +16,7 @@
   home-manager = {
     backupFileExtension = "backup";
     extraSpecialArgs = { inherit inputs; };
-    users = { "danny" = import ../home; };
+    users = { "danny" = import ../../../home; };
   };
 }