diff --git a/core/cubes/wm/core.el b/core/cubes/wm/core.el
index 6f49086..85450e4 100644
--- a/core/cubes/wm/core.el
+++ b/core/cubes/wm/core.el
@@ -25,22 +25,27 @@
 
 (defun wm-randr ()
   "RandR support for wm."
+  (def second-screen
+       (start-process-shell-command
+        "xrandr | awk '/\\ connected/ && /[[:digit:]]x[[:digit:]].*+/{print $1}' | tail -n") 1)
   (when-wm
    (require 'exwm-randr)
-   (setq exwm-randr-workspace-output-plist '(0 "HDMI-1"
-                                             1 "HDMI-1"
-                                             2 "HDMI-1"
-                                             3 "HDMI-1"
-                                             4 "HDMI-1"
-                                             5 "HDMI-1"
-                                             6 "eDP-1"
-                                             7 "HDMI-1"
-                                             8 "HDMI-1"
-                                             9 "HDMI-1"))
+
+   (setq exwm-randr-workspace-output-plist '(0 second-screen
+                                               1 second-screen
+                                               2 second-screen
+                                               3 second-screen
+                                               4 second-screen
+                                               5 second-screen
+                                               6 "eDP-1"
+                                               7 second-screen
+                                               8 second-screen
+                                               9 second-screen))
    (add-hook 'exwm-randr-screen-change-hook
              (lambda ()
                (start-process-shell-command
-                "xrandr" nil "xrandr --output HDMI-1 --above eDP-1 --mode 1920x1080")))
+                "xrandr" nil (concat "xrandr --output " second-screen " --above eDP-1 --mode 1920x1080")))
+
    (exwm-randr-enable)))