Ensure support for 3 monitors on Epsilon.

1 files changed, 6 insertions, 7 deletions

diff --git a/lisp/window-manager.el b/lisp/window-manager.el
index bc144d5..250466f 100644
--- a/lisp/window-manager.el
+++ b/lisp/window-manager.el
@@ -16,15 +16,14 @@
   ;; Set the number of initial workspaces to the number of monitors attached to
   ;; that machine.
   (setq exwm-workspace-number
-        (choose-for-machine ("Epsilon" 2)
+        (choose-for-machine ("Epsilon" 3)
                             ("Upsilon" 1)
                             ("Lambda"  1)
                             (t         1)))
 
   ;; I like being able to use my X windows across workspaces.
   :init
-  (setq exwm-workspace-number 4
-        exwm-workspace-show-all-buffers t
+  (setq exwm-workspace-show-all-buffers t
         exwm-layout-show-all-buffers t)
 
   ;; "Global key bindings" in EXWM work essentially anywhere, including buffers
@@ -47,7 +46,7 @@ selected workspace at the time of invocation."
                ,@body)
            (exwm-workspace-switch ,old)))))
 
-  (defvar exwm-randr-workspace-order '(0 1)
+  (defvar exwm-randr-workspace-order '(2 0 1)
     "An ordering of how the monitor associated with each
     workspace appears on my desk, from left-to-right.")
 
@@ -61,7 +60,7 @@ selected workspace at the time of invocation."
   (defun my-windmove--left-workspace ()
     "Return the workspace to the left of this one, according to
 `exwm-randr-workspace-order'."
-    (let ((index (cl-find exwm-workspace-current-index exwm-randr-workspace-order)))
+    (let ((index (cl-position exwm-workspace-current-index exwm-randr-workspace-order)))
       (if (> 0 (1- index))
           (car (last exwm-randr-workspace-order))
         (nth (1- index) exwm-randr-workspace-order))))
@@ -69,7 +68,7 @@ selected workspace at the time of invocation."
   (defun my-windmove--right-workspace ()
     "Return the workspace to the right of this one, according to
 `exwm-randr-workspace-order'."
-    (let ((index (cl-find exwm-workspace-current-index exwm-randr-workspace-order)))
+    (let ((index (cl-position exwm-workspace-current-index exwm-randr-workspace-order)))
       (if (= (length exwm-randr-workspace-order) (1+ index))
           (cl-first exwm-randr-workspace-order)
         (nth (1+ index) exwm-randr-workspace-order))))
@@ -229,7 +228,7 @@ the same frame, otherwise call out to `exwm-workspace-switch'."
              (cl-search "HDMI-1 connected" (buffer-string))))))
   (setq exwm-randr-workspace-monitor-plist
         (if (string= (system-name) "Epsilon")
-            '(0 "DVI-D-0" 1 "HDMI-A-0")
+            '(0 "DVI-D-0" 1 "HDMI-A-0" 2 "DisplayPort-0")
           '(0 (if (hdmi-out) "HDMI-1" "eDP-1"))))
   (add-hook 'exwm-randr-screen-change-hook
             (lambda ()