diff --git a/.config/hypr/conf.d/20-monitors.conf##hostname.cn-arch b/.config/hypr/conf.d/20-monitors.conf##hostname.cn-arch
index e69de29..5eeb268 100644
--- a/.config/hypr/conf.d/20-monitors.conf##hostname.cn-arch
+++ b/.config/hypr/conf.d/20-monitors.conf##hostname.cn-arch
@@ -0,0 +1,6 @@
+monitor = DP-1, 2560x1440@99.95, 1920x1584, 1, bitdepth, 10, cm, auto
+monitor = DP-2, 3440x1440@100.0, 1476x144, 1, bitdepth, 10, cm, auto
+monitor = HDMI-A-1, 1920x1080@60.0, 0x1584, 1
+
+monitor = , preferred, auto, 1
+
diff --git a/.config/hypr/conf.d/20-monitors.conf##hostname.viking-mate b/.config/hypr/conf.d/20-monitors.conf##hostname.viking-mate
index af3f2a9..d19a53e 100644
--- a/.config/hypr/conf.d/20-monitors.conf##hostname.viking-mate
+++ b/.config/hypr/conf.d/20-monitors.conf##hostname.viking-mate
@@ -1,3 +1,3 @@
-# Adjust resolution/refresh after survey if needed
-monitor = eDP-1, preferred, auto, 1
+monitor = eDP-1, preferred, auto, 1.6, bitdepth, 10, cm, hdr
 
+monitor = , preferred, auto, 1
diff --git a/.config/hypr/conf.d/30-workspaces.conf##hostname.cn-arch b/.config/hypr/conf.d/30-workspaces.conf##hostname.cn-arch
index e69de29..ddd13db 100644
--- a/.config/hypr/conf.d/30-workspaces.conf##hostname.cn-arch
+++ b/.config/hypr/conf.d/30-workspaces.conf##hostname.cn-arch
@@ -0,0 +1,10 @@
+workspace=1,monitor:DP-1,default:true
+workspace=2,monitor:DP-1
+workspace=3,monitor:DP-1
+workspace=4,monitor:DP-1
+workspace=5,monitor:DP-2,default:true
+workspace=6,monitor:DP-2
+workspace=7,monitor:DP-2
+workspace=8,monitor:HDMI-A-1,default:true
+workspace=9,monitor:HDMI-A-1
+workspace=10,monitor:HDMI-A-1
diff --git a/.config/hypr/monitors.conf b/.config/hypr/monitors.conf
deleted file mode 100644
index 024c0b6..0000000
--- a/.config/hypr/monitors.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<<<<<<< HEAD
-# Generated by nwg-displays on 2025-09-13 at 17:34:43. Do not edit manually.
-
-monitor = DP-1, 2560x1440@99.95, 1920x1584, 1, bitdepth, 10, cm, auto
-monitor = DP-2, 3440x1440@100.0, 1476x144, 1, bitdepth, 10, cm, auto
-monitor = HDMI-A-1, 1920x1080@60.0, 0x1584, 1
-=======
-# Generated by nwg-displays on 2025-09-09 at 00:25:22. Do not edit manually.
-
-#monitor=eDP-1,3000x2000@60.0,0x0,1.5999999999999996,bitdepth,10
-monitor = eDP-1, preferred, auto, 1.6, bitdepth, 10, cm, hdr
->>>>>>> f130af1 (config stash laptop)
-monitor = , preferred, auto, 1
diff --git a/.config/hypr/workspaces.conf b/.config/hypr/workspaces.conf
deleted file mode 100644
index 964ebc8..0000000
--- a/.config/hypr/workspaces.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Generated by nwg-displays on 2025-09-09 at 00:25:19. Do not edit manually.
-
-workspace=1,monitor:eDP-1,default:true
-workspace=2,monitor:eDP-1
-workspace=3,monitor:eDP-1
-workspace=4,monitor:eDP-1
-workspace=5,monitor:eDP-1
-workspace=6,monitor:eDP-1
-workspace=7,monitor:eDP-1
-workspace=8,monitor:eDP-1
-workspace=9,monitor:eDP-1
-workspace=10,monitor:eDP-1